@tamagui/switch 1.110.5 → 1.111.0

package/dist/cjs/createSwitch.native.js

@@ -27,121 +27,25 @@ __export(createSwitch_exports, {
   createSwitch: () => createSwitch
 });
 module.exports = __toCommonJS(createSwitch_exports);
-var import_jsx_runtime = require("react/jsx-runtime"), import_core = require("@tamagui/core"), import_focusable = require("@tamagui/focusable"), 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"), import_StyledContext = require("./StyledContext"), import_Switch = require("./Switch");
-function _array_like_to_array(arr, len) {
-  (len == null || len > arr.length) && (len = arr.length);
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _array_with_holes(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _define_property(obj, key, value) {
-  return key in obj ? Object.defineProperty(obj, key, {
-    value,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : obj[key] = value, obj;
-}
-function _iterable_to_array_limit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i != null) {
-    var _arr = [], _n = !0, _d = !1, _s, _e;
-    try {
-      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done) && (_arr.push(_s.value), !(i && _arr.length === i)); _n = !0)
-        ;
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        !_n && _i.return != null && _i.return();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-function _non_iterable_rest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _object_spread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
-    typeof Object.getOwnPropertySymbols == "function" && (ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-    }))), ownKeys2.forEach(function(key) {
-      _define_property(target, key, source[key]);
-    });
-  }
-  return target;
-}
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-  return keys;
-}
-function _object_spread_props(target, source) {
-  return source = source ?? {}, Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
-    Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-  }), target;
-}
-function _object_without_properties(source, excluded) {
-  if (source == null) return {};
-  var target = _object_without_properties_loose(source, excluded), key, i;
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-    for (i = 0; i < sourceSymbolKeys.length; i++)
-      key = sourceSymbolKeys[i], !(excluded.indexOf(key) >= 0) && Object.prototype.propertyIsEnumerable.call(source, key) && (target[key] = source[key]);
-  }
-  return target;
-}
-function _object_without_properties_loose(source, excluded) {
-  if (source == null) return {};
-  var target = {}, sourceKeys = Object.keys(source), key, i;
-  for (i = 0; i < sourceKeys.length; i++)
-    key = sourceKeys[i], !(excluded.indexOf(key) >= 0) && (target[key] = source[key]);
-  return target;
-}
-function _sliced_to_array(arr, i) {
-  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (o) {
-    if (typeof o == "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor && (n = o.constructor.name), n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-  }
-}
-var SwitchContext = /* @__PURE__ */ React.createContext({
+var import_jsx_runtime = require("react/jsx-runtime"), import_core = require("@tamagui/core"), import_focusable = require("@tamagui/focusable"), 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"), import_StyledContext = require("./StyledContext"), import_Switch = require("./Switch"), SwitchContext = /* @__PURE__ */ React.createContext({
   checked: !1,
   disabled: !1,
   frameWidth: 0
 });
 function createSwitch(createProps) {
-  var disableActiveTheme = createProps.disableActiveTheme, _createProps_Frame = createProps.Frame, Frame = _createProps_Frame === void 0 ? import_Switch.SwitchFrame : _createProps_Frame, _createProps_Thumb = createProps.Thumb, Thumb = _createProps_Thumb === void 0 ? import_Switch.SwitchThumb : _createProps_Thumb;
+  var { disableActiveTheme, Frame = import_Switch.SwitchFrame, Thumb = import_Switch.SwitchThumb } = createProps;
   process.env.NODE_ENV === "development" && (Frame !== import_Switch.SwitchFrame && Frame.staticConfig.context && Frame.staticConfig.context !== import_StyledContext.SwitchStyledContext || Thumb !== import_Switch.SwitchThumb && Thumb.staticConfig.context && Thumb.staticConfig.context !== import_StyledContext.SwitchStyledContext) && 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_StyledContext.SwitchStyledContext, Thumb.staticConfig.context = import_StyledContext.SwitchStyledContext;
   var SwitchThumbComponent = Thumb.styleable(function(props, forwardedRef) {
-    var sizeProp = props.size, unstyledProp = props.unstyled, nativeID = props.nativeID, thumbProps = _object_without_properties(props, [
-      "size",
-      "unstyled",
-      "nativeID"
-    ]), context = React.useContext(SwitchContext), checked = context.checked, disabled = context.disabled, frameWidth = context.frameWidth, styledContext = import_StyledContext.SwitchStyledContext.useStyledContext(), unstyledContext = styledContext.unstyled, sizeContext = styledContext.size, _ref, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1, _ref1, size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$true", initialChecked = React.useRef(checked).current, _React_useState = _sliced_to_array(React.useState(0), 2), thumbWidth = _React_useState[0], setThumbWidth = _React_useState[1], distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Thumb, _object_spread(_object_spread_props(_object_spread({
+    var { 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, _ref, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1, _ref1, size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$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 && _object_spread({
-      size
-    }, !disableActiveTheme && {
-      theme: checked ? "active" : null
-    })), {
+      unstyled,
+      ...unstyled === !1 && {
+        size,
+        ...!disableActiveTheme && {
+          theme: checked ? "active" : null
+        }
+      },
       alignSelf: initialChecked ? "flex-end" : "flex-start",
       x,
       // TODO: remove ViewProps cast
@@ -150,26 +54,21 @@ function createSwitch(createProps) {
       }),
       // expected variants
       checked,
-      disabled
-    }), thumbProps));
+      disabled,
+      ...thumbProps
+    });
   }), SwitchComponent = Frame.styleable(function(_props, forwardedRef) {
-    var native = _props.native, nativeProps = _props.nativeProps, checkedProp = _props.checked, defaultChecked = _props.defaultChecked, onCheckedChange = _props.onCheckedChange, props = _object_without_properties(_props, [
-      "native",
-      "nativeProps",
-      "checked",
-      "defaultChecked",
-      "onCheckedChange"
-    ]), _useControllableState = _sliced_to_array((0, import_use_controllable_state.useControllableState)({
+    var { native, nativeProps, checked: checkedProp, defaultChecked, onCheckedChange, ...props } = _props, [checked, setChecked] = (0, import_use_controllable_state.useControllableState)({
       prop: checkedProp,
       defaultProp: defaultChecked || !1,
       onChange: onCheckedChange,
       transition: !0
-    }), 2), checked = _useControllableState[0], setChecked = _useControllableState[1], styledContext = React.useContext(import_StyledContext.SwitchStyledContext.context), _React_useState = _sliced_to_array(React.useState(0), 2), frameWidth = _React_useState[0], setFrameWidth = _React_useState[1], propsActive = (0, import_core.useProps)(props, {
+    }), 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
-    }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, _useSwitch = (0, import_switch_headless.useSwitch)(
+    }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, { switchProps, bubbleInput, switchRef } = (0, import_switch_headless.useSwitch)(
       // @ts-ignore
       Object.assign({
         size: (_ref = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref !== void 0 ? _ref : "$true",
@@ -180,7 +79,7 @@ function createSwitch(createProps) {
         setChecked
       ],
       forwardedRef
-    ), switchProps = _useSwitch.switchProps, bubbleInput = _useSwitch.bubbleInput, switchRef = _useSwitch.switchRef;
+    );
     React.useEffect(function() {
       if (props.id && !props.disabled)
         return (0, import_focusable.registerFocusable)(props.id, {
@@ -197,25 +96,28 @@ function createSwitch(createProps) {
       props.disabled
     ]);
     var renderNative = (0, import_core.shouldRenderNativePlatform)(native);
-    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.Switch, _object_spread({
+    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, {
+      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, _object_spread_props(_object_spread({
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Frame, {
           ref: switchRef,
-          tag: "button"
-        }, import_core.isWeb && {
-          type: "button"
-        }, switchProps, !disableActiveTheme && {
-          theme: checked ? "active" : null,
-          themeShallow: !0
-        }), {
+          tag: "button",
+          ...import_core.isWeb && {
+            type: "button"
+          },
+          ...switchProps,
+          ...!disableActiveTheme && {
+            theme: checked ? "active" : null,
+            themeShallow: !0
+          },
           // expected variants
           checked,
           disabled: switchProps.disabled,
@@ -227,7 +129,7 @@ function createSwitch(createProps) {
             },
             children: switchProps.children
           })
-        })),
+        }),
         bubbleInput
       ]
     });

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/switch/src/createSwitch.tsx"],
-  "mappings": "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",
-  "names": ["SwitchContext", "React", "createContext", "checked", "disabled", "frameWidth", "createSwitch", "createProps", "disableActiveTheme", "Frame", "DefaultSwitchFrame", "Thumb", "SwitchThumb", "process", "env", "NODE_ENV", "staticConfig", "context", "SwitchStyledContext", "console", "warn", "SwitchThumbComponent", "styleable", "props", "forwardedRef", "sizeProp", "size", "unstyledProp", "unstyled", "nativeID", "thumbProps", "useContext", "styledContext", "useStyledContext", "unstyledContext", "sizeContext", "TAMAGUI_HEADLESS", "initialChecked", "useRef", "current", "useState", "thumbWidth", "setThumbWidth", "distance", "x", "_jsx", "ref", "theme", "alignSelf", "onLayout", "composeEventHandlers", "e", "nativeEvent", "layout", "width", "SwitchComponent", "_props", "native", "nativeProps", "checkedProp", "defaultChecked", "onCheckedChange", "useControllableState", "prop", "defaultProp", "onChange", "transition", "setChecked", "setFrameWidth", "propsActive", "useProps", "noNormalize", "noExpand", "resolveValues", "forComponent", "useSwitch", "Object", "assign", "switchProps", "bubbleInput", "switchRef", "useEffect", "id", "registerFocusable", "focusAndSelect", "value", "focus", "renderNative", "shouldRenderNativePlatform", "NativeSwitch", "onValueChange", "_jsxs", "Provider", "tag", "isWeb", "type", "themeShallow", "Stack", "flex", "children", "disableTheme", "withStaticProperties"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDACA,cAOO,0BAKP,mBAAkC,+BAClC,yBAA0B,qCAC1B,gCAAqC,4CACrC,QAAuB,2BAEvB,sBAAuC,yBAEvC,uBAAoC,4BACpC,gBAA+D,qBAoBlDA,gBAAgBC,sBAAMC,cAIhC;EACDC,SAAS;EACTC,UAAU;EACVC,YAAY;AACd,CAAA;AAKO,SAASC,aAGdC,aAAmE;AACnE,MAAM,EACJC,oBACAC,QAAQC,cAAAA,aACRC,QAAQC,0BAAW,IACjBL;AAMJ,EAAIM,QAAQC,IAAIC,aAAa,kBAExBN,UAAUC,cAAAA,eACTD,MAAMO,aAAaC,WACnBR,MAAMO,aAAaC,YAAYC,4CAChCP,UAAUC,6BACTD,MAAMK,aAAaC,WACnBN,MAAMK,aAAaC,YAAYC,6CAEjCC,QAAQC,KACN,2IAA2I,GAKjJX,MAAMO,aAAaC,UAAUC,0CAC7BP,MAAMK,aAAaC,UAAUC;AAE7B,MAAMG,uBAAuBV,MAAMW,UACjC,SAAqBC,OAAOC,cAAY;AACtC,QAAM,EAAEC,MAAMC,UAAUC,UAAUC,cAAcC,UAAU,GAAGC,WAAAA,IAAeP,OACtEN,UAAUhB,MAAM8B,WAAW/B,aAAAA,GAC3B,EAAEG,SAASC,UAAUC,WAAU,IAAKY,SAEpCe,gBAAgBd,yCAAoBe,iBAAgB,GACpD,EAAEN,UAAUO,iBAAiBT,MAAMU,YAAW,IAAKH,eAInDJ,MAHAD,WACJd,QAAQC,IAAIsB,qBAAqB,MAC7B,MACAR,OAAAA,gBAAgBM,qBAAAA,QAAhBN,SAAAA,SAAAA,OAAmC,IAC5BF,OAAPD,QAAOC,QAAAA,YAAYS,iBAAAA,QAAZT,UAAAA,SAAAA,QAA2B,SAElCW,iBAAiBpC,MAAMqC,OAAOnC,OAAAA,EAASoC,SAEvC,CAACC,YAAYC,aAAAA,IAAiBxC,MAAMyC,SAAS,CAAA,GAC7CC,WAAWtC,aAAamC,YACxBI,IAAIP,iBAAkBlC,UAAU,IAAI,CAACwC,WAAYxC,UAAUwC,WAAW;AAC5E,WACE,uCAAAE,KAAClC,OAAAA;MACCmC,KAAKtB;MACLG;MACC,GAAIA,aAAa,MAAS;QACzBF;QACA,GAAI,CAACjB,sBAAsB;UACzBuC,OAAO5C,UAAU,WAAW;QAC9B;MACF;MACA6C,WAAWX,iBAAiB,aAAa;MACzCO;;MAEAK,cAAUC,kCAAsB3B,MAAoB0B,UAAU,SAACE,GAAAA;eAC7DV,cAAcU,EAAEC,YAAYC,OAAOC,KAAK;;;MAG1CnD;MACAC;MACC,GAAG0B;;EAGV,CAAA,GAGIyB,kBAAkB9C,MAAMa,UAC5B,SAAqBkC,QAAQhC,cAAY;AACvC,QAAM,EACJiC,QACAC,aACAvD,SAASwD,aACTC,gBACAC,iBACA,GAAGtC,MAAAA,IACDiC,QACE,CAACrD,SAAS2D,UAAAA,QAAcC,oDAAqB;MACjDC,MAAML;MACNM,aAAaL,kBAAkB;MAC/BM,UAAUL;MACVM,YAAY;IACd,CAAA,GAEMnC,gBAAgB/B,MAAM8B,WAAWb,yCAAoBD,OAAO,GAE5D,CAACZ,YAAY+D,aAAAA,IAAiBnE,MAAMyC,SAAS,CAAA,GAE7C2B,kBAAcC,sBAAS/C,OAAO;MAClCgD,aAAa;MACbC,UAAU;MACVC,eAAe;MACfC,cAAcjE;IAChB,CAAA,GAMYuB,qBAAAA,MACIA,yBAAAA,OALV,EAAE2C,aAAaC,aAAaC,UAAS,QAAKC;;MAE9CC,OAAOC,OACL;QACEvD,OAAMO,QAAAA,sBAAAA,cAAcP,UAAI,QAAlBO,wBAAAA,SAAAA,sBAAsBT,MAAME,UAAI,QAAhCO,SAAAA,SAAAA,OAAoC;QAC1CL,WAAUK,SAAAA,0BAAAA,cAAcL,cAAQ,QAAtBK,4BAAAA,SAAAA,0BAA0BT,MAAMI,cAAQ,QAAxCK,UAAAA,SAAAA,QAA4C;MACxD,GACAqC,WAAAA;MAEF;QAAClE;QAAS2D;;MACVtC;IAAAA;AAIAvB,UAAMgF,UAAU,WAAA;AACd,UAAK1D,MAAM2D,MACP3D,OAAMnB;AAEV,mBAAO+E,oCAAkB5D,MAAM2D,IAAI;UACjCE,gBAAgB,WAAA;AACdtB,0BAAAA,QAAAA,WAAa,SAACuB,OAAAA;qBAAU,CAACA;;UAC3B;UACAC,OAAO,WAAA;UAAO;QAChB,CAAA;IACF,GAAG;MAAC/D,MAAM2D;MAAI3D,MAAMnB;KAAS;AAG/B,QAAMmF,mBAAeC,wCAA2B/B,MAAAA;AAChD,WAAI8B,iBAAiB,aAAaA,iBAAiB,QAE/C,uCAAA1C,KAAC4C,oBAAAA,QAAAA;MAAaJ,OAAOlF;MAASuF,eAAe5B;MAAa,GAAGJ;SAK/D,uCAAAiC,MAAC3F,cAAc4F,UAAQ;MACrBP,OAAO;QAAElF;QAASC,UAAUuE,YAAYvE;QAAUC;MAAW;;QAE7D,uCAAAwC,KAACpC,OAAAA;UACCqC,KAAK+B;UACLgB,KAAI;UACH,GAAIC,qBAAS;YAAEC,MAAM;UAAS;UAC9B,GAAIpB;UACJ,GAAI,CAACnE,sBAAsB;YAC1BuC,OAAO5C,UAAU,WAAW;YAC5B6F,cAAc;UAChB;;UAEA7F;UACAC,UAAUuE,YAAYvE;oBAEtB,uCAAAyC,KAACoD,mBAAAA;YACCjD,WAAU;YACVkD,MAAM;YACNjD,UAAU,SAACE,GAAAA;AACTiB,4BAAcjB,EAAEC,YAAYC,OAAOC,KAAK;YAC1C;sBAECqB,YAAYwB;;;QAIhBvB;;;EAGP,GACA;IACEwB,cAAc;EAChB,CAAA;AAGF,aAAOC,kCAAqB9C,iBAAiB;IAC3C5C,OAAOU;EACT,CAAA;AACF;",
+  "names": ["SwitchContext", "React", "createContext", "checked", "disabled", "frameWidth", "createSwitch", "createProps", "disableActiveTheme", "Frame", "DefaultSwitchFrame", "Thumb", "SwitchThumb", "process", "env", "NODE_ENV", "staticConfig", "context", "SwitchStyledContext", "console", "warn", "SwitchThumbComponent", "styleable", "props", "forwardedRef", "size", "sizeProp", "unstyled", "unstyledProp", "nativeID", "thumbProps", "useContext", "styledContext", "useStyledContext", "unstyledContext", "sizeContext", "TAMAGUI_HEADLESS", "initialChecked", "useRef", "current", "thumbWidth", "setThumbWidth", "useState", "distance", "x", "_jsx", "ref", "theme", "alignSelf", "onLayout", "composeEventHandlers", "e", "nativeEvent", "layout", "width", "SwitchComponent", "_props", "native", "nativeProps", "checkedProp", "defaultChecked", "onCheckedChange", "setChecked", "useControllableState", "prop", "defaultProp", "onChange", "transition", "setFrameWidth", "propsActive", "useProps", "noNormalize", "noExpand", "resolveValues", "forComponent", "switchProps", "bubbleInput", "switchRef", "useSwitch", "Object", "assign", "useEffect", "id", "registerFocusable", "focusAndSelect", "value", "focus", "renderNative", "shouldRenderNativePlatform", "NativeSwitch", "onValueChange", "_jsxs", "Provider", "tag", "isWeb", "type", "themeShallow", "Stack", "flex", "children", "disableTheme", "withStaticProperties"]
 }

package/dist/esm/StyledContext.native.mjs

@@ -0,0 +1,7 @@
+import { createStyledContext } from "@tamagui/core";
+var SwitchStyledContext = createStyledContext({
+  size: void 0,
+  unstyled: process.env.TAMAGUI_HEADLESS === "1"
+});
+export { SwitchStyledContext };
+//# sourceMappingURL=StyledContext.native.mjs.map

package/dist/esm/StyledContext.native.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["createStyledContext","SwitchStyledContext","size","unstyled","process","env","TAMAGUI_HEADLESS"],"sources":["../../src/StyledContext.tsx"],"sourcesContent":[null],"mappings":"AACA,SAASA,mBAAA,QAA2B;AAE7B,IAAAC,mBAAM,GAAAD,mBAAsB;EAIjCE,IAAA,EAAM;EACNC,QAAA,EAAUC,OAAA,CAAQC,GAAA,CAAIC,gBAAA,KAAqB;AAC7C,CAAC","ignoreList":[]}

package/dist/esm/Switch.native.mjs

@@ -0,0 +1,75 @@
+import { getVariableValue, styled } from "@tamagui/core";
+import { getSize } from "@tamagui/get-token";
+import { ThemeableStack, YStack } from "@tamagui/stacks";
+var SwitchThumb = styled(ThemeableStack, {
+    name: "SwitchThumb",
+    variants: {
+      unstyled: {
+        false: {
+          size: "$true",
+          backgroundColor: "$background",
+          borderRadius: 1e3
+        }
+      },
+      checked: {
+        true: {}
+      },
+      size: {
+        "...size": function (val) {
+          var size = getSwitchHeight(val);
+          return {
+            height: size,
+            width: size
+          };
+        }
+      }
+    },
+    defaultVariants: {
+      unstyled: process.env.TAMAGUI_HEADLESS === "1"
+    }
+  }),
+  getSwitchHeight = function (val) {
+    return Math.round(getVariableValue(getSize(val)) * 0.65);
+  },
+  getSwitchWidth = function (val) {
+    return getSwitchHeight(val) * 2;
+  },
+  SwitchFrame = styled(YStack, {
+    name: "Switch",
+    tag: "button",
+    tabIndex: 0,
+    variants: {
+      unstyled: {
+        false: {
+          borderRadius: 1e3,
+          backgroundColor: "$background",
+          borderWidth: 2,
+          borderColor: "$background",
+          focusVisibleStyle: {
+            outlineColor: "$outlineColor",
+            outlineStyle: "solid",
+            outlineWidth: 2
+          }
+        }
+      },
+      checked: {
+        true: {}
+      },
+      size: {
+        "...size": function (val) {
+          var height = getSwitchHeight(val) + 4,
+            width = getSwitchWidth(val) + 4;
+          return {
+            height,
+            minHeight: height,
+            width
+          };
+        }
+      }
+    },
+    defaultVariants: {
+      unstyled: process.env.TAMAGUI_HEADLESS === "1"
+    }
+  });
+export { SwitchFrame, SwitchThumb };
+//# sourceMappingURL=Switch.native.mjs.map

package/dist/esm/Switch.native.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["getVariableValue","styled","getSize","ThemeableStack","YStack","SwitchThumb","name","variants","unstyled","false","size","backgroundColor","borderRadius","checked","true","...size","val","getSwitchHeight","height","width","defaultVariants","process","env","TAMAGUI_HEADLESS","Math","round","getSwitchWidth","SwitchFrame","tag","tabIndex","borderWidth","borderColor","focusVisibleStyle","outlineColor","outlineStyle","outlineWidth","minHeight"],"sources":["../../src/Switch.tsx"],"sourcesContent":[null],"mappings":"AACA,SAASA,gBAAA,EAAkBC,MAAA,QAAc;AACzC,SAASC,OAAA,QAAe;AACxB,SAASC,cAAA,EAAgBC,MAAA,QAAc;AAEhC,IAAAC,WAAM,GAAAJ,MAAc,CAAAE,cAAO;IAChCG,IAAA,EAAM;IAENC,QAAA,EAAU;MACRC,QAAA,EAAU;QACRC,KAAA,EAAO;UACLC,IAAA,EAAM;UACNC,eAAA,EAAiB;UACjBC,YAAA,EAAc;QAChB;MACF;MAEAC,OAAA,EAAS;QACPC,IAAA,EAAM,CAAC;MACT;MAEAJ,IAAA,EAAM;QACJ,WAAW,SAAAK,CAASC,GAAA;UAClB,IAAAN,IAAM,GAAAO,eAAO,CAAAD,GAAgB;UAC7B,OAAO;YACLE,MAAA,EAAQR,IAAA;YACRS,KAAA,EAAOT;UACT;QACF;MACF;IACF;IAEAU,eAAA,EAAiB;MACfZ,QAAA,EAAUa,OAAA,CAAQC,GAAA,CAAIC,gBAAA,KAAqB;IAC7C;EACF,CAAC;EAEKN,eAAA,GAAkB,SAAAA,CACtBD,GAAA,EAAK;IAKL,OAAMQ,IAAA,CAAAC,KAAA,CAAAzB,gBAAA,CAAAE,OAAA,CAAAc,GAAA;EAAA;EACNU,cAAK,YAAAA,CAAAV,GAAA;IACL,OAAAC,eAAU,CAAAD,GAAA;EAAA;EAEVW,WAAU,GAAA1B,MAAA,CAAAG,MAAA;IAAAE,IACR,UAAU;IAAAsB,GAAA,EACR,QAAO;IAAAC,QACL;IAActB,QACd;MAAiBC,QACjB;QAAaC,KACb;UAEAG,YAAA;UAAmBD,eACjB,EAAc;UAAAmB,WACd;UAAcC,WACd,eAAc;UAChBC,iBAAA;YACFC,YAAA;YACFC,YAAA;YAEAC,YAAS;UACP;QACF;MAEA;MAAMtB,OACJ;QACEC,IAAA;MAEA;MAAOJ,IAAA,EACL;QAAA,SACA,WAAAK,CAAWC,GAAA;UAAA,IACXE,MAAA,GAAAD,eAAA,CAAAD,GAAA;YAAAG,KAAA,GAAAO,cAAA,CAAAV,GAAA;UACF;YACFE,MAAA;YACFkB,SAAA,EAAAlB,MAAA;YACFC;UAEA;QACE;MACF;IACD","ignoreList":[]}

package/dist/esm/createSwitch.native.js

@@ -7,120 +7,25 @@ import * as React from "react";
 import { Switch as NativeSwitch } from "react-native";
 import { SwitchStyledContext } from "./StyledContext";
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
-function _array_like_to_array(arr, len) {
-  (len == null || len > arr.length) && (len = arr.length);
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _array_with_holes(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _define_property(obj, key, value) {
-  return key in obj ? Object.defineProperty(obj, key, {
-    value,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : obj[key] = value, obj;
-}
-function _iterable_to_array_limit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i != null) {
-    var _arr = [], _n = !0, _d = !1, _s, _e;
-    try {
-      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done) && (_arr.push(_s.value), !(i && _arr.length === i)); _n = !0)
-        ;
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        !_n && _i.return != null && _i.return();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-function _non_iterable_rest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _object_spread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
-    typeof Object.getOwnPropertySymbols == "function" && (ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-    }))), ownKeys2.forEach(function(key) {
-      _define_property(target, key, source[key]);
-    });
-  }
-  return target;
-}
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-  return keys;
-}
-function _object_spread_props(target, source) {
-  return source = source ?? {}, Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
-    Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-  }), target;
-}
-function _object_without_properties(source, excluded) {
-  if (source == null) return {};
-  var target = _object_without_properties_loose(source, excluded), key, i;
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-    for (i = 0; i < sourceSymbolKeys.length; i++)
-      key = sourceSymbolKeys[i], !(excluded.indexOf(key) >= 0) && Object.prototype.propertyIsEnumerable.call(source, key) && (target[key] = source[key]);
-  }
-  return target;
-}
-function _object_without_properties_loose(source, excluded) {
-  if (source == null) return {};
-  var target = {}, sourceKeys = Object.keys(source), key, i;
-  for (i = 0; i < sourceKeys.length; i++)
-    key = sourceKeys[i], !(excluded.indexOf(key) >= 0) && (target[key] = source[key]);
-  return target;
-}
-function _sliced_to_array(arr, i) {
-  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (o) {
-    if (typeof o == "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor && (n = o.constructor.name), n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-  }
-}
 var SwitchContext = /* @__PURE__ */ React.createContext({
   checked: !1,
   disabled: !1,
   frameWidth: 0
 });
 function createSwitch(createProps) {
-  var disableActiveTheme = createProps.disableActiveTheme, _createProps_Frame = createProps.Frame, Frame = _createProps_Frame === void 0 ? DefaultSwitchFrame : _createProps_Frame, _createProps_Thumb = createProps.Thumb, Thumb = _createProps_Thumb === void 0 ? SwitchThumb : _createProps_Thumb;
+  var { disableActiveTheme, Frame = DefaultSwitchFrame, Thumb = SwitchThumb } = createProps;
   process.env.NODE_ENV === "development" && (Frame !== DefaultSwitchFrame && Frame.staticConfig.context && Frame.staticConfig.context !== SwitchStyledContext || Thumb !== SwitchThumb && Thumb.staticConfig.context && Thumb.staticConfig.context !== SwitchStyledContext) && 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 = SwitchStyledContext, Thumb.staticConfig.context = SwitchStyledContext;
   var SwitchThumbComponent = Thumb.styleable(function(props, forwardedRef) {
-    var sizeProp = props.size, unstyledProp = props.unstyled, nativeID = props.nativeID, thumbProps = _object_without_properties(props, [
-      "size",
-      "unstyled",
-      "nativeID"
-    ]), context = React.useContext(SwitchContext), checked = context.checked, disabled = context.disabled, frameWidth = context.frameWidth, styledContext = SwitchStyledContext.useStyledContext(), unstyledContext = styledContext.unstyled, sizeContext = styledContext.size, _ref, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1, _ref1, size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$true", initialChecked = React.useRef(checked).current, _React_useState = _sliced_to_array(React.useState(0), 2), thumbWidth = _React_useState[0], setThumbWidth = _React_useState[1], distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
-    return /* @__PURE__ */ _jsx(Thumb, _object_spread(_object_spread_props(_object_spread({
+    var { size: sizeProp, unstyled: unstyledProp, nativeID, ...thumbProps } = props, context = React.useContext(SwitchContext), { checked, disabled, frameWidth } = context, styledContext = SwitchStyledContext.useStyledContext(), { unstyled: unstyledContext, size: sizeContext } = styledContext, _ref, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1, _ref1, size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$true", initialChecked = React.useRef(checked).current, [thumbWidth, setThumbWidth] = React.useState(0), distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
+    return /* @__PURE__ */ _jsx(Thumb, {
       ref: forwardedRef,
-      unstyled
-    }, unstyled === !1 && _object_spread({
-      size
-    }, !disableActiveTheme && {
-      theme: checked ? "active" : null
-    })), {
+      unstyled,
+      ...unstyled === !1 && {
+        size,
+        ...!disableActiveTheme && {
+          theme: checked ? "active" : null
+        }
+      },
       alignSelf: initialChecked ? "flex-end" : "flex-start",
       x,
       // TODO: remove ViewProps cast
@@ -129,26 +34,21 @@ function createSwitch(createProps) {
       }),
       // expected variants
       checked,
-      disabled
-    }), thumbProps));
+      disabled,
+      ...thumbProps
+    });
   }), SwitchComponent = Frame.styleable(function(_props, forwardedRef) {
-    var native = _props.native, nativeProps = _props.nativeProps, checkedProp = _props.checked, defaultChecked = _props.defaultChecked, onCheckedChange = _props.onCheckedChange, props = _object_without_properties(_props, [
-      "native",
-      "nativeProps",
-      "checked",
-      "defaultChecked",
-      "onCheckedChange"
-    ]), _useControllableState = _sliced_to_array(useControllableState({
+    var { native, nativeProps, checked: checkedProp, defaultChecked, onCheckedChange, ...props } = _props, [checked, setChecked] = useControllableState({
       prop: checkedProp,
       defaultProp: defaultChecked || !1,
       onChange: onCheckedChange,
       transition: !0
-    }), 2), checked = _useControllableState[0], setChecked = _useControllableState[1], styledContext = React.useContext(SwitchStyledContext.context), _React_useState = _sliced_to_array(React.useState(0), 2), frameWidth = _React_useState[0], setFrameWidth = _React_useState[1], propsActive = useProps(props, {
+    }), styledContext = React.useContext(SwitchStyledContext.context), [frameWidth, setFrameWidth] = React.useState(0), propsActive = useProps(props, {
       noNormalize: !0,
       noExpand: !0,
       resolveValues: "none",
       forComponent: Frame
-    }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, _useSwitch = useSwitch(
+    }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, { switchProps, bubbleInput, switchRef } = useSwitch(
       // @ts-ignore
       Object.assign({
         size: (_ref = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref !== void 0 ? _ref : "$true",
@@ -159,12 +59,12 @@ function createSwitch(createProps) {
         setChecked
       ],
       forwardedRef
-    ), switchProps = _useSwitch.switchProps, bubbleInput = _useSwitch.bubbleInput, switchRef = _useSwitch.switchRef;
+    );
     React.useEffect(function() {
       if (props.id && !props.disabled)
         return registerFocusable(props.id, {
           focusAndSelect: function() {
-            setChecked == null || setChecked(function(value) {
+            setChecked?.(function(value) {
               return !value;
             });
           },
@@ -176,25 +76,28 @@ function createSwitch(createProps) {
       props.disabled
     ]);
     var renderNative = shouldRenderNativePlatform(native);
-    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ _jsx(NativeSwitch, _object_spread({
+    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ _jsx(NativeSwitch, {
       value: checked,
-      onValueChange: setChecked
-    }, nativeProps)) : /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
+      onValueChange: setChecked,
+      ...nativeProps
+    }) : /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
       value: {
         checked,
         disabled: switchProps.disabled,
         frameWidth
       },
       children: [
-        /* @__PURE__ */ _jsx(Frame, _object_spread_props(_object_spread({
+        /* @__PURE__ */ _jsx(Frame, {
           ref: switchRef,
-          tag: "button"
-        }, isWeb && {
-          type: "button"
-        }, switchProps, !disableActiveTheme && {
-          theme: checked ? "active" : null,
-          themeShallow: !0
-        }), {
+          tag: "button",
+          ...isWeb && {
+            type: "button"
+          },
+          ...switchProps,
+          ...!disableActiveTheme && {
+            theme: checked ? "active" : null,
+            themeShallow: !0
+          },
           // expected variants
           checked,
           disabled: switchProps.disabled,
@@ -206,7 +109,7 @@ function createSwitch(createProps) {
             },
             children: switchProps.children
           })
-        })),
+        }),
         bubbleInput
       ]
     });

package/dist/esm/createSwitch.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/switch/src/createSwitch.tsx"],
-  "mappings": "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",
-  "names": ["Stack", "composeEventHandlers", "isWeb", "shouldRenderNativePlatform", "useProps", "withStaticProperties", "registerFocusable", "useSwitch", "useControllableState", "React", "Switch", "NativeSwitch", "SwitchStyledContext", "SwitchFrame", "DefaultSwitchFrame", "SwitchThumb", "SwitchContext", "createContext", "checked", "disabled", "frameWidth", "createSwitch", "createProps", "disableActiveTheme", "Frame", "Thumb", "process", "env", "NODE_ENV", "staticConfig", "context", "console", "warn", "SwitchThumbComponent", "styleable", "props", "forwardedRef", "sizeProp", "size", "unstyledProp", "unstyled", "nativeID", "thumbProps", "useContext", "styledContext", "useStyledContext", "unstyledContext", "sizeContext", "TAMAGUI_HEADLESS", "initialChecked", "useRef", "current", "useState", "thumbWidth", "setThumbWidth", "distance", "x", "ref", "theme", "alignSelf", "onLayout", "e", "nativeEvent", "layout", "width", "SwitchComponent", "_props", "native", "nativeProps", "checkedProp", "defaultChecked", "onCheckedChange", "prop", "defaultProp", "onChange", "transition", "setChecked", "setFrameWidth", "propsActive", "noNormalize", "noExpand", "resolveValues", "forComponent", "Object", "assign", "switchProps", "bubbleInput", "switchRef", "useEffect", "id", "focusAndSelect", "value", "focus", "renderNative", "onValueChange", "Provider", "tag", "type", "themeShallow", "flex", "children", "disableTheme"]
+  "mappings": "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",
+  "names": ["Stack", "composeEventHandlers", "isWeb", "shouldRenderNativePlatform", "useProps", "withStaticProperties", "registerFocusable", "useSwitch", "useControllableState", "React", "Switch", "NativeSwitch", "SwitchStyledContext", "SwitchFrame", "DefaultSwitchFrame", "SwitchThumb", "SwitchContext", "createContext", "checked", "disabled", "frameWidth", "createSwitch", "createProps", "disableActiveTheme", "Frame", "Thumb", "process", "env", "NODE_ENV", "staticConfig", "context", "console", "warn", "SwitchThumbComponent", "styleable", "props", "forwardedRef", "size", "sizeProp", "unstyled", "unstyledProp", "nativeID", "thumbProps", "useContext", "styledContext", "useStyledContext", "unstyledContext", "sizeContext", "TAMAGUI_HEADLESS", "initialChecked", "useRef", "current", "thumbWidth", "setThumbWidth", "useState", "distance", "x", "ref", "theme", "alignSelf", "onLayout", "e", "nativeEvent", "layout", "width", "SwitchComponent", "_props", "native", "nativeProps", "checkedProp", "defaultChecked", "onCheckedChange", "setChecked", "prop", "defaultProp", "onChange", "transition", "setFrameWidth", "propsActive", "noNormalize", "noExpand", "resolveValues", "forComponent", "switchProps", "bubbleInput", "switchRef", "Object", "assign", "useEffect", "id", "focusAndSelect", "value", "focus", "renderNative", "onValueChange", "Provider", "tag", "type", "themeShallow", "flex", "children", "disableTheme"]
 }

package/dist/esm/createSwitch.native.mjs

@@ -0,0 +1,159 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Stack, composeEventHandlers, isWeb, shouldRenderNativePlatform, useProps, withStaticProperties } from "@tamagui/core";
+import { registerFocusable } from "@tamagui/focusable";
+import { useSwitch } from "@tamagui/switch-headless";
+import { useControllableState } from "@tamagui/use-controllable-state";
+import * as React from "react";
+import { Switch as NativeSwitch } from "react-native";
+import { SwitchStyledContext } from "./StyledContext.mjs";
+import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch.mjs";
+var SwitchContext = /* @__PURE__ */React.createContext({
+  checked: !1,
+  disabled: !1,
+  frameWidth: 0
+});
+function createSwitch(createProps) {
+  var {
+    disableActiveTheme,
+    Frame = DefaultSwitchFrame,
+    Thumb = SwitchThumb
+  } = createProps;
+  process.env.NODE_ENV === "development" && (Frame !== DefaultSwitchFrame && Frame.staticConfig.context && Frame.staticConfig.context !== SwitchStyledContext || Thumb !== SwitchThumb && Thumb.staticConfig.context && Thumb.staticConfig.context !== SwitchStyledContext) && 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 = SwitchStyledContext, Thumb.staticConfig.context = SwitchStyledContext;
+  var SwitchThumbComponent = Thumb.styleable(function (props, forwardedRef) {
+      var {
+          size: sizeProp,
+          unstyled: unstyledProp,
+          nativeID,
+          ...thumbProps
+        } = props,
+        context = React.useContext(SwitchContext),
+        {
+          checked,
+          disabled,
+          frameWidth
+        } = context,
+        styledContext = SwitchStyledContext.useStyledContext(),
+        {
+          unstyled: unstyledContext,
+          size: sizeContext
+        } = styledContext,
+        _ref,
+        unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1,
+        _ref1,
+        size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$true",
+        initialChecked = React.useRef(checked).current,
+        [thumbWidth, setThumbWidth] = React.useState(0),
+        distance = frameWidth - thumbWidth,
+        x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
+      return /* @__PURE__ */_jsx(Thumb, {
+        ref: forwardedRef,
+        unstyled,
+        ...(unstyled === !1 && {
+          size,
+          ...(!disableActiveTheme && {
+            theme: checked ? "active" : null
+          })
+        }),
+        alignSelf: initialChecked ? "flex-end" : "flex-start",
+        x,
+        // TODO: remove ViewProps cast
+        onLayout: composeEventHandlers(props.onLayout, function (e) {
+          return setThumbWidth(e.nativeEvent.layout.width);
+        }),
+        // expected variants
+        checked,
+        disabled,
+        ...thumbProps
+      });
+    }),
+    SwitchComponent = Frame.styleable(function (_props, forwardedRef) {
+      var {
+          native,
+          nativeProps,
+          checked: checkedProp,
+          defaultChecked,
+          onCheckedChange,
+          ...props
+        } = _props,
+        [checked, setChecked] = useControllableState({
+          prop: checkedProp,
+          defaultProp: defaultChecked || !1,
+          onChange: onCheckedChange,
+          transition: !0
+        }),
+        styledContext = React.useContext(SwitchStyledContext.context),
+        [frameWidth, setFrameWidth] = React.useState(0),
+        propsActive = useProps(props, {
+          noNormalize: !0,
+          noExpand: !0,
+          resolveValues: "none",
+          forComponent: Frame
+        }),
+        _styledContext_size,
+        _ref,
+        _styledContext_unstyled,
+        _ref1,
+        {
+          switchProps,
+          bubbleInput,
+          switchRef
+        } = useSwitch(
+        // @ts-ignore
+        Object.assign({
+          size: (_ref = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref !== void 0 ? _ref : "$true",
+          unstyled: (_ref1 = (_styledContext_unstyled = styledContext.unstyled) !== null && _styledContext_unstyled !== void 0 ? _styledContext_unstyled : props.unstyled) !== null && _ref1 !== void 0 ? _ref1 : !1
+        }, propsActive), [checked, setChecked], forwardedRef);
+      React.useEffect(function () {
+        if (props.id && !props.disabled) return registerFocusable(props.id, {
+          focusAndSelect: function () {
+            setChecked?.(function (value) {
+              return !value;
+            });
+          },
+          focus: function () {}
+        });
+      }, [props.id, props.disabled]);
+      var renderNative = shouldRenderNativePlatform(native);
+      return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */_jsx(NativeSwitch, {
+        value: checked,
+        onValueChange: setChecked,
+        ...nativeProps
+      }) : /* @__PURE__ */_jsxs(SwitchContext.Provider, {
+        value: {
+          checked,
+          disabled: switchProps.disabled,
+          frameWidth
+        },
+        children: [/* @__PURE__ */_jsx(Frame, {
+          ref: switchRef,
+          tag: "button",
+          ...(isWeb && {
+            type: "button"
+          }),
+          ...switchProps,
+          ...(!disableActiveTheme && {
+            theme: checked ? "active" : null,
+            themeShallow: !0
+          }),
+          // expected variants
+          checked,
+          disabled: switchProps.disabled,
+          children: /* @__PURE__ */_jsx(Stack, {
+            alignSelf: "stretch",
+            flex: 1,
+            onLayout: function (e) {
+              setFrameWidth(e.nativeEvent.layout.width);
+            },
+            children: switchProps.children
+          })
+        }), bubbleInput]
+      });
+    }, {
+      disableTheme: !0
+    });
+  return withStaticProperties(SwitchComponent, {
+    Thumb: SwitchThumbComponent
+  });
+}
+export { SwitchContext, createSwitch };
+//# sourceMappingURL=createSwitch.native.mjs.map

package/dist/esm/createSwitch.native.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","Stack","composeEventHandlers","isWeb","shouldRenderNativePlatform","useProps","withStaticProperties","registerFocusable","useSwitch","useControllableState","React","Switch","NativeSwitch","SwitchStyledContext","SwitchFrame","DefaultSwitchFrame","SwitchThumb","SwitchContext","createContext","checked","disabled","frameWidth","createSwitch","createProps","disableActiveTheme","Frame","Thumb","process","env","NODE_ENV","staticConfig","context","console","warn","SwitchThumbComponent","styleable","props","forwardedRef","size","sizeProp","unstyled","unstyledProp","nativeID","thumbProps","useContext","styledContext","useStyledContext","unstyledContext","sizeContext","_ref","TAMAGUI_HEADLESS","_ref1","initialChecked","useRef","current","thumbWidth","setThumbWidth","useState","distance","x","ref","theme","alignSelf","onLayout","e","nativeEvent","layout","width","SwitchComponent","_props","native","nativeProps","checkedProp","defaultChecked","onCheckedChange","setChecked","prop","defaultProp","onChange","transition","setFrameWidth","propsActive","noNormalize","noExpand","resolveValues","forComponent","_styledContext_size","_styledContext_unstyled","switchProps","bubbleInput","switchRef","Object","assign","useEffect","id","focusAndSelect","value","focus","renderNative","onValueChange","Provider","children","tag","type","themeShallow","flex","disableTheme"],"sources":["../../src/createSwitch.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/index.native.mjs

@@ -0,0 +1,11 @@
+import { createSwitch } from "./createSwitch.mjs";
+import { SwitchFrame, SwitchThumb } from "./Switch.mjs";
+export * from "./createSwitch.mjs";
+export * from "./StyledContext.mjs";
+export * from "./Switch.mjs";
+var Switch = createSwitch({
+  Frame: SwitchFrame,
+  Thumb: SwitchThumb
+});
+export { Switch };
+//# sourceMappingURL=index.native.mjs.map

package/dist/esm/index.native.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["createSwitch","SwitchFrame","SwitchThumb","Switch","Frame","Thumb"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,SAASC,WAAA,EAAaC,WAAA,QAAmB;AAEzC,cAAc;AACd,cAAc;AACd,cAAc;AAEP,IAAAC,MAAM,GAAAH,YAAS;EACpBI,KAAA,EAAOH,WAAA;EACPI,KAAA,EAAOH;AACT,CAAC","ignoreList":[]}

package/dist/jsx/createSwitch.native.js

@@ -7,120 +7,25 @@ import * as React from "react";
 import { Switch as NativeSwitch } from "react-native";
 import { SwitchStyledContext } from "./StyledContext";
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
-function _array_like_to_array(arr, len) {
-  (len == null || len > arr.length) && (len = arr.length);
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _array_with_holes(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _define_property(obj, key, value) {
-  return key in obj ? Object.defineProperty(obj, key, {
-    value,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : obj[key] = value, obj;
-}
-function _iterable_to_array_limit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i != null) {
-    var _arr = [], _n = !0, _d = !1, _s, _e;
-    try {
-      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done) && (_arr.push(_s.value), !(i && _arr.length === i)); _n = !0)
-        ;
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        !_n && _i.return != null && _i.return();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-function _non_iterable_rest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _object_spread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
-    typeof Object.getOwnPropertySymbols == "function" && (ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-    }))), ownKeys2.forEach(function(key) {
-      _define_property(target, key, source[key]);
-    });
-  }
-  return target;
-}
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-  return keys;
-}
-function _object_spread_props(target, source) {
-  return source = source ?? {}, Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
-    Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-  }), target;
-}
-function _object_without_properties(source, excluded) {
-  if (source == null) return {};
-  var target = _object_without_properties_loose(source, excluded), key, i;
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-    for (i = 0; i < sourceSymbolKeys.length; i++)
-      key = sourceSymbolKeys[i], !(excluded.indexOf(key) >= 0) && Object.prototype.propertyIsEnumerable.call(source, key) && (target[key] = source[key]);
-  }
-  return target;
-}
-function _object_without_properties_loose(source, excluded) {
-  if (source == null) return {};
-  var target = {}, sourceKeys = Object.keys(source), key, i;
-  for (i = 0; i < sourceKeys.length; i++)
-    key = sourceKeys[i], !(excluded.indexOf(key) >= 0) && (target[key] = source[key]);
-  return target;
-}
-function _sliced_to_array(arr, i) {
-  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (o) {
-    if (typeof o == "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor && (n = o.constructor.name), n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-  }
-}
 var SwitchContext = /* @__PURE__ */ React.createContext({
   checked: !1,
   disabled: !1,
   frameWidth: 0
 });
 function createSwitch(createProps) {
-  var disableActiveTheme = createProps.disableActiveTheme, _createProps_Frame = createProps.Frame, Frame = _createProps_Frame === void 0 ? DefaultSwitchFrame : _createProps_Frame, _createProps_Thumb = createProps.Thumb, Thumb = _createProps_Thumb === void 0 ? SwitchThumb : _createProps_Thumb;
+  var { disableActiveTheme, Frame = DefaultSwitchFrame, Thumb = SwitchThumb } = createProps;
   process.env.NODE_ENV === "development" && (Frame !== DefaultSwitchFrame && Frame.staticConfig.context && Frame.staticConfig.context !== SwitchStyledContext || Thumb !== SwitchThumb && Thumb.staticConfig.context && Thumb.staticConfig.context !== SwitchStyledContext) && 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 = SwitchStyledContext, Thumb.staticConfig.context = SwitchStyledContext;
   var SwitchThumbComponent = Thumb.styleable(function(props, forwardedRef) {
-    var sizeProp = props.size, unstyledProp = props.unstyled, nativeID = props.nativeID, thumbProps = _object_without_properties(props, [
-      "size",
-      "unstyled",
-      "nativeID"
-    ]), context = React.useContext(SwitchContext), checked = context.checked, disabled = context.disabled, frameWidth = context.frameWidth, styledContext = SwitchStyledContext.useStyledContext(), unstyledContext = styledContext.unstyled, sizeContext = styledContext.size, _ref, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1, _ref1, size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$true", initialChecked = React.useRef(checked).current, _React_useState = _sliced_to_array(React.useState(0), 2), thumbWidth = _React_useState[0], setThumbWidth = _React_useState[1], distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
-    return /* @__PURE__ */ _jsx(Thumb, _object_spread(_object_spread_props(_object_spread({
+    var { size: sizeProp, unstyled: unstyledProp, nativeID, ...thumbProps } = props, context = React.useContext(SwitchContext), { checked, disabled, frameWidth } = context, styledContext = SwitchStyledContext.useStyledContext(), { unstyled: unstyledContext, size: sizeContext } = styledContext, _ref, unstyled = process.env.TAMAGUI_HEADLESS === "1" ? !0 : (_ref = unstyledProp ?? unstyledContext) !== null && _ref !== void 0 ? _ref : !1, _ref1, size = (_ref1 = sizeProp ?? sizeContext) !== null && _ref1 !== void 0 ? _ref1 : "$true", initialChecked = React.useRef(checked).current, [thumbWidth, setThumbWidth] = React.useState(0), distance = frameWidth - thumbWidth, x = initialChecked ? checked ? 0 : -distance : checked ? distance : 0;
+    return /* @__PURE__ */ _jsx(Thumb, {
       ref: forwardedRef,
-      unstyled
-    }, unstyled === !1 && _object_spread({
-      size
-    }, !disableActiveTheme && {
-      theme: checked ? "active" : null
-    })), {
+      unstyled,
+      ...unstyled === !1 && {
+        size,
+        ...!disableActiveTheme && {
+          theme: checked ? "active" : null
+        }
+      },
       alignSelf: initialChecked ? "flex-end" : "flex-start",
       x,
       // TODO: remove ViewProps cast
@@ -129,26 +34,21 @@ function createSwitch(createProps) {
       }),
       // expected variants
       checked,
-      disabled
-    }), thumbProps));
+      disabled,
+      ...thumbProps
+    });
   }), SwitchComponent = Frame.styleable(function(_props, forwardedRef) {
-    var native = _props.native, nativeProps = _props.nativeProps, checkedProp = _props.checked, defaultChecked = _props.defaultChecked, onCheckedChange = _props.onCheckedChange, props = _object_without_properties(_props, [
-      "native",
-      "nativeProps",
-      "checked",
-      "defaultChecked",
-      "onCheckedChange"
-    ]), _useControllableState = _sliced_to_array(useControllableState({
+    var { native, nativeProps, checked: checkedProp, defaultChecked, onCheckedChange, ...props } = _props, [checked, setChecked] = useControllableState({
       prop: checkedProp,
       defaultProp: defaultChecked || !1,
       onChange: onCheckedChange,
       transition: !0
-    }), 2), checked = _useControllableState[0], setChecked = _useControllableState[1], styledContext = React.useContext(SwitchStyledContext.context), _React_useState = _sliced_to_array(React.useState(0), 2), frameWidth = _React_useState[0], setFrameWidth = _React_useState[1], propsActive = useProps(props, {
+    }), styledContext = React.useContext(SwitchStyledContext.context), [frameWidth, setFrameWidth] = React.useState(0), propsActive = useProps(props, {
       noNormalize: !0,
       noExpand: !0,
       resolveValues: "none",
       forComponent: Frame
-    }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, _useSwitch = useSwitch(
+    }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, { switchProps, bubbleInput, switchRef } = useSwitch(
       // @ts-ignore
       Object.assign({
         size: (_ref = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref !== void 0 ? _ref : "$true",
@@ -159,7 +59,7 @@ function createSwitch(createProps) {
         setChecked
       ],
       forwardedRef
-    ), switchProps = _useSwitch.switchProps, bubbleInput = _useSwitch.bubbleInput, switchRef = _useSwitch.switchRef;
+    );
     React.useEffect(function() {
       if (props.id && !props.disabled)
         return registerFocusable(props.id, {
@@ -176,25 +76,28 @@ function createSwitch(createProps) {
       props.disabled
     ]);
     var renderNative = shouldRenderNativePlatform(native);
-    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ _jsx(NativeSwitch, _object_spread({
+    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ _jsx(NativeSwitch, {
       value: checked,
-      onValueChange: setChecked
-    }, nativeProps)) : /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
+      onValueChange: setChecked,
+      ...nativeProps
+    }) : /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
       value: {
         checked,
         disabled: switchProps.disabled,
         frameWidth
       },
       children: [
-        /* @__PURE__ */ _jsx(Frame, _object_spread_props(_object_spread({
+        /* @__PURE__ */ _jsx(Frame, {
           ref: switchRef,
-          tag: "button"
-        }, isWeb && {
-          type: "button"
-        }, switchProps, !disableActiveTheme && {
-          theme: checked ? "active" : null,
-          themeShallow: !0
-        }), {
+          tag: "button",
+          ...isWeb && {
+            type: "button"
+          },
+          ...switchProps,
+          ...!disableActiveTheme && {
+            theme: checked ? "active" : null,
+            themeShallow: !0
+          },
           // expected variants
           checked,
           disabled: switchProps.disabled,
@@ -206,7 +109,7 @@ function createSwitch(createProps) {
             },
             children: switchProps.children
           })
-        })),
+        }),
         bubbleInput
       ]
     });

package/dist/jsx/createSwitch.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/switch/src/createSwitch.tsx"],
-  "mappings": "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",
-  "names": ["Stack", "composeEventHandlers", "isWeb", "shouldRenderNativePlatform", "useProps", "withStaticProperties", "registerFocusable", "useSwitch", "useControllableState", "React", "Switch", "NativeSwitch", "SwitchStyledContext", "SwitchFrame", "DefaultSwitchFrame", "SwitchThumb", "SwitchContext", "createContext", "checked", "disabled", "frameWidth", "createSwitch", "createProps", "disableActiveTheme", "Frame", "Thumb", "process", "env", "NODE_ENV", "staticConfig", "context", "console", "warn", "SwitchThumbComponent", "styleable", "props", "forwardedRef", "sizeProp", "size", "unstyledProp", "unstyled", "nativeID", "thumbProps", "useContext", "styledContext", "useStyledContext", "unstyledContext", "sizeContext", "TAMAGUI_HEADLESS", "initialChecked", "useRef", "current", "useState", "thumbWidth", "setThumbWidth", "distance", "x", "ref", "theme", "alignSelf", "onLayout", "e", "nativeEvent", "layout", "width", "SwitchComponent", "_props", "native", "nativeProps", "checkedProp", "defaultChecked", "onCheckedChange", "prop", "defaultProp", "onChange", "transition", "setChecked", "setFrameWidth", "propsActive", "noNormalize", "noExpand", "resolveValues", "forComponent", "Object", "assign", "switchProps", "bubbleInput", "switchRef", "useEffect", "id", "focusAndSelect", "value", "focus", "renderNative", "onValueChange", "Provider", "tag", "type", "themeShallow", "flex", "children", "disableTheme"]
+  "mappings": ";AACA,SACEA,OACAC,sBACAC,OACAC,4BACAC,UACAC,4BACK;AAKP,SAASC,yBAAyB;AAClC,SAASC,iBAAiB;AAC1B,SAASC,4BAA4B;AACrC,YAAYC,WAAW;AAEvB,SAASC,UAAUC,oBAAoB;AAEvC,SAASC,2BAA2B;AACpC,SAASC,eAAeC,oBAAoBC,mBAAmB;AAoBxD,IAAMC,gBAAgBP,sBAAMQ,cAIhC;EACDC,SAAS;EACTC,UAAU;EACVC,YAAY;AACd,CAAA;AAKO,SAASC,aAGdC,aAAmE;AACnE,MAAM,EACJC,oBACAC,QAAQV,oBACRW,QAAQV,YAAW,IACjBO;AAMJ,EAAII,QAAQC,IAAIC,aAAa,kBAExBJ,UAAUV,sBACTU,MAAMK,aAAaC,WACnBN,MAAMK,aAAaC,YAAYlB,uBAChCa,UAAUV,eACTU,MAAMI,aAAaC,WACnBL,MAAMI,aAAaC,YAAYlB,wBAEjCmB,QAAQC,KACN,2IAA2I,GAKjJR,MAAMK,aAAaC,UAAUlB,qBAC7Ba,MAAMI,aAAaC,UAAUlB;AAE7B,MAAMqB,uBAAuBR,MAAMS,UACjC,SAAqBC,OAAOC,cAAY;AACtC,QAAM,EAAEC,MAAMC,UAAUC,UAAUC,cAAcC,UAAU,GAAGC,WAAAA,IAAeP,OACtEL,UAAUrB,MAAMkC,WAAW3B,aAAAA,GAC3B,EAAEE,SAASC,UAAUC,WAAU,IAAKU,SAEpCc,gBAAgBhC,oBAAoBiC,iBAAgB,GACpD,EAAEN,UAAUO,iBAAiBT,MAAMU,YAAW,IAAKH,eAInDJ,MAHAD,WACJb,QAAQC,IAAIqB,qBAAqB,MAC7B,MACAR,OAAAA,gBAAgBM,qBAAAA,QAAhBN,SAAAA,SAAAA,OAAmC,IAC5BF,OAAPD,QAAOC,QAAAA,YAAYS,iBAAAA,QAAZT,UAAAA,SAAAA,QAA2B,SAElCW,iBAAiBxC,MAAMyC,OAAOhC,OAAAA,EAASiC,SAEvC,CAACC,YAAYC,aAAAA,IAAiB5C,MAAM6C,SAAS,CAAA,GAC7CC,WAAWnC,aAAagC,YACxBI,IAAIP,iBAAkB/B,UAAU,IAAI,CAACqC,WAAYrC,UAAUqC,WAAW;AAC5E,WACE,qBAAC9B,OAAAA;MACCgC,KAAKrB;MACLG;MACC,GAAIA,aAAa,MAAS;QACzBF;QACA,GAAI,CAACd,sBAAsB;UACzBmC,OAAOxC,UAAU,WAAW;QAC9B;MACF;MACAyC,WAAWV,iBAAiB,aAAa;MACzCO;;MAEAI,UAAU3D,qBAAsBkC,MAAoByB,UAAU,SAACC,GAAAA;eAC7DR,cAAcQ,EAAEC,YAAYC,OAAOC,KAAK;;;MAG1C9C;MACAC;MACC,GAAGuB;;EAGV,CAAA,GAGIuB,kBAAkBzC,MAAMU,UAC5B,SAAqBgC,QAAQ9B,cAAY;AACvC,QAAM,EACJ+B,QACAC,aACAlD,SAASmD,aACTC,gBACAC,iBACA,GAAGpC,MAAAA,IACD+B,QACE,CAAChD,SAASsD,UAAAA,IAAchE,qBAAqB;MACjDiE,MAAMJ;MACNK,aAAaJ,kBAAkB;MAC/BK,UAAUJ;MACVK,YAAY;IACd,CAAA,GAEMhC,gBAAgBnC,MAAMkC,WAAW/B,oBAAoBkB,OAAO,GAE5D,CAACV,YAAYyD,aAAAA,IAAiBpE,MAAM6C,SAAS,CAAA,GAE7CwB,cAAc1E,SAAS+B,OAAO;MAClC4C,aAAa;MACbC,UAAU;MACVC,eAAe;MACfC,cAAc1D;IAChB,CAAA,GAMYoB,qBAAAA,MACIA,yBAAAA,OALV,EAAEuC,aAAaC,aAAaC,UAAS,IAAK9E;;MAE9C+E,OAAOC,OACL;QACElD,OAAMO,QAAAA,sBAAAA,cAAcP,UAAI,QAAlBO,wBAAAA,SAAAA,sBAAsBT,MAAME,UAAI,QAAhCO,SAAAA,SAAAA,OAAoC;QAC1CL,WAAUK,SAAAA,0BAAAA,cAAcL,cAAQ,QAAtBK,4BAAAA,SAAAA,0BAA0BT,MAAMI,cAAQ,QAAxCK,UAAAA,SAAAA,QAA4C;MACxD,GACAkC,WAAAA;MAEF;QAAC5D;QAASsD;;MACVpC;IAAAA;AAIA3B,UAAM+E,UAAU,WAAA;AACd,UAAKrD,MAAMsD,MACPtD,OAAMhB;AAEV,eAAOb,kBAAkB6B,MAAMsD,IAAI;UACjCC,gBAAgB,WAAA;AACdlB,0BAAAA,QAAAA,WAAa,SAACmB,OAAAA;qBAAU,CAACA;;UAC3B;UACAC,OAAO,WAAA;UAAO;QAChB,CAAA;IACF,GAAG;MAACzD,MAAMsD;MAAItD,MAAMhB;KAAS;AAG/B,QAAM0E,eAAe1F,2BAA2BgE,MAAAA;AAChD,WAAI0B,iBAAiB,aAAaA,iBAAiB,QAE/C,qBAAClF,cAAAA;MAAagF,OAAOzE;MAAS4E,eAAetB;MAAa,GAAGJ;SAK/D,sBAACpD,cAAc+E,UAAQ;MACrBJ,OAAO;QAAEzE;QAASC,UAAUgE,YAAYhE;QAAUC;MAAW;;QAE7D,qBAACI,OAAAA;UACCiC,KAAK4B;UACLW,KAAI;UACH,GAAI9F,SAAS;YAAE+F,MAAM;UAAS;UAC9B,GAAId;UACJ,GAAI,CAAC5D,sBAAsB;YAC1BmC,OAAOxC,UAAU,WAAW;YAC5BgF,cAAc;UAChB;;UAEAhF;UACAC,UAAUgE,YAAYhE;oBAEtB,qBAACnB,OAAAA;YACC2D,WAAU;YACVwC,MAAM;YACNvC,UAAU,SAACC,GAAAA;AACTgB,4BAAchB,EAAEC,YAAYC,OAAOC,KAAK;YAC1C;sBAECmB,YAAYiB;;;QAIhBhB;;;EAGP,GACA;IACEiB,cAAc;EAChB,CAAA;AAGF,SAAOhG,qBAAqB4D,iBAAiB;IAC3CxC,OAAOQ;EACT,CAAA;AACF;",
+  "names": ["Stack", "composeEventHandlers", "isWeb", "shouldRenderNativePlatform", "useProps", "withStaticProperties", "registerFocusable", "useSwitch", "useControllableState", "React", "Switch", "NativeSwitch", "SwitchStyledContext", "SwitchFrame", "DefaultSwitchFrame", "SwitchThumb", "SwitchContext", "createContext", "checked", "disabled", "frameWidth", "createSwitch", "createProps", "disableActiveTheme", "Frame", "Thumb", "process", "env", "NODE_ENV", "staticConfig", "context", "console", "warn", "SwitchThumbComponent", "styleable", "props", "forwardedRef", "size", "sizeProp", "unstyled", "unstyledProp", "nativeID", "thumbProps", "useContext", "styledContext", "useStyledContext", "unstyledContext", "sizeContext", "TAMAGUI_HEADLESS", "initialChecked", "useRef", "current", "thumbWidth", "setThumbWidth", "useState", "distance", "x", "ref", "theme", "alignSelf", "onLayout", "e", "nativeEvent", "layout", "width", "SwitchComponent", "_props", "native", "nativeProps", "checkedProp", "defaultChecked", "onCheckedChange", "setChecked", "prop", "defaultProp", "onChange", "transition", "setFrameWidth", "propsActive", "noNormalize", "noExpand", "resolveValues", "forComponent", "switchProps", "bubbleInput", "switchRef", "Object", "assign", "useEffect", "id", "focusAndSelect", "value", "focus", "renderNative", "onValueChange", "Provider", "tag", "type", "themeShallow", "flex", "children", "disableTheme"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/switch",
-  "version": "1.110.5",
+  "version": "1.111.0",
   "removeSideEffects": true,
   "sideEffects": [
     "*.css"
@@ -34,23 +34,23 @@
     }
   },
   "dependencies": {
-    "@tamagui/compose-refs": "1.110.5",
-    "@tamagui/constants": "1.110.5",
-    "@tamagui/core": "1.110.5",
-    "@tamagui/focusable": "1.110.5",
-    "@tamagui/get-token": "1.110.5",
-    "@tamagui/helpers": "1.110.5",
-    "@tamagui/label": "1.110.5",
-    "@tamagui/stacks": "1.110.5",
-    "@tamagui/switch-headless": "1.110.5",
-    "@tamagui/use-controllable-state": "1.110.5",
-    "@tamagui/use-previous": "1.110.5"
+    "@tamagui/compose-refs": "1.111.0",
+    "@tamagui/constants": "1.111.0",
+    "@tamagui/core": "1.111.0",
+    "@tamagui/focusable": "1.111.0",
+    "@tamagui/get-token": "1.111.0",
+    "@tamagui/helpers": "1.111.0",
+    "@tamagui/label": "1.111.0",
+    "@tamagui/stacks": "1.111.0",
+    "@tamagui/switch-headless": "1.111.0",
+    "@tamagui/use-controllable-state": "1.111.0",
+    "@tamagui/use-previous": "1.111.0"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.110.5",
+    "@tamagui/build": "1.111.0",
     "react": "^18.2.0 || ^19.0.0"
   },
   "publishConfig": {