@multiplatform.one/forms 6.1.0 → 6.3.0

package/dist/cjs/fields/Barcode/index.native.js

@@ -28,7 +28,9 @@ __export(Barcode_exports, {
 });
 module.exports = __toCommonJS(Barcode_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
+var import_theme = require("@multiplatform.one/theme");
+var import_react = require("@phosphor-icons/react");
+var import_react2 = require("react");
 var import_tamagui = require("tamagui");
 var import_Button = require("../../Button/index.native.js");
 var import_ControlGroup = require("../../ControlGroup/index.native.js");
@@ -37,7 +39,12 @@ var import_fieldLayout = require("../../fieldLayout.native.js");
 var import_InputParts = require("../../InputParts/index.native.js");
 var import_colorRamps = require("../../shared/colorRamps.native.js");
 var import_utils = require("../../shared/utils.native.js");
+var import_t = require("../../shared/t.native.js");
 var import_BarcodeScanner = require("./BarcodeScanner.native.js");
+var suppressBoxFocusRing = {
+  focused: false,
+  setFocused: function setFocused(_val) {}
+};
 function BarcodeInput(param) {
   var {
     value,
@@ -46,14 +53,38 @@ function BarcodeInput(param) {
     readOnly,
     enableScan,
     knobProps,
+    areaFocusRing,
     barcodeIcon,
     scanIcon,
     stopIcon,
     required,
-    hasError
+    hasError,
+    id,
+    hasLabel
   } = param;
-  var [isScanning, setIsScanning] = (0, import_react.useState)(false);
-  var [scanError, setScanError] = (0, import_react.useState)(null);
+  var [isScanning, setIsScanning] = (0, import_react2.useState)(false);
+  var [scanError, setScanError] = (0, import_react2.useState)(null);
+  var preflightingRef = (0, import_react2.useRef)(false);
+  var activeScanIcon = isScanning ? stopIcon : scanIcon;
+  var handleScanPress = async function handleScanPress2() {
+    if (isScanning) {
+      setIsScanning(false);
+      return;
+    }
+    if (preflightingRef.current) return;
+    preflightingRef.current = true;
+    try {
+      var result = await (0, import_BarcodeScanner.preflightCamera)();
+      if (result.ok) {
+        setScanError(null);
+        setIsScanning(true);
+      } else {
+        setScanError(result.reason);
+      }
+    } finally {
+      preflightingRef.current = false;
+    }
+  };
   return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
     children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input, {
       size: knobProps.sizeToken,
@@ -61,32 +92,43 @@ function BarcodeInput(param) {
         children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
           width: 0
         }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_InputParts.Input.Box, {
-          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input.Icon, {
+          children: [barcodeIcon ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input.Icon, {
             adornment: "leading",
             children: barcodeIcon
-          }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input.Area, {
-            value,
-            onChangeText: readOnly ? void 0 : onValueChange,
-            readOnly,
-            "aria-readonly": readOnly || void 0,
-            placeholder: "Enter or scan barcode",
-            disabled,
-            "aria-required": required || void 0,
-            "aria-invalid": hasError || void 0
+          }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.FocusContext.Provider, {
+            ...suppressBoxFocusRing,
+            children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input.Area, {
+              id,
+              value,
+              onChangeText: readOnly ? void 0 : onValueChange,
+              readOnly,
+              "aria-readonly": readOnly || void 0,
+              placeholder: (0, import_t.t)("Enter or scan barcode"),
+              disabled,
+              focusStyle: areaFocusRing,
+              focusVisibleStyle: areaFocusRing,
+              "aria-labelledby": hasLabel && id ? `${id}-label` : void 0,
+              "aria-label": hasLabel ? void 0 : (0, import_t.t)("Barcode"),
+              "aria-required": required || void 0,
+              "aria-invalid": hasError || void 0
+            })
           })]
-        }), enableScan && !readOnly ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+        }), enableScan && !readOnly ?
+        // Icon when provided; otherwise a text label — an icon-less Button
+        // renders as a bare colored box (looks like a stuck skeleton).
+        /* @__PURE__ */
+        (0, import_jsx_runtime.jsx)(import_Button.Button, {
           size: knobProps.sizeToken,
           disabled,
-          onPress: function onPress() {
-            return setIsScanning(function (s) {
-              return !s;
-            });
-          },
-          icon: isScanning ? stopIcon : scanIcon,
+          onPress: handleScanPress,
+          ...(activeScanIcon ? {
+            icon: activeScanIcon
+          } : void 0),
           ...(isScanning ? {
             theme: "red"
           } : void 0),
-          "aria-label": isScanning ? "Stop scanning" : "Scan barcode"
+          "aria-label": isScanning ? (0, import_t.t)("Stop scanning") : (0, import_t.t)("Scan barcode"),
+          children: activeScanIcon ? void 0 : isScanning ? (0, import_t.t)("Stop") : (0, import_t.t)("Scan")
         }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
           width: 0
         })]
