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

[core] Update monorepo #6180

Merged
merged 2 commits into from
Sep 16, 2022
Merged

[core] Update monorepo #6180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f788b3c
[core] Update monorepo
flaviendelangle Sep 16, 2022
ff0ad5b
Generate proptypes
flaviendelangle Sep 16, 2022
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
12 changes: 10 additions & 2 deletions 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 @@ -4,7 +4,10 @@
"type": { "name": "arrayOf", "description": "Array<object>" },
"required": true
},
"rows": { "type": { "name": "array" }, "required": true },
"rows": {
"type": { "name": "arrayOf", "description": "Array<object>" },
"required": true
},
"aggregationFunctions": {
"type": { "name": "object" },
"default": "GRID_AGGREGATION_FUNCTIONS"
Expand Down Expand Up @@ -194,7 +197,12 @@
"description": "{ left?: Array<string>, right?: Array<string> }"
}
},
"pinnedRows": { "type": { "name": "shape", "description": "{ bottom?: array, top?: array }" } },
"pinnedRows": {
"type": {
"name": "shape",
"description": "{ bottom?: Array<object>, top?: Array<object> }"
}
},
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"type": { "name": "arrayOf", "description": "Array<object>" },
"required": true
},
"rows": { "type": { "name": "array" }, "required": true },
"rows": {
"type": { "name": "arrayOf", "description": "Array<object>" },
"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<string>, right?: Array<string> }"
}
},
"pinnedRows": { "type": { "name": "shape", "description": "{ bottom?: array, top?: array }" } },
"pinnedRows": {
"type": {
"name": "shape",
"description": "{ bottom?: Array<object>, top?: Array<object> }"
}
},
"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
View file
Open in desktop
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<object>" },
"required": true
},
"aria-label": { "type": { "name": "string" } },
"aria-labelledby": { "type": { "name": "string" } },
"autoHeight": { "type": { "name": "bool" } },
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@mnajdova/enzyme-adapter-react-18": "^0.2.0",
"@mui/icons-material": "^5.10.3",
"@mui/material": "^5.10.4",
"@mui/monorepo": "https://github.com/m4theushw/material-ui.git#master",
"@mui/monorepo": "https://github.com/flaviendelangle/material-ui.git#master",
Copy link
Member

@oliviertassinari oliviertassinari Sep 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Shouldn't it be?

Suggested change
"@mui/monorepo": "https://github.com/flaviendelangle/material-ui.git#master",
"@mui/monorepo": "https://github.com/mui/material-ui.git#master",

I plan to merge mui/material-ui#34259, I will need it to be on the main release line.

Copy link
Member Author

Choose a reason for hiding this comment

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

The problem is that, unless it has been fixed and I don't know, the codesandbox cache of the mui repo is still broken.
It's the problem when migrating Argos.

Copy link
Member

Choose a reason for hiding this comment

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

I created codesandbox/codesandbox-ci-ui#49 but I don't hope they will implement this. There're issues from last year without any comment in this repo.

Copy link
Member

@oliviertassinari oliviertassinari Sep 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Oh, I see. I think that I could solve the issue. See the build history at https://ci.codesandbox.io/status/mui/mui-x/pr/5938.

  • 294382 failed, I started to look at a fix
  • 294385 failed again with the first attempt I did
  • 294386 passed with the second attempt I did 0d204c9
  • 294388 still passed with a git revert of 0d204c9

So I went ahead I opened #6188, #6189 for our two base branches.

"@mui/utils": "^5.10.3",
"@octokit/plugin-retry": "^3.0.9",
"@octokit/rest": "^18.12.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid/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 @@ -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
10 changes: 10 additions & 0 deletions packages/grid/x-data-grid-premium/src/components/GridExcelExportMenuItem.tsx
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-pro/src/components/GridDetailPanelToggleCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-pro/src/components/GridTreeDataGroupingCell.tsx
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/cell/GridActionsCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/cell/GridBooleanCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/cell/GridEditBooleanCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/cell/GridEditDateCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/cell/GridEditInputCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/cell/GridEditSingleSelectCell.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,9 +2518,9 @@
react-is "^18.2.0"
react-transition-group "^4.4.5"

"@mui/monorepo@https://github.com/m4theushw/material-ui.git#master":
version "5.10.4"
resolved "https://github.com/m4theushw/material-ui.git#0189797d23c6469438c7dc68db214f490697ebce"
"@mui/monorepo@https://github.com/flaviendelangle/material-ui.git#master":
version "5.10.5"
resolved "https://github.com/flaviendelangle/material-ui.git#002ab79b77d4d88add840e21c5101137a4a7de5a"

"@mui/private-theming@^5.10.3":
version "5.10.3"
Expand Down