@tamagui/switch 1.123.10 → 1.123.12

package/dist/esm/createSwitch.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["Stack","composeEventHandlers","isWeb","shouldRenderNativePlatform","useProps","withStaticProperties","useSwitch","useControllableState","React","Switch","NativeSwitch","SwitchStyledContext","SwitchFrame","DefaultSwitchFrame","SwitchThumb","jsx","jsxs","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","renderNative","value","onValueChange","Provider","children","tag","type","themeShallow","flex","disableTheme"],"sources":["../../src/createSwitch.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["composeEventHandlers","isWeb","shouldRenderNativePlatform","withStaticProperties","useSwitch","useControllableState","React","Switch","NativeSwitch","View","SwitchStyledContext","SwitchFrame","DefaultSwitchFrame","SwitchThumb","jsx","jsxs","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","switchProps","bubbleInput","switchRef","renderNative","value","onValueChange","useMemo","handleLayout","useCallback","Provider","children","tag","type","themeShallow","style","measureContainerStyle","disableTheme","flex"],"sources":["../../src/createSwitch.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createSwitch.native.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Stack, composeEventHandlers, isWeb, shouldRenderNativePlatform, useProps, withStaticProperties } from "@tamagui/core";
+import { composeEventHandlers, isWeb, shouldRenderNativePlatform, 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 { Switch as NativeSwitch, View } from "react-native";
 import { SwitchStyledContext } from "./StyledContext";
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
 var SwitchContext = /* @__PURE__ */ React.createContext({
@@ -28,7 +28,6 @@ function createSwitch(createProps) {
       },
       alignSelf: initialChecked ? "flex-end" : "flex-start",
       x,
-      // TODO: remove ViewProps cast
       onLayout: composeEventHandlers(props.onLayout, function(e) {
         return setThumbWidth(e.nativeEvent.layout.width);
       }),
@@ -43,17 +42,9 @@ function createSwitch(createProps) {
       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(
+    }), styledContext = React.useContext(SwitchStyledContext.context), [frameWidth, setFrameWidth] = React.useState(0), { 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),
+      props,
       [
         checked,
         setChecked
@@ -64,8 +55,8 @@ function createSwitch(createProps) {
       if (props.id && !props.disabled)
         return registerFocusable(props.id, {
           focusAndSelect: function() {
-            setChecked?.(function(value) {
-              return !value;
+            setChecked?.(function(value2) {
+              return !value2;
             });
           },
           focus: function() {
@@ -76,16 +67,29 @@ function createSwitch(createProps) {
       props.disabled
     ]);
     var renderNative = shouldRenderNativePlatform(native);
-    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ _jsx(NativeSwitch, {
-      value: checked,
-      onValueChange: setChecked,
-      ...nativeProps
-    }) : /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
-      value: {
+    if (renderNative === "android" || renderNative === "ios")
+      return /* @__PURE__ */ _jsx(NativeSwitch, {
+        value: checked,
+        onValueChange: setChecked,
+        ...nativeProps
+      });
+    var disabled = props.disabled, value = React.useMemo(function() {
+      return {
         checked,
-        disabled: switchProps.disabled,
+        disabled,
         frameWidth
-      },
+      };
+    }, [
+      checked,
+      disabled,
+      frameWidth
+    ]), handleLayout = React.useCallback(function(e) {
+      setFrameWidth(e.nativeEvent.layout.width);
+    }, [
+      setFrameWidth
+    ]), _styledContext_unstyled, _ref, unstyled = (_ref = (_styledContext_unstyled = styledContext.unstyled) !== null && _styledContext_unstyled !== void 0 ? _styledContext_unstyled : props.unstyled) !== null && _ref !== void 0 ? _ref : !1, _styledContext_size, _ref1;
+    return /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
+      value,
       children: [
         /* @__PURE__ */ _jsx(Frame, {
           ref: switchRef,
@@ -93,6 +97,11 @@ function createSwitch(createProps) {
           ...isWeb && {
             type: "button"
           },
+          ...!unstyled && {
+            size: (_ref1 = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref1 !== void 0 ? _ref1 : "$true"
+          },
+          unstyled,
+          ...props,
           ...switchProps,
           ...!disableActiveTheme && !props.unstyled && {
             theme: checked ? "active" : null,
@@ -100,14 +109,11 @@ function createSwitch(createProps) {
           },
           // 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
+          disabled,
+          children: /* @__PURE__ */ _jsx(View, {
+            style: measureContainerStyle,
+            onLayout: handleLayout,
+            children: props.children
           })
         }),
         bubbleInput
@@ -120,6 +126,10 @@ function createSwitch(createProps) {
     Thumb: SwitchThumbComponent
   });
 }
+var measureContainerStyle = {
+  alignSelf: "stretch",
+  flex: 1
+};
 export {
   SwitchContext,
   createSwitch

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", "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"]
+  "mappings": "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",
+  "names": ["composeEventHandlers", "isWeb", "shouldRenderNativePlatform", "withStaticProperties", "registerFocusable", "useSwitch", "useControllableState", "React", "Switch", "NativeSwitch", "View", "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", "switchProps", "bubbleInput", "switchRef", "useEffect", "id", "focusAndSelect", "value", "focus", "renderNative", "onValueChange", "useMemo", "handleLayout", "useCallback", "Provider", "tag", "type", "themeShallow", "style", "measureContainerStyle", "children", "disableTheme", "flex"]
 }

package/dist/jsx/createSwitch.js

@@ -1,16 +1,14 @@
 import {
-  Stack,
   composeEventHandlers,
   isWeb,
   shouldRenderNativePlatform,
-  useProps,
   withStaticProperties
 } from "@tamagui/core";
 
 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-web";
+import { Switch as NativeSwitch, View } from "react-native-web";
 import { SwitchStyledContext } from "./StyledContext";
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -68,58 +66,47 @@ function createSwitch(createProps) {
         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
-      }), { switchProps, bubbleInput, switchRef } = useSwitch(
+      }), styledContext = React.useContext(SwitchStyledContext.context), [frameWidth, setFrameWidth] = React.useState(0), { switchProps, bubbleInput, switchRef } = useSwitch(
         // @ts-ignore
-        Object.assign(
-          {
-            size: styledContext.size ?? props.size ?? "$true",
-            unstyled: styledContext.unstyled ?? props.unstyled ?? !1
-          },
-          propsActive
-        ),
+        props,
         [checked, setChecked],
         forwardedRef
       ), 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 && !props.unstyled && {
-                  theme: checked ? "active" : null,
-                  themeShallow: !0
-                },
-                checked,
-                disabled: switchProps.disabled,
-                children: /* @__PURE__ */ jsx(
-                  Stack,
-                  {
-                    alignSelf: "stretch",
-                    flex: 1,
-                    onLayout: (e) => {
-                      setFrameWidth(e.nativeEvent.layout.width);
-                    },
-                    children: switchProps.children
-                  }
-                )
-              }
-            ),
-            bubbleInput
-          ]
-        }
-      );
+      if (renderNative === "android" || renderNative === "ios")
+        return /* @__PURE__ */ jsx(NativeSwitch, { value: checked, onValueChange: setChecked, ...nativeProps });
+      const disabled = props.disabled, value = React.useMemo(
+        () => ({ checked, disabled, frameWidth }),
+        [checked, disabled, frameWidth]
+      ), handleLayout = React.useCallback(
+        (e) => {
+          setFrameWidth(e.nativeEvent.layout.width);
+        },
+        [setFrameWidth]
+      ), unstyled = styledContext.unstyled ?? props.unstyled ?? !1;
+      return /* @__PURE__ */ jsxs(SwitchContext.Provider, { value, children: [
+        /* @__PURE__ */ jsx(
+          Frame,
+          {
+            ref: switchRef,
+            tag: "button",
+            ...isWeb && { type: "button" },
+            ...!unstyled && {
+              size: styledContext.size ?? props.size ?? "$true"
+            },
+            unstyled,
+            ...props,
+            ...switchProps,
+            ...!disableActiveTheme && !props.unstyled && {
+              theme: checked ? "active" : null,
+              themeShallow: !0
+            },
+            checked,
+            disabled,
+            children: /* @__PURE__ */ jsx(View, { style: measureContainerStyle, onLayout: handleLayout, children: props.children })
+          }
+        ),
+        bubbleInput
+      ] });
     },
     {
       disableTheme: !0
@@ -129,6 +116,10 @@ function createSwitch(createProps) {
     Thumb: SwitchThumbComponent
   });
 }
+const measureContainerStyle = {
+  alignSelf: "stretch",
+  flex: 1
+};
 export {
   SwitchContext,
   createSwitch

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.mjs

@@ -1,8 +1,8 @@
-import { Stack, composeEventHandlers, isWeb, shouldRenderNativePlatform, useProps, withStaticProperties } from "@tamagui/core";
+import { composeEventHandlers, isWeb, shouldRenderNativePlatform, withStaticProperties } from "@tamagui/core";
 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-web";
+import { Switch as NativeSwitch, View } from "react-native-web";
 import { SwitchStyledContext } from "./StyledContext.mjs";
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -76,53 +76,53 @@ function createSwitch(createProps) {
         }),
         styledContext = React.useContext(SwitchStyledContext.context),
         [frameWidth, setFrameWidth] = React.useState(0),
-        propsActive = useProps(props, {
-          noNormalize: !0,
-          noExpand: !0,
-          resolveValues: "none",
-          forComponent: Frame
-        }),
         {
           switchProps,
           bubbleInput,
           switchRef
         } = useSwitch(
         // @ts-ignore
-        Object.assign({
-          size: styledContext.size ?? props.size ?? "$true",
-          unstyled: styledContext.unstyled ?? props.unstyled ?? !1
-        }, propsActive), [checked, setChecked], forwardedRef),
+        props, [checked, setChecked], forwardedRef),
         renderNative = shouldRenderNativePlatform(native);
-      return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */jsx(NativeSwitch, {
+      if (renderNative === "android" || renderNative === "ios") return /* @__PURE__ */jsx(NativeSwitch, {
         value: checked,
         onValueChange: setChecked,
         ...nativeProps
-      }) : /* @__PURE__ */jsxs(SwitchContext.Provider, {
-        value: {
+      });
+      const disabled = props.disabled,
+        value = React.useMemo(() => ({
           checked,
-          disabled: switchProps.disabled,
+          disabled,
           frameWidth
-        },
+        }), [checked, disabled, frameWidth]),
+        handleLayout = React.useCallback(e => {
+          setFrameWidth(e.nativeEvent.layout.width);
+        }, [setFrameWidth]),
+        unstyled = styledContext.unstyled ?? props.unstyled ?? !1;
+      return /* @__PURE__ */jsxs(SwitchContext.Provider, {
+        value,
         children: [/* @__PURE__ */jsx(Frame, {
           ref: switchRef,
           tag: "button",
           ...(isWeb && {
             type: "button"
           }),
+          ...(!unstyled && {
+            size: styledContext.size ?? props.size ?? "$true"
+          }),
+          unstyled,
+          ...props,
           ...switchProps,
           ...(!disableActiveTheme && !props.unstyled && {
             theme: checked ? "active" : null,
             themeShallow: !0
           }),
           checked,
-          disabled: switchProps.disabled,
-          children: /* @__PURE__ */jsx(Stack, {
-            alignSelf: "stretch",
-            flex: 1,
-            onLayout: e => {
-              setFrameWidth(e.nativeEvent.layout.width);
-            },
-            children: switchProps.children
+          disabled,
+          children: /* @__PURE__ */jsx(View, {
+            style: measureContainerStyle,
+            onLayout: handleLayout,
+            children: props.children
           })
         }), bubbleInput]
       });
@@ -133,5 +133,9 @@ function createSwitch(createProps) {
     Thumb: SwitchThumbComponent
   });
 }
+const measureContainerStyle = {
+  alignSelf: "stretch",
+  flex: 1
+};
 export { SwitchContext, createSwitch };
 //# sourceMappingURL=createSwitch.mjs.map

package/dist/jsx/createSwitch.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["Stack","composeEventHandlers","isWeb","shouldRenderNativePlatform","useProps","withStaticProperties","useSwitch","useControllableState","React","Switch","NativeSwitch","SwitchStyledContext","SwitchFrame","DefaultSwitchFrame","SwitchThumb","jsx","jsxs","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","renderNative","value","onValueChange","Provider","children","tag","type","themeShallow","flex","disableTheme"],"sources":["../../src/createSwitch.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["composeEventHandlers","isWeb","shouldRenderNativePlatform","withStaticProperties","useSwitch","useControllableState","React","Switch","NativeSwitch","View","SwitchStyledContext","SwitchFrame","DefaultSwitchFrame","SwitchThumb","jsx","jsxs","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","switchProps","bubbleInput","switchRef","renderNative","value","onValueChange","useMemo","handleLayout","useCallback","Provider","children","tag","type","themeShallow","style","measureContainerStyle","disableTheme","flex"],"sources":["../../src/createSwitch.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/createSwitch.native.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Stack, composeEventHandlers, isWeb, shouldRenderNativePlatform, useProps, withStaticProperties } from "@tamagui/core";
+import { composeEventHandlers, isWeb, shouldRenderNativePlatform, 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 { Switch as NativeSwitch, View } from "react-native";
 import { SwitchStyledContext } from "./StyledContext";
 import { SwitchFrame as DefaultSwitchFrame, SwitchThumb } from "./Switch";
 var SwitchContext = /* @__PURE__ */ React.createContext({
@@ -28,7 +28,6 @@ function createSwitch(createProps) {
       },
       alignSelf: initialChecked ? "flex-end" : "flex-start",
       x,
-      // TODO: remove ViewProps cast
       onLayout: composeEventHandlers(props.onLayout, function(e) {
         return setThumbWidth(e.nativeEvent.layout.width);
       }),
@@ -43,17 +42,9 @@ function createSwitch(createProps) {
       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(
+    }), styledContext = React.useContext(SwitchStyledContext.context), [frameWidth, setFrameWidth] = React.useState(0), { 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),
+      props,
       [
         checked,
         setChecked
@@ -64,8 +55,8 @@ function createSwitch(createProps) {
       if (props.id && !props.disabled)
         return registerFocusable(props.id, {
           focusAndSelect: function() {
-            setChecked == null || setChecked(function(value) {
-              return !value;
+            setChecked == null || setChecked(function(value2) {
+              return !value2;
             });
           },
           focus: function() {
@@ -76,16 +67,29 @@ function createSwitch(createProps) {
       props.disabled
     ]);
     var renderNative = shouldRenderNativePlatform(native);
-    return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ _jsx(NativeSwitch, {
-      value: checked,
-      onValueChange: setChecked,
-      ...nativeProps
-    }) : /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
-      value: {
+    if (renderNative === "android" || renderNative === "ios")
+      return /* @__PURE__ */ _jsx(NativeSwitch, {
+        value: checked,
+        onValueChange: setChecked,
+        ...nativeProps
+      });
+    var disabled = props.disabled, value = React.useMemo(function() {
+      return {
         checked,
-        disabled: switchProps.disabled,
+        disabled,
         frameWidth
-      },
+      };
+    }, [
+      checked,
+      disabled,
+      frameWidth
+    ]), handleLayout = React.useCallback(function(e) {
+      setFrameWidth(e.nativeEvent.layout.width);
+    }, [
+      setFrameWidth
+    ]), _styledContext_unstyled, _ref, unstyled = (_ref = (_styledContext_unstyled = styledContext.unstyled) !== null && _styledContext_unstyled !== void 0 ? _styledContext_unstyled : props.unstyled) !== null && _ref !== void 0 ? _ref : !1, _styledContext_size, _ref1;
+    return /* @__PURE__ */ _jsxs(SwitchContext.Provider, {
+      value,
       children: [
         /* @__PURE__ */ _jsx(Frame, {
           ref: switchRef,
@@ -93,6 +97,11 @@ function createSwitch(createProps) {
           ...isWeb && {
             type: "button"
           },
+          ...!unstyled && {
+            size: (_ref1 = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref1 !== void 0 ? _ref1 : "$true"
+          },
+          unstyled,
+          ...props,
           ...switchProps,
           ...!disableActiveTheme && !props.unstyled && {
             theme: checked ? "active" : null,
@@ -100,14 +109,11 @@ function createSwitch(createProps) {
           },
           // 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
+          disabled,
+          children: /* @__PURE__ */ _jsx(View, {
+            style: measureContainerStyle,
+            onLayout: handleLayout,
+            children: props.children
           })
         }),
         bubbleInput
@@ -120,6 +126,10 @@ function createSwitch(createProps) {
     Thumb: SwitchThumbComponent
   });
 }
+var measureContainerStyle = {
+  alignSelf: "stretch",
+  flex: 1
+};
 export {
   SwitchContext,
   createSwitch