fixed form switch card not using watch

DA0-DA0 · Oct 29, 2024 · 11bd1a1 · 11bd1a1
1 parent 74c6321
commit 11bd1a1
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/packages/stateless/components/inputs/Switch.tsx b/packages/stateless/components/inputs/Switch.tsx
@@ -176,20 +176,25 @@ export const FormSwitchCard = <
   BooleanFieldName extends BooleanFieldNames<FV>
 >({
   fieldName,
-  value,
+  value: _value,
+  watch,
   setValue,
   onToggle,
   ...props
-}: FormSwitchWrapperProps<SwitchCardProps, FV, BooleanFieldName>) => (
-  <SwitchCard
-    enabled={!!value}
-    onClick={() => {
-      const newValue = !value
-      setValue(fieldName, newValue as any)
-      onToggle?.(newValue)
-    }}
-    sizing="sm"
-    tooltipIconSize="sm"
-    {...props}
-  />
-)
+}: FormSwitchWrapperProps<SwitchCardProps, FV, BooleanFieldName>) => {
+  const value = _value ?? watch?.(fieldName)
+
+  return (
+    <SwitchCard
+      enabled={!!value}
+      onClick={() => {
+        const newValue = !value
+        setValue(fieldName, newValue as any)
+        onToggle?.(newValue)
+      }}
+      sizing="sm"
+      tooltipIconSize="sm"
+      {...props}
+    />
+  )
+}