@tamagui/core 1.130.8 → 1.131.1

package/dist/cjs/index.cjs

@@ -34,13 +34,13 @@ var import_react_native_media_driver = require("@tamagui/react-native-media-driv
   import_web = require("@tamagui/web"),
   import_react = require("react"),
   import_use_element_layout = require("@tamagui/use-element-layout"),
-  import_addNativeValidStyles = require("./addNativeValidStyles"),
-  import_createOptimizedView = require("./createOptimizedView"),
-  import_getBaseViews = require("./getBaseViews"),
-  import_Pressability = require("./vendor/Pressability"),
+  import_addNativeValidStyles = require("./addNativeValidStyles.cjs"),
+  import_createOptimizedView = require("./createOptimizedView.cjs"),
+  import_getBaseViews = require("./getBaseViews.cjs"),
+  import_Pressability = require("./vendor/Pressability.cjs"),
   import_use_element_layout2 = require("@tamagui/use-element-layout");
 __reExport(index_exports, require("@tamagui/web"), module.exports);
-__reExport(index_exports, require("./reactNativeTypes"), module.exports);
+__reExport(index_exports, require("./reactNativeTypes.cjs"), module.exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 (0, import_addNativeValidStyles.addNativeValidStyles)();
 const TamaguiProvider = props => ((0, import_web.useIsomorphicLayoutEffect)(() => {

package/dist/native.js

@@ -2119,22 +2119,22 @@ var require_useMedia_native = __commonJS({
         listeners.delete(subscriber);
       };
     }
-    function useMedia2(cc, debug) {
-      var componentState = cc ? States.get(cc) : null, internalRef = (0, import_react3.useRef)(null);
+    function useMedia2(componentContext, debug) {
+      var componentState = componentContext ? States.get(componentContext) : null, internalRef = (0, import_react3.useRef)(null);
       internalRef.current || (internalRef.current = {
-        keys: /* @__PURE__ */ new Set()
-      });
-      var { keys, lastState = (0, import_config.getSetting)("disableSSR") ? mediaState2 : initState } = internalRef.current;
+        keys: /* @__PURE__ */ new Set(),
+        lastState: mediaState2
+      }), internalRef.current.pendingState && (internalRef.current.lastState = internalRef.current.pendingState, internalRef.current.pendingState = void 0);
+      var { keys } = internalRef.current;
       keys.size && keys.clear();
       var state = (0, import_react3.useSyncExternalStore)(subscribe, function() {
-        if (componentState != null && componentState.enabled) return internalRef.current.lastState = mediaState2, mediaState2;
-        var curKeys = (componentState == null ? void 0 : componentState.keys) || keys;
+        var curKeys = (componentState == null ? void 0 : componentState.keys) || keys, { lastState, pendingState } = internalRef.current;
         if (!curKeys.size) return lastState;
         var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
         try {
           for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
             var key = _step.value;
-            if (mediaState2[key] !== lastState[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia() \u270D\uFE0F", key, lastState[key], "=>", mediaState2[key]), internalRef.current.lastState = mediaState2, mediaState2;
+            if (mediaState2[key] !== (pendingState || lastState)[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia() \u270D\uFE0F", key, lastState[key], "=>", mediaState2[key]), componentContext != null && componentContext.mediaEmit ? (componentContext.mediaEmit(mediaState2), internalRef.current.pendingState = mediaState2, lastState) : (internalRef.current.lastState = mediaState2, mediaState2);
           }
         } catch (err) {
           _didIteratorError = !0, _iteratorError = err;
@@ -2713,13 +2713,15 @@ var require_createStyledContext_native = __commonJS({
     module2.exports = __toCommonJS2(createStyledContext_exports);
     var import_jsx_runtime2 = require("react/jsx-runtime"), import_react3 = __toESM2(require("react")), import_objectIdentityKey = require_objectIdentityKey_native(), createReactContext = import_react3.default[Math.random(), "createContext"];
     function createStyledContext(defaultValues) {
-      var OGContext = createReactContext(defaultValues), OGProvider = OGContext.Provider, Context = OGContext, scopedContexts = /* @__PURE__ */ new Map();
+      var namespace = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "", OGContext = createReactContext(defaultValues), OGProvider = OGContext.Provider, Context = OGContext, scopedContexts = /* @__PURE__ */ new Map(), LastScopeInNamespace = createReactContext(namespace);
       function getOrCreateScopedContext(scope) {
         var ScopedContext = scopedContexts.get(scope);
         return ScopedContext || (ScopedContext = createReactContext(defaultValues), scopedContexts.set(scope, ScopedContext)), ScopedContext;
       }
-      var Provider = function(param) {
-        var { children, scope, ...values } = param, next = import_react3.default.useMemo(function() {
+      var getNamespacedScope = function(scope) {
+        return namespace ? `${namespace}--${scope}` : scope;
+      }, Provider = function(param) {
+        var { children, scope: scopeIn, ...values } = param, scope = getNamespacedScope(scopeIn), next = import_react3.default.useMemo(function() {
           return {
             // this ! is a workaround for ts error
             ...defaultValues,
@@ -2728,13 +2730,16 @@ var require_createStyledContext_native = __commonJS({
         }, [
           (0, import_objectIdentityKey.objectIdentityKey)(values)
         ]), Provider22 = OGProvider;
-        return scope && (Provider22 = getOrCreateScopedContext(scope).Provider), /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Provider22, {
-          value: next,
-          children
+        return scope && (Provider22 = getOrCreateScopedContext(scope).Provider), /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(LastScopeInNamespace.Provider, {
+          value: scope,
+          children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Provider22, {
+            value: next,
+            children
+          })
         });
-      }, useStyledContext = function(scope) {
-        var context = scope ? getOrCreateScopedContext(scope) : OGContext;
-        return import_react3.default.useContext(context);
+      }, useStyledContext = function() {
+        var scopeIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", lastScopeInNamespace = (0, import_react3.useContext)(LastScopeInNamespace), scope = namespace ? scopeIn ? getNamespacedScope(scopeIn) : lastScopeInNamespace : scopeIn, context = scope ? getOrCreateScopedContext(scope) : OGContext, value = import_react3.default.useContext(context);
+        return value;
       };
       return Context.Provider = Provider, Context.props = defaultValues, Context.context = OGContext, Context.useStyledContext = useStyledContext, Context;
     }
@@ -7534,7 +7539,7 @@ var require_createComponent_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(createComponent_exports);
-    var import_jsx_runtime2 = require("react/jsx-runtime"), import_compose_refs = require_index_native4(), import_constants = require_index_native2(), import_helpers2 = require_index_native3(), import_is_equal_shallow = require_index_native5(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_constants2 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_ComponentContext = require_ComponentContext_native(), import_GroupContext = require_GroupContext_native(), import_createVariable = require_createVariable_native(), import_defaultComponentState = require_defaultComponentState_native(), import_getShorthandValue = require_getShorthandValue_native(), import_getSplitStyles = require_getSplitStyles_native(), import_log = require_log_native(), import_mergeProps = require_mergeProps_native(), import_setElementProps = require_setElementProps_native(), import_subscribeToContextGroup = require_subscribeToContextGroup_native(), import_themeable = require_themeable_native(), import_wrapStyleTags = require_wrapStyleTags_native(), import_useComponentState = require_useComponentState_native(), import_useMedia = require_useMedia_native(), import_useTheme = require_useTheme_native(), import_setupHooks = require_setupHooks_native(), import_Slot = require_Slot_native(), import_Theme = require_Theme_native(), time2, NextState = /* @__PURE__ */ new WeakMap(), debugKeyListeners, startVisualizer, componentSetStates = /* @__PURE__ */ new Set(), avoidReRenderKeys = /* @__PURE__ */ new Set([
+    var import_jsx_runtime2 = require("react/jsx-runtime"), import_compose_refs = require_index_native4(), import_constants = require_index_native2(), import_helpers2 = require_index_native3(), import_is_equal_shallow = require_index_native5(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_constants2 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_ComponentContext = require_ComponentContext_native(), import_GroupContext = require_GroupContext_native(), import_createVariable = require_createVariable_native(), import_defaultComponentState = require_defaultComponentState_native(), import_getShorthandValue = require_getShorthandValue_native(), import_getSplitStyles = require_getSplitStyles_native(), import_log = require_log_native(), import_mergeProps = require_mergeProps_native(), import_setElementProps = require_setElementProps_native(), import_subscribeToContextGroup = require_subscribeToContextGroup_native(), import_themeable = require_themeable_native(), import_wrapStyleTags = require_wrapStyleTags_native(), import_useComponentState = require_useComponentState_native(), import_useMedia = require_useMedia_native(), import_useTheme = require_useTheme_native(), import_setupHooks = require_setupHooks_native(), import_Slot = require_Slot_native(), import_Theme = require_Theme_native(), time2, NextState = /* @__PURE__ */ new WeakMap(), NextMedia = /* @__PURE__ */ new WeakMap(), debugKeyListeners, startVisualizer, componentSetStates = /* @__PURE__ */ new Set(), avoidReRenderKeys = /* @__PURE__ */ new Set([
       "hover",
       "press",
       "pressIn",
@@ -7750,6 +7755,18 @@ var require_createComponent_native = __commonJS({
         }
         if (splitStyles && (hasAnimationProp || groupName) && animationDriver != null && animationDriver.avoidReRenders) {
           var useStyleListener = stateRef.current.useStyleListener, ogSetStateShallow = setStateShallow;
+          componentContext.mediaEmit = function(next) {
+            NextMedia.set(stateRef, next), updateStyleListener();
+          };
+          var updateStyleListener = function() {
+            var updatedState = NextState.get(stateRef) || state, mediaState22 = NextMedia.get(stateRef), { group, hasDynGroupChildren, unmounted, animation, ...childrenGroupState } = updatedState;
+            groupContext && notifyGroupSubscribers(groupContext, stateRef.current.group || null, childrenGroupState);
+            var nextStyles = (0, import_getSplitStyles.getSplitStyles)(props, staticConfig, theme, themeName, updatedState, mediaState22 ? {
+              ...styleProps,
+              mediaState: mediaState22
+            } : styleProps, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp);
+            useStyleListener == null || useStyleListener((nextStyles == null ? void 0 : nextStyles.style) || {});
+          };
           stateRef.current.setStateShallow = function(nextOrGetNext) {
             var prev = NextState.get(stateRef) || state, next = typeof nextOrGetNext == "function" ? nextOrGetNext(prev) : nextOrGetNext;
             if (!(next === prev || (0, import_is_equal_shallow.isEqualShallow)(prev, next))) {
@@ -7764,11 +7781,7 @@ var require_createComponent_native = __commonJS({
                 NextState.set(stateRef, updatedState), process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile" && (console.groupCollapsed("[\u26A1\uFE0F] avoid setState", next, {
                   updatedState,
                   props
-                }), console.info(stateRef.current.host), console.groupEnd());
-                var { group, hasDynGroupChildren, unmounted, animation, ...childrenGroupState } = updatedState;
-                groupContext && notifyGroupSubscribers(groupContext, stateRef.current.group || null, childrenGroupState);
-                var nextStyles = (0, import_getSplitStyles.getSplitStyles)(props, staticConfig, theme, themeName, updatedState, styleProps, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp);
-                useStyleListener == null || useStyleListener((nextStyles == null ? void 0 : nextStyles.style) || {});
+                }), console.info(stateRef.current.host), console.groupEnd()), updateStyleListener();
               } else process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile" && console.info("[\u{1F40C}] re-render", {
                 canAvoidReRender,
                 next