Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #4872

Merged
merged 6 commits into from
May 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "3.0.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.9.0",
"@material-ui/icons": "^4.5.1",
"@material-ui/core": "^4.10.0",
"@material-ui/icons": "^4.9.1",
"@types/inflection": "^1.5.28",
"@types/recharts": "^1.8.10",
"data-generator-retail": "^3.0.0",
Expand Down Expand Up @@ -54,4 +54,4 @@
"source-map-explorer": "^2.0.0",
"typescript": "^3.7.2"
}
}
}
6 changes: 3 additions & 3 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
},
"dependencies": {
"@babel/polyfill": "^7.0.0",
"@material-ui/core": "^4.9.0",
"@material-ui/icons": "^4.5.1",
"@material-ui/core": "^4.10.0",
"@material-ui/icons": "^4.9.1",
"ra-data-fakerest": "^3.0.0",
"ra-i18n-polyglot": "^3.0.0",
"ra-input-rich-text": "^3.0.0",
Expand All @@ -47,4 +47,4 @@
"react-admin": "^3.0.0",
"react-dom": "^16.9.0"
}
}
}
4 changes: 2 additions & 2 deletions examples/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.0.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.9.0",
"@material-ui/core": "^4.10.0",
"ra-data-json-server": "^3.0.0",
"react": "^16.9.0",
"react-admin": "^3.0.0",
Expand All @@ -21,4 +21,4 @@
"not ie <= 11",
"not op_mini all"
]
}
}
6 changes: 3 additions & 3 deletions packages/ra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"cross-env": "^5.2.0",
"enzyme": "~3.9.0",
"enzyme-adapter-react-16": "~1.12.1",
"final-form": "^4.18.5",
"final-form": "^4.20.0",
"history": "^4.7.2",
"ignore-styles": "~5.0.1",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-final-form": "^6.3.3",
"react-final-form": "^6.5.0",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
Expand Down Expand Up @@ -77,4 +77,4 @@
"recompose": "~0.26.0",
"reselect": "~3.0.0"
}
}
}
12 changes: 6 additions & 6 deletions packages/ra-ui-materialui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
"watch": "tsc --outDir esm --module es2015 --watch"
},
"devDependencies": {
"@material-ui/core": "^4.3.3",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.3.3",
"@material-ui/core": "^4.10.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/styles": "^4.10.0",
"@testing-library/react": "^8.0.7",
"@types/query-string": "5.1.0",
"cross-env": "^5.2.0",
"enzyme": "~3.9.0",
"enzyme-adapter-react-16": "~1.12.1",
"file-api": "~0.10.4",
"final-form": "^4.18.5",
"final-form": "^4.20.0",
"final-form-arrays": "^3.0.1",
"ignore-styles": "~5.0.1",
"ra-core": "^3.5.3",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-final-form": "^6.3.3",
"react-final-form": "^6.5.0",
"react-final-form-arrays": "^3.1.1",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
Expand Down Expand Up @@ -81,4 +81,4 @@
"react-transition-group": "^4.3.0",
"recompose": "~0.26.0"
}
}
}
1 change: 1 addition & 0 deletions packages/ra-ui-materialui/src/field/ReferenceField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ export const ReferenceFieldView: FC<ReferenceFieldViewProps> = props => {
aria-errormessage={error.message ? error.message : error}
color="error"
fontSize="small"
role="presentation"
/>
);
}
Expand Down
4 changes: 3 additions & 1 deletion packages/ra-ui-materialui/src/form/SimpleForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ const sanitizeRestProps = ({
initialize,
initialized,
initialValues,
modifiedSinceLastSubmit,
modifiedsincelastsubmit,
pristine,
pure,
redirect,
Expand All @@ -198,7 +200,7 @@ const sanitizeRestProps = ({
valid,
validate,
validating,
_reduxForm,
__versions,
...props
}) => props;

Expand Down
4 changes: 3 additions & 1 deletion packages/ra-ui-materialui/src/form/TabbedForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ const sanitizeRestProps = ({
initialize,
initialized,
initialValues,
modifiedSinceLastSubmit,
modifiedsincelastsubmit,
pristine,
pure,
redirect,
Expand All @@ -299,7 +301,7 @@ const sanitizeRestProps = ({
valid,
validate,
validating,
_reduxForm,
__versions,
...props
}) => props;

Expand Down
16 changes: 11 additions & 5 deletions packages/ra-ui-materialui/src/input/NullableBooleanInput.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import expect from 'expect';
import { fireEvent, render, cleanup } from '@testing-library/react';
import { fireEvent, render, cleanup, wait } from '@testing-library/react';
import { Form } from 'react-final-form';

import NullableBooleanInput from './NullableBooleanInput';
Expand All @@ -14,7 +14,7 @@ describe('<NullableBooleanInput />', () => {
value: '',
};

it('should give three different choices for true, false or unknown', () => {
it('should give three different choices for true, false or unknown', async () => {
let formApi;
const { getByText, getByRole, getAllByRole } = render(
<Form
Expand All @@ -31,15 +31,21 @@ describe('<NullableBooleanInput />', () => {
expect(options.length).toEqual(3);

fireEvent.click(getByText('ra.boolean.null'));
expect(formApi.getState().values.isPublished).toBeNull();
await wait(() => {
expect(formApi.getState().values.isPublished).toBeUndefined();
});

fireEvent.mouseDown(select);
fireEvent.click(getByText('ra.boolean.false'));
expect(formApi.getState().values.isPublished).toEqual(false);
await wait(() => {
expect(formApi.getState().values.isPublished).toEqual(false);
});

fireEvent.mouseDown(select);
fireEvent.click(getByText('ra.boolean.true'));
expect(formApi.getState().values.isPublished).toEqual(true);
await wait(() => {
expect(formApi.getState().values.isPublished).toEqual(true);
});
});

it('should select the option "true" if value is true', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0"
}
}
}
Loading