[pull] master from mui:master

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  code-infra: https://raw.githubusercontent.com/mui/mui-public/1a52cef604c255c13aaad0383a48d19c02519418/.circleci/orbs/code-infra.yml
+  code-infra: https://raw.githubusercontent.com/mui/mui-public/c6471a4fe98cb2e52efe7397ff8362569f2ddada/.circleci/orbs/code-infra.yml
 
 parameters:
   workflow:

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
       - run: pnpm install
       - run: pnpm release:build
       - name: Publish packages to pkg.pr.new
-        uses: mui/mui-public/.github/actions/ci-publish@b296c98bc17f685db974504d2c00094a59d1698d # master
+        uses: mui/mui-public/.github/actions/ci-publish@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
 
   # Tests dev-only scripts across all supported dev environments
   test-dev:
@@ -116,7 +116,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Prepare for publishing
-        uses: mui/mui-public/.github/actions/publish-prepare@b296c98bc17f685db974504d2c00094a59d1698d # master
+        uses: mui/mui-public/.github/actions/publish-prepare@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
         with:
           node-version: '22.23.2'
       - name: Dry run npm publishing

.github/workflows/claude-review.yml

@@ -13,7 +13,7 @@ permissions: {}
 
 jobs:
   claude-review:
-    uses: mui/mui-public/.github/workflows/claude-review.yml@b296c98bc17f685db974504d2c00094a59d1698d # master
+    uses: mui/mui-public/.github/workflows/claude-review.yml@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
     permissions:
       contents: read # read the repo (checkout + git diff)
       id-token: write # mint the GitHub OIDC token exchanged for a Claude token via WIF

.github/workflows/closed-issue-message.yml

@@ -11,7 +11,7 @@ jobs:
   add-comment:
     name: Add closing message
     if: github.event.issue.state_reason == 'completed'
-    uses: mui/mui-public/.github/workflows/issues_add-closing-message.yml@b296c98bc17f685db974504d2c00094a59d1698d # master
+    uses: mui/mui-public/.github/workflows/issues_add-closing-message.yml@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
     permissions:
       contents: read
       issues: write

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
+        uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
         with:
           languages: typescript
           config-file: ./.github/codeql/codeql-config.yml
@@ -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@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
+        uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1

.github/workflows/create-cherry-pick-pr.yml

@@ -12,7 +12,7 @@ permissions: {}
 jobs:
   create_pr:
     name: Create cherry-pick PR
-    uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@b296c98bc17f685db974504d2c00094a59d1698d # master
+    uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
     permissions:
       contents: write
       pull-requests: write

.github/workflows/publish.yml

@@ -47,7 +47,7 @@ jobs:
           ref: ${{ github.event_name == 'push' && github.sha || inputs.sha }}
           fetch-depth: 0 # Fetch full history for proper git operations
       - name: Prepare for publishing
-        uses: mui/mui-public/.github/actions/publish-prepare@b296c98bc17f685db974504d2c00094a59d1698d # master
+        uses: mui/mui-public/.github/actions/publish-prepare@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
         with:
           node-version: '22.23.2'
       - name: Publish packages
@@ -70,7 +70,7 @@ jobs:
           ref: ${{ inputs.sha }}
           fetch-depth: 0 # Fetch full history for proper git operations
       - name: Prepare for publishing
-        uses: mui/mui-public/.github/actions/publish-prepare@b296c98bc17f685db974504d2c00094a59d1698d # master
+        uses: mui/mui-public/.github/actions/publish-prepare@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
         with:
           node-version: '22.23.2'
       - name: Publish packages

.github/workflows/scorecards.yml

@@ -40,6 +40,6 @@ jobs:
           publish_results: true
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
+        uses: github/codeql-action/upload-sarif@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
         with:
           sarif_file: results.sarif

docs/data/material/components/number-field/number-field.md

@@ -57,6 +57,15 @@ This is ideal for touch devices and narrow ranges of values.
 
 {{"demo": "SpinnerDemo.js"}}
 
