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] Add support for default props from theme #1019

Merged
merged 5 commits into from Feb 10, 2021
Merged

[DataGrid] Add support for default props from theme #1019

merged 5 commits into from Feb 10, 2021

Conversation

DanailH
Copy link
Member

@DanailH DanailH commented Feb 9, 2021 •
edited by oliviertassinari

Fixes #984

This PR allows us to do the folowing:

const theme = createMuiTheme({}, bgBG);

....

<ThemeProvider theme={theme}>
  <DataGrid />
</ThemeProvider>

It turns out we don't need the entire hook to achieve what was desired.

I didn't add the isRtl since the grid doesn't really support it.

Added 1 test.

No docs - I didn't add any since this should have work in the first place. If you have suggestions share and I will also add docs 😉

@DanailH DanailH self-assigned this Feb 9, 2021
@DanailH DanailH added component: data grid This is the name of the generic UI component, not the React module! new feature New feature or request labels Feb 9, 2021
oliviertassinari
oliviertassinari requested changes Feb 9, 2021
View reviewed changes
packages/grid/_modules_/grid/components/toolbar/DensitySelector.tsx Outdated Show resolved Hide resolved
packages/grid/data-grid/src/tests/layout.DataGrid.test.tsx Outdated
Comment on lines 491 to 509
it('should pass translations using the ThemeProvider', () => {
const theme = createMuiTheme({}, bgBG);

const { getByText } = render(
<div style={{ width: 300, height: 300 }}>
<ThemeProvider theme={theme}>
<DataGrid
{...baselineProps}
showToolbar
components={{
Toolbar: GridToolbar,
}}
/>
</ThemeProvider>
</div>,
);

expect(getByText('Гъстота')).not.to.equal(null);
});
Copy link
Member

Choose a reason for hiding this comment

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

I think that this test is too high-level. We don't need it.

Copy link
Member

Choose a reason for hiding this comment

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

Consider this approach instead: https://github.com/mui-org/material-ui/blob/b5bce5007b6d025360fefa887eaf5b0206fab5ae/test/utils/describeConformanceV5.js#L40. We can copy the helper until we upgrade to v5 to be able to simply replace the import.

Copy link
Member Author

Choose a reason for hiding this comment

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

I removed the test for now. If we don't need it it's better to avoid copying the helper.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, no preferences for the testing approach in this case

I think that long term, we should have all the public components running inside describeConformance. Marija had opened mui/material-ui#22371 related to this localization problem.

packages/grid/_modules_/grid/hooks/utils/useOptionsProp.ts Outdated Show resolved Hide resolved
@DanailH DanailH requested a review from dtassone February 9, 2021 15:22
@DanailH DanailH merged commit 9d1c403 into mui:master Feb 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliviertassinari oliviertassinari oliviertassinari approved these changes

@dtassone dtassone Awaiting requested review from dtassone

Assignees

@DanailH DanailH

Labels
component: data grid This is the name of the generic UI component, not the React module! new feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[DataGrid] Add support for default props from theme
2 participants
@DanailH @oliviertassinari