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.

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

[core] Upgrade monorepo #6570

Merged
merged 4 commits into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ module.exports = {
'jsdoc/require-returns': ['error', { contexts: ['TSFunctionType'] }],
'jsdoc/require-returns-type': ['error', { contexts: ['TSFunctionType'] }],
'jsdoc/require-returns-description': ['error', { contexts: ['TSFunctionType'] }],
'react/no-unstable-nested-components': ['error', { allowAsProps: true }],
},
overrides: [
...baselineOverrides,
Expand Down
2 changes: 1 addition & 1 deletion docs/data/data-grid/layout/FixedSizeGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function FixedSizeGrid() {
});

return (
<div style={{ height: 400, width: '100%' }}>
<div style={{ width: '100%' }}>
<div style={{ height: 350, width: '100%' }}>
<DataGrid {...data} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/data/data-grid/layout/FixedSizeGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function FixedSizeGrid() {
});

return (
<div style={{ height: 400, width: '100%' }}>
<div style={{ width: '100%' }}>
<div style={{ height: 350, width: '100%' }}>
<DataGrid {...data} />
</div>
Expand Down
8 changes: 8 additions & 0 deletions docs/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ module.exports = {
return {
...config,
plugins,
resolve: {
...config.resolve,
alias: {
...config.resolve.alias,
docs: path.resolve(__dirname, '../node_modules/@mui/monorepo/docs'),
docsx: path.resolve(__dirname, '../docs'),
},
},
module: {
...config.module,
rules: config.module.rules.concat([
Expand Down
2 changes: 2 additions & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
"react-is": "^18.2.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-runner": "^1.0.3",
"react-simple-code-editor": "^0.13.1",
"react-text-mask": "^5.4.3",
"recast": "^0.21.2",
"rimraf": "^3.0.2",
Expand Down
12 changes: 10 additions & 2 deletions docs/pages/x/api/data-grid/data-grid-premium.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"type": { "name": "arrayOf", "description": "Array&lt;object&gt;" },
"required": true
},
"rows": { "type": { "name": "array" }, "required": true },
"rows": {
"type": { "name": "arrayOf", "description": "Array&lt;object&gt;" },
"required": true
},
"aggregationFunctions": {
"type": { "name": "object" },
"default": "GRID_AGGREGATION_FUNCTIONS"
Expand Down Expand Up @@ -194,7 +197,12 @@
"description": "{ left?: Array&lt;string&gt;, right?: Array&lt;string&gt; }"
}
},
"pinnedRows": { "type": { "name": "shape", "description": "{ bottom?: array, top?: array }" } },
"pinnedRows": {
"type": {
"name": "shape",
"description": "{ bottom?: Array&lt;object&gt;, top?: Array&lt;object&gt; }"
}
},
"processRowUpdate": { "type": { "name": "func" } },
"rowBuffer": { "type": { "name": "number" }, "default": "3" },
"rowCount": { "type": { "name": "number" } },
Expand Down
12 changes: 10 additions & 2 deletions docs/pages/x/api/data-grid/data-grid-pro.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"type": { "name": "arrayOf", "description": "Array&lt;object&gt;" },
"required": true
},
"rows": { "type": { "name": "array" }, "required": true },
"rows": {
"type": { "name": "arrayOf", "description": "Array&lt;object&gt;" },
"required": true
},
"apiRef": { "type": { "name": "shape", "description": "{ current: object }" } },
"aria-label": { "type": { "name": "string" } },
"aria-labelledby": { "type": { "name": "string" } },
Expand Down Expand Up @@ -177,7 +180,12 @@
"description": "{ left?: Array&lt;string&gt;, right?: Array&lt;string&gt; }"
}
},
"pinnedRows": { "type": { "name": "shape", "description": "{ bottom?: array, top?: array }" } },
"pinnedRows": {
"type": {
"name": "shape",
"description": "{ bottom?: Array&lt;object&gt;, top?: Array&lt;object&gt; }"
}
},
"processRowUpdate": { "type": { "name": "func" } },
"rowBuffer": { "type": { "name": "number" }, "default": "3" },
"rowCount": { "type": { "name": "number" } },
Expand Down
5 changes: 4 additions & 1 deletion docs/pages/x/api/data-grid/data-grid.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"props": {
"columns": { "type": { "name": "custom", "description": "array" }, "required": true },
"rows": { "type": { "name": "array" }, "required": true },
"rows": {
"type": { "name": "arrayOf", "description": "Array&lt;object&gt;" },
"required": true
},
"aria-label": { "type": { "name": "string" } },
"aria-labelledby": { "type": { "name": "string" } },
"autoHeight": { "type": { "name": "bool" } },
Expand Down
8 changes: 2 additions & 6 deletions docs/pages/x/react-data-grid/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import * as React from 'react';
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
import {
demos,
docs,
demoComponents,
} from 'docsx/data/data-grid/overview/overview.md?@mui/markdown';
import * as pageProps from 'docsx/data/data-grid/overview/overview.md?@mui/markdown';

export default function Page() {
return <MarkdownDocs demos={demos} docs={docs} demoComponents={demoComponents} />;
return <MarkdownDocs {...pageProps} />;
}
1 change: 1 addition & 0 deletions docs/src/modules/components/ComponentLinkHeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'docs/src/modules/components/ComponentLinkHeader';
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,8 @@ DataGridPremiumRaw.propTypes = {
* Rows data to pin on top or bottom.
*/
pinnedRows: PropTypes.shape({
bottom: PropTypes.array,
top: PropTypes.array,
bottom: PropTypes.arrayOf(PropTypes.object),
top: PropTypes.arrayOf(PropTypes.object),
}),
/**
* Callback called before updating a row with new values in the row and cell editing.
Expand Down Expand Up @@ -882,7 +882,7 @@ DataGridPremiumRaw.propTypes = {
/**
* Set of rows of type [[GridRowsProp]].
*/
rows: PropTypes.array.isRequired,
rows: PropTypes.arrayOf(PropTypes.object).isRequired,
/**
* Loading rows can be processed on the server or client-side.
* Set it to 'client' if you would like enable infnite loading.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,17 @@ GridExcelExportMenuItem.propTypes = {
// ----------------------------------------------------------------------
hideMenu: PropTypes.func,
options: PropTypes.shape({
allColumns: PropTypes.bool,
columnsStyles: PropTypes.object,
disableToolbarButton: PropTypes.bool,
exceljsPostProcess: PropTypes.func,
exceljsPreProcess: PropTypes.func,
fields: PropTypes.arrayOf(PropTypes.string),
fileName: PropTypes.string,
getRowsToExport: PropTypes.func,
includeColumnGroupsHeaders: PropTypes.bool,
includeHeaders: PropTypes.bool,
valueOptionsSheetName: PropTypes.string,
}),
} as any;

Expand Down
6 changes: 3 additions & 3 deletions packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -784,8 +784,8 @@ DataGridProRaw.propTypes = {
* Rows data to pin on top or bottom.
*/
pinnedRows: PropTypes.shape({
bottom: PropTypes.array,
top: PropTypes.array,
bottom: PropTypes.arrayOf(PropTypes.object),
top: PropTypes.arrayOf(PropTypes.object),
}),
/**
* Callback called before updating a row with new values in the row and cell editing.
Expand Down Expand Up @@ -823,7 +823,7 @@ DataGridProRaw.propTypes = {
/**
* Set of rows of type [[GridRowsProp]].
*/
rows: PropTypes.array.isRequired,
rows: PropTypes.arrayOf(PropTypes.object).isRequired,
/**
* Loading rows can be processed on the server or client-side.
* Set it to 'client' if you would like enable infnite loading.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ GridDetailPanelToggleCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ GridTreeDataGroupingCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/DataGrid/DataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ DataGridRaw.propTypes = {
/**
* Set of rows of type [[GridRowsProp]].
*/
rows: PropTypes.array.isRequired,
rows: PropTypes.arrayOf(PropTypes.object).isRequired,
/**
* Sets the type of space between rows added by `getRowSpacing`.
* @default "margin"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ GridActionsCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ GridBooleanCellRaw.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ GridEditBooleanCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ GridEditDateCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ GridEditInputCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object,
row: PropTypes.any,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ GridEditSingleSelectCell.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ GridCellCheckboxForwardRef.propTypes = {
/**
* The row model of the row that the current cell belongs to.
*/
row: PropTypes.object.isRequired,
row: PropTypes.any.isRequired,
/**
* The node of the row that the current cell belongs to.
*/
Expand Down
Loading