tamagui 1.123.9 → 1.123.11

package/dist/native.js

@@ -6810,7 +6810,7 @@ var require_propMapper_native = __commonJS({
             return;
           }
         }
-        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
+        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
           key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
           var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
           if (expanded) for (var max2 = expanded.length, i = 0; i < max2; i++) {
@@ -6872,7 +6872,7 @@ var require_propMapper_native = __commonJS({
           if (styleProps.noExpand) res[subKey] = val;
           else if (variants && subKey in variants) {
             if (parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
-            val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
+            val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val;
             else {
               var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
               if (variantOut) {
@@ -6905,7 +6905,7 @@ var require_propMapper_native = __commonJS({
           if (typeof val == "string") {
             var fVal = (
               // SYNC WITH *1
-              val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val
+              val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val
             );
             res[subKey] = fVal;
             continue;
@@ -6965,16 +6965,18 @@ var require_propMapper_native = __commonJS({
     var fontShorthand = {
       fontSize: "size",
       fontWeight: "weight"
-    }, lastFontFamilyToken = null, getTokenForKey = function(key, value) {
-      var resolveAs = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "none", styleState = arguments.length > 3 ? arguments[3] : void 0, _staticConfig_accept;
+    }, lastFontFamilyToken = null, getTokenForKey = function(key, value, styleProps, styleState) {
+      var _staticConfig_accept, resolveAs = styleProps.resolveValues || "none";
       if (resolveAs === "none") return value;
       var { theme, conf = (0, import_config.getConfig)(), context, fontFamily, staticConfig } = styleState, tokensParsed = conf.tokensParsed, valOrVar, hasSet = !1, customTokenAccept = staticConfig == null || (_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key];
       if (customTokenAccept) {
         var _theme_value, val = (_theme_value = theme == null ? void 0 : theme[value]) !== null && _theme_value !== void 0 ? _theme_value : tokensParsed[customTokenAccept][value];
         val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
       }
-      if (theme && value in theme) valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
-      else {
+      if (theme && value in theme) {
+        if (resolveAs === "except-theme") return value;
+        valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
+      } else {
         if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];
         else {
           switch (key) {
@@ -7480,7 +7482,7 @@ var require_getSplitStyles_native = __commonJS({
           console.groupEnd();
         }
       };
-      props.reddish && (debug = "verbose"), conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
+      conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClass, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, validStyles = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-setup`;
       var styleState = {
@@ -8172,7 +8174,7 @@ var require_themeable_native = __commonJS({
     module2.exports = __toCommonJS2(themeable_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), import_react3 = __toESM2(require("react")), import_Theme = require_Theme_native();
     function themeable3(Component, staticConfig) {
-      var withThemeComponent = /* @__PURE__ */ import_react3.default.forwardRef(function(props, ref) {
+      var optimize = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1, withThemeComponent = function(props, ref) {
         var { themeInverse, theme, componentName, themeReset, ...rest } = props, overriddenContextProps, context = staticConfig == null ? void 0 : staticConfig.context;
         if (context) for (var key in context.props) {
           var val = props[key];
@@ -8185,10 +8187,8 @@ var require_themeable_native = __commonJS({
             ...rest,
             "data-disable-theme": !0
           })
-        ), filteredProps = {
-          componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName)
-        };
-        "debug" in props && (filteredProps.debug = props.debug), "theme" in props && (filteredProps.name = props.theme), "themeInverse" in props && (filteredProps.inverse = props.themeInverse), "themeReset" in props && (filteredProps.reset = themeReset);
+        ), filteredProps = null, compName = componentName || (staticConfig == null ? void 0 : staticConfig.componentName);
+        if (compName && (filteredProps || (filteredProps = {}), filteredProps.componentName = compName), "debug" in props && (filteredProps || (filteredProps = {}), filteredProps.debug = props.debug), "theme" in props && (filteredProps || (filteredProps = {}), filteredProps.name = props.theme), "themeInverse" in props && (filteredProps || (filteredProps = {}), filteredProps.inverse = props.themeInverse), "themeReset" in props && (filteredProps || (filteredProps = {}), filteredProps.reset = themeReset), optimize && !filteredProps) return element;
         var contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_Theme.Theme, {
           "disable-child-theme": !0,
           ...filteredProps,
@@ -8203,8 +8203,8 @@ var require_themeable_native = __commonJS({
           });
         }
         return contents;
-      }), withTheme = withThemeComponent;
-      return withTheme.displayName = `Themed(${(Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "Anonymous"})`, withTheme;
+      }, withTheme = withThemeComponent;
+      return withTheme.displayName = `Themed(${(Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "Anonymous"})`, optimize ? withTheme : /* @__PURE__ */ import_react3.default.forwardRef(withTheme);
     }
   }
 });
@@ -9138,7 +9138,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
       }
       function styleable(Component2, options) {
         var _Component_render, isForwardedRefAlready = ((_Component_render = Component2.render) === null || _Component_render === void 0 ? void 0 : _Component_render.length) === 2, out = isForwardedRefAlready ? Component2 : /* @__PURE__ */ import_react3.default.forwardRef(Component2), extendedConfig = extendStyledConfig(options == null ? void 0 : options.staticConfig);
-        return out = options != null && options.disableTheme ? out : (0, import_themeable.themeable)(out, extendedConfig), process.env.TAMAGUI_MEMOIZE_STYLEABLE && (out = /* @__PURE__ */ import_react3.default.memo(out)), out.staticConfig = extendedConfig, out.styleable = styleable, out;
+        return out = options != null && options.disableTheme ? out : (0, import_themeable.themeable)(out, extendedConfig, !0), process.env.TAMAGUI_MEMOIZE_STYLEABLE && (out = /* @__PURE__ */ import_react3.default.memo(out)), out.staticConfig = extendedConfig, out.styleable = styleable, out;
       }
       return res.extractable = extractable, res.styleable = styleable, res;
     }
@@ -29384,80 +29384,20 @@ var require_useSwitch_native = __commonJS({
     });
     module2.exports = __toCommonJS2(useSwitch_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native12(), import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_label = require_index_native46(), import_use_previous = require_index_native47(), React4 = __toESM2(require("react"));
-    function getState(checked) {
-      return checked ? "checked" : "unchecked";
-    }
-    var BubbleInput = function(props) {
-      var { control, checked, bubbles = !0, ...inputProps } = props, ref = React4.useRef(null), prevChecked = (0, import_use_previous.usePrevious)(checked);
-      return React4.useEffect(function() {
-        var input = ref.current, inputProto = window.HTMLInputElement.prototype, descriptor = Object.getOwnPropertyDescriptor(inputProto, "checked"), setChecked = descriptor.set;
-        if (prevChecked !== checked && setChecked) {
-          var event = new Event("click", {
-            bubbles
-          });
-          setChecked.call(input, checked), input.dispatchEvent(event);
-        }
-      }, [
-        prevChecked,
-        checked,
-        bubbles
-      ]), // @ts-ignore
-      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("input", {
-        type: "checkbox",
-        "aria-hidden": !0,
-        defaultChecked: checked,
-        ...inputProps,
-        tabIndex: -1,
-        ref,
-        style: {
-          ...props.style,
-          position: "absolute",
-          pointerEvents: "none",
-          opacity: 0,
-          margin: 0
-        }
-      });
-    };
     function useSwitch(props, param, ref) {
-      var [checked, setChecked] = param, { disabled, name, value, required } = props, hasConsumerStoppedPropagationRef = React4.useRef(!1), [button, setButton] = React4.useState(null), composedRefs = (0, import_compose_refs.useComposedRefs)(ref, setButton), isFormControl = import_constants4.isWeb ? button ? !!button.closest("form") : !0 : !1, labelId = (0, import_label.useLabelContext)(button), ariaLabelledBy = props["aria-labelledby"] || props.labeledBy || labelId;
+      var [checked, setChecked] = param;
       return {
         switchProps: {
-          role: "switch",
-          "aria-checked": checked,
-          ...import_constants4.isWeb ? {
-            tabIndex: disabled ? void 0 : 0,
-            "data-state": getState(checked),
-            "data-disabled": disabled ? "" : void 0,
-            disabled
-          } : {},
-          ...props,
-          "aria-labelledby": ariaLabelledBy,
-          onPress: (0, import_helpers.composeEventHandlers)(props.onPress, function(event) {
+          onPress() {
             setChecked(function(prevChecked) {
               return !prevChecked;
-            }), import_constants4.isWeb && isFormControl && (hasConsumerStoppedPropagationRef.current = event.isPropagationStopped(), hasConsumerStoppedPropagationRef.current || event.stopPropagation());
-          })
-        },
-        switchRef: composedRefs,
-        /**
-        * insert as a sibling of your switch (should not be inside the switch)
-        */
-        bubbleInput: import_constants4.isWeb && isFormControl ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(BubbleInput, {
-          control: button,
-          bubbles: !hasConsumerStoppedPropagationRef.current,
-          name,
-          value,
-          checked,
-          required,
-          disabled,
-          // We transform because the input is absolutely positioned but we have
-          // rendered it **after** the button. This pulls it back to sit on top
-          // of the button.
-          style: {
-            transform: "translateX(-100%)"
+            });
           }
-        }) : null
+        },
+        switchRef: ref,
+        bubbleInput: null
       };
+      var disabled, name, value, required, hasConsumerStoppedPropagationRef, button, setButton, composedRefs, isFormControl, labelId, ariaLabelledBy;
     }
   }
 });
@@ -29745,7 +29685,6 @@ var require_createSwitch_native = __commonJS({
           },
           alignSelf: initialChecked ? "flex-end" : "flex-start",
           x,
-          // TODO: remove ViewProps cast
           onLayout: (0, import_core12.composeEventHandlers)(props.onLayout, function(e) {
             return setThumbWidth(e.nativeEvent.layout.width);
           }),
@@ -29760,17 +29699,9 @@ var require_createSwitch_native = __commonJS({
           defaultProp: defaultChecked || !1,
           onChange: onCheckedChange,
           transition: !0
-        }), styledContext = React4.useContext(import_StyledContext.SwitchStyledContext.context), [frameWidth, setFrameWidth] = React4.useState(0), propsActive = (0, import_core12.useProps)(props, {
-          noNormalize: !0,
-          noExpand: !0,
-          resolveValues: "none",
-          forComponent: Frame
-        }), _styledContext_size, _ref, _styledContext_unstyled, _ref1, { switchProps, bubbleInput, switchRef } = (0, import_switch_headless.useSwitch)(
+        }), styledContext = React4.useContext(import_StyledContext.SwitchStyledContext.context), [frameWidth, setFrameWidth] = React4.useState(0), { switchProps, bubbleInput, switchRef } = (0, import_switch_headless.useSwitch)(
           // @ts-ignore
-          Object.assign({
-            size: (_ref = (_styledContext_size = styledContext.size) !== null && _styledContext_size !== void 0 ? _styledContext_size : props.size) !== null && _ref !== void 0 ? _ref : "$true",
-            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
@@ -29780,8 +29711,8 @@ var require_createSwitch_native = __commonJS({
         React4.useEffect(function() {
           if (props.id && !props.disabled) return (0, import_focusable2.registerFocusable)(props.id, {
             focusAndSelect: function() {
-              setChecked == null || setChecked(function(value) {
-                return !value;
+              setChecked == null || setChecked(function(value2) {
+                return !value2;
               });
             },
             focus: function() {
@@ -29792,16 +29723,28 @@ var require_createSwitch_native = __commonJS({
           props.disabled
         ]);
         var renderNative = (0, import_core12.shouldRenderNativePlatform)(native);
-        return renderNative === "android" || renderNative === "ios" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_react_native4.Switch, {
+        if (renderNative === "android" || renderNative === "ios") return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_react_native4.Switch, {
           value: checked,
           onValueChange: setChecked,
           ...nativeProps
-        }) : /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(SwitchContext.Provider, {
-          value: {
+        });
+        var disabled = props.disabled, value = React4.useMemo(function() {
+          return {
             checked,
-            disabled: switchProps.disabled,
+            disabled,
             frameWidth
-          },
+          };
+        }, [
+          checked,
+          disabled,
+          frameWidth
+        ]), handleLayout = React4.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__ */ (0, import_jsx_runtime6.jsxs)(SwitchContext.Provider, {
+          value,
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Frame, {
               ref: switchRef,
@@ -29809,6 +29752,11 @@ var require_createSwitch_native = __commonJS({
               ...import_core12.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,
@@ -29816,14 +29764,11 @@ var require_createSwitch_native = __commonJS({
               },
               // expected variants
               checked,
-              disabled: switchProps.disabled,
-              children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Stack, {
-                alignSelf: "stretch",
-                flex: 1,
-                onLayout: function(e) {
-                  setFrameWidth(e.nativeEvent.layout.width);
-                },
-                children: switchProps.children
+              disabled,
+              children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_react_native4.View, {
+                style: measureContainerStyle,
+                onLayout: handleLayout,
+                children: props.children
               })
             }),
             bubbleInput
@@ -29836,6 +29781,10 @@ var require_createSwitch_native = __commonJS({
         Thumb: SwitchThumbComponent
       });
     }
+    var measureContainerStyle = {
+      alignSelf: "stretch",
+      flex: 1
+    };
   }
 });