+## Units and currency
+
+Both fields above use the input's end adornment for the increment and decrement buttons, so that slot is not available for a unit or currency symbol.
+Use the [`format`](https://base-ui.com/react/components/number-field#NumberFieldRoot-format) prop instead—it accepts [`Intl.NumberFormatOptions`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#options) and is forwarded to the Base UI `NumberField.Root`:
+
+```jsx
+<NumberField label="Price" format={{ style: 'currency', currency: 'USD' }} />
+```
+
 ## Base UI API
 
 See the documentation below for a complete reference to all of the props.

docs/package.json

@@ -37,19 +37,19 @@
     "@mui/system": "workspace:^",
     "@mui/types": "workspace:^",
     "@mui/utils": "workspace:^",
-    "@mui/x-charts": "9.13.0",
-    "@mui/x-data-grid": "9.13.0",
-    "@mui/x-data-grid-generator": "9.13.0",
-    "@mui/x-data-grid-premium": "9.13.0",
-    "@mui/x-data-grid-pro": "9.13.0",
-    "@mui/x-date-pickers": "9.13.0",
-    "@mui/x-date-pickers-pro": "9.13.0",
+    "@mui/x-charts": "9.14.0",
+    "@mui/x-data-grid": "9.14.0",
+    "@mui/x-data-grid-generator": "9.14.0",
+    "@mui/x-data-grid-premium": "9.14.0",
+    "@mui/x-data-grid-pro": "9.14.0",
+    "@mui/x-date-pickers": "9.14.0",
+    "@mui/x-date-pickers-pro": "9.14.0",
     "@mui/x-license": "9.13.0",
-    "@mui/x-tree-view": "9.13.0",
+    "@mui/x-tree-view": "9.14.0",
     "@popperjs/core": "^2.11.8",
     "@react-spring/web": "^10.1.2",
     "@tailwindcss/postcss": "^4.3.3",
-    "@tanstack/react-query": "^5.102.8",
+    "@tanstack/react-query": "^5.103.1",
     "@tanstack/react-virtual": "^3.14.13",
     "autosuggest-highlight": "^3.3.4",
     "babel-plugin-module-resolver": "^5.0.3",
@@ -69,23 +69,23 @@
     "flexsearch": "^0.8.212",
     "json2mq": "^0.2.0",
     "lz-string": "^1.5.0",
-    "markdown-to-jsx": "^9.10.2",
+    "markdown-to-jsx": "^9.10.3",
     "material-ui-popup-state": "^5.3.7",
-    "next": "16.3.4",
+    "next": "16.3.5",
     "notistack": "3.0.2",
     "nprogress": "^0.2.0",
     "postcss": "^8.5.28",
     "postcss-import": "^17.0.0",
     "prop-types": "^15.8.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
-    "react-draggable": "^4.7.1",
+    "react-draggable": "^4.7.2",
     "react-final-form": "^7.0.1",
     "react-imask": "^7.6.1",
     "react-intersection-observer": "^11.0.1",
     "react-is": "^19.3.0",
     "react-number-format": "^5.4.5",
-    "react-router": "^8.3.1",
+    "react-router": "^8.4.0",
     "react-runner": "^1.0.5",
     "react-simple-code-editor": "^0.14.1",
     "react-swipeable-views": "^0.14.2",

package.json

@@ -72,7 +72,6 @@
     "use-react-version": "node ./scripts/useReactVersion.mjs",
     "validate-declarations": "tsx scripts/validateTypescriptDeclarations.mts",
     "generate-codeowners": "node scripts/generateCodeowners.mjs",
-    "canary:release": "tsx ./scripts/canaryRelease.mts",
     "clean": "pnpm -r exec rm -rf build"
   },
   "dependencies": {
@@ -88,14 +87,14 @@
     "@eslint/compat": "2.1.1",
     "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.31",
     "@mui/internal-bundle-size-checker": "1.0.9-canary.92",
-    "@mui/internal-code-infra": "0.0.4-canary.117",
+    "@mui/internal-code-infra": "0.0.4-canary.119",
     "@mui/internal-docs-utils": "workspace:^",
     "@mui/internal-netlify-cache": "0.0.3-canary.8",
     "@mui/internal-scripts": "workspace:^",
     "@mui/internal-test-utils": "2.0.18-canary.38",
     "@mui/material": "workspace:^",
     "@mui/utils": "workspace:^",
-    "@next/eslint-plugin-next": "16.3.4",
+    "@next/eslint-plugin-next": "16.3.5",
     "@octokit/rest": "22.0.1",
     "@pigment-css/react": "0.0.31",
     "@playwright/test": "1.63.0",
@@ -147,7 +146,7 @@
     "yargs": "18.1.0"
   },
   "config": {
-    "valeVersion": "3.21.0"
+    "valeVersion": "3.22.0"
   },
   "packageManager": "pnpm@12.4.2",
   "engines": {

packages-internal/core-docs/package.json

@@ -49,7 +49,7 @@
     "@types/prop-types": "15.7.15",
     "@types/react": "19.3.0",
     "@types/react-dom": "19.3.0",
-    "next": "16.3.4"
+    "next": "16.3.5"
   },
   "peerDependencies": {
     "@base-ui/react": "^1",

packages/mui-codemod/package.json

@@ -35,7 +35,7 @@
     "jscodeshift": "^17.4.0",
     "jscodeshift-add-imports": "^1.0.11",
     "postcss": "^8.5.28",
-    "postcss-cli": "^11.0.1",
+    "postcss-cli": "^12.0.0",
     "yargs": "^18.1.0"
   },
   "devDependencies": {

packages/mui-material-nextjs/package.json

@@ -37,7 +37,7 @@
     "@emotion/react": "11.14.0",
     "@emotion/server": "11.11.0",
     "@types/react": "19.3.0",
-    "next": "16.3.4",
+    "next": "16.3.5",
     "react": "19.3.0"
   },
   "peerDependencies": {

packages/mui-material/package.json

@@ -54,7 +54,7 @@
     "es-toolkit": "1.52.0",
     "react": "19.3.0",
     "react-dom": "19.3.0",
-    "react-router": "8.3.1",
+    "react-router": "8.4.0",
     "sinon": "22.1.0"
   },
   "peerDependencies": {

packages/mui-material/src/Button/Button.js

@@ -306,6 +306,7 @@ const ButtonRoot = styled(ButtonBase, {
         },
         {
           props: {
+            loading: true,
             loadingPosition: 'center',
           },
           style: {

packages/mui-material/src/useLazyRipple/useLazyRipple.test.tsx

@@ -0,0 +1,59 @@
+import * as React from 'react';
+import { spy } from 'sinon';
+import { describe, it, expect } from 'vitest';
+import { act, createRenderer } from '@mui/internal-test-utils';
+import useLazyRipple, { LazyRipple } from './useLazyRipple';
+import { TouchRippleActions } from '../ButtonBase/TouchRipple';
+
+describe('useLazyRipple', () => {
+  const { render } = createRenderer();
+
+  function Fixture({ onRipple }: { onRipple: (ripple: LazyRipple) => void }) {
+    const ripple = useLazyRipple();
+    onRipple(ripple);
+    return null;
+  }
+
+  it('resolves mount() even when no ripple is rendered', async () => {
+    let ripple!: LazyRipple;
+    render(
+      <Fixture
+        onRipple={(instance) => {
+          ripple = instance;
+        }}
+      />,
+    );
+
+    await act(async () => {
+      ripple.start({} as React.SyntheticEvent);
+    });
+
+    await ripple.mount();
+
+    expect(ripple.shouldMount).to.equal(true);
+    expect(ripple.ref.current).to.equal(null);
+  });
+
+  it('forwards queued actions to the ripple when one is mounted', async () => {
+    let ripple!: LazyRipple;
+    render(
+      <Fixture
+        onRipple={(instance) => {
+          ripple = instance;
+        }}
+      />,
+    );
+
+    const actions = { start: spy(), stop: spy(), pulsate: spy() };
+    ripple.ref.current = actions as unknown as TouchRippleActions;
+
+    const event = {} as React.SyntheticEvent;
+    await act(async () => {
+      ripple.start(event);
+    });
+    await ripple.mount();
+
+    expect(actions.start.callCount).to.equal(1);
+    expect(actions.start.firstCall.args[0]).to.equal(event);
+  });
+});

packages/mui-material/src/useLazyRipple/useLazyRipple.ts

@@ -67,8 +67,8 @@ export class LazyRipple {
     if (this.shouldMount && !this.didMount) {
       if (this.ref.current !== null) {
         this.didMount = true;
-        this.mounted!.resolve();
       }
+      this.mounted!.resolve();
     }
   };