@tamagui/web 2.3.3 → 2.4.0-1783099846627

package/dist/esm/hooks/useMedia.native.js

@@ -1,5 +1,5 @@
 import { isServer, isWeb } from "@tamagui/constants";
-import { useRef, useSyncExternalStore } from "react";
+import { useEffect, useReducer, useRef } from "react";
 import { getSetting } from "../config.native.js";
 import { resetMediaStyleCache } from "../helpers/createMediaStyle.native.js";
 import { matchMedia } from "../helpers/matchMedia.native.js";
@@ -38,6 +38,7 @@ var configureMedia = function (config) {
   if (!media) return;
   mediaVersion++;
   resetMediaStyleCache();
+  resetMediaTouchTracker();
   for (var key in media) {
     getMedia()[key] = (mediaQueryDefaultActive === null || mediaQueryDefaultActive === void 0 ? void 0 : mediaQueryDefaultActive[key]) || false;
     mediaKeys.add(`$${key}`);
@@ -95,6 +96,53 @@ function updateMediaListeners() {
   });
 }
 var States = /* @__PURE__ */new WeakMap();
+var touchTrackerProto = null;
+var refSlot = /* @__PURE__ */Symbol("mediaRefSlot");
+function buildTouchTrackerProto() {
+  var proto = {};
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    var _loop = function () {
+      var fullKey = _step.value;
+      var key = fullKey[0] === "$" ? fullKey.slice(1) : fullKey;
+      proto[key] = {
+        enumerable: true,
+        configurable: true,
+        get() {
+          var slot = this[refSlot];
+          if (!disableMediaTouch) {
+            slot.keys.add(key);
+          }
+          return slot.proxyTarget[key];
+        }
+      };
+    };
+    for (var _iterator = mediaKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return Object.create(null, proto);
+}
+function getTouchTrackerProto() {
+  if (!touchTrackerProto) touchTrackerProto = buildTouchTrackerProto();
+  return touchTrackerProto;
+}
+function resetMediaTouchTracker() {
+  touchTrackerProto = null;
+}
 function setMediaShouldUpdate(ref, enabled, keys) {
   var cur = States.get(ref);
   if (!cur || cur.enabled !== enabled || keys) {
@@ -114,80 +162,121 @@ function subscribe(subscriber) {
 function useMedia(componentContext, debug) {
   "use no memo";
 
-  var componentState = componentContext ? States.get(componentContext) : null;
   var internalRef = useRef(null);
   if (!internalRef.current) {
-    internalRef.current = {
+    var initial = getMedia();
+    var r = {
       keys: /* @__PURE__ */new Set(),
-      lastState: getMedia()
+      lastState: initial,
+      renderVersion: 0,
+      proxyTarget: initial,
+      proxy: void 0,
+      getSnapshot: void 0,
+      componentContext,
+      debug
     };
-  }
-  if (internalRef.current.pendingState) {
-    internalRef.current.lastState = internalRef.current.pendingState;
-    internalRef.current.pendingState = void 0;
-  }
-  var {
-    keys
-  } = internalRef.current;
-  if (keys.size) {
-    keys.clear();
-  }
-  var state = useSyncExternalStore(subscribe, function () {
-    var curKeys = (componentState === null || componentState === void 0 ? void 0 : componentState.keys) || keys;
-    var {
-      lastState,
-      pendingState
-    } = internalRef.current;
-    if (!curKeys.size) {
-      return lastState;
-    }
-    var ms = getMedia();
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var key = _step.value;
-        if (ms[key] !== (pendingState || lastState)[key]) {
-          if (process.env.NODE_ENV === "development" && debug) {
-            console.warn(`useMedia() \u270D\uFE0F`, key, lastState[key], "=>", ms[key]);
-          }
-          if (componentContext === null || componentContext === void 0 ? void 0 : componentContext.mediaEmit) {
-            componentContext.mediaEmit(ms);
-            internalRef.current.pendingState = ms;
-            return lastState;
-          }
-          internalRef.current.lastState = ms;
-          return ms;
-        }
+    var tracker = Object.create(getTouchTrackerProto());
+    tracker[refSlot] = {
+      proxyTarget: initial,
+      keys: r.keys
+    };
+    r.proxy = tracker;
+    r.getSnapshot = function () {
+      var _States_get;
+      var curKeys = r.componentContext ? ((_States_get = States.get(r.componentContext)) === null || _States_get === void 0 ? void 0 : _States_get.keys) || r.keys : r.keys;
+      var {
+        lastState,
+        pendingState
+      } = r;
+      if (!curKeys.size) {
+        return lastState;
       }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
+      var ms = getMedia();
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
       try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
+        for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var key = _step.value;
+          if (ms[key] !== (pendingState || lastState)[key]) {
+            var _r_componentContext;
+            if (process.env.NODE_ENV === "development" && r.debug) {
+              console.warn(`useMedia() \u270D\uFE0F`, key, lastState[key], "=>", ms[key]);
+            }
+            if ((_r_componentContext = r.componentContext) === null || _r_componentContext === void 0 ? void 0 : _r_componentContext.mediaEmit) {
+              r.componentContext.mediaEmit(ms);
+              r.pendingState = ms;
+              return lastState;
+            }
+            r.lastState = ms;
+            return ms;
+          }
         }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
         }
       }
-    }
-    return lastState;
-  }, getServerSnapshot);
-  return new Proxy(state, {
-    get(_, key) {
-      if (!disableMediaTouch && typeof key === "string") {
-        keys.add(key);
+      return lastState;
+    };
+    internalRef.current = r;
+  } else {
+    internalRef.current.componentContext = componentContext;
+    internalRef.current.debug = debug;
+  }
+  var ref = internalRef.current;
+  ref.renderVersion++;
+  if (ref.pendingState) {
+    ref.lastState = ref.pendingState;
+    ref.pendingState = void 0;
+  }
+  if (ref.keys.size) {
+    ref.keys.clear();
+  }
+  var [, forceUpdate] = useReducer(incReducer, 0);
+  var state = isServer ? initState : ref.getSnapshot();
+  ref.proxyTarget = state;
+  ref.proxy[refSlot].proxyTarget = state;
+  useEffect(function () {
+    var _States_get;
+    var renderVersion = ref.renderVersion;
+    var shouldSubscribe = !ref.componentContext || !!((_States_get = States.get(ref.componentContext)) === null || _States_get === void 0 ? void 0 : _States_get.enabled);
+    if (shouldSubscribe) {
+      if (!ref.unsubscribe) {
+        ref.unsubscribe = subscribe(function () {
+          var next = ref.getSnapshot();
+          if (next !== ref.proxyTarget) {
+            ref.proxyTarget = next;
+            ref.proxy[refSlot].proxyTarget = next;
+            forceUpdate();
+          }
+        });
       }
-      return Reflect.get(state, key);
+    } else if (ref.unsubscribe) {
+      ref.unsubscribe();
+      ref.unsubscribe = void 0;
     }
+    return function () {
+      if (ref.renderVersion === renderVersion) {
+        var _ref_unsubscribe;
+        (_ref_unsubscribe = ref.unsubscribe) === null || _ref_unsubscribe === void 0 ? void 0 : _ref_unsubscribe.call(ref);
+        ref.unsubscribe = void 0;
+      }
+    };
   });
+  return ref.proxy;
 }
-var getServerSnapshot = function () {
-  return initState;
+var incReducer = function (c) {
+  return c + 1;
 };
 var disableMediaTouch = false;
 function _disableMediaTouch(val) {

package/dist/esm/hooks/useMedia.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isServer","isWeb","useRef","useSyncExternalStore","getSetting","resetMediaStyleCache","matchMedia","mediaObjectToString","getMedia","mediaKeys","mediaQueryConfig","setMediaState","defaultMediaImportance","mediaKeyRegex","isMediaKey","key","has","test","getMediaKey","match","initState","mediaKeysOrdered","getMediaKeyImportance","process","env","NODE_ENV","Error","indexOf","dispose","Set","mediaVersion","configureMedia","config","media","mediaQueryDefaultActive","add","Object","assign","keys","setupMediaListeners","unlisten","forEach","cb","clear","setupVersion","_loop","key2","str","getMatch","addListener","update","removeListener","next","matches","updateMediaListeners","IS_STATIC","listeners","States","WeakMap","setMediaShouldUpdate","ref","enabled","cur","get","set","subscribe","subscriber","delete","useMedia","componentContext","debug","componentState","internalRef","current","lastState","pendingState","size","state","curKeys","ms","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","console","warn","mediaEmit","err","return","getServerSnapshot","Proxy","_","disableMediaTouch","Reflect","_disableMediaTouch","val","getMediaState","mediaGroups","layout","res","fromEntries","map","mediaKey","mediaKeyMatch"],"sources":["../../../src/hooks/useMedia.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isServer","isWeb","useEffect","useReducer","useRef","getSetting","resetMediaStyleCache","matchMedia","mediaObjectToString","getMedia","mediaKeys","mediaQueryConfig","setMediaState","defaultMediaImportance","mediaKeyRegex","isMediaKey","key","has","test","getMediaKey","match","initState","mediaKeysOrdered","getMediaKeyImportance","process","env","NODE_ENV","Error","indexOf","dispose","Set","mediaVersion","configureMedia","config","media","mediaQueryDefaultActive","resetMediaTouchTracker","add","Object","assign","keys","setupMediaListeners","unlisten","forEach","cb","clear","setupVersion","_loop","key2","str","getMatch","addListener","update","removeListener","next","matches","updateMediaListeners","IS_STATIC","listeners","States","WeakMap","touchTrackerProto","refSlot","Symbol","buildTouchTrackerProto","proto","_iteratorNormalCompletion","_didIteratorError","_iteratorError","fullKey","_step","value","slice","enumerable","configurable","get","slot","disableMediaTouch","proxyTarget","_iterator","iterator","done","err","return","create","getTouchTrackerProto","setMediaShouldUpdate","ref","enabled","cur","set","subscribe","subscriber","delete","useMedia","componentContext","debug","internalRef","current","initial","r","lastState","renderVersion","proxy","getSnapshot","tracker","_States_get","curKeys","pendingState","size","ms","_r_componentContext","console","warn","mediaEmit","forceUpdate","incReducer","state","shouldSubscribe","unsubscribe"],"sources":["../../../src/hooks/useMedia.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/hooks/useTheme.mjs

@@ -9,12 +9,25 @@ const useTheme = () => {
   const res = theme;
   return res;
 };
-const useThemeWithState = (props, isRoot = false) => {
+const useThemeWithState = (props, isRoot = false, forThemeView = false) => {
   "use no memo";
 
-  const keys = useRef(null);
-  const schemeKeys = useRef(null);
-  const themeState = useThemeState(props, isRoot, keys, schemeKeys);
+  const bag = useRef(null);
+  if (!bag.current) {
+    bag.current = {
+      keys: {
+        current: null
+      },
+      schemeKeys: {
+        current: null
+      }
+    };
+  }
+  const {
+    keys,
+    schemeKeys
+  } = bag.current;
+  const themeState = useThemeState(props, isRoot, keys, schemeKeys, forThemeView);
   if (process.env.NODE_ENV === "development") {
     if (!props.passThrough && !themeState?.theme) {
       if (process.env.TAMAGUI_DISABLE_NO_THEME_WARNING !== "1") {

package/dist/esm/hooks/useTheme.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useRef","getThemeProxied","useThemeState","EMPTY","useTheme","theme","useThemeWithState","res","props","isRoot","keys","schemeKeys","themeState","process","env","NODE_ENV","passThrough","TAMAGUI_DISABLE_NO_THEME_WARNING","console","error","JSON","stringify","themeProxied"],"sources":["../../../src/hooks/useTheme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAEvB,SAASC,eAAA,QAA0C;AACnD,SAASC,aAAA,QAAqB;AAE9B,MAAMC,KAAA,GAAQ,CAAC;AAER,MAAMC,QAAA,GAAWA,CAAA,KAAM;EAC5B;;EAEA,MAAM,CAACC,KAAK,IAAIC,iBAAA,CAAkBH,KAAK;EACvC,MAAMI,GAAA,GAAMF,KAAA;EACZ,OAAOE,GAAA;AACT;AAOO,MAAMD,iBAAA,GAAoBA,CAC/BE,KAAA,EACAC,MAAA,GAAS,UACU;EACnB;;EAEA,MAAMC,IAAA,GAAOV,MAAA,CAA2B,IAAI;EAC5C,MAAMW,UAAA,GAAaX,MAAA,CAA2B,IAAI;EAClD,MAAMY,UAAA,GAAaV,aAAA,CAAcM,KAAA,EAAOC,MAAA,EAAQC,IAAA,EAAMC,UAAU;EAEhE,IAAIE,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,eAAe;IAC1C,IAAI,CAACP,KAAA,CAAMQ,WAAA,IAAe,CAACJ,UAAA,EAAYP,KAAA,EAAO;MAC5C,IAAIQ,OAAA,CAAQC,GAAA,CAAIG,gCAAA,KAAqC,KAAK;QACxDC,OAAA,CAAQC,KAAA,CACN,2FAA2FC,IAAA,CAAKC,SAAA,CAC9Fb,KACF,CAAC;AAAA;AAAA,sKACH;MACF;IACF;EACF;EAEA,MAAMc,YAAA,GAAed,KAAA,CAAMQ,WAAA,GACvB,CAAC,IACDf,eAAA,CAAgBO,KAAA,EAAOI,UAAA,EAAYF,IAAA,EAAMC,UAAU;EAEvD,OAAO,CAACW,YAAA,EAAcV,UAAU;AAClC","ignoreList":[]}
+{"version":3,"names":["useRef","getThemeProxied","useThemeState","EMPTY","useTheme","theme","useThemeWithState","res","props","isRoot","forThemeView","bag","current","keys","schemeKeys","themeState","process","env","NODE_ENV","passThrough","TAMAGUI_DISABLE_NO_THEME_WARNING","console","error","JSON","stringify","themeProxied"],"sources":["../../../src/hooks/useTheme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAqC;AAE9C,SAASC,eAAA,QAA0C;AACnD,SAASC,aAAA,QAAqB;AAE9B,MAAMC,KAAA,GAAQ,CAAC;AAOR,MAAMC,QAAA,GAAWA,CAAA,KAAM;EAC5B;;EAEA,MAAM,CAACC,KAAK,IAAIC,iBAAA,CAAkBH,KAAK;EACvC,MAAMI,GAAA,GAAMF,KAAA;EACZ,OAAOE,GAAA;AACT;AAOO,MAAMD,iBAAA,GAAoBA,CAC/BE,KAAA,EACAC,MAAA,GAAS,OAQTC,YAAA,GAAe,UACI;EACnB;;EAKA,MAAMC,GAAA,GAAMX,MAAA,CAAuB,IAAI;EACvC,IAAI,CAACW,GAAA,CAAIC,OAAA,EAAS;IAChBD,GAAA,CAAIC,OAAA,GAAU;MACZC,IAAA,EAAM;QAAED,OAAA,EAAS;MAAK;MACtBE,UAAA,EAAY;QAAEF,OAAA,EAAS;MAAK;IAC9B;EACF;EACA,MAAM;IAAEC,IAAA;IAAMC;EAAW,IAAIH,GAAA,CAAIC,OAAA;EACjC,MAAMG,UAAA,GAAab,aAAA,CAAcM,KAAA,EAAOC,MAAA,EAAQI,IAAA,EAAMC,UAAA,EAAYJ,YAAY;EAE9E,IAAIM,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,eAAe;IAC1C,IAAI,CAACV,KAAA,CAAMW,WAAA,IAAe,CAACJ,UAAA,EAAYV,KAAA,EAAO;MAC5C,IAAIW,OAAA,CAAQC,GAAA,CAAIG,gCAAA,KAAqC,KAAK;QACxDC,OAAA,CAAQC,KAAA,CACN,2FAA2FC,IAAA,CAAKC,SAAA,CAC9FhB,KACF,CAAC;AAAA;AAAA,sKACH;MACF;IACF;EACF;EAEA,MAAMiB,YAAA,GAAejB,KAAA,CAAMW,WAAA,GACvB,CAAC,IACDlB,eAAA,CAAgBO,KAAA,EAAOO,UAAA,EAAYF,IAAA,EAAMC,UAAU;EAEvD,OAAO,CAACW,YAAA,EAAcV,UAAU;AAClC","ignoreList":[]}

package/dist/esm/hooks/useTheme.native.js

@@ -12,10 +12,24 @@ var useTheme = function () {
 var useThemeWithState = function (props) {
   "use no memo";
 
-  var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-  var keys = useRef(null);
-  var schemeKeys = useRef(null);
-  var themeState = useThemeState(props, isRoot, keys, schemeKeys);
+  var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false,
+    forThemeView = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+  var bag = useRef(null);
+  if (!bag.current) {
+    bag.current = {
+      keys: {
+        current: null
+      },
+      schemeKeys: {
+        current: null
+      }
+    };
+  }
+  var {
+    keys,
+    schemeKeys
+  } = bag.current;
+  var themeState = useThemeState(props, isRoot, keys, schemeKeys, forThemeView);
   if (process.env.NODE_ENV === "development") {
     if (!props.passThrough && !(themeState === null || themeState === void 0 ? void 0 : themeState.theme)) {
       if (process.env.TAMAGUI_DISABLE_NO_THEME_WARNING !== "1") {

package/dist/esm/hooks/useTheme.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["useRef","getThemeProxied","useThemeState","EMPTY","useTheme","theme","useThemeWithState","res","props","isRoot","arguments","length","keys","schemeKeys","themeState","process","env","NODE_ENV","passThrough","TAMAGUI_DISABLE_NO_THEME_WARNING","console","error","JSON","stringify","themeProxied"],"sources":["../../../src/hooks/useTheme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAEvB,SAASC,eAAA,QAA0C;AACnD,SAASC,aAAA,QAAqB;AAE9B,IAAAC,KAAM,KAAQ;AAEP,IAAAC,QAAM,YAAAA,CAAA,EAAiB;EAC5B;;EAEA,KAAAC,KAAO,IAAKC,iBAAI,CAAAH,KAAkB;EAClC,IAAAI,GAAM,GAAAF,KAAM;EACZ,OAAOE,GAAA;AACT;AAOO,IAAAD,iBAAM,YAAAA,CACXE,KACA;EAEA;;EAEA,IAAAC,MAAM,GAAOC,SAA2B,CAAAC,MAAI,QAAAD,SAAA,iBAAAA,SAAA;EAC5C,IAAAE,IAAM,GAAAZ,MAAA,KAAa;EACnB,IAAAa,UAAM,GAAAb,MAAa;EAEnB,IAAIc,UAAQ,GAAIZ,aAAa,CAAAM,KAAA,EAAAC,MAAe,EAAAG,IAAA,EAAAC,UAAA;EAC1C,IAAAE,OAAK,CAAAC,GAAM,CAAAC,QAAA,KAAgB,aAAY;IACrC,KAAAT,KAAI,CAAAU,WAAY,MAAAJ,UAAA,aAAAA,UAA0C,uBAAAA,UAAA,CAAAT,KAAA;MACxD,IAAAU,OAAQ,CAAAC,GAAA,CAAAG,gCAAA;QAAAC,OACN,CAAAC,KAAA,4FAAgGC,IAAA,CAAAC,SAAA,CAAAf,KAAA;AAAA;AAC9F,sKACD;MAAA;IAAA;EAAA;EACH,IACFgB,YAAA,GAAAhB,KAAA,CAAAU,WAAA,QAAAjB,eAAA,CAAAO,KAAA,EAAAM,UAAA,EAAAF,IAAA,EAAAC,UAAA;EAAA,OACF,CACFW,YAAA,EAEAV,UAAM,CAIN;AACF","ignoreList":[]}
+{"version":3,"names":["useRef","getThemeProxied","useThemeState","EMPTY","useTheme","theme","useThemeWithState","res","props","isRoot","arguments","length","forThemeView","bag","current","keys","schemeKeys","themeState","process","env","NODE_ENV","passThrough","TAMAGUI_DISABLE_NO_THEME_WARNING","console","error","JSON","stringify","themeProxied"],"sources":["../../../src/hooks/useTheme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAqC;AAE9C,SAASC,eAAA,QAA0C;AACnD,SAASC,aAAA,QAAqB;AAE9B,IAAAC,KAAM,KAAQ;AAOP,IAAAC,QAAM,YAAAA,CAAA,EAAiB;EAC5B;;EAEA,KAAAC,KAAO,IAAKC,iBAAI,CAAAH,KAAkB;EAClC,IAAAI,GAAM,GAAAF,KAAM;EACZ,OAAOE,GAAA;AACT;AAOO,IAAAD,iBAAM,YAAAA,CACXE,KACA;EAUA;;EAKA,IAAAC,MAAM,GAAMC,SAAuB,CAAIC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;IAAAE,YAAA,GAAAF,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EACvC,IAAIG,GAAC,GAAIb,MAAA,KAAS;EAChB,KAAAa,GAAI,CAAAC,OAAU;IAAAD,GACZ,CAAAC,OAAQ;MACRC,IAAA;QACFD,OAAA;MACF;MACAE,UAAc;QACRF,OAAA;MAEF;IACF;EACE;EACE;IAAAC,IAAA;IAAAC;EAAQ,IAAAH,GAAA,CAAAC,OAAA;EAAA,IAAAG,UACN,GAAAf,aAAA,CAAAM,KAAA,EAAAC,MAAA,EAAAM,IAAA,EAAAC,UAAA,EAAAJ,YAAA;EAAgG,IAAAM,OAC9F,CAAAC,GAAA,CAAAC,QAAA;IAAA,KAAAZ,KACD,CAAAa,WAAA,MAAAJ,UAAA,aAAAA,UAAA,uBAAAA,UAAA,CAAAZ,KAAA;MAAA,IAAAa,OAAA,CAAAC,GAAA,CAAAG,gCAAA;QAAAC,OAAA,CAAAC,KAAA,4FAAAC,IAAA,CAAAC,SAAA,CAAAlB,KAAA;AAAA;AACH,sKACF;MACF;IACF;EAEA;EAIA,IAAAmB,YAAQ,GAAAnB,KAAc,CAAAa,WAAU,QAAApB,eAAA,CAAAO,KAAA,EAAAS,UAAA,EAAAF,IAAA,EAAAC,UAAA;EAClC,Q","ignoreList":[]}

package/dist/esm/hooks/useThemeState.mjs

@@ -1,5 +1,5 @@
 import { useIsomorphicLayoutEffect } from "@tamagui/constants";
-import { createContext, useCallback, useContext, useId, useSyncExternalStore } from "react";
+import { createContext, useContext, useEffect, useId, useReducer, useRef } from "react";
 import { getConfig } from "../config.mjs";
 import { MISSING_THEME_MESSAGE } from "../constants/constants.mjs";
 const ThemeStateContext = createContext("");
@@ -24,7 +24,8 @@ let themeNameCacheVer = -1;
 let themes = null;
 let rootThemeState = null;
 const getRootThemeState = () => rootThemeState;
-const useThemeState = (props, isRoot = false, keys, schemeKeys) => {
+const incReducer = c => c + 1;
+const useThemeState = (props, isRoot = false, keys, schemeKeys, cascadeOnChange = false) => {
   "use no memo";
 
   const {
@@ -40,69 +41,68 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
     theme: getConfig().themes.light
   };
   const id = useId();
-  const subscribe = useCallback(cb => {
-    listenersByParent[parentId] = listenersByParent[parentId] || /* @__PURE__ */new Set();
-    listenersByParent[parentId].add(id);
-    allListeners.set(id, () => {
-      PendingUpdate.set(id, shouldForce ? "force" : true);
-      cb();
-    });
-    return () => {
-      allListeners.delete(id);
-      listenersByParent[parentId].delete(id);
-      localStates.delete(id);
-      states.delete(id);
-      PendingUpdate.delete(id);
-    };
-  }, [id, parentId]);
   const propsKey = getPropsKey(props);
-  const getSnapshot = () => {
-    let local = localStates.get(id);
-    const parentState = states.get(parentId);
-    if (local && !PendingUpdate.has(id)) {
-      if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
-    }
-    const isSchemeOnlyChange = false;
-    const keysSize = keys?.current?.size ?? 0;
-    const allKeysSchemeOptimized = (schemeKeys?.current?.size ?? 0) === keysSize && keysSize > 0;
-    const canSkipForSchemeChange = isSchemeOnlyChange;
-    const needsUpdate = props.passThrough ? false : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : keys?.current?.size ? true : props.needsUpdate?.();
-    const [rerender, next] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
-    PendingUpdate.delete(id);
-    if (!local || rerender) {
-      local = {
-        ...next
-      };
-      localStates.set(id, local);
-    }
-    if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
-      console.groupCollapsed(` ${id} getSnapshot ${rerender}`, local.name, ">", next.name);
-      console.info({
-        props,
-        propsKey,
-        isRoot,
-        parentId,
-        local,
-        next,
-        needsUpdate,
-        isSchemeOnlyChange,
-        allKeysSchemeOptimized,
-        canSkipForSchemeChange
-      });
-      console.groupEnd();
-    }
-    if (next !== local) {
-      Object.assign(local, next);
-      local.id = id;
-    }
-    local._parentName = parentState?.name;
-    local._propsKey = propsKey;
-    states.set(id, next);
-    return local;
-  };
+  const ref = useRef(null);
+  if (!ref.current) ref.current = {
+    id,
+    parentId,
+    props,
+    propsKey,
+    isRoot,
+    keys,
+    schemeKeys,
+    renderVersion: 0
+  };else {
+    ref.current.props = props;
+    ref.current.propsKey = propsKey;
+    ref.current.isRoot = isRoot;
+    ref.current.keys = keys;
+    ref.current.schemeKeys = schemeKeys;
+    ref.current.parentId = parentId;
+  }
+  ref.current.renderVersion++;
   if (process.env.NODE_ENV === "development" && globalThis.time) globalThis.time`theme-prep-uses`;
-  const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-  useIsomorphicLayoutEffect(() => {
+  const [, forceUpdate] = useReducer(incReducer, 0);
+  const state = getSnapshotImpl(ref.current);
+  ref.current.lastSnap = state;
+  useEffect(() => {
+    const r = ref.current;
+    const renderVersion = r.renderVersion;
+    if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
+    if (shouldSubscribeToTheme(r, cascadeOnChange)) {
+      if (!r.unsubscribe) {
+        const pid = r.parentId;
+        const sid = r.id;
+        const cb = () => {
+          const next = getSnapshotImpl(r);
+          if (next !== r.lastSnap) {
+            r.lastSnap = next;
+            forceUpdate();
+          }
+        };
+        listenersByParent[pid] = listenersByParent[pid] || /* @__PURE__ */new Set();
+        listenersByParent[pid].add(sid);
+        allListeners.set(sid, () => {
+          PendingUpdate.set(sid, shouldForce ? "force" : true);
+          cb();
+        });
+        r.subscribedParentId = pid;
+        r.unsubscribe = () => {
+          allListeners.delete(sid);
+          listenersByParent[pid]?.delete(sid);
+          localStates.delete(sid);
+          states.delete(sid);
+          PendingUpdate.delete(sid);
+          r.unsubscribe = void 0;
+          r.subscribedParentId = void 0;
+        };
+      }
+    } else if (r.unsubscribe) cleanupThemeSubscription(r);
+    return () => {
+      if (r.renderVersion === renderVersion) cleanupThemeState(r);
+    };
+  });
+  if (cascadeOnChange) useIsomorphicLayoutEffect(() => {
     if (!HasRenderedOnce.get(keys)) {
       HasRenderedOnce.set(keys, true);
       return;
@@ -118,6 +118,70 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
   }, [keys, propsKey]);
   return state;
 };
+const shouldSubscribeToTheme = (r, cascadeOnChange) => r.isRoot || cascadeOnChange || hasThemeUpdatingProps(r.props) || !!r.keys.current?.size || !!r.props.needsUpdate?.();
+function cleanupThemeSubscription(r) {
+  r.unsubscribe?.();
+}
+function cleanupThemeState(r) {
+  if (r.unsubscribe) cleanupThemeSubscription(r);else {
+    localStates.delete(r.id);
+    states.delete(r.id);
+    PendingUpdate.delete(r.id);
+  }
+}
+const getSnapshotImpl = r => {
+  const {
+    id,
+    parentId,
+    props,
+    propsKey,
+    isRoot,
+    keys,
+    schemeKeys
+  } = r;
+  let local = localStates.get(id);
+  const parentState = states.get(parentId);
+  if (local && !PendingUpdate.has(id)) {
+    if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
+  }
+  const isSchemeOnlyChange = false;
+  const keysSize = keys?.current?.size ?? 0;
+  const allKeysSchemeOptimized = (schemeKeys?.current?.size ?? 0) === keysSize && keysSize > 0;
+  const canSkipForSchemeChange = isSchemeOnlyChange;
+  const needsUpdate = props.passThrough ? false : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : keys?.current?.size ? true : props.needsUpdate?.();
+  const [rerender, next] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
+  PendingUpdate.delete(id);
+  if (!local || rerender) {
+    local = {
+      ...next
+    };
+    localStates.set(id, local);
+  }
+  if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
+    console.groupCollapsed(` ${id} getSnapshot ${rerender}`, local.name, ">", next.name);
+    console.info({
+      props,
+      propsKey,
+      isRoot,
+      parentId,
+      local,
+      next,
+      needsUpdate,
+      isSchemeOnlyChange,
+      allKeysSchemeOptimized,
+      canSkipForSchemeChange
+    });
+    console.groupEnd();
+  }
+  if (next !== local) {
+    Object.assign(local, next);
+    local.id = id;
+  }
+  local._parentName = parentState?.name;
+  local._propsKey = propsKey;
+  states.set(id, next);
+  return local;
+};
 const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId, needsUpdate, pendingUpdate) => {
   const {
     debug
@@ -152,12 +216,13 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
     }];
   }
   if (!name) {
-    const next = lastState ?? parentState;
-    if (!next) throw new Error(process.env.NODE_ENV === "development" ? `${MISSING_THEME_MESSAGE}
-
-Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? ` (component: ${props.componentName})` : ""}, but no theme state was resolved (parentId: ${parentId}, id: ${id}).` : MISSING_THEME_MESSAGE);
+    const next = lastState ?? parentState ?? rootThemeState ?? {
+      id,
+      name: "light",
+      theme: getConfig().themes.light
+    };
     if (shouldRerender) return [true, {
-      ...(parentState || lastState)
+      ...(parentState || lastState || next)
     }];
     return [false, next];
   }