@tamagui/core 1.112.25 → 1.113.1

package/dist/native.js

@@ -2208,6 +2208,7 @@ var require_createVariable_native = __commonJS({
     }
     function getVariable(nameOrVariable) {
       var group = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "size", _tokens_group;
+      if (nameOrVariable != null && nameOrVariable.dynamic) return nameOrVariable;
       if (setDidGetVariableValue(!0), isVariable(nameOrVariable)) return variableToString(nameOrVariable);
       var tokens = (0, import_config.getConfig)().tokensParsed, _tokens_group_nameOrVariable;
       return variableToString((_tokens_group_nameOrVariable = (_tokens_group = tokens[group]) === null || _tokens_group === void 0 ? void 0 : _tokens_group[nameOrVariable]) !== null && _tokens_group_nameOrVariable !== void 0 ? _tokens_group_nameOrVariable : nameOrVariable);
@@ -3652,12 +3653,7 @@ var require_useTheme_native = __commonJS({
         var _props_shouldUpdate, _props_shouldUpdate1, next = (_props_shouldUpdate1 = (_props_shouldUpdate = props.shouldUpdate) === null || _props_shouldUpdate === void 0 ? void 0 : _props_shouldUpdate.call(props)) !== null && _props_shouldUpdate1 !== void 0 ? _props_shouldUpdate1 : keys.current.length > 0 ? !0 : void 0;
         if (process.env.NODE_ENV === "development" && typeof props.debug == "string" && props.debug !== "profile") {
           var _props_shouldUpdate2;
-          console.info("  \u{1F3A8} useTheme() shouldUpdate?", next, import_constants2.isClient ? {
-            shouldUpdateProp: (_props_shouldUpdate2 = props.shouldUpdate) === null || _props_shouldUpdate2 === void 0 ? void 0 : _props_shouldUpdate2.call(props),
-            keys: [
-              ...keys.current
-            ]
-          } : "");
+          console.info(`  \u{1F3A8} useTheme() shouldUpdate? tracking keys ${keys.current.length} ${(_props_shouldUpdate2 = props.shouldUpdate) === null || _props_shouldUpdate2 === void 0 ? void 0 : _props_shouldUpdate2.call(props)}`, next);
         }
         return next;
       }), { themeManager, state } = changedThemeState;
@@ -3665,7 +3661,7 @@ var require_useTheme_native = __commonJS({
 
 If this is intended and you are using Tamagui without any themes, you can disable this warning by setting the environment variable TAMAGUI_DISABLE_NO_THEME_WARNING=1`));
       var themeProxied = import_react3.default.useMemo(function() {
-        return !themeManager || !(state != null && state.theme) ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug);
+        return keys.current = [], !themeManager || !(state != null && state.theme) ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug);
       }, [
         state == null ? void 0 : state.theme,
         themeManager,
@@ -3702,7 +3698,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
               // when they touch the actual value we only track it
               // if its a variable (web), its ignored!
               get(_2, subkey) {
-                if (subkey === "val") track(keyString);
+                if (subkey === "val") globalThis.tamaguiAvoidTracking || (process.env.NODE_ENV === "development" && debug === "verbose" && console.info(" \u{1F3A8} useTheme() tracking new key because of .val access", new Error().stack), track(keyString));
                 else if (subkey === "get") return function(platform) {
                   var outVal = (0, import_createVariable.getVariable)(val);
                   if (platform !== "web" && import_constants2.isIos && !deopt && (0, import_config.getSetting)("fastSchemeChange") && !someParentIsInversed(themeManager) && scheme) {
@@ -3717,6 +3713,16 @@ If this is intended and you are using Tamagui without any themes, you can disabl
                       return dynamicVal;
                     }
                   }
+                  if (process.env.NODE_ENV === "development" && debug && (console.info(` \u{1F3A8} useTheme() tracking new key because of: 
+                        not web: ${platform !== "web"}
+                        isIOS: ${import_constants2.isIos}
+                        deopt: ${deopt}
+                        fastScheme: ${(0, import_config.getSetting)("fastSchemeChange")}
+                        parent inversed: ${someParentIsInversed(themeManager)}
+                      `), someParentIsInversed(themeManager))) {
+                    var _themeManager_parentManager;
+                    console.info(` some parent is inversed: ${themeManager == null ? void 0 : themeManager.state.name} => ${themeManager == null || (_themeManager_parentManager = themeManager.parentManager) === null || _themeManager_parentManager === void 0 ? void 0 : _themeManager_parentManager.state.name}`);
+                  }
                   return track(keyString), outVal;
                 };
                 return Reflect.get(val, subkey);
@@ -3732,7 +3738,18 @@ If this is intended and you are using Tamagui without any themes, you can disabl
     function someParentIsInversed(manager) {
       for (var cur = manager; cur; ) {
         if (!cur.parentManager) return !1;
-        if (cur.parentManager.state.scheme !== cur.state.scheme) return !0;
+        if (cur.parentManager.state.scheme !== cur.state.scheme) return process.env.NODE_ENV === "development" && !globalThis.TAMAGUI_DITW && !process.env.TAMAGUI_DISABLE_INVERSE_THEME_WARNING && console.info(` \u203C\uFE0F De-opted a theme value access due to an inversed parent.
+  
+  This means you've accessed a theme value without .get() in a child of an inversed theme.
+  
+  This isn't necessarily a bug, but can often be due to a mistaken inverse (for example,
+  you may have a Theme inside your TamaguiProvider with mis-matched theme values for light/dark).
+  
+  For this reason we've added this warning. If this is intentional, you can disable it with:
+  
+    process.env.TAMAGUI_DISABLE_INVERSE_THEME_WARNING === 1
+    or globalThis.TAMAGUI_DITW = true
+  `), !0;
         cur = cur.parentManager;
       }
       return !1;
@@ -3764,10 +3781,14 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       function getShouldUpdateTheme() {
         var manager = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : themeManager, nextState = arguments.length > 1 ? arguments[1] : void 0, prevState2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : state, forceShouldChange = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, forceUpdate = shouldUpdate == null ? void 0 : shouldUpdate();
         if (!(!manager || !forceShouldChange && forceUpdate === !1)) {
-          var next = nextState || manager.getState(props, parentManager);
-          if (forceShouldChange || next && !(forceUpdate !== !0 && !manager.getStateShouldChange(next, prevState2))) return next;
+          var next2 = nextState || manager.getState(props, parentManager);
+          if (forceShouldChange || next2 && !(forceUpdate !== !0 && !manager.getStateShouldChange(next2, prevState2))) return next2;
         }
       }
+      if (!import_constants2.isWeb && themeManager && getShouldUpdateTheme(themeManager)) {
+        var _next_state, _themeState_state, next = createState(themeState);
+        ((_next_state = next.state) === null || _next_state === void 0 ? void 0 : _next_state.name) !== ((_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) && (setThemeState(next), console.error = preventWarnSetState, themeManager.notify(), console.error = ogLog);
+      }
       if (import_constants2.isServer || (import_react3.default.useLayoutEffect(function() {
         themeManager && state && prevState && state !== prevState && themeManager.notify();
       }, [
@@ -3786,8 +3807,8 @@ If this is intended and you are using Tamagui without any themes, you can disabl
           (isNewTheme || getShouldUpdateTheme(themeManager)) && (activeThemeManagers.add(themeManager), setThemeState(createState));
           var selfListenerDispose = themeManager.onChangeTheme(function(_a, _b, forced) {
             forced && setThemeState(function(prev) {
-              var next = createState(prev, !!forced);
-              return next;
+              var next2 = createState(prev, forced !== "self");
+              return next2;
             });
           }, !0), disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme(function(name, manager, forced) {
             var force = forced || (shouldUpdate == null ? void 0 : shouldUpdate()) || props.deopt || props["disable-child-theme"], shouldTryUpdate = force ?? !!(keys != null && keys.length || isNewTheme);
@@ -3848,8 +3869,8 @@ If this is intended and you are using Tamagui without any themes, you can disabl
           };
           if (prev != null && prev.themeManager) {
             themeManager2 = prev.themeManager;
-            var forceChange = force || !!(keys != null && keys.length), next = themeManager2.getState(props, parentManager), nextState = getShouldUpdateTheme(themeManager2, next, prev.state, forceChange);
-            nextState ? (state2 = nextState, !prev.isNewTheme && !isRoot ? themeManager2 = getNewThemeManager() : themeManager2.updateState(nextState)) : prev.isNewTheme && parentManager && !next && (themeManager2 = parentManager);
+            var forceChange = force || !!(keys != null && keys.length), next2 = themeManager2.getState(props, parentManager), nextState = getShouldUpdateTheme(themeManager2, next2, prev.state, forceChange);
+            nextState ? (state2 = nextState, !prev.isNewTheme && !isRoot ? themeManager2 = getNewThemeManager() : themeManager2.updateState(nextState)) : prev.isNewTheme && parentManager && !next2 && (themeManager2 = parentManager);
           } else themeManager2 = getNewThemeManager(), state2 = {
             ...themeManager2.state
           };
@@ -6439,11 +6460,7 @@ var require_propMapper_native = __commonJS({
         }
         if (typeof variantValue == "function") {
           var fn = variantValue, extras = (0, import_getVariantExtras.getVariantExtras)(styleState);
-          variantValue = fn(value, extras), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("   expanded functional variant", key), console.info({
-            fn,
-            variantValue,
-            extras
-          }), console.groupEnd());
+          variantValue = fn(value, extras), process.env.NODE_ENV;
         }
         var fontFamilyResult;
         if ((0, import_isObj.isObj)(variantValue)) {
@@ -6578,7 +6595,7 @@ var require_propMapper_native = __commonJS({
         var _theme_value, val = (_theme_value = theme == null ? void 0 : theme[value]) !== null && _theme_value !== void 0 ? _theme_value : tokensParsed[customTokenAccept][value];
         val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
       }
-      if (theme && value in theme) valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.info(` - resolving ${key} to theme value ${value}`, valOrVar), hasSet = !0;
+      if (theme && value in theme) valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
       else {
         if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];
         else {
@@ -6612,7 +6629,7 @@ var require_propMapper_native = __commonJS({
       }
       if (hasSet) {
         var out = resolveVariableValue(key, valOrVar, resolveAs);
-        return process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.info("resolved", resolveAs, valOrVar, out), out;
+        return process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info("resolved", resolveAs, valOrVar, out), globalThis.tamaguiAvoidTracking = !1), out;
       }
       process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.warn(`Warning: no token found for ${key}, omitting`);
     };
@@ -6621,7 +6638,11 @@ var require_propMapper_native = __commonJS({
       if ((0, import_createVariable.isVariable)(valOrVar)) {
         if (resolveValues === "value") return valOrVar.val;
         var get = valOrVar == null ? void 0 : valOrVar.get;
-        return key !== "shadowColor" && typeof get == "function" ? get(resolveValues === "web" ? "web" : void 0) : valOrVar.val;
+        if (key !== "shadowColor" && typeof get == "function") {
+          var resolveDynamicFor = resolveValues === "web" ? "web" : void 0;
+          return get(resolveDynamicFor);
+        }
+        return valOrVar.val;
       }
       return valOrVar;
     }
@@ -7154,13 +7175,13 @@ var require_getSplitStyles_native = __commonJS({
                   usedKeys: {
                     ...usedKeys
                   }
-                }), (0, import_log.log)("expanded", expanded, `
+                }), globalThis.tamaguiAvoidTracking = !0, (0, import_log.log)("expanded", expanded, `
 usedKeys`, {
                   ...usedKeys
                 }, `
 current`, {
                   ...styleState.style
-                }));
+                }), globalThis.tamaguiAvoidTracking = !1);
               } catch {
               }
               console.groupEnd();