From 810dafe087e05d9382802332afa4faa05ddc4360 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Sun, 10 Sep 2023 21:55:46 +0200
Subject: [PATCH] [Switch] Simplify source

---
 packages/mui-base/src/Switch/Switch.tsx | 13 +------------
 packages/mui-joy/src/Switch/Switch.tsx  | 11 ++---------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/packages/mui-base/src/Switch/Switch.tsx b/packages/mui-base/src/Switch/Switch.tsx
index 5d44faa9f82382..79546bfabbdbf9 100644
--- 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
index abc10f43080e6e..07d58dc3fb51f0 100644
--- 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);