@multiplatform.one/forms 7.34.4 → 7.36.0

package/dist/cjs/fields/Switch/index.cjs

@@ -25,10 +25,12 @@ __export(Switch_exports, {
   Switch: () => Switch
 });
 module.exports = __toCommonJS(Switch_exports);
+var import_instantMotion = require("../../shared/instantMotion.cjs");
 var import_theme = require("@multiplatform.one/theme");
+var import_theme2 = require("@multiplatform.one/theme");
 var import_react = require("react");
 var import_tamagui = require("tamagui");
-var import_theme2 = require("@multiplatform.one/theme");
+var import_theme3 = require("@multiplatform.one/theme");
 var import_commitImmediateField = require("../../ContextualSaveBar/commitImmediateField.cjs");
 var import_Form = require("../../Form/index.cjs");
 var import_Skeleton = require("../../Skeleton/index.cjs");
@@ -41,7 +43,7 @@ var import_footprint = require("./footprint.cjs");
 var import_jsx_runtime = require("react/jsx-runtime");
 const SWITCH_DRAG_INTENT_PX = 10;
 const SWITCH_CELL_TARGET_HEIGHT = 44;
-const resolveSwitchMotion = token => token && token !== "none" ? token : "none";
+const resolveSwitchMotion = token => (0, import_instantMotion.transitionOrInstant)(token);
 const SWITCH_KB_RING_CSS_ID = "mp-switch-kb-ring-css";
 const SWITCH_KB_RING_CLASS = "mp-switch-kb-ring";
 function ensureSwitchKbRingCss() {
@@ -66,7 +68,8 @@ const stripOutlineFromState = props => {
   } = props;
   return Object.keys(rest).length > 0 ? rest : void 0;
 };
