Skip to content

Commit

Permalink
Merge branch 'master' into fix-Clickable-area-expands-with-line-height
Browse files Browse the repository at this point in the history
  • Loading branch information
MachaVivek authored Jan 28, 2025
2 parents 4127d5b + a0fa7c1 commit 5a6b0f7
Show file tree
Hide file tree
Showing 57 changed files with 2,358 additions and 1,794 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- name: Use Node.js 20.x
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 20
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
2 changes: 1 addition & 1 deletion .github/workflows/publish-canaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- name: Use Node.js 20.x
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 20
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
sarif_file: results.sarif
8 changes: 4 additions & 4 deletions apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "0.0.29",
"@types/node": "^20.17.12",
"@types/react": "^19.0.6",
"@types/react-dom": "^19.0.2",
"@pigment-css/nextjs-plugin": "0.0.30",
"@types/node": "^20.17.16",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"eslint": "^8.57.1",
"typescript": "^5.7.3"
},
Expand Down
8 changes: 4 additions & 4 deletions apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-error-boundary": "^5.0.0",
"react-router-dom": "^6.28.1",
"react-router-dom": "^6.28.2",
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@pigment-css/vite-plugin": "0.0.29",
"@types/react": "^19.0.6",
"@types/react-dom": "^19.0.2",
"@pigment-css/vite-plugin": "0.0.30",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@types/webfontloader": "^1.6.38",
"@vitejs/plugin-react": "^4.3.4",
"postcss": "^8.4.49",
Expand Down
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"server:system": "cd ../ && cross-env NODE_ENV=production BABEL_ENV=benchmark babel-node benchmark/server/scenarios/system.js --inspect=0.0.0.0:9229 --extensions \".tsx,.ts,.js\""
},
"dependencies": {
"@babel/runtime": "^7.26.0",
"@babel/runtime": "^7.26.7",
"@chakra-ui/system": "^2.6.2",
"@emotion/react": "^11.13.5",
"@emotion/server": "^11.11.0",
Expand Down
2 changes: 1 addition & 1 deletion docs/data/material/guides/composition/composition.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ The popper slot in the original example would now have both classes applied to i
:::
:::info
`style` object are shallow merged rather than replacing one another. The style keys from the first argument have higher priority.
`style` object and `sx` are shallow merged rather than replacing one another. Those values from the first argument have higher priority.
:::
## Component prop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,69 @@ The PaginationItems's `components` prop was deprecated in favor of `slots`:
/>
```

## Popover

Use the [codemod](https://github.com/mui/material-ui/tree/HEAD/packages/mui-codemod#popover-props) below to migrate the code as described in the following sections:

```bash
npx @mui/codemod@latest deprecations/popover-props <path>
```

### BackdropComponent

The Popover's `BackdropComponent` prop was deprecated in favor of `slots.backdrop`:

```diff
<Popover
- BackdropComponent={Backdrop}
+ slots={{ backdrop: Backdrop }}
>
```

### BackdropProps

The Popover's `BackdropProps` prop was deprecated in favor of `slotProps.backdrop`:

```diff
<Popover
- BackdropProps={{ timeout: 500 }}
+ slotProps={{ backdrop: { timeout: 500 } }}
>
```

### PaperProps

The Popover's `PaperProps` prop was deprecated in favor of `slotProps.paper`:

```diff
<Popover
- PaperProps={{ id: 'paper-id' }}
+ slotProps={{ paper: { id: 'paper-id' } }}
>
```

### TransitionComponent

The Popover's `TransitionComponent` prop was deprecated in favor of `slots.transition`:

```diff
<Popover
- TransitionComponent={Transition}
+ slots={{ transition: Transition }}
>
```

### TransitionProps

The Popover's `TransitionProps` prop was deprecated in favor of `slotProps.transition`:

```diff
<Popover
- TransitionProps={{ timeout: 500 }}
+ slotProps={{ transition: { timeout: 500 } }}
>
```

## Popper

Use the [codemod](https://github.com/mui/material-ui/tree/HEAD/packages/mui-codemod#popper-props) below to migrate the code as described in the following sections:
Expand Down
20 changes: 10 additions & 10 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"link-check": "tsx ./scripts/reportBrokenLinks.js"
},
"dependencies": {
"@babel/core": "^7.26.0",
"@babel/runtime": "^7.26.0",
"@babel/runtime-corejs2": "^7.26.0",
"@docsearch/react": "^3.8.2",
"@babel/core": "^7.26.7",
"@babel/runtime": "^7.26.7",
"@babel/runtime-corejs2": "^7.26.7",
"@docsearch/react": "^3.8.3",
"@emotion/cache": "^11.13.5",
"@emotion/react": "^11.13.5",
"@emotion/server": "^11.11.0",
Expand Down Expand Up @@ -82,8 +82,8 @@
"lz-string": "^1.5.0",
"markdown-to-jsx": "^7.7.3",
"material-ui-popup-state": "^5.3.3",
"next": "^15.1.4",
"notistack": "3.0.1",
"next": "^15.1.6",
"notistack": "3.0.2",
"nprogress": "^0.2.0",
"postcss": "^8.4.49",
"postcss-import": "^16.1.0",
Expand All @@ -96,7 +96,7 @@
"react-intersection-observer": "^9.14.1",
"react-is": "^19.0.0",
"react-number-format": "^5.4.3",
"react-router": "^7.1.1",
"react-router": "^7.1.3",
"react-runner": "^1.0.5",
"react-simple-code-editor": "^0.14.1",
"react-spring": "^9.7.5",
Expand Down Expand Up @@ -124,10 +124,10 @@
"@types/css-mediaquery": "^0.1.4",
"@types/gtag.js": "^0.0.20",
"@types/json2mq": "^0.2.2",
"@types/node": "^20.17.12",
"@types/node": "^20.17.16",
"@types/prop-types": "^15.7.14",
"@types/react": "^19.0.6",
"@types/react-dom": "^19.0.2",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@types/react-swipeable-views": "^0.13.6",
"@types/react-transition-group": "^4.4.12",
"@types/react-window": "^1.8.8",
Expand Down
7 changes: 5 additions & 2 deletions docs/pages/material-ui/api/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
"slotProps": {
"type": {
"name": "shape",
"description": "{ paper?: func<br>&#124;&nbsp;object, root?: func<br>&#124;&nbsp;object }"
"description": "{ backdrop?: func<br>&#124;&nbsp;object, paper?: func<br>&#124;&nbsp;object, root?: func<br>&#124;&nbsp;object, transition?: func<br>&#124;&nbsp;object }"
},
"default": "{}"
},
"slots": {
"type": { "name": "shape", "description": "{ paper?: elementType, root?: elementType }" },
"type": {
"name": "shape",
"description": "{ backdrop?: elementType, paper?: elementType, root?: elementType, transition?: elementType }"
},
"default": "{}"
},
"sx": {
Expand Down
51 changes: 43 additions & 8 deletions docs/pages/material-ui/api/popover.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"type": { "name": "elementType" },
"default": "styled(Backdrop, {\n name: 'MuiModal',\n slot: 'Backdrop',\n overridesResolver: (props, styles) => {\n return styles.backdrop;\n },\n})({\n zIndex: -1,\n})",
"deprecated": true,
"deprecationInfo": "Use <code>slotProps.root.slots.backdrop</code> instead. While this prop currently works, it will be removed in the next major version."
"deprecationInfo": "Use <code>slots.backdrop</code> instead. This prop will be removed in v7. See <a href=\"https://mui.com/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
},
"BackdropProps": {
"type": { "name": "object" },
"deprecated": true,
"deprecationInfo": "Use <code>slotProps.root.slotProps.backdrop</code> instead."
"deprecationInfo": "Use <code>slotProps.backdrop</code> instead. This prop will be removed in v7. See <a href=\"https://mui.com/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
},
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" }, "additionalInfo": { "cssApi": true } },
Expand All @@ -47,12 +47,15 @@
"slotProps": {
"type": {
"name": "shape",
"description": "{ paper?: func<br>&#124;&nbsp;object, root?: func<br>&#124;&nbsp;object }"
"description": "{ backdrop?: func<br>&#124;&nbsp;object, paper?: func<br>&#124;&nbsp;object, root?: func<br>&#124;&nbsp;object, transition?: func<br>&#124;&nbsp;object }"
},
"default": "{}"
},
"slots": {
"type": { "name": "shape", "description": "{ paper?: elementType, root?: elementType }" },
"type": {
"name": "shape",
"description": "{ backdrop?: elementType, paper?: elementType, root?: elementType, transition?: elementType }"
},
"default": "{}"
},
"sx": {
Expand All @@ -69,24 +72,56 @@
},
"default": "{\n vertical: 'top',\n horizontal: 'left',\n}"
},
"TransitionComponent": { "type": { "name": "elementType" }, "default": "Grow" },
"TransitionComponent": {
"type": { "name": "elementType" },
"default": "Grow",
"deprecated": true,
"deprecationInfo": "use the <code>slots.transition</code> prop instead. This prop will be removed in v7. See <a href=\"https://mui.com/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
},
"transitionDuration": {
"type": {
"name": "union",
"description": "'auto'<br>&#124;&nbsp;number<br>&#124;&nbsp;{ appear?: number, enter?: number, exit?: number }"
},
"default": "'auto'"
},
"TransitionProps": { "type": { "name": "object" }, "default": "{}" }
"TransitionProps": {
"type": { "name": "object" },
"default": "{}",
"deprecated": true,
"deprecationInfo": "use the <code>slotProps.transition</code> prop instead. This prop will be removed in v7. See <a href=\"https://mui.com/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
}
},
"name": "Popover",
"imports": [
"import Popover from '@mui/material/Popover';",
"import { Popover } from '@mui/material';"
],
"slots": [
{ "name": "root", "description": "", "class": "MuiPopover-root" },
{ "name": "paper", "description": "", "class": "MuiPopover-paper" }
{
"name": "root",
"description": "The component used for the root slot.",
"default": "Modal",
"class": "MuiPopover-root"
},
{
"name": "paper",
"description": "The component used for the paper slot.",
"default": "Paper",
"class": "MuiPopover-paper"
},
{
"name": "transition",
"description": "The component used for the transition slot.",
"default": "Grow",
"class": null
},
{
"name": "backdrop",
"description": "The component used for the backdrop slot.",
"default": "Backdrop",
"class": null
}
],
"classes": [],
"spread": true,
Expand Down
7 changes: 6 additions & 1 deletion docs/translations/api-docs/popover/popover.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,10 @@
}
},
"classDescriptions": {},
"slotDescriptions": { "paper": "", "root": "" }
"slotDescriptions": {
"backdrop": "The component used for the backdrop slot.",
"paper": "The component used for the paper slot.",
"root": "The component used for the root slot.",
"transition": "The component used for the transition slot."
}
}
Loading

0 comments on commit 5a6b0f7

Please sign in to comment.