1 files changed, 34 insertions, 16 deletions
diff --git a/packages/web-util/src/forms/InputToggle.tsx b/packages/web-util/src/forms/InputToggle.tsx
index 56b29c502..58386045c 100644
--- a/packages/web-util/src/forms/InputToggle.tsx
+++ b/packages/web-util/src/forms/InputToggle.tsx
@@ -1,5 +1,6 @@
 import { VNode, h } from "preact";
 import { UIFormProps } from "./FormProvider.js";
+import { noHandlerPropsAndNoContextForField } from "./InputArray.js";
 import { LabelWithTooltipMaybeRequired } from "./InputLine.js";
 import { useField } from "./useField.js";
 
@@ -17,22 +18,39 @@ export function InputToggle<T extends object, K extends keyof T>(
     after,
     converter,
   } = props;
-  const { value, onChange, state, isDirty } = useField<T, K>(name);
+  //FIXME: remove deprecated
+  const fieldCtx = useField<T, K>(props.name);
+  const { value, onChange } =
+    props.handler ?? fieldCtx ?? noHandlerPropsAndNoContextForField(props.name);
 
-  const isOn = !!value
-  return <div class="sm:col-span-6">
-    <div class="flex items-center justify-between">
-      <LabelWithTooltipMaybeRequired
-        label={label}
-        required={required}
-        tooltip={tooltip}
-      />
-      <button type="button" data-enabled={isOn}
-        class="bg-indigo-600 data-[enabled=false]:bg-gray-200 relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2"
-        role="switch" aria-checked="false" aria-labelledby="availability-label" aria-describedby="availability-description"
-        onClick={() => { onChange(!isOn as any); }}>
-        <span aria-hidden="true" data-enabled={isOn} class="translate-x-5 data-[enabled=false]:translate-x-0 pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"></span>
-      </button>
+  const isOn = !!value;
+  return (
+    <div class="sm:col-span-6">
+      <div class="flex items-center justify-between">
+        <LabelWithTooltipMaybeRequired
+          label={label}
+          required={required}
+          tooltip={tooltip}
+        />
+        <button
+          type="button"
+          data-enabled={isOn}
+          class="bg-indigo-600 data-[enabled=false]:bg-gray-200 relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2"
+          role="switch"
+          aria-checked="false"
+          aria-labelledby="availability-label"
+          aria-describedby="availability-description"
+          onClick={() => {
+            onChange(!isOn as any);
+          }}
+        >
+          <span
+            aria-hidden="true"
+            data-enabled={isOn}
+            class="translate-x-5 data-[enabled=false]:translate-x-0 pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+          ></span>
+        </button>
+      </div>
     </div>
-  </div>
+  );
 }