Skip to content

Commit

Permalink
Move loading to DataGridPropsWithDefaultValues
Browse files Browse the repository at this point in the history
  • Loading branch information
MBilalShafi committed Jul 9, 2024
1 parent d03c570 commit 7733550
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions packages/x-data-grid/src/DataGrid/useDataGridProps.ts
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
10 changes: 5 additions & 5 deletions packages/x-data-grid/src/models/props/DataGridProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,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 @@ -734,11 +739,6 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
* Return the id of a given [[GridRowModel]].
*/
getRowId?: GridRowIdGetter<R>;
/**
* If `true`, a loading overlay is displayed.
* @default false
*/
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

0 comments on commit 7733550

Please sign in to comment.