Revert Grid wrap deprecation (mui#42363)

DiegoAndai · Aug 26, 2024 · 065778c · 065778c
1 parent 3226205
commit 065778c
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 175 deletions.
diff --git a/docs/data/material/components/grid/AutoGridNoWrap.js b/docs/data/material/components/grid/AutoGridNoWrap.js
@@ -24,7 +24,7 @@ export default function AutoGridNoWrap() {
   return (
     <Box sx={{ flexGrow: 1, overflow: 'hidden', px: 3 }}>
       <StyledPaper sx={{ my: 1, mx: 'auto', p: 2 }}>
-        <Grid container spacing={2} sx={{ flexWrap: 'nowrap' }}>
+        <Grid container spacing={2} wrap="nowrap">
           <Grid item>
             <Avatar>W</Avatar>
           </Grid>
@@ -34,7 +34,7 @@ export default function AutoGridNoWrap() {
         </Grid>
       </StyledPaper>
       <StyledPaper sx={{ my: 1, mx: 'auto', p: 2 }}>
-        <Grid container spacing={2} sx={{ flexWrap: 'nowrap' }}>
+        <Grid container spacing={2} wrap="nowrap">
           <Grid item>
             <Avatar>W</Avatar>
           </Grid>
@@ -44,7 +44,7 @@ export default function AutoGridNoWrap() {
         </Grid>
       </StyledPaper>
       <StyledPaper sx={{ my: 1, mx: 'auto', p: 2 }}>
-        <Grid container spacing={2} sx={{ flexWrap: 'nowrap' }}>
+        <Grid container spacing={2} wrap="nowrap">
           <Grid item>
             <Avatar>W</Avatar>
           </Grid>

diff --git a/docs/data/material/components/grid/AutoGridNoWrap.tsx b/docs/data/material/components/grid/AutoGridNoWrap.tsx
@@ -24,7 +24,7 @@ export default function AutoGridNoWrap() {
   return (
     <Box sx={{ flexGrow: 1, overflow: 'hidden', px: 3 }}>
       <StyledPaper sx={{ my: 1, mx: 'auto', p: 2 }}>
-        <Grid container spacing={2} sx={{ flexWrap: 'nowrap' }}>
+        <Grid container spacing={2} wrap="nowrap">
           <Grid item>
             <Avatar>W</Avatar>
           </Grid>
@@ -34,7 +34,7 @@ export default function AutoGridNoWrap() {
         </Grid>
       </StyledPaper>
       <StyledPaper sx={{ my: 1, mx: 'auto', p: 2 }}>
-        <Grid container spacing={2} sx={{ flexWrap: 'nowrap' }}>
+        <Grid container spacing={2} wrap="nowrap">
           <Grid item>
             <Avatar>W</Avatar>
           </Grid>
@@ -44,7 +44,7 @@ export default function AutoGridNoWrap() {
         </Grid>
       </StyledPaper>
       <StyledPaper sx={{ my: 1, mx: 'auto', p: 2 }}>
-        <Grid container spacing={2} sx={{ flexWrap: 'nowrap' }}>
+        <Grid container spacing={2} wrap="nowrap">
           <Grid item>
             <Avatar>W</Avatar>
           </Grid>

diff --git a/docs/data/material/components/skeleton/YouTube.js b/docs/data/material/components/skeleton/YouTube.js
@@ -33,7 +33,7 @@ function Media(props) {
   const { loading = false } = props;
 
   return (
-    <Grid container sx={{ flexWrap: 'nowrap' }}>
+    <Grid container wrap="nowrap">
       {(loading ? Array.from(new Array(3)) : data).map((item, index) => (
         <Box key={index} sx={{ width: 210, marginRight: 0.5, my: 5 }}>
           {item ? (

diff --git a/docs/data/material/components/skeleton/YouTube.tsx b/docs/data/material/components/skeleton/YouTube.tsx
@@ -36,7 +36,7 @@ function Media(props: MediaProps) {
   const { loading = false } = props;
 
   return (
-    <Grid container sx={{ flexWrap: 'nowrap' }}>
+    <Grid container wrap="nowrap">
       {(loading ? Array.from(new Array(3)) : data).map((item, index) => (
         <Box key={index} sx={{ width: 210, marginRight: 0.5, my: 5 }}>
           {item ? (

diff --git a/...rial/migration/migrating-from-deprecated-apis/migrating-from-deprecated-apis.md b/...rial/migration/migrating-from-deprecated-apis/migrating-from-deprecated-apis.md
@@ -1166,25 +1166,6 @@ The ListItemSecondaryAction component was deprecated in favor of the `secondaryA
  </ListItem>
 ```
 
-## Grid
-
-Use the [codemod](https://github.com/mui/material-ui/tree/HEAD/packages/mui-codemod#grid-props) below to migrate the code as described in the following sections:
-
-```bash
-npx @mui/codemod@next deprecations/grid-props <path>
-```
-
-### wrap prop
-
-The Grid's `wrap` prop was deprecated in favor of `flexWrap` MUI System prop:
-
-```diff
- <Grid
--  wrap="nowrap"
-+  flexWrap="nowrap"
- >
-```
-
 ## ImageListItemBar
 
 Use the [codemod](https://github.com/mui/material-ui/tree/HEAD/packages/mui-codemod#image-list-item-bar-classes) below to migrate the code as described in the following sections:

diff --git a/docs/pages/material-ui/api/grid.json b/docs/pages/material-ui/api/grid.json
@@ -71,9 +71,7 @@
         "name": "enum",
         "description": "'nowrap'<br>&#124;&nbsp;'wrap-reverse'<br>&#124;&nbsp;'wrap'"
       },
-      "default": "'wrap'",
-      "deprecated": true,
-      "deprecationInfo": "Use <code>flexWrap</code> instead. This prop will be removed in v7. See <a href=\"/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
+      "default": "'wrap'"
     },
     "xl": {
       "type": {

diff --git a/packages/mui-codemod/README.md b/packages/mui-codemod/README.md
@@ -1103,19 +1103,6 @@ npx @mui/codemod@next deprecations/form-control-label-props <path>
 npx @mui/codemod@next deprecations/list-item-props <path>
 ```
 
-#### `grid-props`
-
-```diff
- <Grid
--  wrap="nowrap"
-+  flexWrap="nowrap"
- />
-```
-
-```bash
-npx @mui/codemod@next deprecations/grid-props <path>
-```
-
 #### `image-list-item-bar-classes`
 
 JS transforms:

diff --git a/packages/mui-codemod/src/deprecations/all/deprecations-all.js b/packages/mui-codemod/src/deprecations/all/deprecations-all.js
@@ -10,7 +10,6 @@ import transformCircularProgressClasses from '../circular-progress-classes';
 import transformDividerProps from '../divider-props';
 import transformFilledInputProps from '../filled-input-props';
 import transformFormControlLabelProps from '../form-control-label-props';
-import transformGridProps from '../grid-props';
 import transformImageListItemBarClasses from '../image-list-item-bar-classes';
 import transformInputBaseProps from '../input-base-props';
 import transformInputProps from '../input-props';
@@ -41,7 +40,6 @@ export default function deprecationsAll(file, api, options) {
   file.source = transformDividerProps(file, api, options);
   file.source = transformFilledInputProps(file, api, options);
   file.source = transformFormControlLabelProps(file, api, options);
-  file.source = transformGridProps(file, api, options);
   file.source = transformImageListItemBarClasses(file, api, options);
   file.source = transformInputBaseProps(file, api, options);
   file.source = transformInputProps(file, api, options);

diff --git a/packages/mui-codemod/src/deprecations/grid-props/grid-props.js b/packages/mui-codemod/src/deprecations/grid-props/grid-props.js
diff --git a/packages/mui-codemod/src/deprecations/grid-props/grid-props.test.js b/packages/mui-codemod/src/deprecations/grid-props/grid-props.test.js
diff --git a/packages/mui-codemod/src/deprecations/grid-props/index.js b/packages/mui-codemod/src/deprecations/grid-props/index.js
diff --git a/packages/mui-codemod/src/deprecations/grid-props/test-cases/actual.js b/packages/mui-codemod/src/deprecations/grid-props/test-cases/actual.js
diff --git a/packages/mui-codemod/src/deprecations/grid-props/test-cases/expected.js b/packages/mui-codemod/src/deprecations/grid-props/test-cases/expected.js
diff --git a/packages/mui-codemod/src/deprecations/grid-props/test-cases/theme.actual.js b/packages/mui-codemod/src/deprecations/grid-props/test-cases/theme.actual.js
diff --git a/packages/mui-codemod/src/deprecations/grid-props/test-cases/theme.expected.js b/packages/mui-codemod/src/deprecations/grid-props/test-cases/theme.expected.js
diff --git a/packages/mui-material/src/Grid/Grid.d.ts b/packages/mui-material/src/Grid/Grid.d.ts
@@ -139,7 +139,6 @@ export interface GridOwnProps extends SystemProps<Theme>, Breakpoints {
    * Defines the `flex-wrap` style property.
    * It's applied for all screen sizes.
    * @default 'wrap'
-   * @deprecated Use `flexWrap` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   wrap?: GridWrap;
   /**

diff --git a/packages/mui-material/src/Grid/Grid.js b/packages/mui-material/src/Grid/Grid.js
@@ -595,7 +595,6 @@ Grid.propTypes /* remove-proptypes */ = {
    * Defines the `flex-wrap` style property.
    * It's applied for all screen sizes.
    * @default 'wrap'
-   * @deprecated Use `flexWrap` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
   /**