-const SWITCH_TRACK_BORDER_FALLBACK = 1;
+const stripTrackPaintFromState = props => props && Object.fromEntries(Object.entries(props).filter(([key]) => !/^background|^border.*Color$/.test(key)));
+const SWITCH_TRACK_BORDER_FALLBACK = 0;
 const resolveRadiusValue = radius => {
   if (typeof radius === "number") return radius;
   if (typeof radius !== "string") return void 0;
@@ -77,8 +80,8 @@ const resolveRadiusValue = radius => {
   return Number.isFinite(parsed) ? parsed : void 0;
 };
 function radiusStopFromToken(token) {
-  for (const stop of Object.keys(import_theme2.borderRadiusMap)) {
-    if (import_theme2.borderRadiusMap[stop] === token) return stop;
+  for (const stop of Object.keys(import_theme3.borderRadiusMap)) {
+    if (import_theme3.borderRadiusMap[stop] === token) return stop;
   }
   return void 0;
 }
@@ -106,27 +109,10 @@ const SwitchThumbStyled = (0, import_tamagui.styled)(import_tamagui.View, {
       false: {
         size: "$true",
         backgroundColor: import_colorRamps.formSwitchColors.thumb,
-        // The thumb is a solid physical handle — it gets its definition from a
-        // subtle drop shadow (iOS/Material convention), NOT a flat gray ring.
-        // A visible border reads as an outline/defect; the shadow lifts the
-        // thumb off the track on every side and survives light-thumb-on-light-
-        // track without a hard edge.
         borderWidth: 0,
         borderRadius: 1e3,
         justifyContent: "center",
-        alignItems: "center",
-        ...(import_tamagui.isWeb ? {
-          boxShadow: "0 1px 2px rgba(0,0,0,0.18), 0 0 1px rgba(0,0,0,0.12)"
-        } : {
-          shadowColor: "#000",
-          shadowOffset: {
-            width: 0,
-            height: 1
-          },
-          shadowOpacity: 0.15,
-          shadowRadius: 2,
-          elevation: 2
-        })
+        alignItems: "center"
       }
     },
     checked: {
@@ -157,10 +143,8 @@ const SwitchFrameStyled = (0, import_tamagui.styled)(import_tamagui.View, {
         position: "relative",
         borderRadius: 1e3,
         backgroundColor: import_colorRamps.formSwitchColors.track.off,
-        borderWidth: 1,
-        // Off track: muted fill + ≥3:1 boundary (M3 unselected outline,
-        // DF-06). On track is fill — see `checked` / `activeStyle`.
-        borderColor: import_colorRamps.formControlColors.boundary,
+        borderWidth: 0,
+        borderColor: import_colorRamps.formSwitchColors.track.off,
         outlineWidth: 0,
         focusStyle: {
           outlineWidth: 0
@@ -179,7 +163,7 @@ const SwitchFrameStyled = (0, import_tamagui.styled)(import_tamagui.View, {
       },
       false: {
         backgroundColor: import_colorRamps.formSwitchColors.track.off,
-        borderColor: import_colorRamps.formControlColors.boundary
+        borderColor: import_colorRamps.formSwitchColors.track.off
       }
     },
     size: {
@@ -268,19 +252,6 @@ const SwitchComp = (0, import_tamagui.createSwitch)({
 const StyledSwitch = (0, import_tamagui.withStaticProperties)(SwitchComp, {
   Icon: SwitchIcon
 });
-function useLuminanceThumbColor(displayChecked) {
-  const theme = (0, import_tamagui.useTheme)();
-  const trackToken = (displayChecked ? import_colorRamps.formSwitchColors.track.on : import_colorRamps.formSwitchColors.track.off).slice(1);
-  const trackRaw = String(theme[trackToken]?.val ?? "");
-  const paperRaw = String(theme.color1?.val ?? "");
-  const inkRaw = String(theme.color12?.val ?? "");
-  const track = trackRaw ? (0, import_theme2.normalizeToHex)(trackRaw) : null;
-  const paper = paperRaw ? (0, import_theme2.normalizeToHex)(paperRaw) : null;
-  const ink = inkRaw ? (0, import_theme2.normalizeToHex)(inkRaw) : null;
-  if (!track || !paper || !ink) return void 0;
-  const trackLum = (0, import_theme2.relativeLuminance)(track);
-  return (0, import_theme2.contrastRatio)((0, import_theme2.relativeLuminance)(paper), trackLum) >= (0, import_theme2.contrastRatio)((0, import_theme2.relativeLuminance)(ink), trackLum) ? paperRaw : inkRaw;
-}
 function SwitchControl({
   checked,
   onCheckedChange,
@@ -314,16 +285,17 @@ function SwitchControl({
   radiusResolution
 }) {
   if (import_tamagui.isWeb) {
-    (0, import_theme2.ensureKeyboardModalityTracking)();
+    (0, import_theme3.ensureKeyboardModalityTracking)();
     ensureSwitchKbRingCss();
   }
   const {
     disabledState,
     knobProps
-  } = (0, import_theme2.useResolvedKnobs)();
+  } = (0, import_theme3.useResolvedKnobs)();
   const outlined = knobProps.outlined;
-  const trackOffFill = outlined ? "transparent" : import_colorRamps.formSwitchColors.track.off;
-  const trackOffBorder = import_colorRamps.formControlColors.boundary;
+  const [hovered, setHovered] = (0, import_react.useState)(false);
+  const [pressed, setPressed] = (0, import_react.useState)(false);
+  const offPaint = pressed ? import_colorRamps.formSwitchColors.track.offPress : hovered ? import_colorRamps.formSwitchColors.track.offHover : import_colorRamps.formSwitchColors.track.off;
   const {
     thumbInset,
     thumbSize,
@@ -358,6 +330,7 @@ function SwitchControl({
       if (session.moved) setDragX(nextX);
     };
     const endDrag = e => {
+      setPressed(false);
       const session = sessionRef.current;
       if (!session || e.pointerId !== session.pointerId) return;
       const dist = dragDistanceRef.current;
@@ -386,7 +359,6 @@ function SwitchControl({
     };
   }, []);
   const displayChecked = snapChecked ?? checked;
-  const thumbHandleColor = useLuminanceThumbColor(displayChecked);
   const restingX = displayChecked ? dragDistance : 0;
   const thumbX = dragX != null ? dragX : restingX;
   const canDrag = import_tamagui.isWeb && !disabled && !readOnly;
@@ -417,6 +389,10 @@ function SwitchControl({
   const focusSafe = stripOutlineFromState(focusStyle);
   const {
     onPointerDown: switchPointerDown,
+    onMouseEnter: switchMouseEnter,
+    onMouseLeave: switchMouseLeave,
+    onPressIn: switchPressIn,
+    onPressOut: switchPressOut,
     onPress: switchPress,
     onFocus: switchFocus,
     onBlur: switchBlur,
@@ -427,7 +403,10 @@ function SwitchControl({
   const frameClassName = [switchClassName, !cellTrack ? kbRingClass : void 0].filter(Boolean).join(" ") || void 0;
   return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(StyledSwitch, {
     ...inputSurface,
-    transition: motion,
+    ...(0, import_theme.transitionProps)({
+      ...knobProps.motion.control,
+      transition: motion
+    }, ["borderWidth"]),
     size: sizeToken,
     ...(hoverSafe && {
       hoverStyle: hoverSafe
@@ -457,8 +436,8 @@ function SwitchControl({
       backgroundColor: import_colorRamps.formSwitchColors.track.on,
       borderColor: import_colorRamps.formSwitchColors.track.on
     } : {
-      backgroundColor: trackOffFill,
-      borderColor: trackOffBorder
+      backgroundColor: outlined ? "transparent" : offPaint,
+      borderColor: offPaint
     }),
     ...(kbFocus ? {
       "data-kb-focus": "true"
@@ -468,7 +447,7 @@ function SwitchControl({
     } : void 0),
     ...(cellTrack ? {
       outlineWidth: 0
-    } : kbFocus ? (0, import_theme2.ensureFocusVisibleRing)() : {
+    } : kbFocus ? (0, import_theme3.ensureFocusVisibleRing)() : {
       outlineWidth: 0
     }),
     ...(!import_tamagui.isWeb && {
@@ -501,7 +480,7 @@ function SwitchControl({
     "aria-invalid": hasError || void 0,
     onFocus: e => {
       switchFocus?.(e);
-      if ((0, import_theme2.wasKeyboardFocus)()) setKbFocus(true);
+      if ((0, import_theme3.wasKeyboardFocus)()) setKbFocus(true);
     },
     onBlur: e => {
       setKbFocus(false);
@@ -516,6 +495,24 @@ function SwitchControl({
       }
       onCheckedChange?.(val);
     },
+    ...(import_tamagui.isWeb && {
+      onMouseEnter: e => {
+        if (!disabled && !readOnly) setHovered(true);
+        switchMouseEnter?.(e);
+      },
+      onMouseLeave: e => {
+        setHovered(false);
+        switchMouseLeave?.(e);
+      }
+    }),
+    onPressIn: e => {
+      if (!disabled && !readOnly) setPressed(true);
+      switchPressIn?.(e);
+    },
+    onPressOut: e => {
+      setPressed(false);
+      switchPressOut?.(e);
+    },
     onPointerDown: e => {
       switchPointerDown?.(e);
       if (!canDrag) return;
@@ -533,20 +530,23 @@ function SwitchControl({
     } : void 0),
     children: [cellTrack && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
       position: "absolute",
-      left: 0,
-      right: 0,
+      left: (cellTrack.frameWidth - cellTrack.width) / 2,
+      width: cellTrack.width,
       top: "50%",
       y: -cellTrack.height / 2,
       height: cellTrack.height,
       borderRadius: cellTrack.borderRadius,
       ...radiusResolution,
       borderWidth: cellTrack.borderWidth,
-      borderColor: displayChecked ? import_colorRamps.formSwitchColors.track.on : trackOffBorder,
-      backgroundColor: displayChecked ? import_colorRamps.formSwitchColors.track.on : trackOffFill,
-      transition: motion,
+      borderColor: displayChecked ? import_colorRamps.formSwitchColors.track.on : offPaint,
+      backgroundColor: displayChecked ? import_colorRamps.formSwitchColors.track.on : outlined ? "transparent" : offPaint,
+      ...(0, import_theme.transitionProps)({
+        ...knobProps.motion.control,
+        transition: motion
+      }, ["borderWidth"]),
       pointerEvents: "none",
       className: kbFocus ? SWITCH_KB_RING_CLASS : void 0,
-      ...(kbFocus ? (0, import_theme2.ensureFocusVisibleRing)() : {
+      ...(kbFocus ? (0, import_theme3.ensureFocusVisibleRing)() : {
         outlineWidth: 0
       }),
       ...(cellTrack.hoverStyle && {
@@ -565,17 +565,18 @@ function SwitchControl({
       placement: "right",
       children: rightIcon
     }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(StyledSwitch.Thumb, {
+      ...knobProps.thumbShadow,
       borderRadius: thumbRadius,
       ...radiusResolution,
       width: thumbSize,
       height: thumbSize,
       alignSelf: "flex-start",
-      x: thumbX + thumbInset + (cellTrack ? cellTrack.borderWidth : 0),
+      x: thumbX + thumbInset + (cellTrack ? cellTrack.borderWidth + (cellTrack.frameWidth - cellTrack.width) / 2 : 0),
       y: cellTrack ? (cellTrack.frameHeight - thumbSize) / 2 : thumbInset,
-      ...(thumbHandleColor ? {
-        backgroundColor: thumbHandleColor
-      } : void 0),
-      transition: dragX != null ? "none" : motion,
+      ...(0, import_theme.transitionProps)({
+        ...knobProps.motion.control,
+        transition: dragX != null ? (0, import_instantMotion.transitionOrInstant)(void 0) : motion
+      }),
       ...(thumbHoverStyle && {
         hoverStyle: thumbHoverStyle
       }),
@@ -613,10 +614,9 @@ function Switch({
   switchProps,
   pointy,
   skeleton,
-  compact,
   minTargetHeight
 }) {
-  const hydrationTouch = (0, import_theme.useTouchSurface)();
+  const hydrationTouch = (0, import_theme2.useTouchSurface)();
   const handleValueChange = val => {
     onChange?.(val);
     onCheckedChange?.(val);
@@ -630,8 +630,7 @@ function Switch({
     id
   } = (0, import_utils.useFormField)({
     form: formProp,
-    id: idProp,
-    compact
+    id: idProp
   });
   const {
     mode: saveMode,
@@ -647,36 +646,37 @@ function Switch({
     }
   }, [defaultValue, checked]);
   const sizeToken = size ?? knobProps.sizeToken;
-  const borderWidth = knobProps.borderRadius.borderWidth ?? 1;
-  const footprint = (0, import_footprint.switchFootprint)(String(sizeToken), borderWidth);
+  const ringWidth = knobProps.outlined ? Math.max(Number(knobProps.borderRadius.borderWidth) || 1, 1) : 0;
+  const footprint = (0, import_footprint.switchFootprint)(String(sizeToken), ringWidth);
   const {
     trackHeight,
     trackWidth
   } = footprint;
-  const targetHeight = inTableCell ? SWITCH_CELL_TARGET_HEIGHT : minTargetHeight !== void 0 ? Math.max(minTargetHeight, trackHeight) : hydrationTouch && trackHeight < import_theme2.TOUCH_HEIGHT_FLOOR ? import_theme2.TOUCH_HEIGHT_FLOOR : void 0;
+  const targetHeight = inTableCell ? SWITCH_CELL_TARGET_HEIGHT : minTargetHeight !== void 0 ? Math.max(minTargetHeight, trackHeight) : hydrationTouch && trackHeight < import_theme3.TOUCH_HEIGHT_FLOOR ? import_theme3.TOUCH_HEIGHT_FLOOR : void 0;
   const grownTarget = targetHeight !== void 0;
   const rowMinHeight = !inTableCell && grownTarget ? targetHeight : void 0;
   const renderSwitch = (switchChecked, handleChange, handleBlur, hasError, errorMessage) => {
     const overrideRadius = switchProps?.borderRadius;
     const radiusStop = resolveSwitchRadiusStop(pointy, knobProps.borderRadius.borderRadius);
     const thumbPaintedHeight = footprint.thumbSize;
-    const trackRadius = overrideRadius != null ? resolveRadiusValue(overrideRadius) ?? 1e3 : (0, import_theme2.resolveRadiusClass)("BINARY", radiusStop, {
+    const trackRadius = overrideRadius != null ? resolveRadiusValue(overrideRadius) ?? 1e3 : (0, import_theme3.resolveRadiusClass)("BINARY", radiusStop, {
       heightPx: trackHeight
     });
-    const thumbRadius = overrideRadius != null ? resolveRadiusValue(overrideRadius) ?? 1e3 : (0, import_theme2.resolveRadiusClass)("BINARY", radiusStop, {
+    const thumbRadius = overrideRadius != null ? resolveRadiusValue(overrideRadius) ?? 1e3 : (0, import_theme3.resolveRadiusClass)("BINARY", radiusStop, {
       heightPx: thumbPaintedHeight
     });
-    const radiusResolution = overrideRadius == null ? (0, import_theme2.radiusResolutionProps)("BINARY") : void 0;
+    const radiusResolution = overrideRadius == null ? (0, import_theme3.radiusResolutionProps)("BINARY") : void 0;
     let frameProps = {
       borderRadius: overrideRadius ?? trackRadius,
+      borderWidth: ringWidth,
       height: trackHeight,
       minHeight: trackHeight,
       width: trackWidth,
-      ...(0, import_pressSlopProps.pressSlopProps)(trackHeight, !grownTarget, trackWidth >= import_theme2.TOUCH_HEIGHT_FLOOR ? "vertical" : "both")
+      ...(0, import_pressSlopProps.pressSlopProps)(trackHeight, !grownTarget, trackWidth >= import_theme3.TOUCH_HEIGHT_FLOOR ? "vertical" : "both")
     };
-    const hoverRaw = stripOutlineFromState(control.hoverKnobProps);
-    const pressRaw = stripOutlineFromState(control.pressKnobProps);
-    const focusRaw = stripOutlineFromState(control.focusKnobProps);
+    const hoverRaw = stripTrackPaintFromState(stripOutlineFromState(control.hoverKnobProps));
+    const pressRaw = stripTrackPaintFromState(stripOutlineFromState(control.pressKnobProps));
+    const focusRaw = stripTrackPaintFromState(stripOutlineFromState(control.focusKnobProps));
     const trackHover = overrideRadius != null ? (0, import_utils.stripRadiusFromStateProps)(hoverRaw) : withBinaryStateRadius(hoverRaw, trackHeight);
     const trackPress = overrideRadius != null ? (0, import_utils.stripRadiusFromStateProps)(pressRaw) : withBinaryStateRadius(pressRaw, trackHeight);
     const trackFocus = overrideRadius != null ? (0, import_utils.stripRadiusFromStateProps)(focusRaw) : withBinaryStateRadius(focusRaw, trackHeight);
@@ -693,10 +693,12 @@ function Switch({
       borderRadius: state.borderRadius
     } : void 0;
     const cellTrack = grownTarget ? {
+      width: trackWidth,
       height: trackHeight,
       borderRadius: trackRadius,
-      borderWidth,
+      borderWidth: ringWidth,
       frameHeight: targetHeight,
+      frameWidth: Math.max(import_theme3.TOUCH_HEIGHT_FLOOR, trackWidth),
       ...(cellTrackRadiusStyle(trackHover) && {
         hoverStyle: cellTrackRadiusStyle(trackHover)
       }),
@@ -712,6 +714,7 @@ function Switch({
         ...frameProps,
         height: targetHeight,
         minHeight: targetHeight,
+        width: Math.max(import_theme3.TOUCH_HEIGHT_FLOOR, trackWidth),
         backgroundColor: "transparent",
         borderWidth: 0,
         borderColor: "transparent",
@@ -722,26 +725,12 @@ function Switch({
           borderColor: "transparent"
         }
       };
-    } else if (switchChecked) {
-      frameProps = {
-        ...frameProps,
-        ...radiusResolution,
-        backgroundColor: import_colorRamps.formSwitchColors.track.on,
-        borderColor: import_colorRamps.formSwitchColors.track.on
-      };
     } else {
       frameProps = {
         ...frameProps,
-        ...radiusResolution,
-        backgroundColor: knobProps.outlined ? "transparent" : import_colorRamps.formSwitchColors.track.off,
-        borderColor: import_colorRamps.formControlColors.boundary
+        ...radiusResolution
       };
     }
-    const stateBorderColor = switchChecked ? import_colorRamps.formSwitchColors.track.on : import_colorRamps.formControlColors.boundary;
-    const checkedTrackFill = switchChecked ? {
-      backgroundColor: import_colorRamps.formSwitchColors.track.on,
-      borderColor: import_colorRamps.formSwitchColors.track.on
-    } : void 0;
     const switchElement = /* @__PURE__ */(0, import_jsx_runtime.jsx)(SwitchControl, {
       checked: switchChecked,
       onCheckedChange: val => {
@@ -758,7 +747,7 @@ function Switch({
       sizeToken,
       footprint,
       thumbRadius,
-      transition: resolveSwitchMotion(knobProps.transition),
+      transition: resolveSwitchMotion(knobProps.motion.control.transition),
       frameProps,
       switchProps,
       leftIcon,
@@ -780,25 +769,15 @@ function Switch({
         thumbFocusStyle: thumbFocus
       }),
       ...(trackHover && {
-        hoverStyle: {
-          ...trackHover,
-          borderColor: stateBorderColor,
-          ...checkedTrackFill
-        }
+        hoverStyle: trackHover
       }),
       ...(trackPress && {
-        pressStyle: {
-          ...trackPress,
-          borderColor: stateBorderColor,
-          ...checkedTrackFill
-        }
+        pressStyle: trackPress
       }),
       ...(trackFocus && {
         focusStyle: {
           outlineWidth: 0,
-          ...trackFocus,
-          borderColor: stateBorderColor,
-          ...checkedTrackFill
+          ...trackFocus
         }
       })
     });
@@ -818,7 +797,6 @@ function Switch({
       id,
       size,
       knobProps,
-      compactSpacing: true,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
         ...knobProps.gap,
         alignItems: "center",
@@ -827,13 +805,13 @@ function Switch({
           variant: "rounded",
           width: trackWidth,
           height: trackHeight,
-          borderRadius: (0, import_theme2.resolveRadiusClass)("BINARY", skeletonStop, {
+          borderRadius: (0, import_theme3.resolveRadiusClass)("BINARY", skeletonStop, {
             heightPx: trackHeight
           })
         }), label && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Skeleton.Skeleton, {
           variant: "text",
           width: 96,
-          height: (0, import_theme2.sizeRecipeForToken)(String(sizeToken)).fontSize
+          height: (0, import_theme3.sizeRecipeForToken)(String(sizeToken)).fontSize
         })]
       })
     });