@tamagui/switch 1.69.3 → 1.71.0

package/dist/jsx/Switch.js

@@ -13,6 +13,9 @@ const SwitchThumb = styled(ThemeableStack, {
         borderRadius: 1e3
       }
     },
+    checked: {
+      true: {}
+    },
     size: {
       "...size": (val) => {
         const size = getSwitchHeight(val);
@@ -28,21 +31,19 @@ const SwitchThumb = styled(ThemeableStack, {
   }
 }), getSwitchHeight = (val) => Math.round(getVariableValue(getSize(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = styled(YStack, {
   name: "Switch",
-  tag: "button",
   context: SwitchContext,
   variants: {
     unstyled: {
       false: {
         size: "$true",
         borderRadius: 1e3,
-        borderWidth: 2,
-        borderColor: "transparent",
         backgroundColor: "$background",
+        borderWidth: 2,
+        borderColor: "$background",
         focusStyle: {
-          borderColor: "$borderColorFocus",
           outlineColor: "$borderColorFocus",
           outlineStyle: "solid",
-          outlineWidth: 1
+          outlineWidth: 2
         }
       }
     },

package/dist/jsx/Switch.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Switch.tsx"],
-  "mappings": "AAAA,SAAqB,kBAAkB,cAAc;AACrD,SAAS,eAAe;AACxB,SAAS,gBAAgB,cAAc;AAEvC,SAAS,qBAAqB;AAEvB,MAAM,cAAc,OAAO,gBAAgB;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,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;AAAA,EACZ;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,MAAM,iBAAiB,QAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,cAAc,OAAO,QAAQ;AAAA,EACxC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,cAAc;AAAA,QACd,aAAa;AAAA,QACb,aAAa;AAAA,QACb,iBAAiB;AAAA,QAEjB,YAAY;AAAA,UACV,aAAa;AAAA,UACb,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;AAAA,EACZ;AACF,CAAC;",
+  "mappings": "AAAA,SAAqB,kBAAkB,cAAc;AACrD,SAAS,eAAe;AACxB,SAAS,gBAAgB,cAAc;AAEvC,SAAS,qBAAqB;AAEvB,MAAM,cAAc,OAAO,gBAAgB;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;AAAA,EACZ;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,MAAM,iBAAiB,QAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,cAAc,OAAO,QAAQ;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;AAAA,EACZ;AACF,CAAC;",
   "names": []
 }

package/dist/jsx/Switch.native.js

@@ -13,6 +13,9 @@ const SwitchThumb = styled(ThemeableStack, {
         borderRadius: 1e3
       }
     },
+    checked: {
+      true: {}
+    },
     size: {
       "...size": (val) => {
         const size = getSwitchHeight(val);
@@ -28,21 +31,19 @@ const SwitchThumb = styled(ThemeableStack, {
   }
 }), getSwitchHeight = (val) => Math.round(getVariableValue(getSize(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = styled(YStack, {
   name: "Switch",
-  tag: "button",
   context: SwitchContext,
   variants: {
     unstyled: {
       false: {
         size: "$true",
         borderRadius: 1e3,
-        borderWidth: 2,
-        borderColor: "transparent",
         backgroundColor: "$background",
+        borderWidth: 2,
+        borderColor: "$background",
         focusStyle: {
-          borderColor: "$borderColorFocus",
           outlineColor: "$borderColorFocus",
           outlineStyle: "solid",
-          outlineWidth: 1
+          outlineWidth: 2
         }
       }
     },

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Switch.tsx"],
-  "mappings": "AAAA,SAAqB,kBAAkB,cAAc;AACrD,SAAS,eAAe;AACxB,SAAS,gBAAgB,cAAc;AAEvC,SAAS,qBAAqB;AAEvB,MAAM,cAAc,OAAO,gBAAgB;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,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;AAAA,EACZ;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,MAAM,iBAAiB,QAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,cAAc,OAAO,QAAQ;AAAA,EACxC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,cAAc;AAAA,QACd,aAAa;AAAA,QACb,aAAa;AAAA,QACb,iBAAiB;AAAA,QAEjB,YAAY;AAAA,UACV,aAAa;AAAA,UACb,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;AAAA,EACZ;AACF,CAAC;",
+  "mappings": "AAAA,SAAqB,kBAAkB,cAAc;AACrD,SAAS,eAAe;AACxB,SAAS,gBAAgB,cAAc;AAEvC,SAAS,qBAAqB;AAEvB,MAAM,cAAc,OAAO,gBAAgB;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;AAAA,EACZ;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,MAAM,iBAAiB,QAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,cAAc,OAAO,QAAQ;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;AAAA,EACZ;AACF,CAAC;",
   "names": []
 }

package/dist/jsx/createSwitch.js

@@ -1,14 +1,13 @@
 import { useComposedRefs } from "@tamagui/compose-refs";
 import {
   composeEventHandlers,
-  getVariableValue,
   isWeb,
   useProps,
   withStaticProperties
 } from "@tamagui/core";
 import { registerFocusable } from "@tamagui/focusable";
-import { getSize } from "@tamagui/get-token";
 import { useLabelContext } from "@tamagui/label";
+import { YStack } from "@tamagui/stacks";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import { usePrevious } from "@tamagui/use-previous";
 import * as React from "react";
@@ -19,9 +18,9 @@ import {
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
 import { SwitchContext } from "./SwitchContext";
 function createSwitch({
+  disableActiveTheme,
   Frame = DefaultSwitchFrame,
-  Thumb = SwitchThumb,
-  acceptsUnstyled
+  Thumb = SwitchThumb
 }) {
   process.env.NODE_ENV === "development" && (Frame !== DefaultSwitchFrame && 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."
@@ -42,11 +41,14 @@ function createSwitch({
         {...unstyled === !1 && {
           unstyled: !1,
           size: sizeProp ?? sizeContext ?? "$true",
-          theme: checked ? "active" : null
+          ...!disableActiveTheme && {
+            theme: checked ? "active" : null
+          }
         }}
         data-state={getState(checked)}
         data-disabled={disabled ? "" : void 0}
         alignSelf={initialChecked ? "flex-end" : "flex-start"}
+        checked={checked}
         x={x}
         {...thumbProps}
         onLayout={composeEventHandlers(
@@ -61,7 +63,12 @@ function createSwitch({
     );
   }), SwitchComponent = Frame.extractable(
     React.forwardRef(function(propsIn, forwardedRef) {
-      const styledContext = React.useContext(SwitchContext), props = useProps(propsIn), {
+      const styledContext = React.useContext(SwitchContext), props = useProps(propsIn, {
+        noNormalize: !0,
+        noExpand: !0,
+        resolveValues: "none",
+        forComponent: Frame
+      }), {
         labeledBy: ariaLabelledby,
         name,
         checked: checkedProp,
@@ -76,12 +83,7 @@ function createSwitch({
         nativeProps,
         children,
         ...switchProps
-      } = props, leftBorderWidth = (() => {
-        let _;
-        for (const key in switchProps)
-          (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
-        return Frame === DefaultSwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : 0;
-      })(), native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !isWeb && nativeProp === !0 || !isWeb && native.includes("mobile") || native.includes("android") && Platform.OS === "android" || native.includes("ios") && Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node)), labelId = useLabelContext(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = useControllableState({
+      } = props, native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !isWeb && nativeProp === !0 || !isWeb && native.includes("mobile") || native.includes("android") && Platform.OS === "android" || native.includes("ios") && Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node)), labelId = useLabelContext(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = useControllableState({
         prop: checkedProp,
         defaultProp: defaultChecked || !1,
         onChange: onCheckedChange,
@@ -107,9 +109,12 @@ function createSwitch({
           size={size}
           checked={checked}
           disabled={disabled}
-          frameWidth={frameWidth ? frameWidth - leftBorderWidth * 2 : 0}
-          theme={checked ? "active" : null}
+          frameWidth={frameWidth}
           themeShallow
+          {...!disableActiveTheme && {
+            theme: checked ? "active" : null,
+            themeShallow: !0
+          }}
           role="switch"
           aria-checked={checked}
           aria-labelledby={labelledBy}
@@ -123,14 +128,13 @@ function createSwitch({
           onPress={composeEventHandlers(props.onPress, (event) => {
             setChecked((prevChecked) => !prevChecked), isWeb && isFormControl && (hasConsumerStoppedPropagationRef.current = event.isPropagationStopped(), hasConsumerStoppedPropagationRef.current || event.stopPropagation());
           })}
-          onLayout={composeEventHandlers(
-            // @ts-ignore
-            props.onLayout,
-            (e) => {
-              setFrameWidth(e.nativeEvent.layout.width);
-            }
-          )}
-        >{typeof children == "function" ? children(checked) : children}</Frame>
+        ><YStack
+          alignSelf="stretch"
+          flex={1}
+          onLayout={(e) => {
+            setFrameWidth(e.nativeEvent.layout.width);
+          }}
+        >{typeof children == "function" ? children(checked) : children}</YStack></Frame>
         {isWeb && isFormControl && <BubbleInput
           control={button}
           bubbles={!hasConsumerStoppedPropagationRef.current}

package/dist/jsx/createSwitch.js.map

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

package/dist/jsx/createSwitch.native.js

@@ -1,14 +1,13 @@
 import { useComposedRefs } from "@tamagui/compose-refs";
 import {
   composeEventHandlers,
-  getVariableValue,
   isWeb,
   useProps,
   withStaticProperties
 } from "@tamagui/core";
 import { registerFocusable } from "@tamagui/focusable";
-import { getSize } from "@tamagui/get-token";
 import { useLabelContext } from "@tamagui/label";
+import { YStack } from "@tamagui/stacks";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import { usePrevious } from "@tamagui/use-previous";
 import * as React from "react";
@@ -19,9 +18,9 @@ import {
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
 import { SwitchContext } from "./SwitchContext";
 function createSwitch({
+  disableActiveTheme,
   Frame = DefaultSwitchFrame,
-  Thumb = SwitchThumb,
-  acceptsUnstyled
+  Thumb = SwitchThumb
 }) {
   process.env.NODE_ENV === "development" && (Frame !== DefaultSwitchFrame && 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."
@@ -42,11 +41,14 @@ function createSwitch({
         {...unstyled === !1 && {
           unstyled: !1,
           size: sizeProp ?? sizeContext ?? "$true",
-          theme: checked ? "active" : null
+          ...!disableActiveTheme && {
+            theme: checked ? "active" : null
+          }
         }}
         data-state={getState(checked)}
         data-disabled={disabled ? "" : void 0}
         alignSelf={initialChecked ? "flex-end" : "flex-start"}
+        checked={checked}
         x={x}
         {...thumbProps}
         onLayout={composeEventHandlers(
@@ -61,7 +63,12 @@ function createSwitch({
     );
   }), SwitchComponent = Frame.extractable(
     React.forwardRef(function(propsIn, forwardedRef) {
-      const styledContext = React.useContext(SwitchContext), props = useProps(propsIn), {
+      const styledContext = React.useContext(SwitchContext), props = useProps(propsIn, {
+        noNormalize: !0,
+        noExpand: !0,
+        resolveValues: "none",
+        forComponent: Frame
+      }), {
         labeledBy: ariaLabelledby,
         name,
         checked: checkedProp,
@@ -76,12 +83,7 @@ function createSwitch({
         nativeProps,
         children,
         ...switchProps
-      } = props, leftBorderWidth = (() => {
-        let _;
-        for (const key in switchProps)
-          (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
-        return Frame === DefaultSwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : 0;
-      })(), native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !isWeb && nativeProp === !0 || !isWeb && native.includes("mobile") || native.includes("android") && Platform.OS === "android" || native.includes("ios") && Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node)), labelId = useLabelContext(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = useControllableState({
+      } = props, native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !isWeb && nativeProp === !0 || !isWeb && native.includes("mobile") || native.includes("android") && Platform.OS === "android" || native.includes("ios") && Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node)), labelId = useLabelContext(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = useControllableState({
         prop: checkedProp,
         defaultProp: defaultChecked || !1,
         onChange: onCheckedChange,
@@ -107,9 +109,12 @@ function createSwitch({
           size={size}
           checked={checked}
           disabled={disabled}
-          frameWidth={frameWidth ? frameWidth - leftBorderWidth * 2 : 0}
-          theme={checked ? "active" : null}
+          frameWidth={frameWidth}
           themeShallow
+          {...!disableActiveTheme && {
+            theme: checked ? "active" : null,
+            themeShallow: !0
+          }}
           role="switch"
           aria-checked={checked}
           aria-labelledby={labelledBy}
@@ -123,14 +128,13 @@ function createSwitch({
           onPress={composeEventHandlers(props.onPress, (event) => {
             setChecked((prevChecked) => !prevChecked), isWeb && isFormControl && (hasConsumerStoppedPropagationRef.current = event.isPropagationStopped(), hasConsumerStoppedPropagationRef.current || event.stopPropagation());
           })}
-          onLayout={composeEventHandlers(
-            // @ts-ignore
-            props.onLayout,
-            (e) => {
-              setFrameWidth(e.nativeEvent.layout.width);
-            }
-          )}
-        >{typeof children == "function" ? children(checked) : children}</Frame>
+        ><YStack
+          alignSelf="stretch"
+          flex={1}
+          onLayout={(e) => {
+            setFrameWidth(e.nativeEvent.layout.width);
+          }}
+        >{typeof children == "function" ? children(checked) : children}</YStack></Frame>
         {isWeb && isFormControl && <BubbleInput
           control={button}
           bubbles={!hasConsumerStoppedPropagationRef.current}

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

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

package/dist/jsx/index.js

@@ -4,8 +4,7 @@ export * from "./Switch";
 export * from "./createSwitch";
 const Switch = createSwitch({
   Frame: SwitchFrame,
-  Thumb: SwitchThumb,
-  acceptsUnstyled: !0
+  Thumb: SwitchThumb
 });
 export {
   Switch

package/dist/jsx/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,aAAa,mBAAmB;AAEzC,cAAc;AACd,cAAc;AAEP,MAAM,SAAS,aAAa;AAAA,EACjC,OAAO;AAAA,EACP,OAAO;AAAA,EACP,iBAAiB;AACnB,CAAC;",
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,aAAa,mBAAmB;AAEzC,cAAc;AACd,cAAc;AAEP,MAAM,SAAS,aAAa;AAAA,EACjC,OAAO;AAAA,EACP,OAAO;AACT,CAAC;",
   "names": []
 }

package/dist/jsx/index.native.js

@@ -4,8 +4,7 @@ export * from "./Switch";
 export * from "./createSwitch";
 const Switch = createSwitch({
   Frame: SwitchFrame,
-  Thumb: SwitchThumb,
-  acceptsUnstyled: !0
+  Thumb: SwitchThumb
 });
 export {
   Switch

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,aAAa,mBAAmB;AAEzC,cAAc;AACd,cAAc;AAEP,MAAM,SAAS,aAAa;AAAA,EACjC,OAAO;AAAA,EACP,OAAO;AAAA,EACP,iBAAiB;AACnB,CAAC;",
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,aAAa,mBAAmB;AAEzC,cAAc;AACd,cAAc;AAEP,MAAM,SAAS,aAAa;AAAA,EACjC,OAAO;AAAA,EACP,OAAO;AACT,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/switch",
-  "version": "1.69.3",
+  "version": "1.71.0",
   "sideEffects": [
     "*.css"
   ],
@@ -31,22 +31,22 @@
     }
   },
   "dependencies": {
-    "@tamagui/compose-refs": "1.69.3",
-    "@tamagui/core": "1.69.3",
-    "@tamagui/create-context": "1.69.3",
-    "@tamagui/focusable": "1.69.3",
-    "@tamagui/get-token": "1.69.3",
-    "@tamagui/label": "1.69.3",
-    "@tamagui/stacks": "1.69.3",
-    "@tamagui/use-controllable-state": "1.69.3",
-    "@tamagui/use-previous": "1.69.3"
+    "@tamagui/compose-refs": "1.71.0",
+    "@tamagui/core": "1.71.0",
+    "@tamagui/create-context": "1.71.0",
+    "@tamagui/focusable": "1.71.0",
+    "@tamagui/get-token": "1.71.0",
+    "@tamagui/label": "1.71.0",
+    "@tamagui/stacks": "1.71.0",
+    "@tamagui/use-controllable-state": "1.71.0",
+    "@tamagui/use-previous": "1.71.0"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.69.3",
+    "@tamagui/build": "1.71.0",
     "react": "^18.2.0",
     "react-native": "^0.72.1"
   },

package/src/Switch.tsx

@@ -17,6 +17,10 @@ export const SwitchThumb = styled(ThemeableStack, {
       },
     },
 
+    checked: {
+      true: {},
+    },
+
     size: {
       '...size': (val) => {
         const size = getSwitchHeight(val)
@@ -40,7 +44,6 @@ const getSwitchWidth = (val: SizeTokens) => getSwitchHeight(val) * 2
 
 export const SwitchFrame = styled(YStack, {
   name: 'Switch',
-  tag: 'button',
   context: SwitchContext,
 
   variants: {
@@ -48,15 +51,14 @@ export const SwitchFrame = styled(YStack, {
       false: {
         size: '$true',
         borderRadius: 1000,
-        borderWidth: 2,
-        borderColor: 'transparent',
         backgroundColor: '$background',
+        borderWidth: 2,
+        borderColor: '$background',
 
         focusStyle: {
-          borderColor: '$borderColorFocus',
           outlineColor: '$borderColorFocus',
           outlineStyle: 'solid',
-          outlineWidth: 1,
+          outlineWidth: 2,
         },
       },
     },

package/src/createSwitch.tsx

@@ -14,6 +14,7 @@ import {
 import { registerFocusable } from '@tamagui/focusable'
 import { getSize } from '@tamagui/get-token'
 import { useLabelContext } from '@tamagui/label'
+import { YStack } from '@tamagui/stacks'
 import { useControllableState } from '@tamagui/use-controllable-state'
 import { usePrevious } from '@tamagui/use-previous'
 import * as React from 'react'
@@ -60,13 +61,13 @@ type SwitchThumbComponent = TamaguiComponentExpectingVariants<
 >
 
 export function createSwitch<F extends SwitchComponent, T extends SwitchThumbComponent>({
+  disableActiveTheme,
   Frame = DefaultSwitchFrame as any,
   Thumb = SwitchThumb as any,
-  acceptsUnstyled,
 }: {
+  disableActiveTheme?: boolean
   Frame?: F
   Thumb?: T
-  acceptsUnstyled?: boolean
 }) {
   if (process.env.NODE_ENV === 'development') {
     if (Frame !== DefaultSwitchFrame && Frame.staticConfig.context) {
@@ -106,11 +107,14 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
         {...(unstyled === false && {
           unstyled: false,
           size: sizeProp ?? sizeContext ?? '$true',
-          theme: checked ? 'active' : null,
+          ...(!disableActiveTheme && {
+            theme: checked ? 'active' : null,
+          }),
         })}
         data-state={getState(checked)}
         data-disabled={disabled ? '' : undefined}
         alignSelf={initialChecked ? 'flex-end' : 'flex-start'}
+        checked={checked}
         x={x}
         {...thumbProps}
         // @ts-ignore
@@ -129,7 +133,12 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
       forwardedRef
     ) {
       const styledContext = React.useContext(SwitchContext)
-      const props = useProps(propsIn)
+      const props = useProps(propsIn, {
+        noNormalize: true,
+        noExpand: true,
+        resolveValues: 'none',
+        forComponent: Frame,
+      })
       const {
         labeledBy: ariaLabelledby,
         name,
@@ -147,30 +156,6 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
         ...switchProps
       } = props
 
-      const leftBorderWidth = (() => {
-        let _: any = undefined
-        for (const key in switchProps) {
-          if (key === 'borderWidth' || key === 'borderLeftWidth') {
-            _ = switchProps[key]
-          }
-        }
-        if (
-          Frame === DefaultSwitchFrame &&
-          acceptsUnstyled &&
-          _ == undefined &&
-          unstyled === false
-        ) {
-          _ = 2 // default we use for styled
-        }
-        if (typeof _ === 'string') {
-          _ = getVariableValue(getSize(_))
-        }
-        if (typeof _ === 'number') {
-          return _
-        }
-        return 0
-      })()
-
       const native = Array.isArray(nativeProp) ? nativeProp : [nativeProp]
 
       const shouldRenderMobileNative =
@@ -230,9 +215,12 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
             size={size}
             checked={checked}
             disabled={disabled}
-            frameWidth={frameWidth ? frameWidth - leftBorderWidth * 2 : 0}
-            theme={checked ? 'active' : null}
+            frameWidth={frameWidth}
             themeShallow
+            {...(!disableActiveTheme && {
+              theme: checked ? 'active' : null,
+              themeShallow: true,
+            })}
             role="switch"
             aria-checked={checked}
             aria-labelledby={labelledBy}
@@ -255,16 +243,16 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
                 if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation()
               }
             })}
-            onLayout={composeEventHandlers(
-              // @ts-ignore
-              props.onLayout,
-              (e) => {
-                // @ts-ignore
-                setFrameWidth(e.nativeEvent.layout.width)
-              }
-            )}
           >
-            {typeof children === 'function' ? children(checked) : children}
+            <YStack
+              alignSelf="stretch"
+              flex={1}
+              onLayout={(e) => {
+                setFrameWidth(e.nativeEvent.layout.width)
+              }}
+            >
+              {typeof children === 'function' ? children(checked) : children}
+            </YStack>
           </Frame>
           {isWeb && isFormControl && (
             <BubbleInput

package/src/index.ts

@@ -7,5 +7,4 @@ export * from './createSwitch'
 export const Switch = createSwitch({
   Frame: SwitchFrame,
   Thumb: SwitchThumb,
-  acceptsUnstyled: true,
 })