tamagui 1.106.0 → 1.107.0

package/dist/native.js

@@ -5451,7 +5451,7 @@ var require_createMediaStyle_native = __commonJS({
         return rule.replace(identifier, nextIdentifier);
       }).join(";"), isHover = !1;
       if (isNonWindowMedia) {
-        var specificity = (priority || 0) + (isGroup ? 1 : 0);
+        var specificity = (priority || 0) + (isGroup || isPlatform ? 1 : 0);
         if (isTheme || isGroup) {
           var _getGroupPropParts = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyIn), name = _getGroupPropParts.name, media = _getGroupPropParts.media, pseudo = _getGroupPropParts.pseudo;
           groupMediaKey = media, isGroup && (containerName = name);
@@ -8105,10 +8105,8 @@ current`, _object_spread9({}, styleState.style)));
                     var importance = descriptor.priority;
                     for (var pkey in pseudoStyleObject) {
                       var val1 = pseudoStyleObject[pkey];
-                      if (isDisabled) {
-                        var defaultValues = animatableDefaults[pkey];
-                        defaultValues != null && !(pkey in usedKeys) && (!styleState.style || !(pkey in styleState.style)) && mergeStyle(styleState, pkey, defaultValues);
-                      } else {
+                      if (isDisabled) applyDefaultStyle(pkey, styleState);
+                      else {
                         var curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
                         if (shouldMerge) {
                           var _pseudos1, _key1;
@@ -8197,14 +8195,20 @@ current`, _object_spread9({}, styleState.style)));
                       if (groupMediaKey) {
                         mediaGroups || (mediaGroups = /* @__PURE__ */ new Set()), mediaGroups.add(groupMediaKey);
                         var mediaState1 = componentGroupState == null ? void 0 : componentGroupState.media, isActive = mediaState1 == null ? void 0 : mediaState1[groupMediaKey];
-                        if (!mediaState1 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP media ".concat(groupMediaKey, " active? ").concat(isActive)), !isActive) continue;
+                        if (!mediaState1 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP media ".concat(groupMediaKey, " active? ").concat(isActive)), !isActive) {
+                          for (var pkey1 in mediaStyle1) applyDefaultStyle(pkey1, styleState);
+                          continue;
+                        }
                         importanceBump = 2;
                       }
                       if (groupPseudoKey) {
                         pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set()), pseudoGroups.add(groupName);
                         var componentGroupPseudoState = (componentGroupState || // fallback to context initially
                         context.groups.state[groupName]).pseudo, isActive1 = componentGroupPseudoState == null ? void 0 : componentGroupPseudoState[groupPseudoKey], priority1 = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
-                        if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP pseudo ".concat(groupMediaKey, " active? ").concat(isActive1, ", priority ").concat(priority1)), !isActive1) continue;
+                        if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP pseudo ".concat(groupMediaKey, " active? ").concat(isActive1, ", priority ").concat(priority1)), !isActive1) {
+                          for (var pkey2 in mediaStyle1) applyDefaultStyle(pkey2, styleState);
+                          continue;
+                        }
                         importanceBump = priority1;
                       }
                     }
@@ -8214,7 +8218,9 @@ current`, _object_spread9({}, styleState.style)));
                         space = valInit.space;
                         continue;
                       }
-                      (_styleState1 = styleState).style || (_styleState1.style = {}), mergeMediaByImportance(styleState, mediaKeyShort, subKey, mediaStyle1[subKey], usedKeys, mediaState3[mediaKeyShort], importanceBump, debug), key === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
+                      (_styleState1 = styleState).style || (_styleState1.style = {});
+                      var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, subKey, mediaStyle1[subKey], usedKeys, mediaState3[mediaKeyShort], importanceBump, debug);
+                      didMerge && key === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
                     }
                   }
                   continue;
@@ -8463,6 +8469,10 @@ current`, _object_spread9({}, styleState.style)));
       }
       return import_constants4.isWeb && Array.isArray(out.transform) && (out.transform = (0, import_transformsToString.transformsToString)(out.transform)), (0, import_expandStyles.fixStyles)(out), out;
     }
