@tamagui/switch 1.69.2 → 1.70.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -30,6 +30,9 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
30
30
  borderRadius: 1e3
31
31
  }
32
32
  },
33
+ checked: {
34
+ true: {}
35
+ },
33
36
  size: {
34
37
  "...size": (val) => {
35
38
  const size = getSwitchHeight(val);
@@ -45,7 +48,6 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
45
48
  }
46
49
  }), getSwitchHeight = (val) => Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = (0, import_core.styled)(import_stacks.YStack, {
47
50
  name: "Switch",
48
- tag: "button",
49
51
  context: import_SwitchContext.SwitchContext,
50
52
  variants: {
51
53
  unstyled: {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Switch.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqD,0BACrD,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAA8B;AAEvB,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,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,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,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;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqD,0BACrD,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAA8B;AAEvB,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,OAAO,gBAAgB,GAAG;AAChC,eAAO;AAAA,UACL,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,cAAc;AAAA,QACd,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;",
5
5
  "names": []
6
6
  }
@@ -31,6 +31,9 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
31
31
  borderRadius: 1e3
32
32
  }
33
33
  },
34
+ checked: {
35
+ true: {}
36
+ },
34
37
  size: {
35
38
  "...size": (val) => {
36
39
  const size = getSwitchHeight(val);
@@ -46,7 +49,6 @@ const SwitchThumb = (0, import_core.styled)(import_stacks.ThemeableStack, {
46
49
  }
47
50
  }), getSwitchHeight = (val) => Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = (0, import_core.styled)(import_stacks.YStack, {
48
51
  name: "Switch",
49
- tag: "button",
50
52
  context: import_SwitchContext.SwitchContext,
51
53
  variants: {
52
54
  unstyled: {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Switch.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqD,0BACrD,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAA8B;AAEvB,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,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,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,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;",
4
+ "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqD,0BACrD,mBAAwB,+BACxB,gBAAuC,4BAEvC,uBAA8B;AAEvB,MAAM,kBAAc,oBAAO,8BAAgB;AAAA,EAChD,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,iBAAiB;AAAA,QACjB,cAAc;AAAA,MAChB;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,MAAM,CAAC;AAAA,IACT;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW,CAAC,QAAQ;AAClB,cAAM,OAAO,gBAAgB,GAAG;AAChC,eAAO;AAAA,UACL,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC,GAEK,kBAAkB,CAAC,QACvB,KAAK,UAAM,kCAAiB,0BAAQ,GAAG,CAAC,IAAI,IAAI,GAE5C,iBAAiB,CAAC,QAAoB,gBAAgB,GAAG,IAAI,GAEtD,kBAAc,oBAAO,sBAAQ;AAAA,EACxC,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,cAAc;AAAA,QACd,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;",
5
5
  "names": []
6
6
  }
@@ -58,6 +58,7 @@ function createSwitch({
58
58
  "data-state": getState(checked),
59
59
  "data-disabled": disabled ? "" : void 0,
60
60
  alignSelf: initialChecked ? "flex-end" : "flex-start",
61
+ checked,
61
62
  x,
62
63
  ...thumbProps,
63
64
  onLayout: (0, import_core.composeEventHandlers)(
@@ -72,7 +73,12 @@ function createSwitch({
72
73
  );
73
74
  }), SwitchComponent = Frame.extractable(
74
75
  React.forwardRef(function(propsIn, forwardedRef) {
75
- const styledContext = React.useContext(import_SwitchContext.SwitchContext), props = (0, import_core.useProps)(propsIn), {
76
+ const styledContext = React.useContext(import_SwitchContext.SwitchContext), [props, style] = (0, import_core.usePropsAndStyle)(propsIn, {
77
+ noNormalize: !0,
78
+ noExpand: !0,
79
+ resolveValues: "none",
80
+ forComponent: Frame
81
+ }), {
76
82
  labeledBy: ariaLabelledby,
77
83
  name,
78
84
  checked: checkedProp,
@@ -88,10 +94,8 @@ function createSwitch({
88
94
  children,
89
95
  ...switchProps
90
96
  } = props, leftBorderWidth = (() => {
91
- let _;
92
- for (const key in switchProps)
93
- (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
94
- return Frame === import_Switch.SwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = (0, import_core.getVariableValue)((0, import_get_token.getSize)(_))), typeof _ == "number" ? _ : 0;
97
+ let _ = style.borderLeftWidth || style.borderWidth;
98
+ return typeof _ == "string" && (_.endsWith("px") ? _ = +_.replace("px", "") : _ = (0, import_core.getVariableValue)((0, import_get_token.getSize)(_))), typeof _ == "number" ? _ : Frame === import_Switch.SwitchFrame && !unstyled ? 2 : 0;
95
99
  })(), native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !import_core.isWeb && nativeProp === !0 || !import_core.isWeb && native.includes("mobile") || native.includes("android") && import_react_native.Platform.OS === "android" || native.includes("ios") && import_react_native.Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, (node) => setButton(node)), labelId = (0, import_label.useLabelContext)(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = import_core.isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = (0, import_use_controllable_state.useControllableState)({
96
100
  prop: checkedProp,
97
101
  defaultProp: defaultChecked || !1,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createSwitch.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["DefaultSwitchFrame", "NativeSwitch"]
6
6
  }
@@ -59,6 +59,7 @@ function createSwitch({
59
59
  "data-state": getState(checked),
60
60
  "data-disabled": disabled ? "" : void 0,
61
61
  alignSelf: initialChecked ? "flex-end" : "flex-start",
62
+ checked,
62
63
  x,
63
64
  ...thumbProps,
64
65
  onLayout: (0, import_core.composeEventHandlers)(
@@ -73,7 +74,12 @@ function createSwitch({
73
74
  );
74
75
  }), SwitchComponent = Frame.extractable(
75
76
  React.forwardRef(function(propsIn, forwardedRef) {
76
- const styledContext = React.useContext(import_SwitchContext.SwitchContext), props = (0, import_core.useProps)(propsIn), {
77
+ const styledContext = React.useContext(import_SwitchContext.SwitchContext), [props, style] = (0, import_core.usePropsAndStyle)(propsIn, {
78
+ noNormalize: !0,
79
+ noExpand: !0,
80
+ resolveValues: "none",
81
+ forComponent: Frame
82
+ }), {
77
83
  labeledBy: ariaLabelledby,
78
84
  name,
79
85
  checked: checkedProp,
@@ -89,10 +95,8 @@ function createSwitch({
89
95
  children,
90
96
  ...switchProps
91
97
  } = props, leftBorderWidth = (() => {
92
- let _;
93
- for (const key in switchProps)
94
- (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
95
- return Frame === import_Switch.SwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = (0, import_core.getVariableValue)((0, import_get_token.getSize)(_))), typeof _ == "number" ? _ : 0;
98
+ let _ = style.borderLeftWidth || style.borderWidth;
99
+ return typeof _ == "string" && (_.endsWith("px") ? _ = +_.replace("px", "") : _ = (0, import_core.getVariableValue)((0, import_get_token.getSize)(_))), typeof _ == "number" ? _ : Frame === import_Switch.SwitchFrame && !unstyled ? 2 : 0;
96
100
  })(), native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !import_core.isWeb && nativeProp === !0 || !import_core.isWeb && native.includes("mobile") || native.includes("android") && import_react_native.Platform.OS === "android" || native.includes("ios") && import_react_native.Platform.OS === "ios", [button, setButton] = React.useState(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, (node) => setButton(node)), labelId = (0, import_label.useLabelContext)(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React.useRef(!1), isFormControl = import_core.isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React.useState(0), [checked = !1, setChecked] = (0, import_use_controllable_state.useControllableState)({
97
101
  prop: checkedProp,
98
102
  defaultProp: defaultChecked || !1,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createSwitch.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["DefaultSwitchFrame", "NativeSwitch"]
6
6
  }
@@ -13,6 +13,9 @@ const SwitchThumb = styled(ThemeableStack, {
13
13
  borderRadius: 1e3
14
14
  }
15
15
  },
16
+ checked: {
17
+ true: {}
18
+ },
16
19
  size: {
17
20
  "...size": (val) => {
18
21
  const size = getSwitchHeight(val);
@@ -28,7 +31,6 @@ const SwitchThumb = styled(ThemeableStack, {
28
31
  }
29
32
  }), getSwitchHeight = (val) => Math.round(getVariableValue(getSize(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = styled(YStack, {
30
33
  name: "Switch",
31
- tag: "button",
32
34
  context: SwitchContext,
33
35
  variants: {
34
36
  unstyled: {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Switch.tsx"],
4
- "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;",
4
+ "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,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;",
5
5
  "names": []
6
6
  }
@@ -3,7 +3,7 @@ import {
3
3
  composeEventHandlers,
4
4
  getVariableValue,
5
5
  isWeb,
6
- useProps,
6
+ usePropsAndStyle,
7
7
  withStaticProperties
8
8
  } from "@tamagui/core";
9
9
  import { registerFocusable } from "@tamagui/focusable";
@@ -50,6 +50,7 @@ function createSwitch({
50
50
  "data-state": getState(checked),
51
51
  "data-disabled": disabled ? "" : void 0,
52
52
  alignSelf: initialChecked ? "flex-end" : "flex-start",
53
+ checked,
53
54
  x,
54
55
  ...thumbProps,
55
56
  onLayout: composeEventHandlers(
@@ -65,7 +66,12 @@ function createSwitch({
65
66
  );
66
67
  }), SwitchComponent = Frame.extractable(
67
68
  React.forwardRef(function(propsIn, forwardedRef) {
68
- const styledContext = React.useContext(SwitchContext), props = useProps(propsIn), {
69
+ const styledContext = React.useContext(SwitchContext), [props, style] = usePropsAndStyle(propsIn, {
70
+ noNormalize: !0,
71
+ noExpand: !0,
72
+ resolveValues: "none",
73
+ forComponent: Frame
74
+ }), {
69
75
  labeledBy: ariaLabelledby,
70
76
  name,
71
77
  checked: checkedProp,
@@ -81,10 +87,8 @@ function createSwitch({
81
87
  children,
82
88
  ...switchProps
83
89
  } = props, leftBorderWidth = (() => {
84
- let _;
85
- for (const key in switchProps)
86
- (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
87
- return Frame === DefaultSwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : 0;
90
+ let _ = style.borderLeftWidth || style.borderWidth;
91
+ return typeof _ == "string" && (_.endsWith("px") ? _ = +_.replace("px", "") : _ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : Frame === DefaultSwitchFrame && !unstyled ? 2 : 0;
88
92
  })(), 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({
89
93
  prop: checkedProp,
90
94
  defaultProp: defaultChecked || !1,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createSwitch.tsx"],
4
- "mappings": "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",
4
+ "mappings": "AAAA,SAAS,uBAAuB;AAChC;AAAA,EAME;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,OACK;AACP,SAAS,yBAAyB;AAClC,SAAS,eAAe;AACxB,SAAS,uBAAuB;AAChC,SAAS,4BAA4B;AACrC,SAAS,mBAAmB;AAC5B,YAAY,WAAW;AACvB;AAAA,EACE,UAAU;AAAA,EAEV;AAAA,OACK;AAEP,SAAS,eAAe,oBAAoB,mBAAmB;AAC/D,SAAS,qBAAqB;AA8ExB,SAyHE,UAzHF,KAyHE,YAzHF;AA3CC,SAAS,aAAwE;AAAA,EACtF,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR;AACF,GAIG;AACD,EAAI,QAAQ,IAAI,aAAa,kBACvB,UAAU,sBAAsB,MAAM,aAAa,WACrD,QAAQ;AAAA,IACN;AAAA,EACF,GAEE,UAAU,eAAe,MAAM,aAAa,WAC9C,QAAQ;AAAA,IACN;AAAA,EACF,IAIJ,MAAM,aAAa,UAAU,eAC7B,MAAM,aAAa,UAAU;AAE7B,QAAM,uBAAuB,MAAM,UAAU,SAAqB,OAAO,cAAc;AACrF,UAAM,EAAE,MAAM,UAAU,UAAU,cAAc,GAAG,WAAW,IAAI,OAC5D,UAAU,MAAM,WAAW,aAAa,GACxC;AAAA,MACJ;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA,MAAM;AAAA,IACR,IAAI,SACE,CAAC,YAAY,aAAa,IAAI,MAAM,SAAS,CAAC,GAC9C,iBAAiB,MAAM,OAAO,OAAO,EAAE,SACvC,WAAW,aAAa,YACxB,IAAI,iBAAkB,UAAU,IAAI,CAAC,WAAY,UAAU,WAAW;AAG5E;AAAA;AAAA,MAEE;AAAA,QAAC;AAAA;AAAA,UACE,IALY,gBAAgB,mBAAmB,QAK9B,MAAS;AAAA,YACzB,UAAU;AAAA,YACV,MAAM,YAAY,eAAe;AAAA,YACjC,OAAO,UAAU,WAAW;AAAA,UAC9B;AAAA,UACA,cAAY,SAAS,OAAO;AAAA,UAC5B,iBAAe,WAAW,KAAK;AAAA,UAC/B,WAAW,iBAAiB,aAAa;AAAA,UACzC;AAAA,UACA;AAAA,UACC,GAAG;AAAA,UAEJ,UAAU;AAAA,YAAqB,MAAM;AAAA,YAAU,CAAC;AAAA;AAAA,cAE9C,cAAc,EAAE,YAAY,OAAO,KAAK;AAAA;AAAA,UAC1C;AAAA,UACA,KAAK;AAAA;AAAA,MACP;AAAA;AAAA,EAEJ,CAAC,GAEK,kBAAkB,MAAM;AAAA,IAC5B,MAAM,WAAwC,SAC5C,SACA,cACA;AACA,YAAM,gBAAgB,MAAM,WAAW,aAAa,GAC9C,CAAC,OAAO,KAAK,IAAI,iBAAiB,SAAS;AAAA,QAC/C,aAAa;AAAA,QACb,UAAU;AAAA,QACV,eAAe;AAAA,QACf,cAAc;AAAA,MAChB,CAAC,GACK;AAAA,QACJ,WAAW;AAAA,QACX;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA,QAAQ;AAAA,QACR;AAAA,QACA,OAAO,cAAc,QAAQ;AAAA,QAC7B,WAAW,cAAc,YAAY;AAAA,QACrC,QAAQ;AAAA,QACR;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL,IAAI,OAEE,mBAAmB,MAAM;AAC7B,YAAI,IAAI,MAAM,mBAAmB,MAAM;AAQvC,eAPI,OAAO,KAAM,aACX,EAAE,SAAS,IAAI,IACjB,IAAI,CAAC,EAAE,QAAQ,MAAM,EAAE,IAEvB,IAAI,iBAAiB,QAAQ,CAAC,CAAC,IAG/B,OAAO,KAAM,WACR,IAEL,UAAU,sBAAsB,CAAC,WAC5B,IAEF;AAAA,MACT,GAAG,GAEG,SAAS,MAAM,QAAQ,UAAU,IAAI,aAAa,CAAC,UAAU,GAE7D,2BACH,CAAC,SAAS,eAAe,MACzB,CAAC,SAAS,OAAO,SAAS,QAAQ,KAClC,OAAO,SAAS,SAAS,KAAK,SAAS,OAAO,aAC9C,OAAO,SAAS,KAAK,KAAK,SAAS,OAAO,OAEvC,CAAC,QAAQ,SAAS,IAAI,MAAM,SAAmC,IAAI,GACnE,eAAe,gBAAgB,cAAc,CAAC,SAAS,UAAU,IAAW,CAAC,GAC7E,UAAU,gBAAgB,MAAM,GAChC,aAAa,kBAAkB,SAC/B,mCAAmC,MAAM,OAAO,EAAK,GAErD,gBAAgB,QAClB,SACE,EAAQ,OAAO,QAAQ,MAAM,IAC7B,KACF,IAEE,CAAC,YAAY,aAAa,IAAI,MAAM,SAAS,CAAC,GAE9C,CAAC,UAAU,IAAO,UAAU,IAAI,qBAAqB;AAAA,QACzD,MAAM;AAAA,QACN,aAAa,kBAAkB;AAAA,QAC/B,UAAU;AAAA,QACV,YAAY;AAAA,MACd,CAAC;AAED,aAAI,2BAEA;AAAA,QAAC;AAAA;AAAA,UACC,OAAO;AAAA,UACP,eAAe;AAAA,UACd,GAAG;AAAA;AAAA,MACN,KAIC,SAEH,MAAM,UAAU,MAAM;AACpB,YAAK,MAAM;AACX,iBAAO,kBAAkB,MAAM,IAAI;AAAA,YACjC,OAAO,MAAM;AACX,yBAAW,CAAC,MAAM,CAAC,CAAC;AAAA,YACtB;AAAA,UACF,CAAC;AAAA,MACH,GAAG,CAAC,MAAM,IAAI,UAAU,CAAC,GAIzB,iCAEE;AAAA;AAAA,UAAC;AAAA;AAAA,YACC;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA,YAAY,aAAa,aAAa,kBAAkB,IAAI;AAAA,YAC5D,OAAO,UAAU,WAAW;AAAA,YAC5B,cAAY;AAAA,YACZ,MAAK;AAAA,YACL,gBAAc;AAAA,YACd,mBAAiB;AAAA,YACjB,iBAAe;AAAA,YACf,cAAY,SAAS,OAAO;AAAA,YAC5B,iBAAe,WAAW,KAAK;AAAA,YAE/B,UAAU,WAAW,SAAY;AAAA,YAEjC;AAAA,YACC,GAAG;AAAA,YACJ,KAAK;AAAA,YACL,SAAS,qBAAqB,MAAM,SAAS,CAAC,UAAU;AACtD,yBAAW,CAAC,gBAAgB,CAAC,WAAW,GACpC,SAAS,kBACX,iCAAiC,UAAU,MAAM,qBAAqB,GAIjE,iCAAiC,WAAS,MAAM,gBAAgB;AAAA,YAEzE,CAAC;AAAA,YACD,UAAU;AAAA;AAAA,cAER,MAAM;AAAA,cACN,CAAC,MAAM;AAEL,8BAAc,EAAE,YAAY,OAAO,KAAK;AAAA,cAC1C;AAAA,YACF;AAAA,YAEC,iBAAO,YAAa,aAAa,SAAS,OAAO,IAAI;AAAA;AAAA,QACxD;AAAA,QACC,SAAS,iBACR;AAAA,UAAC;AAAA;AAAA,YACC,SAAS;AAAA,YACT,SAAS,CAAC,iCAAiC;AAAA,YAC3C;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YAIA,OAAO,EAAE,WAAW,oBAAoB;AAAA;AAAA,QAC1C;AAAA,SAEJ;AAAA,IAEJ,CAAC;AAAA,EACH,GAaM,cAAc,CAAC,UAA4B;AAC/C,UAAM,EAAE,SAAS,SAAS,UAAU,IAAM,GAAG,WAAW,IAAI,OACtD,MAAM,MAAM,OAAyB,IAAI,GACzC,cAAc,YAAY,OAAO;AAIvC,iBAAM,UAAU,MAAM;AACpB,YAAM,QAAQ,IAAI,SACZ,aAAa,OAAO,iBAAiB,WAKrC,aAJa,OAAO;AAAA,QACxB;AAAA,QACA;AAAA,MACF,EAC8B;AAC9B,UAAI,gBAAgB,WAAW,YAAY;AACzC,cAAM,QAAQ,IAAI,MAAM,SAAS,EAAE,QAAQ,CAAC;AAC5C,mBAAW,KAAK,OAAO,OAAO,GAC9B,MAAM,cAAc,KAAK;AAAA,MAC3B;AAAA,IACF,GAAG,CAAC,aAAa,SAAS,OAAO,CAAC;AAAA,IAIhC;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,eAAW;AAAA,QACX,gBAAgB;AAAA,QACf,GAAG;AAAA,QACJ,UAAU;AAAA,QACV;AAAA,QACA,OAAO;AAAA,UACL,GAAG,MAAM;AAAA;AAAA,UAET,UAAU;AAAA,UACV,eAAe;AAAA,UACf,SAAS;AAAA,UACT,QAAQ;AAAA,QACV;AAAA;AAAA,IACF;AAAA,EAEJ;AAEA,WAAS,SAAS,SAAkB;AAClC,WAAO,UAAU,YAAY;AAAA,EAC/B;AAMA,SAJe,qBAAqB,iBAAiB;AAAA,IACnD,OAAO;AAAA,EACT,CAAC;AAGH;",
5
5
  "names": []
6
6
  }
@@ -13,6 +13,9 @@ const SwitchThumb = styled(ThemeableStack, {
13
13
  borderRadius: 1e3
14
14
  }
15
15
  },
16
+ checked: {
17
+ true: {}
18
+ },
16
19
  size: {
17
20
  "...size": (val) => {
18
21
  const size = getSwitchHeight(val);
@@ -28,7 +31,6 @@ const SwitchThumb = styled(ThemeableStack, {
28
31
  }
29
32
  }), getSwitchHeight = (val) => Math.round(getVariableValue(getSize(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = styled(YStack, {
30
33
  name: "Switch",
31
- tag: "button",
32
34
  context: SwitchContext,
33
35
  variants: {
34
36
  unstyled: {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Switch.tsx"],
4
- "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;",
4
+ "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,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;",
5
5
  "names": []
6
6
  }
@@ -13,6 +13,9 @@ const SwitchThumb = styled(ThemeableStack, {
13
13
  borderRadius: 1e3
14
14
  }
15
15
  },
16
+ checked: {
17
+ true: {}
18
+ },
16
19
  size: {
17
20
  "...size": (val) => {
18
21
  const size = getSwitchHeight(val);
@@ -28,7 +31,6 @@ const SwitchThumb = styled(ThemeableStack, {
28
31
  }
29
32
  }), getSwitchHeight = (val) => Math.round(getVariableValue(getSize(val)) * 0.65), getSwitchWidth = (val) => getSwitchHeight(val) * 2, SwitchFrame = styled(YStack, {
30
33
  name: "Switch",
31
- tag: "button",
32
34
  context: SwitchContext,
33
35
  variants: {
34
36
  unstyled: {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Switch.tsx"],
4
- "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;",
4
+ "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,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;",
5
5
  "names": []
6
6
  }
@@ -3,7 +3,7 @@ import {
3
3
  composeEventHandlers,
4
4
  getVariableValue,
5
5
  isWeb,
6
- useProps,
6
+ usePropsAndStyle,
7
7
  withStaticProperties
8
8
  } from "@tamagui/core";
9
9
  import { registerFocusable } from "@tamagui/focusable";
@@ -47,6 +47,7 @@ function createSwitch({
47
47
  data-state={getState(checked)}
48
48
  data-disabled={disabled ? "" : void 0}
49
49
  alignSelf={initialChecked ? "flex-end" : "flex-start"}
50
+ checked={checked}
50
51
  x={x}
51
52
  {...thumbProps}
52
53
  onLayout={composeEventHandlers(
@@ -61,7 +62,12 @@ function createSwitch({
61
62
  );
62
63
  }), SwitchComponent = Frame.extractable(
63
64
  React.forwardRef(function(propsIn, forwardedRef) {
64
- const styledContext = React.useContext(SwitchContext), props = useProps(propsIn), {
65
+ const styledContext = React.useContext(SwitchContext), [props, style] = usePropsAndStyle(propsIn, {
66
+ noNormalize: !0,
67
+ noExpand: !0,
68
+ resolveValues: "none",
69
+ forComponent: Frame
70
+ }), {
65
71
  labeledBy: ariaLabelledby,
66
72
  name,
67
73
  checked: checkedProp,
@@ -77,10 +83,8 @@ function createSwitch({
77
83
  children,
78
84
  ...switchProps
79
85
  } = props, leftBorderWidth = (() => {
80
- let _;
81
- for (const key in switchProps)
82
- (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
83
- return Frame === DefaultSwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : 0;
86
+ let _ = style.borderLeftWidth || style.borderWidth;
87
+ return typeof _ == "string" && (_.endsWith("px") ? _ = +_.replace("px", "") : _ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : Frame === DefaultSwitchFrame && !unstyled ? 2 : 0;
84
88
  })(), 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({
85
89
  prop: checkedProp,
86
90
  defaultProp: defaultChecked || !1,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createSwitch.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -3,7 +3,7 @@ import {
3
3
  composeEventHandlers,
4
4
  getVariableValue,
5
5
  isWeb,
6
- useProps,
6
+ usePropsAndStyle,
7
7
  withStaticProperties
8
8
  } from "@tamagui/core";
9
9
  import { registerFocusable } from "@tamagui/focusable";
@@ -47,6 +47,7 @@ function createSwitch({
47
47
  data-state={getState(checked)}
48
48
  data-disabled={disabled ? "" : void 0}
49
49
  alignSelf={initialChecked ? "flex-end" : "flex-start"}
50
+ checked={checked}
50
51
  x={x}
51
52
  {...thumbProps}
52
53
  onLayout={composeEventHandlers(
@@ -61,7 +62,12 @@ function createSwitch({
61
62
  );
62
63
  }), SwitchComponent = Frame.extractable(
63
64
  React.forwardRef(function(propsIn, forwardedRef) {
64
- const styledContext = React.useContext(SwitchContext), props = useProps(propsIn), {
65
+ const styledContext = React.useContext(SwitchContext), [props, style] = usePropsAndStyle(propsIn, {
66
+ noNormalize: !0,
67
+ noExpand: !0,
68
+ resolveValues: "none",
69
+ forComponent: Frame
70
+ }), {
65
71
  labeledBy: ariaLabelledby,
66
72
  name,
67
73
  checked: checkedProp,
@@ -77,10 +83,8 @@ function createSwitch({
77
83
  children,
78
84
  ...switchProps
79
85
  } = props, leftBorderWidth = (() => {
80
- let _;
81
- for (const key in switchProps)
82
- (key === "borderWidth" || key === "borderLeftWidth") && (_ = switchProps[key]);
83
- return Frame === DefaultSwitchFrame && acceptsUnstyled && _ == null && unstyled === !1 && (_ = 2), typeof _ == "string" && (_ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : 0;
86
+ let _ = style.borderLeftWidth || style.borderWidth;
87
+ return typeof _ == "string" && (_.endsWith("px") ? _ = +_.replace("px", "") : _ = getVariableValue(getSize(_))), typeof _ == "number" ? _ : Frame === DefaultSwitchFrame && !unstyled ? 2 : 0;
84
88
  })(), 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({
85
89
  prop: checkedProp,
86
90
  defaultProp: defaultChecked || !1,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createSwitch.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/switch",
3
- "version": "1.69.2",
3
+ "version": "1.70.0",
4
4
  "sideEffects": [
5
5
  "*.css"
6
6
  ],
@@ -31,22 +31,22 @@
31
31
  }
32
32
  },
33
33
  "dependencies": {
34
- "@tamagui/compose-refs": "1.69.2",
35
- "@tamagui/core": "1.69.2",
36
- "@tamagui/create-context": "1.69.2",
37
- "@tamagui/focusable": "1.69.2",
38
- "@tamagui/get-token": "1.69.2",
39
- "@tamagui/label": "1.69.2",
40
- "@tamagui/stacks": "1.69.2",
41
- "@tamagui/use-controllable-state": "1.69.2",
42
- "@tamagui/use-previous": "1.69.2"
34
+ "@tamagui/compose-refs": "1.70.0",
35
+ "@tamagui/core": "1.70.0",
36
+ "@tamagui/create-context": "1.70.0",
37
+ "@tamagui/focusable": "1.70.0",
38
+ "@tamagui/get-token": "1.70.0",
39
+ "@tamagui/label": "1.70.0",
40
+ "@tamagui/stacks": "1.70.0",
41
+ "@tamagui/use-controllable-state": "1.70.0",
42
+ "@tamagui/use-previous": "1.70.0"
43
43
  },
44
44
  "peerDependencies": {
45
45
  "react": "*",
46
46
  "react-native": "*"
47
47
  },
48
48
  "devDependencies": {
49
- "@tamagui/build": "1.69.2",
49
+ "@tamagui/build": "1.70.0",
50
50
  "react": "^18.2.0",
51
51
  "react-native": "^0.72.1"
52
52
  },
package/src/Switch.tsx CHANGED
@@ -17,6 +17,10 @@ export const SwitchThumb = styled(ThemeableStack, {
17
17
  },
18
18
  },
19
19
 
20
+ checked: {
21
+ true: {},
22
+ },
23
+
20
24
  size: {
21
25
  '...size': (val) => {
22
26
  const size = getSwitchHeight(val)
@@ -40,7 +44,6 @@ const getSwitchWidth = (val: SizeTokens) => getSwitchHeight(val) * 2
40
44
 
41
45
  export const SwitchFrame = styled(YStack, {
42
46
  name: 'Switch',
43
- tag: 'button',
44
47
  context: SwitchContext,
45
48
 
46
49
  variants: {
@@ -9,6 +9,7 @@ import {
9
9
  getVariableValue,
10
10
  isWeb,
11
11
  useProps,
12
+ usePropsAndStyle,
12
13
  withStaticProperties,
13
14
  } from '@tamagui/core'
14
15
  import { registerFocusable } from '@tamagui/focusable'
@@ -111,6 +112,7 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
111
112
  data-state={getState(checked)}
112
113
  data-disabled={disabled ? '' : undefined}
113
114
  alignSelf={initialChecked ? 'flex-end' : 'flex-start'}
115
+ checked={checked}
114
116
  x={x}
115
117
  {...thumbProps}
116
118
  // @ts-ignore
@@ -129,7 +131,12 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
129
131
  forwardedRef
130
132
  ) {
131
133
  const styledContext = React.useContext(SwitchContext)
132
- const props = useProps(propsIn)
134
+ const [props, style] = usePropsAndStyle(propsIn, {
135
+ noNormalize: true,
136
+ noExpand: true,
137
+ resolveValues: 'none',
138
+ forComponent: Frame,
139
+ })
133
140
  const {
134
141
  labeledBy: ariaLabelledby,
135
142
  name,
@@ -148,26 +155,20 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
148
155
  } = props
149
156
 
150
157
  const leftBorderWidth = (() => {
151
- let _: any = undefined
152
- for (const key in switchProps) {
153
- if (key === 'borderWidth' || key === 'borderLeftWidth') {
154
- _ = switchProps[key]
155
- }
156
- }
157
- if (
158
- Frame === DefaultSwitchFrame &&
159
- acceptsUnstyled &&
160
- _ == undefined &&
161
- unstyled === false
162
- ) {
163
- _ = 2 // default we use for styled
164
- }
158
+ let _ = style.borderLeftWidth || style.borderWidth
165
159
  if (typeof _ === 'string') {
166
- _ = getVariableValue(getSize(_))
160
+ if (_.endsWith('px')) {
161
+ _ = +_.replace('px', '')
162
+ } else {
163
+ _ = getVariableValue(getSize(_))
164
+ }
167
165
  }
168
166
  if (typeof _ === 'number') {
169
167
  return _
170
168
  }
169
+ if (Frame === DefaultSwitchFrame && !unstyled) {
170
+ return 2
171
+ }
171
172
  return 0
172
173
  })()
173
174
 
package/types/Switch.d.ts CHANGED
@@ -17,8 +17,9 @@ export declare const SwitchThumb: import("@tamagui/core").TamaguiComponent<Omit<
17
17
  readonly bordered?: number | boolean | undefined;
18
18
  readonly transparent?: boolean | undefined;
19
19
  readonly chromeless?: boolean | "all" | undefined;
20
- }, "size" | "unstyled"> & {
20
+ }, "size" | "checked" | "unstyled"> & {
21
21
  readonly unstyled?: boolean | undefined;
22
+ readonly checked?: boolean | undefined;
22
23
  readonly size?: SizeTokens | undefined;
23
24
  } & import("@tamagui/core").PseudoProps<Partial<Omit<import("react-native").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native").GestureResponderHandlers | "style"> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
24
25
  style?: import("@tamagui/core").StyleProp<import("react-native").ViewStyle | import("react").CSSProperties | (import("react").CSSProperties & import("react-native").ViewStyle)>;
@@ -37,8 +38,9 @@ export declare const SwitchThumb: import("@tamagui/core").TamaguiComponent<Omit<
37
38
  readonly bordered?: number | boolean | undefined;
38
39
  readonly transparent?: boolean | undefined;
39
40
  readonly chromeless?: boolean | "all" | undefined;
40
- }, "size" | "unstyled"> & {
41
+ }, "size" | "checked" | "unstyled"> & {
41
42
  readonly unstyled?: boolean | undefined;
43
+ readonly checked?: boolean | undefined;
42
44
  readonly size?: SizeTokens | undefined;
43
45
  }>> & import("@tamagui/core").MediaProps<Partial<Omit<import("react-native").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native").GestureResponderHandlers | "style"> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
44
46
  style?: import("@tamagui/core").StyleProp<import("react-native").ViewStyle | import("react").CSSProperties | (import("react").CSSProperties & import("react-native").ViewStyle)>;
@@ -57,8 +59,9 @@ export declare const SwitchThumb: import("@tamagui/core").TamaguiComponent<Omit<
57
59
  readonly bordered?: number | boolean | undefined;
58
60
  readonly transparent?: boolean | undefined;
59
61
  readonly chromeless?: boolean | "all" | undefined;
60
- }, "size" | "unstyled"> & {
62
+ }, "size" | "checked" | "unstyled"> & {
61
63
  readonly unstyled?: boolean | undefined;
64
+ readonly checked?: boolean | undefined;
62
65
  readonly size?: SizeTokens | undefined;
63
66
  }>>, import("@tamagui/core").TamaguiElement, Omit<import("react-native").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native").GestureResponderHandlers | "style"> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
64
67
  style?: import("@tamagui/core").StyleProp<import("react-native").ViewStyle | import("react").CSSProperties | (import("react").CSSProperties & import("react-native").ViewStyle)>;
@@ -79,6 +82,7 @@ export declare const SwitchThumb: import("@tamagui/core").TamaguiComponent<Omit<
79
82
  readonly chromeless?: boolean | "all" | undefined;
80
83
  } & {
81
84
  readonly unstyled?: boolean | undefined;
85
+ readonly checked?: boolean | undefined;
82
86
  readonly size?: SizeTokens | undefined;
83
87
  }, {
84
88
  displayName: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"Switch.d.ts","sourceRoot":"","sources":["../src/Switch.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAA;AAMpE,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BtB,CAAA;AAOF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CtB,CAAA"}
1
+ {"version":3,"file":"Switch.d.ts","sourceRoot":"","sources":["../src/Switch.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAA;AAMpE,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BtB,CAAA;AAOF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8CtB,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"createSwitch.d.ts","sourceRoot":"","sources":["../src/createSwitch.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,UAAU,EACV,UAAU,EACV,iCAAiC,EACjC,cAAc,EAMf,MAAM,eAAe,CAAA;AAMtB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAEL,WAAW,IAAI,iBAAiB,EAEjC,MAAM,cAAc,CAAA;AAKrB,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,eAAe,GAAG,UAAU,GAAG,iBAAiB,CAAA;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,iBAAiB,CAAA;IAC/B,eAAe,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,GAAG,gBAAgB,EAAE,UAAU,CAAC,GAAG;IAC/E,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC,CAAA;CACrE,CAAA;AAED,KAAK,eAAe,GAAG,iCAAiC,CACtD,WAAW,EACX,iBAAiB,GAAG,gBAAgB,CACrC,CAAA;AAED,KAAK,oBAAoB,GAAG,iCAAiC,CAC3D,eAAe,EACf,iBAAiB,CAClB,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,SAAS,oBAAoB,EAAE,EACtF,KAAiC,EACjC,KAA0B,EAC1B,eAAe,GAChB,EAAE;IACD,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;;;;;;;;;EA0RA"}
1
+ {"version":3,"file":"createSwitch.d.ts","sourceRoot":"","sources":["../src/createSwitch.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,UAAU,EACV,UAAU,EACV,iCAAiC,EACjC,cAAc,EAOf,MAAM,eAAe,CAAA;AAMtB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAEL,WAAW,IAAI,iBAAiB,EAEjC,MAAM,cAAc,CAAA;AAKrB,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,eAAe,GAAG,UAAU,GAAG,iBAAiB,CAAA;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,iBAAiB,CAAA;IAC/B,eAAe,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,GAAG,gBAAgB,EAAE,UAAU,CAAC,GAAG;IAC/E,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC,CAAA;CACrE,CAAA;AAED,KAAK,eAAe,GAAG,iCAAiC,CACtD,WAAW,EACX,iBAAiB,GAAG,gBAAgB,CACrC,CAAA;AAED,KAAK,oBAAoB,GAAG,iCAAiC,CAC3D,eAAe,EACf,iBAAiB,CAClB,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,SAAS,oBAAoB,EAAE,EACtF,KAAiC,EACjC,KAA0B,EAC1B,eAAe,GAChB,EAAE;IACD,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;;;;;;;;;EA0RA"}