@tamagui/core 1.91.2 → 1.91.4

package/dist/test.native.js

@@ -3230,6 +3230,9 @@ var require_constants_native2 = __commonJS({
       }), mod);
     }, constants_exports = {};
     __export2(constants_exports, {
+      FONT_DATA_ATTRIBUTE_NAME: function() {
+        return FONT_DATA_ATTRIBUTE_NAME;
+      },
       THEME_CLASSNAME_PREFIX: function() {
         return THEME_CLASSNAME_PREFIX;
       },
@@ -3244,7 +3247,7 @@ var require_constants_native2 = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(constants_exports);
-    var THEME_NAME_SEPARATOR = "_", THEME_CLASSNAME_PREFIX = "t_", stackDefaultStyles = {}, webViewFlexCompatStyles = {
+    var THEME_NAME_SEPARATOR = "_", THEME_CLASSNAME_PREFIX = "t_", FONT_DATA_ATTRIBUTE_NAME = "data-tamagui-font", stackDefaultStyles = {}, webViewFlexCompatStyles = {
       display: "flex",
       alignItems: "stretch",
       flexDirection: "column",
@@ -4012,9 +4015,9 @@ var require_useTheme_native = __commonJS({
         }
         var isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse);
         isNewTheme2 && registerThemeManager(themeManager2);
-        var mounted2 = props.inverse ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
+        var isWebSSR = import_constants.isWeb ? !(0, import_config.getConfig)().disableSSR : !1, mounted2 = isWebSSR ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
         state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
-        var wasInversed = prev == null ? void 0 : prev.inversed, nextInversed = isNewTheme2 && state2.scheme !== (parentManager == null ? void 0 : parentManager.state.scheme), inversed2 = nextInversed ? !0 : wasInversed != null ? !1 : null, response = {
+        var wasInversed = prev == null ? void 0 : prev.inversed, isInherentlyInversed = isNewTheme2 && state2.scheme !== (parentManager == null ? void 0 : parentManager.state.scheme), inversed2 = isInherentlyInversed ? !0 : isWebSSR ? wasInversed != null ? !1 : null : props.inverse, response = {
           themeManager: themeManager2,
           isNewTheme: isNewTheme2,
           mounted: mounted2,
@@ -4069,7 +4072,7 @@ var require_useTheme_native = __commonJS({
         props.name,
         props.reset,
         mounted
-      ]), isInversingOnMount ? {
+      ]), import_constants.isWeb && isInversingOnMount ? {
         isNewTheme: !1,
         inversed: !1,
         themeManager: parentManager,
@@ -7550,7 +7553,7 @@ var require_getSplitStyles_native = __commonJS({
         if (isHOC)
           viewProps.style = normalizeStyle(styleProp);
         else
-          for (var isArray = Array.isArray(styleProp), len = isArray ? props.length : 1, i1 = 0; i1 < len; i1++) {
+          for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i1 = 0; i1 < len; i1++) {
             var style1 = isArray ? styleProp[i1] : styleProp;
             if (style1)
               if (style1.$$css)
@@ -7560,6 +7563,14 @@ var require_getSplitStyles_native = __commonJS({
                 (_styleState4 = styleState).style || (_styleState4.style = {}), Object.assign(styleState.style, normalizeStyle(style1));
               }
           }
+      var style2 = styleState.style;
+      if (style2 != null && style2.fontFamily) {
+        var _getFont, faceInfo = (_getFont = (0, import_config.getFont)(style2.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
+        if (faceInfo) {
+          var _faceInfo_style_fontWeight_, _faceInfo_style_fontWeight, overrideFace = (_faceInfo_style_fontWeight = faceInfo[style2.fontWeight]) === null || _faceInfo_style_fontWeight === void 0 || (_faceInfo_style_fontWeight_ = _faceInfo_style_fontWeight[style2.fontStyle || "normal"]) === null || _faceInfo_style_fontWeight_ === void 0 ? void 0 : _faceInfo_style_fontWeight_.val;
+          overrideFace && (style2.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style2.fontWeight, delete style2.fontStyle);
+        }
+      }
       var result = {
         space,
         hasMedia,
@@ -7572,15 +7583,7 @@ var require_getSplitStyles_native = __commonJS({
         dynamicThemeAccess,
         pseudoGroups,
         mediaGroups
-      }, style2 = styleState.style;
-      if (style2 != null && style2.fontFamily) {
-        var _getFont, faceInfo = (_getFont = (0, import_config.getFont)(style2.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
-        if (faceInfo) {
-          var _faceInfo_style_fontWeight_, _faceInfo_style_fontWeight, overrideFace = (_faceInfo_style_fontWeight = faceInfo[style2.fontWeight]) === null || _faceInfo_style_fontWeight === void 0 || (_faceInfo_style_fontWeight_ = _faceInfo_style_fontWeight[style2.fontStyle || "normal"]) === null || _faceInfo_style_fontWeight_ === void 0 ? void 0 : _faceInfo_style_fontWeight_.val;
-          overrideFace && (style2.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style2.fontWeight, delete style2.fontStyle);
-        }
-      }
-      var asChild = props.asChild, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
+      }, asChild = props.asChild, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
       if (!asChildExceptStyleLike) {
         var style3 = styleState.style;
         if (0) {
@@ -8553,7 +8556,16 @@ var require_createComponent_native = __commonJS({
         return x();
       }), mouseUps.clear();
     }, addEventListener("mouseup", cancelTouches), addEventListener("touchend", cancelTouches), addEventListener("touchcancel", cancelTouches));
-    var cancelTouches, BaseText, BaseView, hasSetupBaseViews = !1;
+    var cancelTouches, BaseText, BaseView, hasSetupBaseViews = !1, lastInteractionWasKeyboard = {
+      value: !1
+    };
+    import_constants.isWeb && globalThis.document && (document.addEventListener("keydown", function() {
+      lastInteractionWasKeyboard.value = !0;
+    }), document.addEventListener("mousedown", function() {
+      lastInteractionWasKeyboard.value = !1;
+    }), document.addEventListener("mousemove", function() {
+      lastInteractionWasKeyboard.value = !1;
+    }));
     function createComponent(staticConfig) {
       var _staticConfig_defaultProps, componentName = staticConfig.componentName, config = null, defaultProps = staticConfig.defaultProps;
       (0, import_config.onConfiguredOnce)(function(conf) {
@@ -8594,9 +8606,7 @@ var require_createComponent_native = __commonJS({
         var debugProp = props.debug, componentName2 = props.componentName || staticConfig.componentName;
         if (0)
           var timer;
-        var stateRef = (0, import_react3.useRef)({
-          handleFocusVisible: !0
-        }), animationsConfig = componentContext.animationDriver, useAnimations = animationsConfig == null ? void 0 : animationsConfig.useAnimations, hasAnimationProp = !!("animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSSVars = animationsConfig == null ? void 0 : animationsConfig.supportsCSSVars, curState = stateRef.current, willBeAnimatedClient = function() {
+        var stateRef = (0, import_react3.useRef)({}), animationsConfig = componentContext.animationDriver, useAnimations = animationsConfig == null ? void 0 : animationsConfig.useAnimations, hasAnimationProp = !!("animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSSVars = animationsConfig == null ? void 0 : animationsConfig.supportsCSSVars, curState = stateRef.current, willBeAnimatedClient = function() {
           var next = !!(hasAnimationProp && !isHOC && useAnimations);
           return !!(next || curState.hasAnimated);
         }(), willBeAnimated = !import_constants.isServer && willBeAnimatedClient;
@@ -8761,11 +8771,11 @@ var require_createComponent_native = __commonJS({
             }
             var disposeGroupsListener;
             if (pseudoGroups || mediaGroups) {
-              var current = {
+              var _componentContext_groups, current = {
                 pseudo: {},
                 media: {}
               };
-              disposeGroupsListener = componentContext.groups.subscribe(function(name2, param) {
+              disposeGroupsListener = (_componentContext_groups = componentContext.groups) === null || _componentContext_groups === void 0 ? void 0 : _componentContext_groups.subscribe(function(name2, param) {
                 var layout = param.layout, pseudo = param.pseudo, persist = function() {
                   var group = _object_spread_props(_object_spread2({}, state.group), _define_property2({}, name2, current));
                   setStateShallow({
@@ -8792,7 +8802,7 @@ var require_createComponent_native = __commonJS({
         ]);
         var runtimePressStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusStyle), runtimeFocusVisibleStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusVisibleStyle), attachFocus = !!(runtimePressStyle || runtimeFocusStyle || runtimeFocusVisibleStyle || onFocus || onBlur), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onMouseDown || onMouseUp || onLongPress || onClick || pseudos != null && pseudos.focusVisibleStyle), runtimeHoverStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = !!(groupName || runtimeHoverStyle || onHoverIn || onHoverOut), attachHover = import_constants.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), shouldAttach = !disabled && !props.asChild && !!(attachFocus || attachPress || attachHover || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle), needsPressState = !!(groupName || runtimeHoverStyle), events = shouldAttach ? _object_spread2(_object_spread_props(_object_spread2({
           onPressOut: attachPress ? function(e) {
-            stateRef.current.handleFocusVisible = !0, unPress(), onPressOut == null || onPressOut(e), onMouseUp == null || onMouseUp(e);
+            unPress(), onPressOut == null || onPressOut(e), onMouseUp == null || onMouseUp(e);
           } : void 0
         }, (attachHover || attachPress) && {
           onMouseEnter: function(e) {
@@ -8805,7 +8815,7 @@ var require_createComponent_native = __commonJS({
           }
         }), {
           onPressIn: attachPress ? function(e) {
-            stateRef.current.handleFocusVisible = !1, runtimePressStyle && setStateShallow({
+            runtimePressStyle && setStateShallow({
               press: !0,
               pressIn: !0
             }), onPressIn == null || onPressIn(e), onMouseDown == null || onMouseDown(e), import_constants.isWeb && mouseUps.add(unPress);
@@ -8822,7 +8832,7 @@ var require_createComponent_native = __commonJS({
             pseudos != null && pseudos.focusVisibleStyle ? setTimeout(function() {
               setStateShallow({
                 focus: !0,
-                focusVisible: !!stateRef.current.handleFocusVisible
+                focusVisible: !!lastInteractionWasKeyboard.value
               });
             }, 0) : setStateShallow({
               focus: !0,
@@ -8830,7 +8840,7 @@ var require_createComponent_native = __commonJS({
             }), onFocus == null || onFocus(e);
           },
           onBlur: function(e) {
-            stateRef.current.handleFocusVisible = !0, setStateShallow({
+            setStateShallow({
               focus: !1,
               focusVisible: !1
             }), onBlur == null || onBlur(e);
@@ -9779,11 +9789,11 @@ var require_insertFont_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(insertFont_exports);
-    var import_config = require_config_native(), import_createFont = require_createFont_native(), import_createVariables = require_createVariables_native(), import_registerCSSVariable = require_registerCSSVariable_native();
+    var import_config = require_config_native(), import_constants = require_constants_native2(), import_createFont = require_createFont_native(), import_createVariables = require_createVariables_native(), import_registerCSSVariable = require_registerCSSVariable_native();
     function insertFont(name, fontIn) {
       var font = (0, import_createFont.createFont)(fontIn), tokened = (0, import_createVariables.createVariables)(font, name), parsed = parseFont(tokened);
       if (0)
-        var fontVars, style;
+        var fontVars, styleElement;
       return (0, import_config.setConfigFont)(name, tokened, parsed), parsed;
     }
     var updateFont = insertFont;