@tamagui/web 1.100.2 → 1.100.4

package/dist/cjs/hooks/useDidHydrateOnce.js

@@ -23,7 +23,7 @@ let didHydrateOnce = !1;
 function useDidHydrateOnceRoot() {
   (0, import_react.useEffect)(() => {
     const tm = setInterval(() => {
-      Date.now() - last > 32 && (didHydrateOnce = !0, clearInterval(tm));
+      Date.now() - last > 500 && (didHydrateOnce = !0, clearInterval(tm));
     }, 16);
     return () => {
       clearInterval(tm);

package/dist/cjs/hooks/useDidHydrateOnce.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useDidHydrateOnce.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0B;AAE1B,IAAI,iBAAiB;AAKd,SAAS,wBAAwB;AACtC,8BAAU,MAAM;AACd,UAAM,KAAK,YAAY,MAAM;AAC3B,MAAI,KAAK,IAAI,IAAI,OAAO,OACtB,iBAAiB,IACjB,cAAc,EAAE;AAAA,IAEpB,GAAG,EAAE;AACL,WAAO,MAAM;AACX,oBAAc,EAAE;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,CAAC;AACP;AAEA,IAAI,OAAO,KAAK,IAAI;AAEb,SAAS,oBAAoB;AAClC,SAAK,mBACH,OAAO,KAAK,IAAI,IAEX;AACT;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0B;AAE1B,IAAI,iBAAiB;AAEd,SAAS,wBAAwB;AAKtC,8BAAU,MAAM;AACd,UAAM,KAAK,YAAY,MAAM;AAC3B,MAAI,KAAK,IAAI,IAAI,OAAO,QACtB,iBAAiB,IACjB,cAAc,EAAE;AAAA,IAEpB,GAAG,EAAE;AACL,WAAO,MAAM;AACX,oBAAc,EAAE;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,CAAC;AACP;AAEA,IAAI,OAAO,KAAK,IAAI;AAEb,SAAS,oBAAoB;AAIlC,SAAK,mBACH,OAAO,KAAK,IAAI,IAEX;AACT;",
   "names": []
 }

package/dist/cjs/hooks/useDidHydrateOnce.native.js

@@ -21,18 +21,11 @@ __export(useDidHydrateOnce_exports, {
 module.exports = __toCommonJS(useDidHydrateOnce_exports);
 var import_react = require("react"), didHydrateOnce = !1;
 function useDidHydrateOnceRoot() {
-  (0, import_react.useEffect)(function() {
-    var tm = setInterval(function() {
-      Date.now() - last > 32 && (didHydrateOnce = !0, clearInterval(tm));
-    }, 16);
-    return function() {
-      clearInterval(tm);
-    };
-  }, []);
+  return !0;
 }
 var last = Date.now();
 function useDidHydrateOnce() {
-  return didHydrateOnce || (last = Date.now()), didHydrateOnce;
+  return !0;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/hooks/useDidHydrateOnce.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/packages/web/src/hooks/useDidHydrateOnce.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;mBAA0B,kBAEtBA,iBAAiB;AAKd,SAASC,wBAAAA;AACdC,8BAAU,WAAA;AACR,QAAMC,KAAKC,YAAY,WAAA;AACrB,MAAIC,KAAKC,IAAG,IAAKC,OAAO,OACtBP,iBAAiB,IACjBQ,cAAcL,EAAAA;IAElB,GAAG,EAAA;AACH,WAAO,WAAA;AACLK,oBAAcL,EAAAA;IAChB;EACF,GAAG,CAAA,CAAE;AACP;AAEA,IAAII,OAAOF,KAAKC,IAAG;AAEZ,SAASG,oBAAAA;AACd,SAAKT,mBACHO,OAAOF,KAAKC,IAAG,IAEVN;AACT;",
-  "names": ["didHydrateOnce", "useDidHydrateOnceRoot", "useEffect", "tm", "setInterval", "Date", "now", "last", "clearInterval", "useDidHydrateOnce"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;mBAA0B,kBAEtBA,iBAAiB;AAEd,SAASC,wBAAAA;AAEZ,SAAO;AAcX;AAEA,IAAIC,OAAOC,KAAKC,IAAG;AAEZ,SAASC,oBAAAA;AAEZ,SAAO;AAMX;",
+  "names": ["didHydrateOnce", "useDidHydrateOnceRoot", "last", "Date", "now", "useDidHydrateOnce"]
 }

package/dist/cjs/hooks/useMedia.js

@@ -78,7 +78,7 @@ function unlisten() {
 let setupVersion = -1;
 function setupMediaListeners() {
   if (!(import_constants.isWeb && import_constants.isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, unlisten();
+    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
     for (const key in mediaQueryConfig) {
       let update = function() {
         const next = !!getMatch().matches;
@@ -100,42 +100,37 @@ function updateCurrentState() {
     flushing = !1, listeners.forEach((cb) => cb(mediaState));
   }));
 }
-const shouldUpdate = /* @__PURE__ */ new WeakMap();
+const States = /* @__PURE__ */ new WeakMap();
 function setMediaShouldUpdate(ref, props) {
-  return shouldUpdate.set(ref, props);
+  return States.set(ref, {
+    ...States.get(ref),
+    ...props
+  });
 }
-function subscribe(subscriber) {
-  return listeners.add(subscriber), () => listeners.delete(subscriber);
+function getSnapshot({ touched, prev, enabled, keys }) {
+  if (enabled === !1)
+    return prev;
+  const testKeys = keys || touched ? [...keys || [], ...touched || []] : null;
+  return !testKeys || testKeys?.every((key) => mediaState[key] === prev[key]) ? prev : mediaState;
 }
-function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
-  const hasHydrated = (0, import_useDidHydrateOnce.useDidHydrateOnce)(), [state, setState] = (0, import_react.useState)(hasHydrated ? mediaState : getServerSnapshot);
+function useMedia(uidIn, componentContext) {
+  const uid = uidIn ?? (0, import_react.useRef)(), hasHydrated = (0, import_useDidHydrateOnce.useDidHydrateOnce)(), initialState = !import_constants.isWeb || (0, import_useDisableSSR.getDisableSSR)(componentContext) || hasHydrated ? mediaState : initState;
+  let componentState = States.get(uid);
+  componentState || (componentState = { prev: initialState }, States.set(uid, componentState)), componentState.touched = void 0;
+  const [state, setState] = (0, import_react.useState)(initialState);
   return (0, import_constants.useIsomorphicLayoutEffect)(() => {
     function update() {
       setState((prev) => {
-        const next = getSnapshot();
-        return next !== prev ? next : prev;
+        const componentState2 = States.get(uid), next = getSnapshot(componentState2);
+        return next !== prev ? (componentState2.prev = next, next) : prev;
       });
     }
-    return update(), subscriber(update);
-  }, []), state;
-}
-function useMedia(uid, componentContext) {
-  const internal = (0, import_react.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants.isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(
-    subscribe,
-    () => {
-      if (!internal.current)
-        return mediaState;
-      const { touched, prev } = internal.current, componentState = uid ? shouldUpdate.get(uid) : void 0;
-      if (componentState && componentState.enabled === !1)
-        return prev;
-      const testKeys = componentState?.keys ?? ((!componentState || componentState.enabled) && touched ? [...touched] : null);
-      return !testKeys || testKeys?.every((key) => mediaState[key] === prev[key]) ? prev : (internal.current.prev = mediaState, mediaState);
-    },
-    () => initialState
-  );
-  return new Proxy(state, {
+    return Promise.resolve().then(update), listeners.add(update), () => {
+      listeners.delete(update);
+    };
+  }, [uid]), new Proxy(state, {
     get(_, key) {
-      return typeof key == "string" && (internal.current ||= { prev: initialState }, internal.current.touched ||= /* @__PURE__ */ new Set(), internal.current.touched.add(key)), Reflect.get(state, key);
+      return typeof key == "string" && (componentState.touched ||= /* @__PURE__ */ new Set(), componentState.touched.add(key)), Reflect.get(state, key);
     }
   });
 }

package/dist/cjs/hooks/useMedia.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useMedia.tsx"],
-  "mappings": "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",
-  "names": []
+  "mappings": "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",
+  "names": ["componentState"]
 }

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

@@ -174,7 +174,7 @@ function setupMediaListeners() {
     }), update();
   };
   if (!(import_constants.isWeb && import_constants.isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, unlisten();
+    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
     for (var key in mediaQueryConfig) _loop(key);
   }
 }
@@ -186,48 +186,42 @@ function updateCurrentState() {
     });
   }));
 }
-var shouldUpdate = /* @__PURE__ */ new WeakMap();
+var States = /* @__PURE__ */ new WeakMap();
 function setMediaShouldUpdate(ref, props) {
-  return shouldUpdate.set(ref, props);
+  return States.set(ref, _object_spread({}, States.get(ref), props));
 }
-function subscribe(subscriber) {
-  return listeners.add(subscriber), function() {
-    return listeners.delete(subscriber);
-  };
+function getSnapshot(param) {
+  var touched = param.touched, prev = param.prev, enabled = param.enabled, keys = param.keys, isDisabled = enabled === !1;
+  if (isDisabled)
+    return prev;
+  var testKeys = keys || touched ? _to_consumable_array(keys || []).concat(_to_consumable_array(touched || [])) : null, hasntUpdated = !testKeys || (testKeys == null ? void 0 : testKeys.every(function(key) {
+    return mediaState[key] === prev[key];
+  }));
+  return hasntUpdated ? prev : mediaState;
 }
-function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
-  var hasHydrated = (0, import_useDidHydrateOnce.useDidHydrateOnce)(), _useState = _sliced_to_array((0, import_react.useState)(hasHydrated ? mediaState : getServerSnapshot), 2), state = _useState[0], setState = _useState[1];
+function useMedia(uidIn, componentContext) {
+  var uid = uidIn ?? (0, import_react.useRef)(), hasHydrated = (0, import_useDidHydrateOnce.useDidHydrateOnce)(), isHydrated = !import_constants.isWeb || (0, import_useDisableSSR.getDisableSSR)(componentContext) || hasHydrated, initialState = isHydrated ? mediaState : initState, componentState = States.get(uid);
+  componentState || (componentState = {
+    prev: initialState
+  }, States.set(uid, componentState)), componentState.touched = void 0;
+  var _useState = _sliced_to_array((0, import_react.useState)(initialState), 2), state = _useState[0], setState = _useState[1];
   return (0, import_constants.useIsomorphicLayoutEffect)(function() {
     var update = function() {
       setState(function(prev) {
-        var next = getSnapshot();
-        return next !== prev ? next : prev;
+        var componentState2 = States.get(uid), next = getSnapshot(componentState2);
+        return next !== prev ? (componentState2.prev = next, next) : prev;
       });
     };
-    return update(), subscriber(update);
-  }, []), state;
-}
-function useMedia(uid, componentContext) {
-  var internal = (0, import_react.useRef)(), disableSSR = (0, import_useDisableSSR.getDisableSSR)(componentContext), initialState = (disableSSR || !import_constants.isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(subscribe, function() {
-    if (!internal.current)
-      return mediaState;
-    var _internal_current = internal.current, touched = _internal_current.touched, prev = _internal_current.prev, componentState = uid ? shouldUpdate.get(uid) : void 0;
-    if (componentState && componentState.enabled === !1)
-      return prev;
-    var _componentState_keys, testKeys = (_componentState_keys = componentState == null ? void 0 : componentState.keys) !== null && _componentState_keys !== void 0 ? _componentState_keys : (!componentState || componentState.enabled) && touched ? _to_consumable_array(touched) : null, hasntUpdated = !testKeys || (testKeys == null ? void 0 : testKeys.every(function(key) {
-      return mediaState[key] === prev[key];
-    }));
-    return hasntUpdated ? prev : (internal.current.prev = mediaState, mediaState);
-  }, function() {
-    return initialState;
-  });
-  return new Proxy(state, {
+    return Promise.resolve().then(update), listeners.add(update), function() {
+      listeners.delete(update);
+    };
+  }, [
+    uid
+  ]), new Proxy(state, {
     get: function(_, key) {
       if (typeof key == "string") {
-        var _internal, _internal_current;
-        (_internal = internal).current || (_internal.current = {
-          prev: initialState
-        }), (_internal_current = internal.current).touched || (_internal_current.touched = /* @__PURE__ */ new Set()), internal.current.touched.add(key);
+        var _componentState;
+        (_componentState = componentState).touched || (_componentState.touched = /* @__PURE__ */ new Set()), componentState.touched.add(key);
       }
       return Reflect.get(state, key);
     }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/packages/web/src/hooks/useMedia.tsx"],
-  "mappings": "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",
-  "names": ["mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "pseudoDescriptors", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "getConfig", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "add", "assign", "disableSSR", "setupMediaListeners", "updateCurrentState", "unlisten", "forEach", "cb", "clear", "setupVersion", "update", "next", "getMatch", "matches", "str", "mediaObjectToString", "matchMedia", "match", "addListener", "removeListener", "isWeb", "isServer", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "shouldUpdate", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "useLayoutExternalStore", "getSnapshot", "getServerSnapshot", "hasHydrated", "useDidHydrateOnce", "useState", "state", "setState", "useIsomorphicLayoutEffect", "prev", "useMedia", "uid", "componentContext", "internal", "useRef", "getDisableSSR", "initialState", "current", "touched", "componentState", "undefined", "enabled", "testKeys", "hasntUpdated", "every", "_", "getMediaImportanceIfMoreImportant", "mediaKey", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "res", "entries", "map", "feature", "value", "test", "join", "mediaKeyToQuery", "mediaKeyMatch", "dimensions", "mediaQueries", "result", "expectedVal", "isMax", "isWidth", "endsWith", "givenVal"]
+  "mappings": "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",
+  "names": ["mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "pseudoDescriptors", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "getConfig", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "add", "assign", "disableSSR", "setupMediaListeners", "updateCurrentState", "unlisten", "forEach", "cb", "clear", "setupVersion", "update", "next", "getMatch", "matches", "str", "mediaObjectToString", "matchMedia", "match", "addListener", "removeListener", "isWeb", "isServer", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "getSnapshot", "touched", "prev", "enabled", "isDisabled", "testKeys", "hasntUpdated", "every", "useMedia", "uidIn", "componentContext", "uid", "useRef", "hasHydrated", "useDidHydrateOnce", "isHydrated", "getDisableSSR", "initialState", "componentState", "undefined", "useState", "state", "setState", "useIsomorphicLayoutEffect", "delete", "_", "getMediaImportanceIfMoreImportant", "mediaKey", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "res", "entries", "map", "feature", "value", "test", "join", "mediaKeyToQuery", "mediaKeyMatch", "dimensions", "mediaQueries", "result", "expectedVal", "isMax", "isWidth", "endsWith", "givenVal"]
 }

package/dist/esm/hooks/useDidHydrateOnce.js

@@ -3,7 +3,7 @@ let didHydrateOnce = !1;
 function useDidHydrateOnceRoot() {
   useEffect(() => {
     const tm = setInterval(() => {
-      Date.now() - last > 32 && (didHydrateOnce = !0, clearInterval(tm));
+      Date.now() - last > 500 && (didHydrateOnce = !0, clearInterval(tm));
     }, 16);
     return () => {
       clearInterval(tm);

package/dist/esm/hooks/useDidHydrateOnce.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useDidHydrateOnce.tsx"],
-  "mappings": "AAAA,SAAS,iBAAiB;AAE1B,IAAI,iBAAiB;AAKd,SAAS,wBAAwB;AACtC,YAAU,MAAM;AACd,UAAM,KAAK,YAAY,MAAM;AAC3B,MAAI,KAAK,IAAI,IAAI,OAAO,OACtB,iBAAiB,IACjB,cAAc,EAAE;AAAA,IAEpB,GAAG,EAAE;AACL,WAAO,MAAM;AACX,oBAAc,EAAE;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,CAAC;AACP;AAEA,IAAI,OAAO,KAAK,IAAI;AAEb,SAAS,oBAAoB;AAClC,SAAK,mBACH,OAAO,KAAK,IAAI,IAEX;AACT;",
+  "mappings": "AAAA,SAAS,iBAAiB;AAE1B,IAAI,iBAAiB;AAEd,SAAS,wBAAwB;AAKtC,YAAU,MAAM;AACd,UAAM,KAAK,YAAY,MAAM;AAC3B,MAAI,KAAK,IAAI,IAAI,OAAO,QACtB,iBAAiB,IACjB,cAAc,EAAE;AAAA,IAEpB,GAAG,EAAE;AACL,WAAO,MAAM;AACX,oBAAc,EAAE;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,CAAC;AACP;AAEA,IAAI,OAAO,KAAK,IAAI;AAEb,SAAS,oBAAoB;AAIlC,SAAK,mBACH,OAAO,KAAK,IAAI,IAEX;AACT;",
   "names": []
 }

package/dist/esm/hooks/useDidHydrateOnce.mjs

@@ -3,7 +3,7 @@ let didHydrateOnce = !1;
 function useDidHydrateOnceRoot() {
   useEffect(() => {
     const tm = setInterval(() => {
-      Date.now() - last > 32 && (didHydrateOnce = !0, clearInterval(tm));
+      Date.now() - last > 500 && (didHydrateOnce = !0, clearInterval(tm));
     }, 16);
     return () => {
       clearInterval(tm);

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

@@ -1,18 +1,11 @@
 import { useEffect } from "react";
 var didHydrateOnce = !1;
 function useDidHydrateOnceRoot() {
-  useEffect(function() {
-    var tm = setInterval(function() {
-      Date.now() - last > 32 && (didHydrateOnce = !0, clearInterval(tm));
-    }, 16);
-    return function() {
-      clearInterval(tm);
-    };
-  }, []);
+  return !0;
 }
 var last = Date.now();
 function useDidHydrateOnce() {
-  return didHydrateOnce || (last = Date.now()), didHydrateOnce;
+  return !0;
 }
 export {
   useDidHydrateOnce,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/packages/web/src/hooks/useDidHydrateOnce.tsx"],
-  "mappings": "AAAA,SAASA,iBAAiB;AAE1B,IAAIC,iBAAiB;AAKd,SAASC,wBAAAA;AACdF,YAAU,WAAA;AACR,QAAMG,KAAKC,YAAY,WAAA;AACrB,MAAIC,KAAKC,IAAG,IAAKC,OAAO,OACtBN,iBAAiB,IACjBO,cAAcL,EAAAA;IAElB,GAAG,EAAA;AACH,WAAO,WAAA;AACLK,oBAAcL,EAAAA;IAChB;EACF,GAAG,CAAA,CAAE;AACP;AAEA,IAAII,OAAOF,KAAKC,IAAG;AAEZ,SAASG,oBAAAA;AACd,SAAKR,mBACHM,OAAOF,KAAKC,IAAG,IAEVL;AACT;",
-  "names": ["useEffect", "didHydrateOnce", "useDidHydrateOnceRoot", "tm", "setInterval", "Date", "now", "last", "clearInterval", "useDidHydrateOnce"]
+  "mappings": "AAAA,SAASA,iBAAiB;AAE1B,IAAIC,iBAAiB;AAEd,SAASC,wBAAAA;AAEZ,SAAO;AAcX;AAEA,IAAIC,OAAOC,KAAKC,IAAG;AAEZ,SAASC,oBAAAA;AAEZ,SAAO;AAMX;",
+  "names": ["useEffect", "didHydrateOnce", "useDidHydrateOnceRoot", "last", "Date", "now", "useDidHydrateOnce"]
 }

package/dist/esm/hooks/useMedia.js

@@ -52,7 +52,7 @@ function unlisten() {
 let setupVersion = -1;
 function setupMediaListeners() {
   if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, unlisten();
+    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
     for (const key in mediaQueryConfig) {
       let update = function() {
         const next = !!getMatch().matches;
@@ -74,42 +74,37 @@ function updateCurrentState() {
     flushing = !1, listeners.forEach((cb) => cb(mediaState));
   }));
 }
-const shouldUpdate = /* @__PURE__ */ new WeakMap();
+const States = /* @__PURE__ */ new WeakMap();
 function setMediaShouldUpdate(ref, props) {
-  return shouldUpdate.set(ref, props);
+  return States.set(ref, {
+    ...States.get(ref),
+    ...props
+  });
 }
-function subscribe(subscriber) {
-  return listeners.add(subscriber), () => listeners.delete(subscriber);
+function getSnapshot({ touched, prev, enabled, keys }) {
+  if (enabled === !1)
+    return prev;
+  const testKeys = keys || touched ? [...keys || [], ...touched || []] : null;
+  return !testKeys || testKeys?.every((key) => mediaState[key] === prev[key]) ? prev : mediaState;
 }
-function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
-  const hasHydrated = useDidHydrateOnce(), [state, setState] = useState(hasHydrated ? mediaState : getServerSnapshot);
+function useMedia(uidIn, componentContext) {
+  const uid = uidIn ?? useRef(), hasHydrated = useDidHydrateOnce(), initialState = !isWeb || getDisableSSR(componentContext) || hasHydrated ? mediaState : initState;
+  let componentState = States.get(uid);
+  componentState || (componentState = { prev: initialState }, States.set(uid, componentState)), componentState.touched = void 0;
+  const [state, setState] = useState(initialState);
   return useIsomorphicLayoutEffect(() => {
     function update() {
       setState((prev) => {
-        const next = getSnapshot();
-        return next !== prev ? next : prev;
+        const componentState2 = States.get(uid), next = getSnapshot(componentState2);
+        return next !== prev ? (componentState2.prev = next, next) : prev;
       });
     }
-    return update(), subscriber(update);
-  }, []), state;
-}
-function useMedia(uid, componentContext) {
-  const internal = useRef(), initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(
-    subscribe,
-    () => {
-      if (!internal.current)
-        return mediaState;
-      const { touched, prev } = internal.current, componentState = uid ? shouldUpdate.get(uid) : void 0;
-      if (componentState && componentState.enabled === !1)
-        return prev;
-      const testKeys = componentState?.keys ?? ((!componentState || componentState.enabled) && touched ? [...touched] : null);
-      return !testKeys || testKeys?.every((key) => mediaState[key] === prev[key]) ? prev : (internal.current.prev = mediaState, mediaState);
-    },
-    () => initialState
-  );
-  return new Proxy(state, {
+    return Promise.resolve().then(update), listeners.add(update), () => {
+      listeners.delete(update);
+    };
+  }, [uid]), new Proxy(state, {
     get(_, key) {
-      return typeof key == "string" && (internal.current ||= { prev: initialState }, internal.current.touched ||= /* @__PURE__ */ new Set(), internal.current.touched.add(key)), Reflect.get(state, key);
+      return typeof key == "string" && (componentState.touched ||= /* @__PURE__ */ new Set(), componentState.touched.add(key)), Reflect.get(state, key);
     }
   });
 }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useMedia.tsx"],
-  "mappings": "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",
-  "names": []
+  "mappings": "AAAA,SAAS,UAAU,OAAO,iCAAiC;AAC3D,SAAgB,QAAQ,gBAAsC;AAE9D,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;AAWlC,SAAS,qBAAqB;AAC9B,SAAS,yBAAyB;AAE3B,IAAI;AAAA;AAAA,EAET,QAAQ,IAAI,aAAa,gBACrB,IAAI;AAAA,IACF,CAAC;AAAA,IACD;AAAA,MACE,IAAI,QAAQ,KAAK;AACf,YACE,OAAO,OAAQ,YACf,IAAI,CAAC,MAAM;AAAA,QAEX,IAAI,CAAC,MAAM;AAEX,gBAAM,IAAI,MAAM,yCAAyC,GAAG,EAAE;AAEhE,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAAA,IACF;AAAA,EACF,IACC,CAAC;AAAA;AAED,MAAM,mBAAiC,CAAC,GAElC,WAAW,MAAM,YAEjB,YAAY,oBAAI,IAAY,GAE5B,aAAa,CAAC,QAA6B;AACtD,MAAI,UAAU,IAAI,GAAG,EAAG,QAAO;AAC/B,MAAI,IAAI,CAAC,MAAM,KAAK;AAClB,QAAI,IAAI,WAAW,YAAY,EAAG,QAAO;AACzC,QAAI,IAAI,WAAW,SAAS,EAAG,QAAO;AACtC,QAAI,IAAI,WAAW,SAAS,EAAG,QAAO;AAAA,EACxC;AACA,SAAO;AACT;AAGA,IAAI;AAGJ,MAAM,yBAAyB,OAAO,KAAK,iBAAiB,EAAE;AAE9D,IAAI;AAEG,MAAM,wBAAwB,CAAC,QAAgB;AACpD,MAAI,QAAQ,IAAI,aAAa,iBAAiB,IAAI,CAAC,MAAM;AACvD,UAAM,IAAI,MAAM,eAAe;AAIjC,SADa,UAAU,EACd,SAAS,iBACT,yBAMF,iBAAiB,QAAQ,GAAG,IAAI;AACzC,GAEM,UAAU,oBAAI,IAAc;AAElC,IAAI,eAAe;AAEZ,MAAM,iBAAiB,CAAC,WAAkC;AAC/D,QAAM,EAAE,OAAO,wBAAwB,IAAI;AAC3C,MAAK,OACL;AAAA;AACA,eAAW,OAAO;AAChB,iBAAW,GAAG,IAAI,0BAA0B,GAAG,KAAK,IACpD,UAAU,IAAI,IAAI,GAAG,EAAE;AAEzB,WAAO,OAAO,kBAAkB,KAAK,GACrC,YAAY,EAAE,GAAG,WAAW,GAC5B,mBAAmB,OAAO,KAAK,KAAK,GAEhC,OAAO,aACT,oBAAoB,IAEpB,mBAAmB;AAAA;AAEvB;AAEA,SAAS,WAAW;AAClB,UAAQ,QAAQ,CAAC,OAAO,GAAG,CAAC,GAC5B,QAAQ,MAAM;AAChB;AAOA,IAAI,eAAe;AACZ,SAAS,sBAAsB;AACpC,MAAI,WAAS,aAGT,iBAAiB,cACrB;AAAA,mBAAe,cAGX,QAAQ,IAAI,aAAa,iBAC3B,SAAS;AAGX,eAAW,OAAO,kBAAkB;AAgBlC,UAAS,SAAT,WAAkB;AAChB,cAAM,OAAO,CAAC,CAAC,SAAS,EAAE;AAC1B,QAAI,SAAS,WAAW,GAAG,MAC3B,aAAa,EAAE,GAAG,YAAY,CAAC,GAAG,GAAG,KAAK,GAC1C,mBAAmB;AAAA,MACrB;AApBA,YAAM,MAAM,oBAAoB,iBAAiB,GAAG,GAAG,GAAG,GACpD,WAAW,MAAM,WAAW,GAAG,GAC/B,QAAQ,SAAS;AACvB,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,uBAAa;AAI/B,YAAM,YAAY,MAAM,GACxB,QAAQ,IAAI,MAAM;AAChB,cAAM,eAAe,MAAM;AAAA,MAC7B,CAAC,GAED,OAAO;AAAA,IAQT;AAAA;AACF;AAEA,MAAM,YAAY,oBAAI,IAAS;AAC/B,IAAI,WAAW,IACX,eAAe;AACnB,SAAS,qBAAqB;AAE5B,EAAI,YAAY,iBAAiB,iBAGjC,eAAe,cACf,WAAW,IACX,QAAQ,QAAQ,EAAE,KAAK,MAAM;AAC3B,eAAW,IACX,UAAU,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC;AAAA,EAC1C,CAAC;AACH;AAaA,MAAM,SAAS,oBAAI,QAA0B;AAEtC,SAAS,qBAAqB,KAAU,OAA6B;AAC1E,SAAO,OAAO,IAAI,KAAK;AAAA,IACrB,GAAI,OAAO,IAAI,GAAG;AAAA,IAClB,GAAG;AAAA,EACL,CAAC;AACH;AAEA,SAAS,YAAY,EAAE,SAAS,MAAM,SAAS,KAAK,GAAgB;AAElE,MADmB,YAAY;AAE7B,WAAO;AAGT,QAAM,WAAW,QAAQ,UAAU,CAAC,GAAI,QAAQ,CAAC,GAAI,GAAI,WAAW,CAAC,CAAE,IAAI;AAG3E,SADE,CAAC,YAAY,UAAU,MAAM,CAAC,QAAQ,WAAW,GAAG,MAAM,KAAK,GAAG,CAAC,IAE5D,OAGF;AACT;AAEO,SAAS,SACd,OACA,kBACe;AACf,QAAM,MAAM,SAAS,OAAO,GAEtB,cAAc,kBAAkB,GAEhC,eADa,CAAC,SAAS,cAAc,gBAAgB,KAAK,cAC9B,aAAa;AAE/C,MAAI,iBAAiB,OAAO,IAAI,GAAG;AACnC,EAAK,mBACH,iBAAiB,EAAE,MAAM,aAAa,GACtC,OAAO,IAAI,KAAK,cAAc,IAIhC,eAAe,UAAU;AAEzB,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAS,YAAY;AAE/C,mCAA0B,MAAM;AAC9B,aAAS,SAAS;AAChB,eAAS,CAAC,SAAS;AACjB,cAAMA,kBAAiB,OAAO,IAAI,GAAG,GAC/B,OAAO,YAAYA,eAAc;AACvC,eAAI,SAAS,QACXA,gBAAe,OAAO,MACf,QAEF;AAAA,MACT,CAAC;AAAA,IACH;AAGA,mBAAQ,QAAQ,EAAE,KAAK,MAAM,GAE7B,UAAU,IAAI,MAAM,GACb,MAAM;AACX,gBAAU,OAAO,MAAM;AAAA,IACzB;AAAA,EACF,GAAG,CAAC,GAAG,CAAC,GAED,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,GAAG,KAAK;AACV,aAAI,OAAO,OAAQ,aACjB,eAAe,YAAY,oBAAI,IAAI,GACnC,eAAe,QAAQ,IAAI,GAAG,IAEzB,QAAQ,IAAI,OAAO,GAAG;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAEO,MAAM,oCAAoC,CAC/C,UACA,KACA,iBACA,gBACG;AACH,QAAM,OAAO,UAAU,GACjB,aACJ,eAAe,CAAC,KAAK,SAAS,iBAC1B,sBAAsB,QAAQ,IAC9B;AACN,SAAO,CAAC,gBAAgB,GAAG,KAAK,aAAa,gBAAgB,GAAG,IAAI,aAAa;AACnF;AAEA,SAAS,cAAc,KAAa;AAClC,SAAO,IAAI,QAAQ,UAAU,CAAC,MAAM,IAAI,EAAE,YAAY,CAAC,EAAE,EAAE,YAAY;AACzE;AAEA,MAAM,QAAQ,oBAAI,QAAqB,GACjC,wBAAgD,CAAC;AAEhD,SAAS,oBAAoB,OAAkC,KAAc;AAClF,MAAI,OAAO,SAAU;AACnB,WAAO;AAET,MAAI,MAAM,IAAI,KAAK;AACjB,WAAO,MAAM,IAAI,KAAK;AAExB,QAAM,MAAM,OAAO,QAAQ,KAAK,EAC7B,IAAI,CAAC,CAAC,SAAS,KAAK,OACnB,UAAU,cAAc,OAAO,GAC3B,OAAO,SAAU,WACZ,IAAI,OAAO,KAAK,KAAK,OAE1B,OAAO,SAAU,YAAY,kBAAkB,KAAK,OAAO,MAC7D,QAAQ,GAAG,KAAK,OAEX,IAAI,OAAO,KAAK,KAAK,KAC7B,EACA,KAAK,OAAO;AACf,SAAI,QACF,sBAAsB,GAAG,IAAI,MAE/B,MAAM,IAAI,OAAO,GAAG,GACb;AACT;AAEO,SAAS,gBAAgB,KAAa;AAC3C,SAAO,sBAAsB,GAAG,KAAK,oBAAoB,iBAAiB,GAAG,GAAG,GAAG;AACrF;AAEO,SAAS,cACd,KACA,YACA;AACA,QAAM,eAAe,iBAAiB,GAAG;AASzC,SARe,OAAO,KAAK,YAAY,EAAE,MAAM,CAAC,UAAU;AACxD,UAAM,cAAc,CAAC,aAAa,KAAK,GACjC,QAAQ,MAAM,WAAW,KAAK,GAC9B,UAAU,MAAM,SAAS,OAAO,GAChC,WAAW,WAAW,UAAU,UAAU,QAAQ;AAExD,WAAO,QAAQ,WAAW,cAAc,WAAW;AAAA,EACrD,CAAC;AAEH;",
+  "names": ["componentState"]
 }

package/dist/esm/hooks/useMedia.mjs

@@ -55,7 +55,7 @@ function unlisten() {
 let setupVersion = -1;
 function setupMediaListeners() {
   if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, unlisten();
+    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
     for (const key in mediaQueryConfig) {
       let update = function () {
         const next = !!getMatch().matches;
@@ -82,45 +82,46 @@ function updateCurrentState() {
     flushing = !1, listeners.forEach(cb => cb(mediaState));
   }));
 }
-const shouldUpdate = /* @__PURE__ */new WeakMap();
+const States = /* @__PURE__ */new WeakMap();
 function setMediaShouldUpdate(ref, props) {
-  return shouldUpdate.set(ref, props);
+  return States.set(ref, {
+    ...States.get(ref),
+    ...props
+  });
 }
-function subscribe(subscriber) {
-  return listeners.add(subscriber), () => listeners.delete(subscriber);
+function getSnapshot({
+  touched,
+  prev,
+  enabled,
+  keys
+}) {
+  if (enabled === !1) return prev;
+  const testKeys = keys || touched ? [...(keys || []), ...(touched || [])] : null;
+  return !testKeys || testKeys?.every(key => mediaState[key] === prev[key]) ? prev : mediaState;
 }
-function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
-  const hasHydrated = useDidHydrateOnce(),
-    [state, setState] = useState(hasHydrated ? mediaState : getServerSnapshot);
+function useMedia(uidIn, componentContext) {
+  const uid = uidIn ?? useRef(),
+    hasHydrated = useDidHydrateOnce(),
+    initialState = !isWeb || getDisableSSR(componentContext) || hasHydrated ? mediaState : initState;
+  let componentState = States.get(uid);
+  componentState || (componentState = {
+    prev: initialState
+  }, States.set(uid, componentState)), componentState.touched = void 0;
+  const [state, setState] = useState(initialState);
   return useIsomorphicLayoutEffect(() => {
     function update() {
       setState(prev => {
-        const next = getSnapshot();
-        return next !== prev ? next : prev;
+        const componentState2 = States.get(uid),
+          next = getSnapshot(componentState2);
+        return next !== prev ? (componentState2.prev = next, next) : prev;
       });
     }
-    return update(), subscriber(update);
-  }, []), state;
-}
-function useMedia(uid, componentContext) {
-  const internal = useRef(),
-    initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {},
-    state = useLayoutExternalStore(subscribe, () => {
-      if (!internal.current) return mediaState;
-      const {
-          touched,
-          prev
-        } = internal.current,
-        componentState = uid ? shouldUpdate.get(uid) : void 0;
-      if (componentState && componentState.enabled === !1) return prev;
-      const testKeys = componentState?.keys ?? ((!componentState || componentState.enabled) && touched ? [...touched] : null);
-      return !testKeys || testKeys?.every(key => mediaState[key] === prev[key]) ? prev : (internal.current.prev = mediaState, mediaState);
-    }, () => initialState);
-  return new Proxy(state, {
+    return Promise.resolve().then(update), listeners.add(update), () => {
+      listeners.delete(update);
+    };
+  }, [uid]), new Proxy(state, {
     get(_, key) {
-      return typeof key == "string" && (internal.current ||= {
-        prev: initialState
-      }, internal.current.touched ||= /* @__PURE__ */new Set(), internal.current.touched.add(key)), Reflect.get(state, key);
+      return typeof key == "string" && (componentState.touched ||= /* @__PURE__ */new Set(), componentState.touched.add(key)), Reflect.get(state, key);
     }
   });
 }

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

@@ -147,7 +147,7 @@ function setupMediaListeners() {
     }), update();
   };
   if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, unlisten();
+    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
     for (var key in mediaQueryConfig) _loop(key);
   }
 }
@@ -159,48 +159,42 @@ function updateCurrentState() {
     });
   }));
 }
-var shouldUpdate = /* @__PURE__ */ new WeakMap();
+var States = /* @__PURE__ */ new WeakMap();
 function setMediaShouldUpdate(ref, props) {
-  return shouldUpdate.set(ref, props);
-}
-function subscribe(subscriber) {
-  return listeners.add(subscriber), function() {
-    return listeners.delete(subscriber);
-  };
-}
-function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
-  var hasHydrated = useDidHydrateOnce(), _useState = _sliced_to_array(useState(hasHydrated ? mediaState : getServerSnapshot), 2), state = _useState[0], setState = _useState[1];
+  return States.set(ref, _object_spread({}, States.get(ref), props));
+}
+function getSnapshot(param) {
+  var touched = param.touched, prev = param.prev, enabled = param.enabled, keys = param.keys, isDisabled = enabled === !1;
+  if (isDisabled)
+    return prev;
+  var testKeys = keys || touched ? _to_consumable_array(keys || []).concat(_to_consumable_array(touched || [])) : null, hasntUpdated = !testKeys || (testKeys == null ? void 0 : testKeys.every(function(key) {
+    return mediaState[key] === prev[key];
+  }));
+  return hasntUpdated ? prev : mediaState;
+}
+function useMedia(uidIn, componentContext) {
+  var uid = uidIn ?? useRef(), hasHydrated = useDidHydrateOnce(), isHydrated = !isWeb || getDisableSSR(componentContext) || hasHydrated, initialState = isHydrated ? mediaState : initState, componentState = States.get(uid);
+  componentState || (componentState = {
+    prev: initialState
+  }, States.set(uid, componentState)), componentState.touched = void 0;
+  var _useState = _sliced_to_array(useState(initialState), 2), state = _useState[0], setState = _useState[1];
   return useIsomorphicLayoutEffect(function() {
     var update = function() {
       setState(function(prev) {
-        var next = getSnapshot();
-        return next !== prev ? next : prev;
+        var componentState2 = States.get(uid), next = getSnapshot(componentState2);
+        return next !== prev ? (componentState2.prev = next, next) : prev;
       });
     };
-    return update(), subscriber(update);
-  }, []), state;
-}
-function useMedia(uid, componentContext) {
-  var internal = useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(subscribe, function() {
-    if (!internal.current)
-      return mediaState;
-    var _internal_current = internal.current, touched = _internal_current.touched, prev = _internal_current.prev, componentState = uid ? shouldUpdate.get(uid) : void 0;
-    if (componentState && componentState.enabled === !1)
-      return prev;
-    var _componentState_keys, testKeys = (_componentState_keys = componentState == null ? void 0 : componentState.keys) !== null && _componentState_keys !== void 0 ? _componentState_keys : (!componentState || componentState.enabled) && touched ? _to_consumable_array(touched) : null, hasntUpdated = !testKeys || (testKeys == null ? void 0 : testKeys.every(function(key) {
-      return mediaState[key] === prev[key];
-    }));
-    return hasntUpdated ? prev : (internal.current.prev = mediaState, mediaState);
-  }, function() {
-    return initialState;
-  });
-  return new Proxy(state, {
+    return Promise.resolve().then(update), listeners.add(update), function() {
+      listeners.delete(update);
+    };
+  }, [
+    uid
+  ]), new Proxy(state, {
     get: function(_, key) {
       if (typeof key == "string") {
-        var _internal, _internal_current;
-        (_internal = internal).current || (_internal.current = {
-          prev: initialState
-        }), (_internal_current = internal.current).touched || (_internal_current.touched = /* @__PURE__ */ new Set()), internal.current.touched.add(key);
+        var _componentState;
+        (_componentState = componentState).touched || (_componentState.touched = /* @__PURE__ */ new Set()), componentState.touched.add(key);
       }
       return Reflect.get(state, key);
     }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/packages/web/src/hooks/useMedia.tsx"],
-  "mappings": "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",
-  "names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "useRef", "useState", "getConfig", "matchMedia", "pseudoDescriptors", "getDisableSSR", "useDidHydrateOnce", "mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "add", "assign", "disableSSR", "setupMediaListeners", "updateCurrentState", "unlisten", "forEach", "cb", "clear", "setupVersion", "update", "next", "getMatch", "matches", "str", "mediaObjectToString", "match", "addListener", "removeListener", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "shouldUpdate", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "useLayoutExternalStore", "getSnapshot", "getServerSnapshot", "hasHydrated", "state", "setState", "prev", "useMedia", "uid", "componentContext", "internal", "initialState", "current", "touched", "componentState", "undefined", "enabled", "testKeys", "hasntUpdated", "every", "_", "getMediaImportanceIfMoreImportant", "mediaKey", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "res", "entries", "map", "feature", "value", "test", "join", "mediaKeyToQuery", "mediaKeyMatch", "dimensions", "mediaQueries", "result", "expectedVal", "isMax", "isWidth", "endsWith", "givenVal"]
+  "mappings": "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",
+  "names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "useRef", "useState", "getConfig", "matchMedia", "pseudoDescriptors", "getDisableSSR", "useDidHydrateOnce", "mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "add", "assign", "disableSSR", "setupMediaListeners", "updateCurrentState", "unlisten", "forEach", "cb", "clear", "setupVersion", "update", "next", "getMatch", "matches", "str", "mediaObjectToString", "match", "addListener", "removeListener", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "getSnapshot", "touched", "prev", "enabled", "isDisabled", "testKeys", "hasntUpdated", "every", "useMedia", "uidIn", "componentContext", "uid", "hasHydrated", "isHydrated", "initialState", "componentState", "undefined", "state", "setState", "delete", "_", "getMediaImportanceIfMoreImportant", "mediaKey", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "res", "entries", "map", "feature", "value", "test", "join", "mediaKeyToQuery", "mediaKeyMatch", "dimensions", "mediaQueries", "result", "expectedVal", "isMax", "isWidth", "endsWith", "givenVal"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.100.2",
+  "version": "1.100.4",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,18 +27,18 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.100.2",
-    "@tamagui/constants": "1.100.2",
-    "@tamagui/helpers": "1.100.2",
-    "@tamagui/normalize-css-color": "1.100.2",
-    "@tamagui/timer": "1.100.2",
-    "@tamagui/types": "1.100.2",
-    "@tamagui/use-did-finish-ssr": "1.100.2",
-    "@tamagui/use-event": "1.100.2",
-    "@tamagui/use-force-update": "1.100.2"
+    "@tamagui/compose-refs": "1.100.4",
+    "@tamagui/constants": "1.100.4",
+    "@tamagui/helpers": "1.100.4",
+    "@tamagui/normalize-css-color": "1.100.4",
+    "@tamagui/timer": "1.100.4",
+    "@tamagui/types": "1.100.4",
+    "@tamagui/use-did-finish-ssr": "1.100.4",
+    "@tamagui/use-event": "1.100.4",
+    "@tamagui/use-force-update": "1.100.4"
   },
   "devDependencies": {
-    "@tamagui/build": "1.100.2",
+    "@tamagui/build": "1.100.4",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/hooks/useDidHydrateOnce.tsx

@@ -2,13 +2,14 @@ import { useEffect } from 'react'
 
 let didHydrateOnce = false
 
-// if set on the root tamagui provider, we now can know when things are fully hydrated
-// we cheat a bit why just resetting as we render components below
-
 export function useDidHydrateOnceRoot() {
+  if (process.env.TAMAGUI_TARGET !== 'web') {
+    return true
+  }
+
   useEffect(() => {
     const tm = setInterval(() => {
-      if (Date.now() - last > 32) {
+      if (Date.now() - last > 500) {
         didHydrateOnce = true
         clearInterval(tm)
       }
@@ -22,6 +23,9 @@ export function useDidHydrateOnceRoot() {
 let last = Date.now()
 
 export function useDidHydrateOnce() {
+  if (process.env.TAMAGUI_TARGET !== 'web') {
+    return true
+  }
   if (!didHydrateOnce) {
     last = Date.now()
   }

package/src/hooks/useMedia.tsx

@@ -1,5 +1,5 @@
 import { isServer, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
-import { useRef, useState, useSyncExternalStore } from 'react'
+import { useId, useRef, useState, useSyncExternalStore } from 'react'
 
 import { getConfig } from '../config'
 import { matchMedia } from '../helpers/matchMedia'
@@ -120,7 +120,9 @@ export function setupMediaListeners() {
   setupVersion = mediaVersion
 
   // hmr, undo existing before re-binding
-  unlisten()
+  if (process.env.NODE_ENV === 'development') {
+    unlisten()
+  }
 
   for (const key in mediaQueryConfig) {
     const str = mediaObjectToString(mediaQueryConfig[key], key)
@@ -168,97 +170,85 @@ type MediaKeysState = {
 }
 
 type UpdateState = {
-  enabled: boolean
-  keys: MediaQueryKey[]
+  enabled?: boolean
+  keys?: string[]
+  prev: MediaKeysState
+  touched?: Set<string>
 }
 
-const shouldUpdate = new WeakMap<any, UpdateState>()
+const States = new WeakMap<any, UpdateState>()
 
-export function setMediaShouldUpdate(ref: any, props: UpdateState) {
-  return shouldUpdate.set(ref, props)
+export function setMediaShouldUpdate(ref: any, props: Partial<UpdateState>) {
+  return States.set(ref, {
+    ...(States.get(ref) as any),
+    ...props,
+  })
 }
 
-type UseMediaInternalState = {
-  prev: MediaKeysState
-  touched?: Set<string>
-}
+function getSnapshot({ touched, prev, enabled, keys }: UpdateState) {
+  const isDisabled = enabled === false
+  if (isDisabled) {
+    return prev
+  }
 
-function subscribe(subscriber: any) {
-  listeners.add(subscriber)
-  return () => listeners.delete(subscriber)
+  const testKeys = keys || touched ? [...(keys || []), ...(touched || [])] : null
+  const hasntUpdated =
+    !testKeys || testKeys?.every((key) => mediaState[key] === prev[key])
+  if (hasntUpdated) {
+    return prev
+  }
+
+  return mediaState
 }
 
-function useLayoutExternalStore<State>(
-  subscriber,
-  getSnapshot,
-  getServerSnapshot
-): State {
+export function useMedia(
+  uidIn?: any,
+  componentContext?: ComponentContextI
+): UseMediaState {
+  const uid = uidIn ?? useRef()
+
   const hasHydrated = useDidHydrateOnce()
-  const [state, setState] = useState(hasHydrated ? mediaState : getServerSnapshot)
+  const isHydrated = !isWeb || getDisableSSR(componentContext) || hasHydrated
+  const initialState = isHydrated ? mediaState : initState
+
+  let componentState = States.get(uid)
+  if (!componentState) {
+    componentState = { prev: initialState }
+    States.set(uid, componentState)
+  }
+
+  // reset on each render
+  componentState.touched = undefined
+
+  const [state, setState] = useState(initialState)
 
   useIsomorphicLayoutEffect(() => {
     function update() {
       setState((prev) => {
-        const next = getSnapshot()
+        const componentState = States.get(uid)!
+        const next = getSnapshot(componentState)
         if (next !== prev) {
+          componentState.prev = next
           return next
         }
         return prev
       })
     }
 
-    update()
-
-    return subscriber(update)
-  }, [])
+    // layout effects evidently run before the rest of render?
+    Promise.resolve().then(update)
 
-  return state
-}
-
-export function useMedia(uid?: any, componentContext?: ComponentContextI): UseMediaState {
-  const internal = useRef<UseMediaInternalState | undefined>()
-  // performance boost to avoid using context twice
-  const disableSSR = getDisableSSR(componentContext)
-  const initialState = (disableSSR || !isWeb ? mediaState : initState) || {}
-
-  const state = useLayoutExternalStore<MediaQueryState>(
-    subscribe,
-    () => {
-      if (!internal.current) {
-        return mediaState
-      }
-
-      const { touched, prev } = internal.current
-      const componentState = uid ? shouldUpdate.get(uid) : undefined
-
-      if (componentState && componentState.enabled === false) {
-        return prev
-      }
-
-      const testKeys =
-        componentState?.keys ??
-        ((!componentState || componentState.enabled) && touched ? [...touched] : null)
-
-      const hasntUpdated =
-        !testKeys || testKeys?.every((key) => mediaState[key] === prev[key])
-
-      if (hasntUpdated) {
-        return prev
-      }
-
-      internal.current.prev = mediaState
-
-      return mediaState
-    },
-    () => initialState
-  )
+    listeners.add(update)
+    return () => {
+      listeners.delete(update)
+    }
+  }, [uid])
 
   return new Proxy(state, {
     get(_, key) {
       if (typeof key === 'string') {
-        internal.current ||= { prev: initialState }
-        internal.current.touched ||= new Set()
-        internal.current.touched.add(key)
+        componentState.touched ||= new Set()
+        componentState.touched.add(key)
       }
       return Reflect.get(state, key)
     },

package/types/hooks/useDidHydrateOnce.d.ts

@@ -1,3 +1,3 @@
-export declare function useDidHydrateOnceRoot(): void;
+export declare function useDidHydrateOnceRoot(): true | undefined;
 export declare function useDidHydrateOnce(): boolean;
 //# sourceMappingURL=useDidHydrateOnce.d.ts.map

package/types/hooks/useDidHydrateOnce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDidHydrateOnce.d.ts","sourceRoot":"","sources":["../../src/hooks/useDidHydrateOnce.tsx"],"names":[],"mappings":"AAOA,wBAAgB,qBAAqB,SAYpC;AAID,wBAAgB,iBAAiB,YAKhC"}
+{"version":3,"file":"useDidHydrateOnce.d.ts","sourceRoot":"","sources":["../../src/hooks/useDidHydrateOnce.tsx"],"names":[],"mappings":"AAIA,wBAAgB,qBAAqB,qBAgBpC;AAID,wBAAgB,iBAAiB,YAQhC"}

package/types/hooks/useMedia.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentContextI, IsMediaType, MediaQueries, MediaQueryKey, MediaQueryObject, MediaQueryState, TamaguiInternalConfig, UseMediaState } from '../types';
+import type { ComponentContextI, IsMediaType, MediaQueries, MediaQueryObject, MediaQueryState, TamaguiInternalConfig, UseMediaState } from '../types';
 export declare let mediaState: MediaQueryState;
 export declare const mediaQueryConfig: MediaQueries;
 export declare const getMedia: () => MediaQueryState;
@@ -7,12 +7,17 @@ export declare const isMediaKey: (key: string) => IsMediaType;
 export declare const getMediaKeyImportance: (key: string) => number;
 export declare const configureMedia: (config: TamaguiInternalConfig) => void;
 export declare function setupMediaListeners(): void;
+type MediaKeysState = {
+    [key: string]: any;
+};
 type UpdateState = {
-    enabled: boolean;
-    keys: MediaQueryKey[];
+    enabled?: boolean;
+    keys?: string[];
+    prev: MediaKeysState;
+    touched?: Set<string>;
 };
-export declare function setMediaShouldUpdate(ref: any, props: UpdateState): WeakMap<any, UpdateState>;
-export declare function useMedia(uid?: any, componentContext?: ComponentContextI): UseMediaState;
+export declare function setMediaShouldUpdate(ref: any, props: Partial<UpdateState>): WeakMap<any, UpdateState>;
+export declare function useMedia(uidIn?: any, componentContext?: ComponentContextI): UseMediaState;
 export declare const getMediaImportanceIfMoreImportant: (mediaKey: string, key: string, importancesUsed: Record<string, number>, isSizeMedia: boolean) => number | null;
 export declare function mediaObjectToString(query: string | MediaQueryObject, key?: string): string;
 export declare function mediaKeyToQuery(key: string): string;

package/types/hooks/useMedia.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,aAAa,EACd,MAAM,UAAU,CAAA;AAIjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,WAQxC,CAAA;AAUD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAiB3D,CAAA;AAaD,wBAAgB,mBAAmB,SAiClC;AAsBD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAuCD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,aAAa,CAgDvF;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAQrB,CAAA;AASD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,UAwBjF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,UAE1C;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,WAY9C"}
+{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,YAAY,EAEZ,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,aAAa,EACd,MAAM,UAAU,CAAA;AAIjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,WAQxC,CAAA;AAUD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAiB3D,CAAA;AAaD,wBAAgB,mBAAmB,SAmClC;AAkBD,KAAK,cAAc,GAAG;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,IAAI,EAAE,cAAc,CAAA;IACpB,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,6BAKzE;AAkBD,wBAAgB,QAAQ,CACtB,KAAK,CAAC,EAAE,GAAG,EACX,gBAAgB,CAAC,EAAE,iBAAiB,GACnC,aAAa,CAiDf;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAQrB,CAAA;AASD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,UAwBjF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,UAE1C;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,WAY9C"}