@@ -107,6 +149,15 @@ function BarcodeInput(param) {
     })]
   });
 }
+var defaultBarcodeIcon = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react.BarcodeIcon, {
+  size: 18
+});
+var defaultScanIcon = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react.CameraIcon, {
+  size: 18
+});
+var defaultStopIcon = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react.XIcon, {
+  size: 18
+});
 function Barcode(param) {
   var {
     name,
@@ -126,15 +177,16 @@ function Barcode(param) {
     disabled,
     readOnly,
     enableScan = true,
-    barcodeIcon,
-    scanIcon,
-    stopIcon,
+    barcodeIcon = defaultBarcodeIcon,
+    scanIcon = defaultScanIcon,
+    stopIcon = defaultStopIcon,
     skeleton,
     compact
   } = param;
   var {
     resolvedForm,
     knobProps,
+    control,
     id
   } = (0, import_utils.useFormField)({
     form: formProp,
@@ -142,6 +194,10 @@ function Barcode(param) {
     compact
   });
   var resolvedValidators = (0, import_utils.useResolvedValidators)(required, validators, label, name);
+  var areaFocusRing = (0, import_theme.ensureFocusVisibleRing)({
+    ...control.focusVisibleKnobProps,
+    outlineOffset: -2
+  });
   var iconProps = {
     barcodeIcon,
     scanIcon,
@@ -172,6 +228,9 @@ function Barcode(param) {
       size,
       knobProps,
       onBlur,
+      // LC-40: FieldLayout owns the dimWhole assembly dim (keepLabel pins
+      // the sibling label/helper readable) — it needs the disabled state.
+      disabled,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(BarcodeInput, {
         value: (_ref = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref !== void 0 ? _ref : "",
         onValueChange: function onValueChange(v) {
@@ -181,8 +240,11 @@ function Barcode(param) {
         readOnly: !!readOnly,
         enableScan,
         knobProps,
+        areaFocusRing,
         required,
         hasError: !!error,
+        id,
+        hasLabel: Boolean(label),
         ...iconProps
       })
     });
@@ -205,6 +267,8 @@ function Barcode(param) {
         size,
         knobProps,
         onBlur: (0, import_utils.mergeFieldHandler)(field, "handleBlur", onBlur),
+        // LC-40: see standalone branch — FieldLayout carries dimWhole.
+        disabled,
         children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(BarcodeInput, {
           value: (_field_state_value = field.state.value) !== null && _field_state_value !== void 0 ? _field_state_value : "",
           onValueChange: function onValueChange(v) {
@@ -216,8 +280,11 @@ function Barcode(param) {
           readOnly: !!readOnly,
           enableScan,
           knobProps,
+          areaFocusRing,
           required,
           hasError: !!resolvedError,
+          id,
+          hasLabel: Boolean(label),
           ...iconProps
         })
       });

package/dist/cjs/fields/Barcode/index.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Barcode_exports","__export","Barcode","module","exports","import_jsx_runtime","require","import_react","import_tamagui","import_Button","import_ControlGroup","import_Skeleton","import_fieldLayout","import_InputParts","import_colorRamps","import_utils","import_BarcodeScanner","BarcodeInput","param","onValueChange","disabled","readOnly","enableScan","knobProps","barcodeIcon","scanIcon","stopIcon","required","hasError","isScanning","setIsScanning","useState","scanError","setScanError","jsxs","Fragment","children","jsx","Input","size","sizeToken","ControlGroup","View","width","Box","Icon","adornment","Area","onChangeText","placeholder","Button","onPress","s","icon","theme","BarcodeScanner","active","onScan","onError","onClose","Text","body","color","formCommonColors","error","fontSize","name","form","formProp","validators","label","labelProps","helperText","id","idProp","defaultValue","onChange","onBlur","skeleton","compact","resolvedForm","useFormField","resolvedValidators","useResolvedValidators","iconProps","FieldLayout","Skeleton","variant","height","_ref","v","Field","field","_field_state_value","resolvedError","getFieldError","mergeFieldHandler","state","handleChange"],"sources":["../../../../src/fields/Barcode/index.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Barcode_exports","__export","Barcode","module","exports","import_jsx_runtime","require","import_theme","import_react","import_react2","import_tamagui","import_Button","import_ControlGroup","import_Skeleton","import_fieldLayout","import_InputParts","import_colorRamps","import_utils","import_t","import_BarcodeScanner","suppressBoxFocusRing","focused","setFocused","_val","BarcodeInput","param","onValueChange","disabled","readOnly","enableScan","knobProps","areaFocusRing","barcodeIcon","scanIcon","stopIcon","required","hasError","id","hasLabel","isScanning","setIsScanning","useState","scanError","setScanError","preflightingRef","useRef","activeScanIcon","handleScanPress","handleScanPress2","current","result","preflightCamera","ok","reason","jsxs","Fragment","children","jsx","Input","size","sizeToken","ControlGroup","View","width","Box","Icon","adornment","FocusContext","Provider","Area","onChangeText","placeholder","t","focusStyle","focusVisibleStyle","Button","onPress","icon","theme","BarcodeScanner","active","onScan","onError","onClose","Text","body","color","formCommonColors","error","fontSize","defaultBarcodeIcon","BarcodeIcon","defaultScanIcon","CameraIcon","defaultStopIcon","XIcon","name","form","formProp","validators","label","labelProps","helperText","idProp","defaultValue","onChange","onBlur","skeleton","compact","resolvedForm","control","useFormField","resolvedValidators","useResolvedValidators","ensureFocusVisibleRing","focusVisibleKnobProps","outlineOffset","iconProps","FieldLayout","Skeleton","variant","height","_ref","v","Boolean","Field","field","_field_state_value","resolvedError","getFieldError","mergeFieldHandler","state","handleChange"],"sources":["../../../../src/fields/Barcode/index.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/fields/Checkbox/Checkbox.cjs

@@ -22,18 +22,30 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var Checkbox_exports = {};
 __export(Checkbox_exports, {
-  Checkbox: () => Checkbox
+  Checkbox: () => Checkbox,
+  getCheckboxInlineGap: () => getCheckboxInlineGap
 });
 module.exports = __toCommonJS(Checkbox_exports);
 var import_react = require("@phosphor-icons/react");
 var import_react2 = require("react");
 var import_tamagui = require("tamagui");
+var import_get_token = require("@tamagui/get-token");
+var import_tableCellContext = require("../../shared/tableCellContext.cjs");
 var import_Skeleton = require("../../Skeleton/index.cjs");
 var import_fieldLayout = require("../../fieldLayout.cjs");
 var import_colorRamps = require("../../shared/colorRamps.cjs");
 var import_utils = require("../../shared/utils.cjs");
 var import_CheckboxFieldFrame = require("./CheckboxFieldFrame.cjs");
 var import_jsx_runtime = require("react/jsx-runtime");
+function getCheckboxInlineGap(space) {
+  const inlineGapMap = {
+    none: "$1",
+    small: "$1.5",
+    medium: "$2",
+    large: "$2.5"
+  };
+  return inlineGapMap[space] || "$2";
+}
 function Checkbox({
   name,
   form: formProp,
@@ -49,6 +61,7 @@ function Checkbox({
   id: idProp,
   checked,
   defaultValue,
+  onChange,
   onCheckedChange,
   onBlur,
   checkboxProps,
@@ -57,12 +70,17 @@ function Checkbox({
   skeleton,
   compact
 }) {
+  const handleValueChange = val => {
+    onChange?.(val);
+    onCheckedChange?.(val);
+  };
   const {
     resolvedForm,
     knobProps,
     control,
     text,
     elevation,
+    disabledState,
     id
   } = (0, import_utils.useFormField)({
     form: formProp,
@@ -87,13 +105,7 @@ function Checkbox({
     borderWidth: knobProps.borderRadius.borderWidth,
     borderRadius: cappedRadius
   };
-  const inlineGapMap = {
-    none: "$1",
-    small: "$1.5",
-    medium: "$2",
-    large: "$2.5"
-  };
-  const inlineGap = inlineGapMap[knobProps.space] || "$2";
+  const inlineGap = getCheckboxInlineGap(knobProps.space);
   const baseLabelColor = error ? import_colorRamps.formCommonColors.error : knobProps.textAccentColor;
   const labelHoverStyle = {
     color: baseLabelColor,
@@ -131,6 +143,54 @@ function Checkbox({
       })
     });
   };
+  const inTableCell = (0, import_tableCellContext.useIsInTableCell)();
+  const targetSize = 44;
+  const glyphSize = Math.round((0, import_tamagui.getVariableValue)((0, import_get_token.getSize)(resolvedSize)) * 0.45);
+  const targetFrameProps = {
+    width: targetSize,
+    height: targetSize,
+    minWidth: targetSize,
+    minHeight: targetSize,
+    padding: 0,
+    borderWidth: 0,
+    backgroundColor: "transparent",
+    alignItems: "center",
+    justifyContent: "center",
+    activeStyle: {
+      backgroundColor: "transparent"
+    }
+  };
+  const stateBaseStyle = {
+    backgroundColor: "transparent"
+  };
+  const glyphBox = currentChecked => /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
+    width: glyphSize,
+    height: glyphSize,
+    ...knobProps.inputSurface,
+    ...resolvedRadius,
+    backgroundColor: knobProps.outlined ? "transparent" : import_colorRamps.formControlColors.background,
+    borderColor: import_colorRamps.formControlColors.border,
+    alignItems: "center",
+    justifyContent: "center",
+    children: renderIndicator(currentChecked)
+  });
+  const renderControlContent = currentChecked => elevationWrapperProps.elevation && !inTableCell ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
+    borderRadius: resolvedRadius.borderRadius ?? knobProps.borderRadius.borderRadius,
+    ...elevationWrapperProps,
+    children: glyphBox(currentChecked)
+  }) : glyphBox(currentChecked);
+  const nativeCheckboxA11y = errorText => import_tamagui.isWeb ? void 0 : {
+    accessible: true,
+    accessibilityState: {
+      disabled: !!disabled
+    },
+    ...(typeof label === "string" ? {
+      accessibilityLabel: `${label}${required ? " *" : ""}`
+    } : void 0),
+    ...(errorText || helperText ? {
+      accessibilityHint: errorText ?? helperText
+    } : void 0)
+  };
   if (skeleton) {
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_fieldLayout.FieldLayout, {
       id,
@@ -138,15 +198,22 @@ function Checkbox({
       knobProps,
       compactSpacing: true,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
-        gap: "$2",
+        gap: inlineGap,
         alignItems: "center",
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Skeleton.Skeleton, {
-          variant: "rounded",
-          width: 20,
-          height: 20
+        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
+          width: targetSize,
+          height: targetSize,
+          alignItems: "center",
+          justifyContent: "center",
+          children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Skeleton.Skeleton, {
+            variant: "rounded",
+            width: 20,
+            height: 20,
+            borderRadius: cappedRadius
+          })
         }), label && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Skeleton.Skeleton, {
           variant: "text",
-          width: "40%",
+          width: 96,
           height: 14
         })]
       })
@@ -156,41 +223,36 @@ function Checkbox({
     const isControlled = checked !== void 0;
     const needsFieldLayout = !!(error || helperText);
     const checkboxEl = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_CheckboxFieldFrame.CheckboxFieldFrame, {
-      ...knobProps.inputSurface,
       size: resolvedSize,
-      ...resolvedRadius,
-      outlined: knobProps.outlined,
       transition: knobProps.transition,
       ...((0, import_utils.clampRadiusInStateProps)(control.hoverKnobProps, 2) && {
         hoverStyle: {
-          backgroundColor: import_colorRamps.formControlColors.background,
-          borderColor: import_colorRamps.formControlColors.border,
+          ...stateBaseStyle,
           ...(0, import_utils.clampRadiusInStateProps)(control.hoverKnobProps, 2)
         }
       }),
       ...((0, import_utils.clampRadiusInStateProps)(control.pressKnobProps, 2) && {
         pressStyle: {
-          backgroundColor: import_colorRamps.formControlColors.background,
-          borderColor: import_colorRamps.formControlColors.border,
+          ...stateBaseStyle,
           ...(0, import_utils.clampRadiusInStateProps)(control.pressKnobProps, 2)
         }
       }),
       ...((0, import_utils.clampRadiusInStateProps)(control.focusKnobProps, 2) && {
         focusStyle: {
-          backgroundColor: import_colorRamps.formControlColors.background,
-          borderColor: import_colorRamps.formControlColors.border,
+          ...stateBaseStyle,
           ...(0, import_utils.clampRadiusInStateProps)(control.focusKnobProps, 2)
         }
       }),
       ...((0, import_utils.clampRadiusInStateProps)(control.focusVisibleKnobProps, 2) && {
         focusVisibleStyle: {
-          backgroundColor: import_colorRamps.formControlColors.background,
-          borderColor: import_colorRamps.formControlColors.border,
+          ...stateBaseStyle,
           ...(0, import_utils.clampRadiusInStateProps)(control.focusVisibleKnobProps, 2)
         }
       }),
+      ...targetFrameProps,
       ...checkboxProps,
       disabled,
+      ...(disabled ? disabledState.chromeKnobProps : void 0),
       id,
       ...(isControlled ? {
         checked
@@ -205,20 +267,16 @@ function Checkbox({
       } : void 0),
       "aria-required": required || void 0,
       "aria-invalid": !!error || void 0,
+      ...nativeCheckboxA11y(typeof error === "string" && error ? error : void 0),
       onCheckedChange: val => {
         if (disabled || readOnly) return;
-        onCheckedChange?.(val);
+        handleValueChange(val);
       },
       ...(onBlur ? {
         onBlur
       } : void 0),
-      children: renderIndicator(checked ?? defaultValue)
+      children: renderControlContent(checked ?? defaultValue)
     });
-    const checkboxControl = elevationWrapperProps.elevation ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
-      borderRadius: resolvedRadius.borderRadius ?? knobProps.borderRadius.borderRadius,
-      ...elevationWrapperProps,
-      children: checkboxEl
-    }) : checkboxEl;
     const hasElevation = !!elevationWrapperProps.elevation;
     const checkboxRow = /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
       gap: inlineGap,
@@ -226,7 +284,11 @@ function Checkbox({
       ...(hasElevation && {
         overflow: "visible"
       }),
-      children: [checkboxControl, label && /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.Label, {
+      ...(disabled && !needsFieldLayout ? disabledState.assemblyKnobProps : void 0),
+      ...(disabled && !needsFieldLayout ? {
+        "data-disabled-dimmed": disabledState.style === "dimWhole" ? "true" : "false"
+      } : void 0),
+      children: [checkboxEl, label && /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.Label, {
         htmlFor: id,
         size: size || "$true",
         ...knobProps.textWeight,
@@ -235,7 +297,7 @@ function Checkbox({
         pressStyle: labelPressStyle,
         focusStyle: labelFocusStyle,
         focusVisibleStyle: labelFocusVisibleStyle,
-        paddingRight: "$1",
+        paddingInlineEnd: "$1",
         ...labelProps,
         children: [label, required && " *"]
       })]
@@ -247,6 +309,7 @@ function Checkbox({
       helperText,
       size,
       knobProps,
+      disabled,
       children: checkboxRow
     });
   }
@@ -281,6 +344,7 @@ function Checkbox({
         helperText,
         size,
         knobProps,
+        disabled,
         children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
           gap: inlineGap,
           alignItems: "center",
@@ -289,41 +353,36 @@ function Checkbox({
           }),
           children: [(() => {
             const checkboxElement = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_CheckboxFieldFrame.CheckboxFieldFrame, {
-              ...knobProps.inputSurface,
               size: resolvedSize,
-              ...resolvedRadius,
-              outlined: knobProps.outlined,
               transition: knobProps.transition,
               ...((0, import_utils.clampRadiusInStateProps)(control.hoverKnobProps, 2) && {
                 hoverStyle: {
-                  backgroundColor: import_colorRamps.formControlColors.background,
-                  borderColor: import_colorRamps.formControlColors.border,
+                  ...stateBaseStyle,
                   ...(0, import_utils.clampRadiusInStateProps)(control.hoverKnobProps, 2)
                 }
               }),
               ...((0, import_utils.clampRadiusInStateProps)(control.pressKnobProps, 2) && {
                 pressStyle: {
-                  backgroundColor: import_colorRamps.formControlColors.background,
-                  borderColor: import_colorRamps.formControlColors.border,
+                  ...stateBaseStyle,
                   ...(0, import_utils.clampRadiusInStateProps)(control.pressKnobProps, 2)
                 }
               }),
               ...((0, import_utils.clampRadiusInStateProps)(control.focusKnobProps, 2) && {
                 focusStyle: {
-                  backgroundColor: import_colorRamps.formControlColors.background,
-                  borderColor: import_colorRamps.formControlColors.border,
+                  ...stateBaseStyle,
                   ...(0, import_utils.clampRadiusInStateProps)(control.focusKnobProps, 2)
                 }
               }),
               ...((0, import_utils.clampRadiusInStateProps)(control.focusVisibleKnobProps, 2) && {
                 focusVisibleStyle: {
-                  backgroundColor: import_colorRamps.formControlColors.background,
-                  borderColor: import_colorRamps.formControlColors.border,
+                  ...stateBaseStyle,
                   ...(0, import_utils.clampRadiusInStateProps)(control.focusVisibleKnobProps, 2)
                 }
               }),
+              ...targetFrameProps,
               ...checkboxProps,
               disabled,
+              ...(disabled ? disabledState.chromeKnobProps : void 0),
               id,
               checked: resolvedChecked,
               ...(readOnly ? {
@@ -334,20 +393,17 @@ function Checkbox({
               } : void 0),
               "aria-required": required || void 0,
               "aria-invalid": !!resolvedError || void 0,
+              ...nativeCheckboxA11y(typeof resolvedError === "string" && resolvedError ? resolvedError : void 0),
               onCheckedChange: newChecked => {
                 if (disabled || readOnly) return;
                 const fieldValue = newChecked === "indeterminate" ? false : newChecked === true;
                 field.handleChange(fieldValue);
-                onCheckedChange?.(newChecked);
+                handleValueChange(newChecked);
               },
               onBlur: (0, import_utils.mergeFieldHandler)(field, "handleBlur", onBlur),
-              children: renderIndicator(resolvedChecked)
+              children: renderControlContent(resolvedChecked)
             });
-            return elevationWrapperProps.elevation ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
-              borderRadius: resolvedRadius.borderRadius ?? knobProps.borderRadius.borderRadius,
-              ...elevationWrapperProps,
-              children: checkboxElement
-            }) : checkboxElement;
+            return checkboxElement;
           })(), label && /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.Label, {
             htmlFor: id,
             size: size || "$true",
@@ -357,7 +413,7 @@ function Checkbox({
             pressStyle: resolvedLabelPressStyle,
             focusStyle: resolvedLabelFocusStyle,
             focusVisibleStyle: resolvedLabelFocusVisibleStyle,
-            paddingRight: "$1",
+            paddingInlineEnd: "$1",
             ...labelProps,
             children: [label, required && " *"]
           })]