tamagui 1.88.18 → 1.88.19

package/dist/native.js

@@ -3935,8 +3935,14 @@ var require_getSplitStyles_native = __commonJS({
           style[keyInit] = valInit;
           continue;
         }
-        let expanded = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit ? [[keyInit, valInit]] : (0, import_propMapper.propMapper)(keyInit, valInit, styleState), next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
-        if (next && (styleState.fontFamily = next), process.env.NODE_ENV === "development" && debug === "verbose") {
+        let avoidPropMap = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
+        if (!avoidPropMap) {
+          if (!expanded)
+            continue;
+          let next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
+          next && (styleState.fontFamily = next);
+        }
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
           console.groupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
           try {
             !import_constants4.isServer && import_isDevTools.isDevTools && ((0, import_log.log)({
@@ -3959,192 +3965,195 @@ current`, {
           }
           console.groupEnd();
         }
-        if (expanded) {
-          for (let [key, val] of expanded)
-            if (!(val == null || key in usedKeys)) {
-              if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key in variants, (inlineProps != null && inlineProps.has(key) || IS_STATIC && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || ((_b = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _b[keyInit]))) {
-                passDownProp(viewProps, key, val, isMediaOrPseudo), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(` - passing down prop ${key}`), (0, import_log.log)({ val, after: { ...viewProps[key] } }), console.groupEnd());
+        let key = keyInit, val = valInit, max2 = expanded ? expanded.length : 1;
+        for (let i = 0; i < max2; i++) {
+          if (expanded) {
+            let [k, v] = expanded[i];
+            key = k, val = v;
+          }
+          if (!(val == null || key in usedKeys)) {
+            if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key in variants, (inlineProps != null && inlineProps.has(key) || IS_STATIC && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || ((_b = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _b[keyInit]))) {
+              passDownProp(viewProps, key, val, isMediaOrPseudo), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(` - passing down prop ${key}`), (0, import_log.log)({ val, after: { ...viewProps[key] } }), console.groupEnd());
+              continue;
+            }
+            if (isPseudo) {
+              if (!val)
+                continue;
+              let pseudoStyleObject = getSubStyle(
+                styleState,
+                key,
+                val,
+                styleProps.noClassNames
+              ), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
+              if (!descriptor)
+                continue;
+              if ((!shouldDoClasses || IS_STATIC) && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), IS_STATIC)) {
+                Object.assign(pseudos[key], pseudoStyleObject);
                 continue;
               }
-              if (isPseudo) {
-                if (!val)
-                  continue;
-                let pseudoStyleObject = getSubStyle(
-                  styleState,
-                  key,
-                  val,
-                  styleProps.noClassNames
-                ), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
-                if (!descriptor)
-                  continue;
-                if ((!shouldDoClasses || IS_STATIC) && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), IS_STATIC)) {
-                  Object.assign(pseudos[key], pseudoStyleObject);
-                  continue;
-                }
-                if (shouldDoClasses && !isExit) {
-                  let pseudoStyles = (0, import_getStylesAtomic.generateAtomicStyles)(pseudoStyleObject, descriptor);
-                  process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo (classes)", key), (0, import_log.log)({ pseudoStyleObject, pseudoStyles }), console.groupEnd());
-                  for (let psuedoStyle of pseudoStyles)
-                    `${psuedoStyle.property}${PROP_SPLIT}${descriptor.name}` in usedKeys || psuedoStyle.identifier;
-                }
-                if (!shouldDoClasses || isExit || isEnter) {
-                  let descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
-                  isExit && (isDisabled = !styleProps.isExiting), isEnter && (isDisabled = componentState.unmounted === "should-enter" ? !0 : !componentState.unmounted), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo", key, { isDisabled }), (0, import_log.log)({ pseudoStyleObject, isDisabled, descriptor, componentState }), console.groupEnd());
-                  let importance = descriptor.priority;
-                  for (let pkey in pseudoStyleObject) {
-                    let val2 = pseudoStyleObject[pkey];
-                    if (isDisabled) {
-                      let defaultValues = animatableDefaults[pkey];
-                      defaultValues != null && !(pkey in usedKeys) && !(pkey in styleState.style) && mergeStyle(styleState, pkey, defaultValues);
-                    } else {
-                      let curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
-                      shouldMerge && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
-                        importance,
-                        curImportance,
-                        pkey,
-                        val: val2,
-                        transforms: { ...styleState.transforms }
-                      });
-                    }
+              if (shouldDoClasses && !isExit) {
+                let pseudoStyles = (0, import_getStylesAtomic.generateAtomicStyles)(pseudoStyleObject, descriptor);
+                process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo (classes)", key), (0, import_log.log)({ pseudoStyleObject, pseudoStyles }), console.groupEnd());
+                for (let psuedoStyle of pseudoStyles)
+                  `${psuedoStyle.property}${PROP_SPLIT}${descriptor.name}` in usedKeys || psuedoStyle.identifier;
+              }
+              if (!shouldDoClasses || isExit || isEnter) {
+                let descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
+                isExit && (isDisabled = !styleProps.isExiting), isEnter && (isDisabled = componentState.unmounted === "should-enter" ? !0 : !componentState.unmounted), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo", key, { isDisabled }), (0, import_log.log)({ pseudoStyleObject, isDisabled, descriptor, componentState }), console.groupEnd());
+                let importance = descriptor.priority;
+                for (let pkey in pseudoStyleObject) {
+                  let val2 = pseudoStyleObject[pkey];
+                  if (isDisabled) {
+                    let defaultValues = animatableDefaults[pkey];
+                    defaultValues != null && !(pkey in usedKeys) && !(pkey in styleState.style) && mergeStyle(styleState, pkey, defaultValues);
+                  } else {
+                    let curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
+                    shouldMerge && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
+                      importance,
+                      curImportance,
+                      pkey,
+                      val: val2,
+                      transforms: { ...styleState.transforms }
+                    });
                   }
-                  if (!isDisabled)
-                    for (let key2 in val) {
-                      let k = shorthands[key2] || key2;
-                      usedKeys[k] = Math.max(importance, usedKeys[k] || 0);
-                    }
                 }
+                if (!isDisabled)
+                  for (let key2 in val) {
+                    let k = shorthands[key2] || key2;
+                    usedKeys[k] = Math.max(importance, usedKeys[k] || 0);
+                  }
+              }
+              continue;
+            }
+            if (isMedia) {
+              if (!val)
                 continue;
+              if (isMedia === "platform") {
+                let platform = key.slice(10);
+                if (
+                  // supports web, ios, android
+                  platform !== import_constants4.currentPlatform && // supports web, native
+                  platform !== "native"
+                )
+                  continue;
               }
-              if (isMedia) {
-                if (!val)
+              hasMedia || (hasMedia = !0);
+              let mediaStyle = getSubStyle(
+                styleState,
+                key,
+                val,
+                // TODO try true like pseudo
+                !1
+              ), mediaKeyShort = key.slice(1);
+              process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} ${key}`, {
+                key,
+                val,
+                mediaStyle,
+                props,
+                shouldDoClasses,
+                componentState
+              });
+              let hasSpace = val.space;
+              if ((hasSpace || !shouldDoClasses) && (Array.isArray(hasMedia) || (hasMedia = []), hasMedia.push(mediaKeyShort)), shouldDoClasses) {
+                if (hasSpace && (delete mediaStyle.space, mediaState3[mediaKeyShort])) {
+                  let importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(
+                    mediaKeyShort,
+                    "space",
+                    usedKeys,
+                    !0
+                  );
+                  importance && (space = val.space, usedKeys.space = importance, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(
+                    `Found more important space for current media ${mediaKeyShort}: ${val} (importance: ${importance})`
+                  ));
+                }
+                let mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle, debug), priority = mediaStylesSeen;
+                mediaStylesSeen += 1;
+                for (let style2 of mediaStyles) {
+                  let out = (0, import_createMediaStyle.createMediaStyle)(
+                    style2,
+                    mediaKeyShort,
+                    import_useMedia.mediaQueryConfig,
+                    isMedia,
+                    !1,
+                    priority
+                  );
+                  process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out), `${style2.property}${PROP_SPLIT}${mediaKeyShort}` in usedKeys || out.identifier;
+                }
+              } else {
+                let isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group";
+                if (!isThemeMedia && isMedia !== "platform" && !isGroupMedia && !mediaState3[mediaKeyShort])
                   continue;
-                if (isMedia === "platform") {
-                  let platform = key.slice(10);
-                  if (
-                    // supports web, ios, android
-                    platform !== import_constants4.currentPlatform && // supports web, native
-                    platform !== "native"
-                  )
+                let importanceBump = 0;
+                if (isThemeMedia) {
+                  dynamicThemeAccess = !0;
+                  let mediaThemeName = mediaKeyShort.slice(6);
+                  if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName)))
                     continue;
-                }
-                hasMedia || (hasMedia = !0);
-                let mediaStyle = getSubStyle(
-                  styleState,
-                  key,
-                  val,
-                  // TODO try true like pseudo
-                  !1
-                ), mediaKeyShort = key.slice(1);
-                process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} ${key}`, {
-                  key,
-                  val,
-                  mediaStyle,
-                  props,
-                  shouldDoClasses,
-                  componentState
-                });
-                let hasSpace = val.space;
-                if ((hasSpace || !shouldDoClasses) && (Array.isArray(hasMedia) || (hasMedia = []), hasMedia.push(mediaKeyShort)), shouldDoClasses) {
-                  if (hasSpace && (delete mediaStyle.space, mediaState3[mediaKeyShort])) {
-                    let importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(
-                      mediaKeyShort,
-                      "space",
-                      usedKeys,
-                      !0
-                    );
-                    importance && (space = val.space, usedKeys.space = importance, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(
-                      `Found more important space for current media ${mediaKeyShort}: ${val} (importance: ${importance})`
-                    ));
-                  }
-                  let mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle, debug), priority = mediaStylesSeen;
-                  mediaStylesSeen += 1;
-                  for (let style2 of mediaStyles) {
-                    let out = (0, import_createMediaStyle.createMediaStyle)(
-                      style2,
-                      mediaKeyShort,
-                      import_useMedia.mediaQueryConfig,
-                      isMedia,
-                      !1,
-                      priority
-                    );
-                    process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out), `${style2.property}${PROP_SPLIT}${mediaKeyShort}` in usedKeys || out.identifier;
-                  }
-                } else {
-                  let isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group";
-                  if (!isThemeMedia && isMedia !== "platform" && !isGroupMedia && !mediaState3[mediaKeyShort])
+                } else if (isGroupMedia) {
+                  let groupInfo = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyShort), groupName = groupInfo.name, groupContext = context == null ? void 0 : context.groups.state[groupName];
+                  if (!groupContext) {
+                    process.env.NODE_ENV === "development" && debug && console.warn(`No parent with group prop, skipping styles: ${groupName}`);
                     continue;
-                  let importanceBump = 0;
-                  if (isThemeMedia) {
-                    dynamicThemeAccess = !0;
-                    let mediaThemeName = mediaKeyShort.slice(6);
-                    if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName)))
-                      continue;
-                  } else if (isGroupMedia) {
-                    let groupInfo = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyShort), groupName = groupInfo.name, groupContext = context == null ? void 0 : context.groups.state[groupName];
-                    if (!groupContext) {
-                      process.env.NODE_ENV === "development" && debug && console.warn(`No parent with group prop, skipping styles: ${groupName}`);
+                  }
+                  let groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media, componentGroupState = (_c = componentState.group) == null ? void 0 : _c[groupName];
+                  if (groupMediaKey) {
+                    mediaGroups || (mediaGroups = /* @__PURE__ */ new Set()), mediaGroups.add(groupMediaKey);
+                    let mediaState22 = componentGroupState == null ? void 0 : componentGroupState.media, isActive = mediaState22 == null ? void 0 : mediaState22[groupMediaKey];
+                    if (!mediaState22 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), !isActive)
                       continue;
-                    }
-                    let groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media, componentGroupState = (_c = componentState.group) == null ? void 0 : _c[groupName];
-                    if (groupMediaKey) {
-                      mediaGroups || (mediaGroups = /* @__PURE__ */ new Set()), mediaGroups.add(groupMediaKey);
-                      let mediaState22 = componentGroupState == null ? void 0 : componentGroupState.media, isActive = mediaState22 == null ? void 0 : mediaState22[groupMediaKey];
-                      if (!mediaState22 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), !isActive)
-                        continue;
-                      importanceBump = 2;
-                    }
-                    if (groupPseudoKey) {
-                      pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set()), pseudoGroups.add(groupName);
-                      let componentGroupPseudoState = (componentGroupState || // fallback to context initially
-                      context.groups.state[groupName]).pseudo;
-                      if (!(componentGroupPseudoState != null && componentGroupPseudoState[groupPseudoKey]))
-                        continue;
-                      importanceBump = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
-                    }
+                    importanceBump = 2;
                   }
-                  for (let subKey in mediaStyle) {
-                    if (subKey === "space") {
-                      space = valInit.space;
+                  if (groupPseudoKey) {
+                    pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set()), pseudoGroups.add(groupName);
+                    let componentGroupPseudoState = (componentGroupState || // fallback to context initially
+                    context.groups.state[groupName]).pseudo;
+                    if (!(componentGroupPseudoState != null && componentGroupPseudoState[groupPseudoKey]))
                       continue;
-                    }
-                    (0, import_useMedia.mergeMediaByImportance)(
-                      style,
-                      mediaKeyShort,
-                      subKey,
-                      mediaStyle[subKey],
-                      usedKeys,
-                      mediaState3[mediaKeyShort],
-                      importanceBump
-                    ), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
+                    importanceBump = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
                   }
                 }
-                continue;
-              }
-              if (key === "pointerEvents") {
-                viewProps[key] = val;
-                continue;
-              }
-              if (
-                // is HOC we can just pass through the styles as props
-                // this fixes issues where style prop got merged with wrong priority
-                !isHOC && (isValidStyleKey(key, staticConfig) || import_constants4.isAndroid && key === "elevation")
-              ) {
-                mergeStyle(styleState, key, val);
-                continue;
+                for (let subKey in mediaStyle) {
+                  if (subKey === "space") {
+                    space = valInit.space;
+                    continue;
+                  }
+                  (0, import_useMedia.mergeMediaByImportance)(
+                    style,
+                    mediaKeyShort,
+                    subKey,
+                    mediaStyle[subKey],
+                    usedKeys,
+                    mediaState3[mediaKeyShort],
+                    importanceBump
+                  ), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
+                }
               }
-              isVariant || (viewProps[key] = val);
+              continue;
             }
-          if (process.env.NODE_ENV === "development" && debug === "verbose") {
-            console.groupCollapsed(" \u2714\uFE0F expand complete", keyInit);
-            try {
-              (0, import_log.log)("style", { ...style }), (0, import_log.log)("transforms", { ...transforms }), (0, import_log.log)("viewProps", { ...viewProps });
-            } catch {
+            if (key === "pointerEvents") {
+              viewProps[key] = val;
+              continue;
             }
-            console.groupEnd();
+            if (
+              // is HOC we can just pass through the styles as props
+              // this fixes issues where style prop got merged with wrong priority
+              !isHOC && (isValidStyleKey(key, staticConfig) || import_constants4.isAndroid && key === "elevation")
+            ) {
+              mergeStyle(styleState, key, val);
+              continue;
+            }
+            isVariant || (viewProps[key] = val);
           }
         }
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
+          try {
+            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", { ...style }), (0, import_log.log)("transforms", { ...transforms }), (0, import_log.log)("viewProps", { ...viewProps });
+          } catch {
+          }
+          console.groupEnd();
+        }
       }
-      if (process.env.NODE_ENV === "development" && console.groupEnd(), props.style)
+      if (props.style)
         if (isHOC)
           viewProps.style = props.style;
         else
@@ -5053,8 +5062,9 @@ If you meant to do this, you can disable this warning - either change untilMeasu
                 willBeAnimated
               }));
             } catch {
+            } finally {
+              console.groupEnd();
             }
-            console.groupEnd();
           } else {
             (0, import_log.log)(title), (0, import_log.log)("final styles:");
             for (let key in splitStylesStyle)