Reapply "Partial changes for issue #656"

This reverts commit cc20541.
mui · Oct 13, 2024 · 55f8f07 · 55f8f07
1 parent cc20541
commit 55f8f07
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 16 deletions.
diff --git a/docs/data/api/menu-trigger.json b/docs/data/api/menu-trigger.json
@@ -2,7 +2,6 @@
   "props": {
     "className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
     "disabled": { "type": { "name": "bool" }, "default": "false" },
-    "focusableWhenDisabled": { "type": { "name": "bool" }, "default": "false" },
     "label": { "type": { "name": "string" } },
     "render": { "type": { "name": "union", "description": "element<br>&#124;&nbsp;func" } }
   },

diff --git a/docs/data/translations/api-docs/menu-trigger/menu-trigger.json b/docs/data/translations/api-docs/menu-trigger/menu-trigger.json
@@ -5,9 +5,6 @@
       "description": "Class names applied to the element or a function that returns them based on the component&#39;s state."
     },
     "disabled": { "description": "If <code>true</code>, the component is disabled." },
-    "focusableWhenDisabled": {
-      "description": "If <code>true</code>, allows a disabled button to receive focus."
-    },
     "label": { "description": "Label of the button" },
     "render": { "description": "A function to customize rendering of the component." }
   },

diff --git a/packages/mui-base/src/Checkbox/Root/CheckboxRoot.tsx b/packages/mui-base/src/Checkbox/Root/CheckboxRoot.tsx
@@ -98,6 +98,7 @@ const CheckboxRoot = React.forwardRef(function CheckboxRoot(
     extraProps: {
       ...otherProps,
       ...otherGroupProps,
+      disabled
     },
   });
 

diff --git a/packages/mui-base/src/Menu/Trigger/MenuTrigger.tsx b/packages/mui-base/src/Menu/Trigger/MenuTrigger.tsx
@@ -69,11 +69,6 @@ namespace MenuTrigger {
      * @default false
      */
     disabled?: boolean;
-    /**
-     * If `true`, allows a disabled button to receive focus.
-     * @default false
-     */
-    focusableWhenDisabled?: boolean;
     /**
      * Label of the button
      */
@@ -103,11 +98,6 @@ MenuTrigger.propTypes /* remove-proptypes */ = {
    * @default false
    */
   disabled: PropTypes.bool,
-  /**
-   * If `true`, allows a disabled button to receive focus.
-   * @default false
-   */
-  focusableWhenDisabled: PropTypes.bool,
   /**
    * Label of the button
    */

diff --git a/packages/mui-base/src/Menu/Trigger/useMenuTrigger.ts b/packages/mui-base/src/Menu/Trigger/useMenuTrigger.ts
@@ -23,7 +23,6 @@ export function useMenuTrigger(parameters: useMenuTrigger.Parameters): useMenuTr
 
   const { getButtonProps, buttonRef } = useButton({
     disabled,
-    focusableWhenDisabled: false,
     buttonRef: mergedRef,
   });
 

diff --git a/packages/mui-base/src/Switch/Root/SwitchRoot.tsx b/packages/mui-base/src/Switch/Root/SwitchRoot.tsx
@@ -59,7 +59,7 @@ const SwitchRoot = React.forwardRef(function SwitchRoot(
     className,
     propGetter: getButtonProps,
     ownerState,
-    extraProps: other,
+    extraProps: {...other, disabled},
     customStyleHookMapping: styleHookMapping,
     ref: forwardedRef,
   });