Merge branch 'master' into fix/permissive-pnpm

mui · Aug 6, 2024 · 5bece3f · 5bece3f
2 parents fd8b3f2 + 3771ff4
commit 5bece3f
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 39 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -78,14 +78,14 @@
     "@mui/internal-docs-utils": "^1.0.8",
     "@mui/internal-test-utils": "1.0.6",
     "@types/autosuggest-highlight": "^3.2.3",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.17",
     "@types/node": "^18.19.42",
     "@types/prop-types": "^15.7.12",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "@types/react-transition-group": "^4.4.10",
     "@types/stylis": "^4.2.6",
-    "chai": "^4.4.1",
+    "chai": "^4.5.0",
     "cross-fetch": "^4.0.0",
     "framer-motion": "^11.2.10",
     "marked": "^12.0.2",

diff --git a/docs/translations/api-docs/slider-root/slider-root.json b/docs/translations/api-docs/slider-root/slider-root.json
@@ -13,7 +13,7 @@
     "direction": {
       "description": "Sets the direction. For right-to-left languages, the lowest value is on the right-hand side."
     },
-    "disabled": { "description": "/** If <code>true</code>, the component is disabled." },
+    "disabled": { "description": "If <code>true</code>, the component is disabled." },
     "largeStep": {
       "description": "The granularity with which the slider can step through values when using Page Up/Page Down or Shift + Arrow Up/Arrow Down."
     },

diff --git a/packages/mui-base/package.json b/packages/mui-base/package.json
@@ -52,13 +52,13 @@
     "@mui/internal-test-utils": "1.0.6",
     "@testing-library/react": "^15.0.7",
     "@testing-library/user-event": "^14.5.2",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.17",
     "@types/chai-dom": "^1.11.3",
     "@types/prop-types": "^15.7.12",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "@types/sinon": "^17.0.3",
-    "chai": "^4.4.1",
+    "chai": "^4.5.0",
     "fast-glob": "^3.3.2",
     "lodash": "^4.17.21",
     "react": "^18.3.1",

diff --git a/packages/mui-base/src/Slider/Root/SliderRoot.tsx b/packages/mui-base/src/Slider/Root/SliderRoot.tsx
@@ -116,7 +116,6 @@ SliderRoot.propTypes /* remove-proptypes */ = {
    */
   direction: PropTypes.oneOf(['ltr', 'rtl']),
   /**
-   * /**
    * If `true`, the component is disabled.
    * @default false
    */

diff --git a/packages/mui-base/src/Slider/Root/SliderRoot.types.ts b/packages/mui-base/src/Slider/Root/SliderRoot.types.ts
@@ -69,7 +69,6 @@ export interface SliderRootProps
    * The default value of the slider. Use when the component is not controlled.
    */
   defaultValue?: number | ReadonlyArray<number>;
-  /**
   /**
    * If `true`, the component is disabled.
    * @default false

diff --git a/packages/mui-base/src/useCompound/useCompoundParent.ts b/packages/mui-base/src/useCompound/useCompoundParent.ts
@@ -43,7 +43,9 @@ export const CompoundComponentContext = React.createContext<CompoundComponentCon
   any
 > | null>(null);
 
-CompoundComponentContext.displayName = 'CompoundComponentContext';
+if (process.env.NODE_ENV !== 'production') {
+  CompoundComponentContext.displayName = 'CompoundComponentContext';
+}
 
 export interface UseCompoundParentReturnValue<Key, Subitem extends { ref: React.RefObject<Node> }> {
   /**

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/package.json b/test/package.json
@@ -15,11 +15,11 @@
     "@mui/material": "6.0.0-beta.4",
     "@playwright/test": "1.45.3",
     "@testing-library/dom": "^10.1.0",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.17",
     "@types/react": "^18.3.1",
     "@types/react-is": "^18.3.0",
     "@types/sinon": "^17.0.3",
-    "chai": "^4.4.1",
+    "chai": "^4.5.0",
     "docs": "workspace:^",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,7 +116,6 @@ SliderRoot.propTypes /* remove-proptypes */ = { @@
        */
       direction: PropTypes.oneOf(['ltr', 'rtl']),
       /**
-       * /**
        * If `true`, the component is disabled.
        * @default false
        */
@@ Expand Down @@