tamagui 1.101.4 → 1.101.6

package/dist/native.js

@@ -2753,45 +2753,34 @@ var require_insertStyleRule_native = __commonJS({
     }
     function insertStyleRules(rulesToInsert) {
       if (!process.env.TAMAGUI_REACT_19) {
-        if (!rulesToInsert.length || !sheet) return;
-        var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
-        try {
-          for (var _iterator = rulesToInsert[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-            var styleObject = _step.value, identifier = styleObject[import_helpers.StyleObjectIdentifier];
-            if (shouldInsertStyleRules(identifier)) {
-              var rules = styleObject[import_helpers.StyleObjectRules];
-              allSelectors[identifier] = rules.join(`
+        if (!sheet) return;
+        for (var key in rulesToInsert) {
+          var styleObject = rulesToInsert[key], identifier = styleObject[import_helpers.StyleObjectIdentifier];
+          if (shouldInsertStyleRules(identifier)) {
+            var rules = styleObject[import_helpers.StyleObjectRules];
+            allSelectors[identifier] = rules.join(`
 `), track(identifier), updateRules(identifier, rules);
-              var _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0;
-              try {
-                for (var _iterator1 = rules[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
-                  var rule = _step1.value;
-                  if (process.env.NODE_ENV === "production") try {
-                    sheet.insertRule(rule, sheet.cssRules.length);
-                  } catch (err) {
-                    console.error("Error inserting CSS", err);
-                  }
-                  else sheet.insertRule(rule, sheet.cssRules.length);
+            var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+            try {
+              for (var _iterator = rules[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+                var rule = _step.value;
+                if (process.env.NODE_ENV === "production") try {
+                  sheet.insertRule(rule, sheet.cssRules.length);
+                } catch (err) {
+                  console.error("Error inserting CSS", err);
                 }
-              } catch (err) {
-                _didIteratorError1 = !0, _iteratorError1 = err;
+                else sheet.insertRule(rule, sheet.cssRules.length);
+              }
+            } catch (err) {
+              _didIteratorError = !0, _iteratorError = err;
+            } finally {
+              try {
+                !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
               } finally {
-                try {
-                  !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
-                } finally {
-                  if (_didIteratorError1) throw _iteratorError1;
-                }
+                if (_didIteratorError) throw _iteratorError;
               }
             }
           }
-        } catch (err) {
-          _didIteratorError = !0, _iteratorError = err;
-        } finally {
-          try {
-            !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-          } finally {
-            if (_didIteratorError) throw _iteratorError;
-          }
         }
       }
     }
@@ -7793,7 +7782,7 @@ current`, _object_spread9({}, styleState.style)));
                     try {
                       for (var _iterator = pseudoStyles[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
                         var psuedoStyle = _step.value, fullKey = "".concat(psuedoStyle[import_helpers.StyleObjectProperty]).concat(PROP_SPLIT).concat(descriptor.name);
-                        fullKey in usedKeys || mergeClassName(transforms, classNames, fullKey, psuedoStyle[import_helpers.StyleObjectIdentifier], isMediaOrPseudo1, !0);
+                        fullKey in usedKeys || (addStyleToInsertRules(rulesToInsert, psuedoStyle), mergeClassName(transforms, classNames, fullKey, psuedoStyle[import_helpers.StyleObjectIdentifier], isMediaOrPseudo1, !0));
                       }
                     } catch (err) {
                       _didIteratorError = !0, _iteratorError = err;
@@ -7875,7 +7864,7 @@ current`, _object_spread9({}, styleState.style)));
                         var style = _step1.value, out = (0, import_createMediaStyle.createMediaStyle)(style, mediaKeyShort, import_useMedia.mediaQueryConfig, isMedia, !1, priority);
                         process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out);
                         var fullKey1 = "".concat(style[import_helpers.StyleObjectProperty]).concat(PROP_SPLIT).concat(mediaKeyShort).concat(style[import_helpers.StyleObjectPseudo] || "");
-                        fullKey1 in usedKeys || mergeClassName(transforms, classNames, fullKey1, out[import_helpers.StyleObjectIdentifier], !0, !0);
+                        fullKey1 in usedKeys || (addStyleToInsertRules(rulesToInsert, out), mergeClassName(transforms, classNames, fullKey1, out[import_helpers.StyleObjectIdentifier], !0, !0));
                       }
                     } catch (err) {
                       _didIteratorError1 = !0, _iteratorError1 = err;
@@ -8120,7 +8109,11 @@ current`, _object_spread9({}, styleState.style)));
       conf = conf || (0, import_config.getConfig)();
       var res = getSplitStyles(a, b, c, d, e, f, g, h, i, j);
       return res;
-    }, defaultColor = process.env.TAMAGUI_DEFAULT_COLOR || "rgba(0,0,0,0)", animatableDefaults = _object_spread_props8(_object_spread9({}, Object.fromEntries(Object.entries(import_helpers.tokenCategories.color).map(function(param) {
+    };
+    function addStyleToInsertRules(rulesToInsert, styleObject) {
+      if (0) var identifier;
+    }
+    var defaultColor = process.env.TAMAGUI_DEFAULT_COLOR || "rgba(0,0,0,0)", animatableDefaults = _object_spread_props8(_object_spread9({}, Object.fromEntries(Object.entries(import_helpers.tokenCategories.color).map(function(param) {
       var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
       return [
         k,
@@ -9746,23 +9739,27 @@ If you meant to do this, you can disable this warning - either change untilMeasu
             children: content
           }));
         }
-        if (process.env.TAMAGUI_REACT_19 && splitStyles.rulesToInsert.length && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, {
-          children: [
-            content,
-            /* lets see if we can put a single style tag per rule for optimal de-duping */
-            splitStyles.rulesToInsert.map(function(styleObject) {
-              var identifier = styleObject[import_helpers.StyleObjectIdentifier];
-              return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("style", {
-                // @ts-ignore
-                href: "t_".concat(identifier),
-                // @ts-ignore
-                precedence: "default",
-                children: styleObject[import_helpers.StyleObjectRules].join(`
+        if (process.env.TAMAGUI_REACT_19) {
+          var rulesToInsert = splitStyles.rulesToInsert, keys = Object.keys(splitStyles.rulesToInsert);
+          keys.length && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, {
+            children: [
+              content,
+              /* lets see if we can put a single style tag per rule for optimal de-duping */
+              keys.map(function(key3) {
+                var styleObject = rulesToInsert[key3], identifier = styleObject[import_helpers.StyleObjectIdentifier];
+                return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("style", {
+                  // @ts-ignore
+                  href: "t_".concat(identifier),
+                  // @ts-ignore
+                  precedence: "default",
+                  children: styleObject[import_helpers.StyleObjectRules].join(`
 `)
-              }, identifier);
-            })
-          ]
-        })), process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile") {
+                }, identifier);
+              })
+            ]
+          }));
+        }
+        if (process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile") {
           var element1 = typeof elementType == "string" ? elementType : "Component", title = "render <".concat(element1, " /> (").concat(internalID, ") with props");
           if (import_constants4.isWeb) {
             console.groupCollapsed(title);
@@ -9875,10 +9872,10 @@ If you meant to do this, you can disable this warning - either change untilMeasu
       }
     });
     function spacedChildren2(props) {
-      var _childrenList__type, _childrenList_, isZStack = props.isZStack, children = props.children, space = props.space, direction = props.direction, spaceFlex = props.spaceFlex, separator = props.separator, hasSpace = !!(space || spaceFlex), hasSeparator = separator != null;
-      if (!(hasSpace || hasSeparator || isZStack)) return children;
-      var childrenList = import_react4.Children.toArray(children), len = childrenList.length;
-      if (len <= 1 && !isZStack && !(!((_childrenList_ = childrenList[0]) === null || _childrenList_ === void 0 || (_childrenList__type = _childrenList_.type) === null || _childrenList__type === void 0) && _childrenList__type.shouldForwardSpace)) return childrenList;
+      var _childrenList__type, _childrenList_, isZStack = props.isZStack, children = props.children, space = props.space, direction = props.direction, spaceFlex = props.spaceFlex, separator = props.separator, ensureKeys = props.ensureKeys, hasSpace = !!(space || spaceFlex), hasSeparator = separator != null, areChildrenArray = Array.isArray(children);
+      if (!ensureKeys && !(hasSpace || hasSeparator || isZStack)) return children;
+      var childrenList = areChildrenArray ? children : import_react4.Children.toArray(children), len = childrenList.length;
+      if (len <= 1 && !isZStack && !(!((_childrenList_ = childrenList[0]) === null || _childrenList_ === void 0 || (_childrenList__type = _childrenList_.type) === null || _childrenList__type === void 0) && _childrenList__type.shouldForwardSpace)) return children;
       var final = [], _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
       try {
         for (var _iterator = childrenList.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
@@ -9892,22 +9889,22 @@ If you meant to do this, you can disable this warning - either change untilMeasu
             children: isZStack ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(AbsoluteFill, {
               children: child
             }) : child
-          }, index)), !(isUnspaced(child) && index === 0) && !isZStack) {
+          }, "".concat(index, "0t"))), !(isUnspaced(child) && index === 0) && !isZStack) {
             var next = childrenList[index + 1];
-            next && !isUnspaced(next) && (separator ? (hasSpace && final.push(createSpacer({
-              key: "_".concat(index, "_00tmgui"),
+            next && !isEmpty && !isUnspaced(next) && (separator ? (hasSpace && final.push(createSpacer({
+              key: "_".concat(index, "_00t"),
               direction,
               space,
               spaceFlex
-            })), final.push(/* @__PURE__ */ import_react4.default.isValidElement(separator) ? /* @__PURE__ */ import_react4.default.cloneElement(separator, {
-              key: "sep_".concat(index)
-            }) : separator), hasSpace && final.push(createSpacer({
-              key: "_".concat(index, "01tmgui"),
+            })), final.push(/* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_react4.Fragment, {
+              children: separator
+            }, "".concat(index, "03t"))), hasSpace && final.push(createSpacer({
+              key: "_".concat(index, "01t"),
               direction,
               space,
               spaceFlex
             }))) : final.push(createSpacer({
-              key: "_".concat(index, "02tmgui"),
+              key: "_".concat(index, "02t"),
               direction,
               space,
               spaceFlex
@@ -23570,8 +23567,11 @@ var require_Button_native = __commonJS({
         // a bit arbitrary but scaling to font size is necessary so long as button does
         space: spaceSize,
         spaceFlex,
+        ensureKeys: !0,
         separator,
         direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
+        // for keys to stay the same we keep indices as similar a possible
+        // so even if icons are undefined we still pass them
         children: [
           themedIcon
         ].concat(_to_consumable_array2(contents), [
@@ -29992,11 +29992,11 @@ var require_Popper_native = __commonJS({
         "virtualRef",
         "__scopePopper"
       ]), _usePopperContext = usePopperContext(__scopePopper), getReferenceProps = _usePopperContext.getReferenceProps, refs = _usePopperContext.refs, ref = React2.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, ref, refs.setReference);
-      if (React2.useEffect(function() {
+      React2.useEffect(function() {
         virtualRef && refs.setReference(virtualRef.current);
       }, [
         virtualRef
-      ]), virtualRef) return null;
+      ]);
       var stackProps = _object_spread9({
         ref: composedRefs
       }, anchorProps);
@@ -30457,6 +30457,18 @@ var require_Popover_native = __commonJS({
       var __scopePopover = props.__scopePopover, rest = _object_without_properties5(props, [
         "__scopePopover"
       ]), context = usePopoverContext(__scopePopover), anchorTo = context.anchorTo, composedTriggerRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, context.triggerRef);
+      if (!props.children) return null;
+      var trigger = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.View, _object_spread_props8(_object_spread9({
+        "aria-haspopup": "dialog",
+        "aria-expanded": context.open,
+        // TODO not matching
+        // aria-controls={context.contentId}
+        "data-state": getState(context.open)
+      }, rest), {
+        // @ts-ignore
+        ref: composedTriggerRef,
+        onPress: (0, import_helpers.composeEventHandlers)(props.onPress, context.onOpenToggle)
+      }));
       if (anchorTo) {
         var virtualRef = {
           current: _object_spread9({
@@ -30474,21 +30486,10 @@ var require_Popover_native = __commonJS({
         };
         return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperAnchor, {
           virtualRef,
-          __scopePopper: __scopePopover || POPOVER_SCOPE
+          __scopePopper: __scopePopover || POPOVER_SCOPE,
+          children: trigger
         });
       }
-      if (!props.children) return null;
-      var trigger = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.View, _object_spread_props8(_object_spread9({
-        "aria-haspopup": "dialog",
-        "aria-expanded": context.open,
-        // TODO not matching
-        // aria-controls={context.contentId}
-        "data-state": getState(context.open)
-      }, rest), {
-        // @ts-ignore
-        ref: composedTriggerRef,
-        onPress: (0, import_helpers.composeEventHandlers)(props.onPress, context.onOpenToggle)
-      }));
       return context.hasCustomAnchor ? trigger : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperAnchor, {
         __scopePopper: __scopePopover || POPOVER_SCOPE,
         asChild: !0,