@tamagui/switch 1.89.0-1706483140977 → 1.89.0

package/dist/cjs/StyledContext.js

@@ -20,7 +20,6 @@ module.exports = __toCommonJS(StyledContext_exports);
 var import_core = require("@tamagui/core");
 const SwitchStyledContext = (0, import_core.createStyledContext)({
   size: void 0,
-  frameWidth: 0,
   unstyled: process.env.TAMAGUI_HEADLESS === "1"
 });
 //# sourceMappingURL=StyledContext.js.map

package/dist/cjs/StyledContext.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/StyledContext.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAgD;AAEzC,MAAM,0BAAsB,iCAIhC;AAAA,EACD,MAAM;AAAA,EACN,YAAY;AAAA,EACZ,UAAU,QAAQ,IAAI,qBAAqB;AAC7C,CAAC;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAoC;AAE7B,MAAM,0BAAsB,iCAGhC;AAAA,EACD,MAAM;AAAA,EACN,UAAU,QAAQ,IAAI,qBAAqB;AAC7C,CAAC;",
   "names": []
 }

package/dist/cjs/StyledContext.native.js

@@ -21,7 +21,6 @@ module.exports = __toCommonJS(StyledContext_exports);
 var import_core = require("@tamagui/core");
 const SwitchStyledContext = (0, import_core.createStyledContext)({
   size: void 0,
-  frameWidth: 0,
   unstyled: process.env.TAMAGUI_HEADLESS === "1"
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/StyledContext.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/StyledContext.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAgD;AAEzC,MAAM,0BAAsB,iCAIhC;AAAA,EACD,MAAM;AAAA,EACN,YAAY;AAAA,EACZ,UAAU,QAAQ,IAAI,qBAAqB;AAC7C,CAAC;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAoC;AAE7B,MAAM,0BAAsB,iCAGhC;AAAA,EACD,MAAM;AAAA,EACN,UAAU,QAAQ,IAAI,qBAAqB;AAC7C,CAAC;",
   "names": []
 }

package/dist/cjs/Switch.js

@@ -18,10 +18,10 @@ __export(Switch_exports, {
   SwitchThumb: () => SwitchThumb
 });
 module.exports = __toCommonJS(Switch_exports);
-var import_core = require("@tamagui/core"), import_get_token = require("@tamagui/get-token"), import_stacks = require("@tamagui/stacks"), import_SwitchContext = require("./SwitchContext");
+var import_core = require("@tamagui/core"), import_get_token = require("@tamagui/get-token"), import_stacks = require("@tamagui/stacks"), import_StyledContext = require("./StyledContext");
 const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
   name: "SwitchThumb",
-  context: import_SwitchContext.SwitchContext,
+  context: import_StyledContext.SwitchStyledContext,
   variants: {
     unstyled: {
       false: {
@@ -48,11 +48,11 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
   }
 }), getSwitchHeight = (val) => Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = (0, import_core.styled)(import_stacks.YStack, {
   name: "Switch",
-  context: import_SwitchContext.SwitchContext,
+  tag: "button",
+  context: import_StyledContext.SwitchStyledContext,
   variants: {
     unstyled: {
       false: {
-        size: "$true",
         borderRadius: 1e3,
         backgroundColor: "$background",
         borderWidth: 2,
@@ -67,9 +67,6 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
     checked: {
       true: {}
     },
-    frameWidth: {
-      ":number": () => null
-    },
     size: {
       "...size": (val) => {
         const height = getSwitchHeight(val) + 4, width = getSwitchWidth(val) + 4;

package/dist/cjs/Switch.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Switch.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAyC,0BACzC,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAA8B;AAEvB,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,OAAO,gBAAgB,GAAG;AAChC,eAAO;AAAA,UACL,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,cAAc;AAAA,QACd,iBAAiB;AAAA,QACjB,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,cAAc;AAAA,UACd,cAAc;AAAA,UACd,cAAc;AAAA,QAChB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,YAAY;AAAA,MACV,WAAW,MAAM;AAAA,IACnB;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,SAAS,gBAAgB,GAAG,IAAI,GAChC,QAAQ,eAAe,GAAG,IAAI;AACpC,eAAO;AAAA,UACL;AAAA,UACA,WAAW;AAAA,UACX;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAyC,0BACzC,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAAoC;AAE7B,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,OAAO,gBAAgB,GAAG;AAChC,eAAO;AAAA,UACL,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,cAAc;AAAA,QACd,iBAAiB;AAAA,QACjB,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,cAAc;AAAA,UACd,cAAc;AAAA,UACd,cAAc;AAAA,QAChB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,SAAS,gBAAgB,GAAG,IAAI,GAChC,QAAQ,eAAe,GAAG,IAAI;AACpC,eAAO;AAAA,UACL;AAAA,UACA,WAAW;AAAA,UACX;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC;",
   "names": []
 }

package/dist/cjs/Switch.native.js

@@ -19,10 +19,10 @@ __export(Switch_exports, {
   SwitchThumb: () => SwitchThumb
 });
 module.exports = __toCommonJS(Switch_exports);
-var import_core = require("@tamagui/core"), import_get_token = require("@tamagui/get-token"), import_stacks = require("@tamagui/stacks"), import_SwitchContext = require("./SwitchContext");
+var import_core = require("@tamagui/core"), import_get_token = require("@tamagui/get-token"), import_stacks = require("@tamagui/stacks"), import_StyledContext = require("./StyledContext");
 const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
   name: "SwitchThumb",
-  context: import_SwitchContext.SwitchContext,
+  context: import_StyledContext.SwitchStyledContext,
   variants: {
     unstyled: {
       false: {
@@ -49,11 +49,11 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
   }
 }), getSwitchHeight = (val) => Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = (0, import_core.styled)(import_stacks.YStack, {
   name: "Switch",
-  context: import_SwitchContext.SwitchContext,
+  tag: "button",
+  context: import_StyledContext.SwitchStyledContext,
   variants: {
     unstyled: {
       false: {
-        size: "$true",
         borderRadius: 1e3,
         backgroundColor: "$background",
         borderWidth: 2,
@@ -68,9 +68,6 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
     checked: {
       true: {}
     },
-    frameWidth: {
-      ":number": () => null
-    },
     size: {
       "...size": (val) => {
         const height = getSwitchHeight(val) + 4, width = getSwitchWidth(val) + 4;

package/dist/cjs/Switch.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Switch.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAyC,0BACzC,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAA8B;AAEvB,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,OAAO,gBAAgB,GAAG;AAChC,eAAO;AAAA,UACL,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,cAAc;AAAA,QACd,iBAAiB;AAAA,QACjB,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,cAAc;AAAA,UACd,cAAc;AAAA,UACd,cAAc;AAAA,QAChB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,YAAY;AAAA,MACV,WAAW,MAAM;AAAA,IACnB;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,SAAS,gBAAgB,GAAG,IAAI,GAChC,QAAQ,eAAe,GAAG,IAAI;AACpC,eAAO;AAAA,UACL;AAAA,UACA,WAAW;AAAA,UACX;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAyC,0BACzC,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAAoC;AAE7B,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,OAAO,gBAAgB,GAAG;AAChC,eAAO;AAAA,UACL,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,cAAc;AAAA,QACd,iBAAiB;AAAA,QACjB,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,cAAc;AAAA,UACd,cAAc;AAAA,UACd,cAAc;AAAA,QAChB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,SAAS,gBAAgB,GAAG,IAAI,GAChC,QAAQ,eAAe,GAAG,IAAI;AACpC,eAAO;AAAA,UACL;AAAA,UACA,WAAW;AAAA,UACX;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC;",
   "names": []
 }

package/dist/cjs/createSwitch.js

@@ -22,199 +22,119 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 )), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var createSwitch_exports = {};
 __export(createSwitch_exports, {
+  SwitchContext: () => SwitchContext,
   createSwitch: () => createSwitch
 });
 module.exports = __toCommonJS(createSwitch_exports);
-var import_compose_refs = require("@tamagui/compose-refs"), import_constants = require("@tamagui/constants"), import_core = require("@tamagui/core"), import_focusable = require("@tamagui/focusable"), import_helpers = require("@tamagui/helpers"), import_label = require("@tamagui/label"), import_stacks = require("@tamagui/stacks"), import_use_controllable_state = require("@tamagui/use-controllable-state"), import_use_previous = require("@tamagui/use-previous"), React = __toESM(require("react")), import_react_native = require("react-native-web"), import_Switch = require("./Switch"), import_SwitchContext = require("./SwitchContext"), import_jsx_runtime = (
-  // @ts-ignore
-  require("react/jsx-runtime")
-);
+var import_core = require("@tamagui/core"), import_switch_headless = require("@tamagui/switch-headless"), import_use_controllable_state = require("@tamagui/use-controllable-state"), React = __toESM(require("react")), import_react_native = require("react-native-web"), import_StyledContext = require("./StyledContext"), import_Switch = require("./Switch"), import_jsx_runtime = require("react/jsx-runtime");
+const SwitchContext = React.createContext({
+  checked: !1,
+  disabled: !1,
+  frameWidth: 0
+});
 function createSwitch(createProps) {
   const {
     disableActiveTheme,
     Frame = import_Switch.SwitchFrame,
     Thumb = import_Switch.SwitchThumb
   } = createProps;
-  process.env.NODE_ENV === "development" && (Frame !== import_Switch.SwitchFrame && Frame.staticConfig.context && console.warn(
-    "Warning: createSwitch() needs to control context to pass checked state from Frame to Thumb, any custom context passed will be overridden."
-  ), Thumb !== import_Switch.SwitchThumb && Thumb.staticConfig.context && console.warn(
+  process.env.NODE_ENV === "development" && (Frame !== import_Switch.SwitchFrame && Frame.staticConfig.context || Thumb !== import_Switch.SwitchThumb && Thumb.staticConfig.context) && console.warn(
     "Warning: createSwitch() needs to control context to pass checked state from Frame to Thumb, any custom context passed will be overridden."
-  )), Frame.staticConfig.context = import_SwitchContext.SwitchContext, Thumb.staticConfig.context = import_SwitchContext.SwitchContext;
-  const SwitchThumbComponent = Thumb.styleable(function(props, forwardedRef) {
-    const { size: sizeProp, unstyled: unstyledProp, ...thumbProps } = props, context = React.useContext(import_SwitchContext.SwitchContext), {
-      disabled,
-      checked,
-      unstyled: unstyledContext,
-      frameWidth,
-      size: sizeContext
-    } = context, [thumbWidth, setThumbWidth] = React.useState(0), initialChecked = React.useRef(checked).current, distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      Thumb,
-      {
-        ...(unstyledProp ?? unstyledContext ?? !1) === !1 && {
-          unstyled: process.env.TAMAGUI_HEADLESS === "1",
-          size: sizeProp ?? sizeContext ?? "$true",
-          ...!disableActiveTheme && {
-            theme: checked ? "active" : null
-          }
-        },
-        "data-state": getState(checked),
-        "data-disabled": disabled ? "" : void 0,
-        alignSelf: initialChecked ? "flex-end" : "flex-start",
-        checked,
-        x,
-        ...thumbProps,
-        onLayout: (0, import_helpers.composeEventHandlers)(
-          props.onLayout,
-          (e) => (
-            // @ts-ignore
-            setThumbWidth(e.nativeEvent.layout.width)
-          )
-        ),
-        ref: forwardedRef
-      }
-    );
-  }), SwitchComponent = Frame.styleable(
-    function(propsIn, forwardedRef) {
-      const styledContext = React.useContext(import_SwitchContext.SwitchContext), props = (0, import_core.useProps)(propsIn, {
-        noNormalize: !0,
-        noExpand: !0,
-        resolveValues: "none",
-        forComponent: Frame
-      }), {
-        labeledBy: ariaLabelledby,
-        name,
+  ), Frame.staticConfig.context = import_StyledContext.SwitchStyledContext, Thumb.staticConfig.context = import_StyledContext.SwitchStyledContext;
+  const SwitchThumbComponent = Thumb.styleable(
+    function(props, forwardedRef) {
+      const { size: sizeProp, unstyled: unstyledProp, nativeID, ...thumbProps } = props, context = React.useContext(SwitchContext), { checked, disabled, frameWidth } = context, styledContext = import_StyledContext.SwitchStyledContext.useStyledContext(), { unstyled: unstyledContext, size: sizeContext } = styledContext, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : unstyledProp ?? unstyledContext ?? !1, size = sizeProp ?? sizeContext ?? "$true", initialChecked = React.useRef(checked).current, [thumbWidth, setThumbWidth] = React.useState(0), distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        Thumb,
+        {
+          ref: forwardedRef,
+          unstyled,
+          ...unstyled === !1 && {
+            size,
+            ...!disableActiveTheme && {
+              theme: checked ? "active" : null
+            }
+          },
+          alignSelf: initialChecked ? "flex-end" : "flex-start",
+          x,
+          onLayout: (0, import_core.composeEventHandlers)(
+            props.onLayout,
+            (e) => setThumbWidth(e.nativeEvent.layout.width)
+          ),
+          checked,
+          disabled,
+          ...thumbProps
+        }
+      );
+    }
+  ), SwitchComponent = Frame.styleable(
+    function(_props, forwardedRef) {
+      const {
+        native,
+        nativeProps,
         checked: checkedProp,
         defaultChecked,
-        required,
-        disabled,
-        value = "on",
         onCheckedChange,
-        size = styledContext.size ?? "$true",
-        unstyled = styledContext.unstyled ?? !1,
-        native: nativeProp,
-        nativeProps,
-        children,
-        ...switchProps
-      } = props, native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !import_constants.isWeb && nativeProp === !0 || !import_constants.isWeb && native.includes("mobile") || native.includes("android") && import_react_native.Platform.OS === "android" || native.includes("ios") && import_react_native.Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, setButton), labelId = (0, import_label.useLabelContext)(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = import_constants.isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = (0, import_use_controllable_state.useControllableState)({
+        ...props
+      } = _props, [checked, setChecked] = (0, import_use_controllable_state.useControllableState)({
         prop: checkedProp,
         defaultProp: defaultChecked || !1,
         onChange: onCheckedChange,
         transition: !0
+      }), styledContext = React.useContext(import_StyledContext.SwitchStyledContext.context), [frameWidth, setFrameWidth] = React.useState(0), propsActive = (0, import_core.useProps)(props, {
+        noNormalize: !0,
+        noExpand: !0,
+        resolveValues: "none",
+        forComponent: Frame
       });
-      if (shouldRenderMobileNative)
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          import_react_native.Switch,
-          {
-            value: checkedProp,
-            onValueChange: onCheckedChange,
-            ...nativeProps
-          }
-        );
-      import_constants.isWeb || React.useEffect(() => {
-        if (props.id)
-          return (0, import_focusable.registerFocusable)(props.id, {
-            focus: () => {
-              setChecked((x) => !x);
-            }
-          });
-      }, [props.id, setChecked]);
-      const isInsideButton = React.useContext(import_stacks.ButtonNestingContext);
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_stacks.ButtonNestingContext.Provider, { value: !0, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          Frame,
-          {
-            tag: isInsideButton ? "span" : "button",
-            unstyled,
-            size,
-            checked,
-            disabled,
-            frameWidth,
-            themeShallow: !0,
-            ...!disableActiveTheme && {
-              theme: checked ? "active" : null,
-              themeShallow: !0
-            },
-            role: "switch",
-            "aria-checked": checked,
-            "aria-labelledby": labelledBy,
-            "aria-required": required,
-            "data-state": getState(checked),
-            "data-disabled": disabled ? "" : void 0,
-            tabIndex: disabled ? void 0 : 0,
-            value,
-            ...switchProps,
-            ref: composedRefs,
-            onPress: (0, import_helpers.composeEventHandlers)(props.onPress, (event) => {
-              setChecked((prevChecked) => !prevChecked), import_constants.isWeb && isFormControl && (hasConsumerStoppedPropagationRef.current = event.isPropagationStopped(), hasConsumerStoppedPropagationRef.current || event.stopPropagation());
-            }),
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-              import_stacks.YStack,
+      propsActive.size = styledContext.size ?? props.size ?? "$true", propsActive.unstyled = styledContext.unstyled ?? props.unstyled ?? !1;
+      const { switchProps, bubbleInput, switchRef } = (0, import_switch_headless.useSwitch)(
+        // @ts-ignore
+        propsActive,
+        [checked, setChecked],
+        forwardedRef
+      ), renderNative = (0, import_core.shouldRenderNativePlatform)(native);
+      return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.Switch, { value: checked, onValueChange: setChecked, ...nativeProps }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+        SwitchContext.Provider,
+        {
+          value: { checked, disabled: switchProps.disabled, frameWidth },
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+              Frame,
               {
-                alignSelf: "stretch",
-                flex: 1,
-                onLayout: (e) => {
-                  setFrameWidth(e.nativeEvent.layout.width);
+                ref: switchRef,
+                tag: "button",
+                ...import_core.isWeb && { type: "button" },
+                ...switchProps,
+                ...!disableActiveTheme && {
+                  theme: checked ? "active" : null,
+                  themeShallow: !0
                 },
-                children: typeof children == "function" ? children(checked) : children
+                checked,
+                disabled: switchProps.disabled,
+                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                  import_core.Stack,
+                  {
+                    alignSelf: "stretch",
+                    flex: 1,
+                    onLayout: (e) => {
+                      setFrameWidth(e.nativeEvent.layout.width);
+                    },
+                    children: switchProps.children
+                  }
+                )
               }
-            )
-          }
-        ) }),
-        import_constants.isWeb && isFormControl && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          BubbleInput,
-          {
-            control: button,
-            bubbles: !hasConsumerStoppedPropagationRef.current,
-            name,
-            value,
-            checked,
-            required,
-            disabled,
-            style: { transform: "translateX(-100%)" }
-          }
-        )
-      ] });
+            ),
+            bubbleInput
+          ]
+        }
+      );
     },
     {
       disableTheme: !0
     }
-  ), BubbleInput = (props) => {
-    const { control, checked, bubbles = !0, ...inputProps } = props, ref = React.useRef(null), prevChecked = (0, import_use_previous.usePrevious)(checked);
-    return React.useEffect(() => {
-      const input = ref.current, inputProto = window.HTMLInputElement.prototype, setChecked = Object.getOwnPropertyDescriptor(
-        inputProto,
-        "checked"
-      ).set;
-      if (prevChecked !== checked && setChecked) {
-        const event = new Event("click", { bubbles });
-        setChecked.call(input, checked), input.dispatchEvent(event);
-      }
-    }, [prevChecked, checked, bubbles]), // @ts-ignore
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      "input",
-      {
-        type: "checkbox",
-        "aria-hidden": !0,
-        defaultChecked: checked,
-        ...inputProps,
-        tabIndex: -1,
-        ref,
-        style: {
-          ...props.style,
-          // ...controlSize,
-          position: "absolute",
-          pointerEvents: "none",
-          opacity: 0,
-          margin: 0
-        }
-      }
-    );
-  };
-  function getState(checked) {
-    return checked ? "checked" : "unchecked";
-  }
-  return (0, import_helpers.withStaticProperties)(SwitchComponent, {
+  );
+  return (0, import_core.withStaticProperties)(SwitchComponent, {
     Thumb: SwitchThumbComponent
   });
 }

package/dist/cjs/createSwitch.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createSwitch.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["DefaultSwitchFrame", "NativeSwitch"]
 }