Merge remote-tracking branch 'upstream/master' into update-test-infra

mui · Aug 6, 2024 · 899c36e · 899c36e
2 parents 50359e2 + 3771ff4
commit 899c36e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
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/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> }> {
   /**
-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 @@