+    function applyDefaultStyle(pkey, styleState) {
+      var defaultValues = animatableDefaults[pkey];
+      defaultValues != null && !(pkey in styleState.usedKeys) && (!styleState.style || !(pkey in styleState.style)) && mergeStyle(styleState, pkey, defaultValues);
+    }
   }
 });
 
@@ -10288,11 +10298,11 @@ If you meant to do this, you can disable this warning - either change untilMeasu
     }, subscribeToContextGroup = function(param) {
       var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? !1 : _param_disabled, setStateShallow = param.setStateShallow, pseudoGroups = param.pseudoGroups, mediaGroups = param.mediaGroups, componentContext = param.componentContext, state = param.state;
       if (pseudoGroups || mediaGroups) {
-        var _componentContext_groups, current = {
+        var _componentContext_groups_subscribe, _componentContext_groups, current = {
           pseudo: {},
           media: {}
         };
-        return process.env.NODE_ENV === "development" && !componentContext.groups && console.debug("No context group found"), (_componentContext_groups = componentContext.groups) === null || _componentContext_groups === void 0 ? void 0 : _componentContext_groups.subscribe(function(name, param2) {
+        return process.env.NODE_ENV === "development" && !componentContext.groups && console.debug("No context group found"), (_componentContext_groups = componentContext.groups) === null || _componentContext_groups === void 0 || (_componentContext_groups_subscribe = _componentContext_groups.subscribe) === null || _componentContext_groups_subscribe === void 0 ? void 0 : _componentContext_groups_subscribe.call(_componentContext_groups, function(name, param2) {
           var layout = param2.layout, pseudo = param2.pseudo, persist = function() {
             var group = _object_spread_props8(_object_spread9({}, state.group), _define_property9({}, name, current));
             setStateShallow({
@@ -17990,7 +18000,7 @@ var require_Adapt_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(Adapt_exports);
-    var import_jsx_runtime6 = require("react/jsx-runtime"), import_constants4 = require_index_native6(), import_constants22 = require_index_native6(), import_core12 = require_index_native16(), import_helpers = require_index_native7(), import_react4 = require("react");
+    var import_jsx_runtime6 = require("react/jsx-runtime"), import_constants4 = require_index_native6(), import_core12 = require_index_native16(), import_helpers = require_index_native7(), import_react4 = require("react");
     function _array_like_to_array2(arr, len) {
       (len == null || len > arr.length) && (len = arr.length);
       for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -18057,14 +18067,19 @@ var require_Adapt_native = __commonJS({
         when
       };
     }, Adapt = (0, import_helpers.withStaticProperties)(function(param) {
-      var platform2 = param.platform, when = param.when, children = param.children, context = (0, import_react4.useContext)(AdaptParentContext), media = (0, import_core12.useMedia)(), enabled = !platform2;
-      return platform2 === "touch" && (enabled = import_constants22.isTouchable), platform2 === "native" && (enabled = !import_constants4.isWeb), platform2 === "web" && (enabled = import_constants4.isWeb), platform2 === "ios" && (enabled = import_constants4.isIos), platform2 === "android" && (enabled = import_constants4.isAndroid), when && !media[when] && (enabled = !1), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
+      var platform2 = param.platform, when = param.when, children = param.children, context = (0, import_react4.useContext)(AdaptParentContext), media = (0, import_core12.useMedia)(), enabled = !1;
+      return typeof when == "function" ? enabled = when({
+        media
+      }) : (enabled = !platform2, platform2 === "touch" && (enabled = import_constants4.isTouchable), platform2 === "native" && (enabled = !import_constants4.isWeb), platform2 === "web" && (enabled = import_constants4.isWeb), platform2 === "ios" && (enabled = import_constants4.isIos), platform2 === "android" && (enabled = import_constants4.isAndroid), when && !media[when] && (enabled = !1)), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
         enabled && (context == null || context.setWhen(when || enabled));
       }, [
         when,
         context,
         enabled
-      ]), enabled ? children : null;
+      ]), enabled ? typeof children == "function" ? children({
+        enabled,
+        media
+      }) : children : null;
     }, {
       Contents: AdaptContents
     });