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 fluid columns width support #480

Merged
merged 25 commits into from
Nov 4, 2020
Merged

[DataGrid] Add fluid columns width support #480

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b2392dd
[DataGrid] Add fluid columns width support
DanailH Oct 21, 2020
e54cb9a
Fix doc formatting
DanailH Oct 21, 2020
c77a475
Fix documentation so that it is complient to the MUI documentation st…
DanailH Oct 22, 2020
756932d
Add unit tests
DanailH Oct 26, 2020
2d23e7d
Update packages/grid/_modules_/grid/hooks/root/useColumns.ts
DanailH Oct 27, 2020
6cdced3
Update packages/grid/_modules_/grid/models/colDef/colDef.ts
DanailH Oct 27, 2020
b6cf786
Merge branch 'feature/DataGrid-347-columns-fluid-width' of github.com…
DanailH Oct 27, 2020
12fa1fa
Fix PR comments
DanailH Oct 27, 2020
3b1d8c3
Rebase from upstream master
DanailH Oct 28, 2020
9b042c6
Fix unit tests
DanailH Oct 28, 2020
e92df89
Resolve TS issues
DanailH Oct 28, 2020
ff5e963
Add // @ts-expect-error need to migrate helpers to TypeScript before …
DanailH Oct 28, 2020
5805baa
Add storybook examples
DanailH Oct 30, 2020
6e5401c
Update docs/src/pages/components/data-grid/columns/columns.md
DanailH Nov 2, 2020
bf768d3
Update docs/src/pages/components/data-grid/columns/columns.md
DanailH Nov 2, 2020
94404aa
Update docs/src/pages/components/data-grid/columns/columns.md
DanailH Nov 2, 2020
4c6a988
Update docs/src/pages/components/data-grid/columns/columns.md
DanailH Nov 2, 2020
04f336a
Update docs/src/pages/components/data-grid/columns/columns.md
DanailH Nov 2, 2020
b358751
Update packages/grid/data-grid/src/DataGrid.test.tsx
DanailH Nov 2, 2020
2219564
Fix storybook flex col width examples
DanailH Nov 2, 2020
401b7ed
rerun ci
oliviertassinari Nov 2, 2020
2bd46a0
Fix formatting
DanailH Nov 2, 2020
28baf68
Merge branch 'feature/DataGrid-347-columns-fluid-width' of github.com…
DanailH Nov 2, 2020
9672852
Update docs/src/pages/components/data-grid/columns/columns.md
mbrookes Nov 2, 2020
d300dfe
Trigger CI
DanailH Nov 3, 2020
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
2 changes: 1 addition & 1 deletion docs/src/pages/components/data-grid/columns/columns.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ The first column will be 200px wide, leaving 300px remaining. The column with `f

Note that `flex` doesn't work together with `width`. If you set both `flex` and `width` in `ColDef`, `flex` will override `width`.

The `flex` configuration does not work if the combined width of the columns that have `width` is more than the width of the grid itself. If that is the case a scroll bar will be visible and the columns that hava `flex` will default back to their base value of 100 pixels.
In addition, `flex` does not work if the combined width of the columns that have `width` is more than the width of the grid itself. If that is the case a scroll bar will be visible and the columns that have `flex` will default back to their base value of 100px.
mbrookes marked this conversation as resolved.
Show resolved Hide resolved

{{"demo": "pages/components/data-grid/columns/ColumnFluidWidthGrid.js", "bg": "inline"}}

Expand Down