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.

Sign up for GitHub

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

Jump to bottom

[DataGrid] Replace require with import #455

Merged
merged 2 commits into from
Oct 27, 2020
Merged

[DataGrid] Replace require with import #455

merged 2 commits into from
Oct 27, 2020

Conversation

oliviertassinari
Copy link
Member

Help with #447

@oliviertassinari oliviertassinari added bug 🐛 Something doesn't work component: data grid This is the name of the generic UI component, not the React module! labels Oct 18, 2020
@oliviertassinari oliviertassinari mentioned this pull request Oct 18, 2020
Merged
@oliviertassinari oliviertassinari force-pushed the replace-require-with-import branch 2 times, most recently from 482f918 to 64a6c35 Compare October 19, 2020 13:59
@oliviertassinari oliviertassinari added the on hold There is a blocker, we need to wait label Oct 20, 2020
@oliviertassinari oliviertassinari force-pushed the replace-require-with-import branch from 64a6c35 to cb97890 Compare October 24, 2020 15:48
@oliviertassinari oliviertassinari force-pushed the replace-require-with-import branch from cb97890 to 9675d45 Compare October 24, 2020 16:14
@oliviertassinari oliviertassinari removed the on hold There is a blocker, we need to wait label Oct 24, 2020
@oliviertassinari oliviertassinari force-pushed the replace-require-with-import branch 4 times, most recently from 913e6d4 to 711904a Compare October 24, 2020 16:26
@oliviertassinari oliviertassinari force-pushed the replace-require-with-import branch from 711904a to 232bee0 Compare October 24, 2020 19:29
oliviertassinari
oliviertassinari commented Oct 25, 2020
View reviewed changes
packages/grid/data-grid/src/DataGrid.tsx
@@ -55,8 +53,8 @@ const DataGrid2 = React.forwardRef<HTMLDivElement, DataGridProps>(function DataG
);
});

DataGrid2.propTypes = {
apiRef: chainPropTypes(PropTypes.any, (props) => {
(DataGrid2 as any).propTypes = {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per https://github.com/mui-org/material-ui/pull/22692/files#diff-627976337a26c909a72e934c47966e3a14f3d494334a24994bfec500db76f01fR70

@oliviertassinari oliviertassinari merged commit e39acaf into mui:master Oct 27, 2020
@oliviertassinari oliviertassinari deleted the replace-require-with-import branch October 29, 2020 20:52
dtassone pushed a commit to dtassone/material-ui-x that referenced this pull request Nov 9, 2020
@oliviertassinari @dtassone
[DataGrid] Replace require with import (mui#455)
27e1b85
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtassone dtassone dtassone approved these changes

Assignees
No one assigned
Labels
bug 🐛 Something doesn't work component: data grid This is the name of the generic UI component, not the React module!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oliviertassinari @dtassone