[Switch] Simplify source (mui#38910)

anon-phantom · Sep 11, 2023 · 925a3b0 · 925a3b0
1 parent 88918c9
commit 925a3b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/packages/mui-base/src/Switch/Switch.tsx b/packages/mui-base/src/Switch/Switch.tsx
@@ -66,18 +66,7 @@ const Switch = React.forwardRef(function Switch<RootComponentType extends React.
     ...other
   } = props;
 
-  const useSwitchProps = {
-    checked: checkedProp,
-    defaultChecked,
-    disabled: disabledProp,
-    onBlur,
-    onChange,
-    onFocus,
-    onFocusVisible,
-    readOnly: readOnlyProp,
-  };
-
-  const { getInputProps, checked, disabled, focusVisible, readOnly } = useSwitch(useSwitchProps);
+  const { getInputProps, checked, disabled, focusVisible, readOnly } = useSwitch(props);
 
   const ownerState: SwitchOwnerState = {
     ...props,

diff --git a/packages/mui-joy/src/Switch/Switch.tsx b/packages/mui-joy/src/Switch/Switch.tsx
@@ -266,7 +266,6 @@ const Switch = React.forwardRef(function Switch(inProps, ref) {
     }, [registerEffect]);
   }
 
-  const disabledProp = inProps.disabled ?? formControl?.disabled ?? disabledExternalProp;
   const size = inProps.size ?? formControl?.size ?? sizeProp;
   const { getColor } = useColorInversion(variant);
   const color = getColor(
@@ -275,14 +274,8 @@ const Switch = React.forwardRef(function Switch(inProps, ref) {
   );
 
   const useSwitchProps = {
-    checked: checkedProp,
-    defaultChecked,
-    disabled: disabledProp,
-    onBlur,
-    onChange,
-    onFocus,
-    onFocusVisible,
-    readOnly: readOnlyProp,
+    disabled: inProps.disabled ?? formControl?.disabled ?? disabledExternalProp,
+    ...props,
   };
 
   const { getInputProps, checked, disabled, focusVisible, readOnly } = useSwitch(useSwitchProps);