Skip to content

[docs] Add missing default loading prop value #13604

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

Merged
merged 3 commits into from
Jul 9, 2024
Merged

[docs] Add missing default loading prop value #13604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d03c570
[data grid][docs] Add missing default loading prop value
oliviertassinari Jun 23, 2024
7733550
Move loading to DataGridPropsWithDefaultValues
MBilalShafi Jul 9, 2024
23b34b6
Merge branch 'master' into add-missing-default
MBilalShafi Jul 9, 2024
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/pages/x/api/data-grid/data-grid-premium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
},
"keepColumnPositionIfDraggedOutside": { "type": { "name": "bool" }, "default": "false" },
"keepNonExistentRowsSelected": { "type": { "name": "bool" }, "default": "false" },
"loading": { "type": { "name": "bool" } },
"loading": { "type": { "name": "bool" }, "default": "false" },
"localeText": { "type": { "name": "object" } },
"logger": {
"type": {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/data-grid/data-grid-pro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
},
"keepColumnPositionIfDraggedOutside": { "type": { "name": "bool" }, "default": "false" },
"keepNonExistentRowsSelected": { "type": { "name": "bool" }, "default": "false" },
"loading": { "type": { "name": "bool" } },
"loading": { "type": { "name": "bool" }, "default": "false" },
"localeText": { "type": { "name": "object" } },
"logger": {
"type": {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/data-grid/data-grid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
}
},
"keepNonExistentRowsSelected": { "type": { "name": "bool" }, "default": "false" },
"loading": { "type": { "name": "bool" } },
"loading": { "type": { "name": "bool" }, "default": "false" },
"localeText": { "type": { "name": "object" } },
"logger": {
"type": {
Expand Down
1 change: 1 addition & 0 deletions packages/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ DataGridPremiumRaw.propTypes = {
keepNonExistentRowsSelected: PropTypes.bool,
/**
* If `true`, a loading overlay is displayed.
* @default false
*/
loading: PropTypes.bool,
/**
Expand Down
1 change: 1 addition & 0 deletions packages/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ DataGridProRaw.propTypes = {
keepNonExistentRowsSelected: PropTypes.bool,
/**
* If `true`, a loading overlay is displayed.
* @default false
*/
loading: PropTypes.bool,
/**
Expand Down
1 change: 1 addition & 0 deletions packages/x-data-grid/src/DataGrid/DataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ DataGridRaw.propTypes = {
keepNonExistentRowsSelected: PropTypes.bool,
/**
* If `true`, a loading overlay is displayed.
* @default false
*/
loading: PropTypes.bool,
/**
Expand Down
1 change: 1 addition & 0 deletions packages/x-data-grid/src/DataGrid/useDataGridProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export const DATA_GRID_PROPS_DEFAULT_VALUES: DataGridPropsWithDefaultValues = {
rowPositionsDebounceMs: 166,
autosizeOnMount: false,
disableAutosize: false,
loading: false,
};

const defaultSlots = DATA_GRID_DEFAULT_SLOTS_COMPONENTS;
Expand Down
9 changes: 5 additions & 4 deletions packages/x-data-grid/src/models/props/DataGridProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ export interface DataGridPropsWithDefaultValues<R extends GridValidRowModel = an
* @default "error" ("warn" in dev mode)
*/
logLevel: keyof Logger | false;
/**
* If `true`, a loading overlay is displayed.
* @default false
*/
loading: boolean;
/**
* If `true`, pagination is enabled.
* @default false
Expand Down Expand Up @@ -735,10 +740,6 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
* Return the id of a given [[GridRowModel]].
*/
getRowId?: GridRowIdGetter<R>;
/**
* If `true`, a loading overlay is displayed.
*/
loading?: boolean;
/**
* Nonce of the inline styles for [Content Security Policy](https://www.w3.org/TR/2016/REC-CSP2-20161215/#script-src-the-nonce-attribute).
*/
Expand Down