@tamagui/web 1.101.1 → 1.101.3

package/dist/esm/hooks/useMedia.js

@@ -1,9 +1,8 @@
 import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
-import { useRef, useState } from "react";
+import { useRef, useState, useSyncExternalStore } from "react";
 import { getConfig } from "../config";
 import { matchMedia } from "../helpers/matchMedia";
 import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
-import { useDidHydrateOnce } from "./useDidHydrateOnce";
 import { getDisableSSR } from "./useDisableSSR";
 let mediaState = (
   // development only safeguard
@@ -51,7 +50,7 @@ function unlisten() {
 let setupVersion = -1;
 function setupMediaListeners() {
   if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
+    setupVersion = mediaVersion, unlisten();
     for (const key in mediaQueryConfig) {
       let update = function() {
         const next = !!getMatch().matches;
@@ -80,35 +79,45 @@ function setMediaShouldUpdate(ref, props) {
     ...props
   });
 }
-function getSnapshot({ touched, prev, enabled }) {
-  return enabled === !1 || !touched || touched.every((key) => mediaState[key] === prev[key]) ? prev : mediaState;
+function subscribe(subscriber) {
+  return listeners.add(subscriber), () => {
+    listeners.delete(subscriber);
+  };
 }
-function useMedia(uidIn, componentContext, debug = !1) {
-  const uid = uidIn ?? useRef(), hasHydrated = useDidHydrateOnce(), initialState = !isWeb || getDisableSSR(componentContext) || hasHydrated ? mediaState : initState;
+function useMedia(uidIn, componentContext, debug) {
+  const uid = uidIn ?? useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !isWeb ? mediaState : initState) || {};
   let componentState = States.get(uid);
   componentState || (componentState = { prev: initialState }, States.set(uid, componentState));
-  const [state, setState] = useState(initialState);
-  return useIsomorphicLayoutEffect(() => {
-    function update() {
-      setState((prev) => {
-        const componentState2 = States.get(uid);
-        process.env.NODE_ENV === "development" && debug && console.info("useMedia() update?", getSnapshot(componentState2) !== prev, {
-          componentState: componentState2,
-          touched: [...componentState2.touched || []],
-          prev: { ...componentState2.prev },
-          next: getSnapshot(componentState2),
-          mediaState: { ...mediaState }
-        });
-        const next = getSnapshot(componentState2);
-        return next !== prev ? (componentState2.prev = next, next) : prev;
-      });
-    }
-    return update(), listeners.add(update), () => {
-      listeners.delete(update);
-    };
-  }, [uid]), new Proxy(state, {
+  const getSnapshot = () => {
+    if (!componentState)
+      return initialState;
+    const { enabled, keys, prev = initialState } = componentState;
+    if (enabled === !1)
+      return prev;
+    const testKeys = keys ?? (enabled && keys) ?? null;
+    return !testKeys || Object.keys(testKeys).every((key) => mediaState[key] === prev[key]) ? prev : (componentState.prev = mediaState, mediaState);
+  };
+  let state;
+  if (process.env.TAMAGUI_SYNC_MEDIA_QUERY)
+    state = useSyncExternalStore(
+      subscribe,
+      getSnapshot,
+      () => initialState
+    );
+  else {
+    const [_state, setState] = useState(initialState);
+    state = _state, useIsomorphicLayoutEffect(() => {
+      function update() {
+        setState(getSnapshot);
+      }
+      return update(), disableSSR || Promise.resolve().then(() => {
+        update();
+      }), subscribe(update);
+    }, []);
+  }
+  return new Proxy(state, {
     get(_, key) {
-      return typeof key == "string" && (componentState.touched ||= [], componentState.touched.includes(key) || componentState.touched.push(key), process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key)), Reflect.get(state, key);
+      return typeof key == "string" && (componentState.keys ||= {}, componentState.keys[key] = !0, process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", 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": ["componentState"]
+  "mappings": "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",
+  "names": []
 }

package/dist/esm/hooks/useMedia.mjs

@@ -1,9 +1,8 @@
 import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
-import { useRef, useState } from "react";
+import { useRef, useState, useSyncExternalStore } from "react";
 import { getConfig } from "../config.mjs";
 import { matchMedia } from "../helpers/matchMedia.mjs";
 import { pseudoDescriptors } from "../helpers/pseudoDescriptors.mjs";
-import { useDidHydrateOnce } from "./useDidHydrateOnce.mjs";
 import { getDisableSSR } from "./useDisableSSR.mjs";
 let mediaState =
 // development only safeguard
@@ -55,7 +54,7 @@ function unlisten() {
 let setupVersion = -1;
 function setupMediaListeners() {
   if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
+    setupVersion = mediaVersion, unlisten();
     for (const key in mediaQueryConfig) {
       let update = function () {
         const next = !!getMatch().matches;
@@ -89,47 +88,45 @@ function setMediaShouldUpdate(ref, props) {
     ...props
   });
 }
-function getSnapshot({
-  touched,
-  prev,
-  enabled
-}) {
-  return enabled === !1 || !touched || touched.every(key => mediaState[key] === prev[key]) ? prev : mediaState;
+function subscribe(subscriber) {
+  return listeners.add(subscriber), () => {
+    listeners.delete(subscriber);
+  };
 }
-function useMedia(uidIn, componentContext, debug = !1) {
+function useMedia(uidIn, componentContext, debug) {
   const uid = uidIn ?? useRef(),
-    hasHydrated = useDidHydrateOnce(),
-    initialState = !isWeb || getDisableSSR(componentContext) || hasHydrated ? mediaState : initState;
+    disableSSR = getDisableSSR(componentContext),
+    initialState = (disableSSR || !isWeb ? mediaState : initState) || {};
   let componentState = States.get(uid);
   componentState || (componentState = {
     prev: initialState
   }, States.set(uid, componentState));
-  const [state, setState] = useState(initialState);
-  return useIsomorphicLayoutEffect(() => {
-    function update() {
-      setState(prev => {
-        const componentState2 = States.get(uid);
-        process.env.NODE_ENV === "development" && debug && console.info("useMedia() update?", getSnapshot(componentState2) !== prev, {
-          componentState: componentState2,
-          touched: [...(componentState2.touched || [])],
-          prev: {
-            ...componentState2.prev
-          },
-          next: getSnapshot(componentState2),
-          mediaState: {
-            ...mediaState
-          }
-        });
-        const next = getSnapshot(componentState2);
-        return next !== prev ? (componentState2.prev = next, next) : prev;
-      });
-    }
-    return update(), listeners.add(update), () => {
-      listeners.delete(update);
-    };
-  }, [uid]), new Proxy(state, {
+  const getSnapshot = () => {
+    if (!componentState) return initialState;
+    const {
+      enabled,
+      keys,
+      prev = initialState
+    } = componentState;
+    if (enabled === !1) return prev;
+    const testKeys = keys ?? (enabled && keys) ?? null;
+    return !testKeys || Object.keys(testKeys).every(key => mediaState[key] === prev[key]) ? prev : (componentState.prev = mediaState, mediaState);
+  };
+  let state;
+  if (process.env.TAMAGUI_SYNC_MEDIA_QUERY) state = useSyncExternalStore(subscribe, getSnapshot, () => initialState);else {
+    const [_state, setState] = useState(initialState);
+    state = _state, useIsomorphicLayoutEffect(() => {
+      function update() {
+        setState(getSnapshot);
+      }
+      return update(), disableSSR || Promise.resolve().then(() => {
+        update();
+      }), subscribe(update);
+    }, []);
+  }
+  return new Proxy(state, {
     get(_, key) {
-      return typeof key == "string" && (componentState.touched ||= [], componentState.touched.includes(key) || componentState.touched.push(key), process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key)), Reflect.get(state, key);
+      return typeof key == "string" && (componentState.keys ||= {}, componentState.keys[key] = !0, process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key)), Reflect.get(state, key);
     }
   });
 }

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

@@ -1,9 +1,8 @@
 import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
-import { useRef, useState } from "react";
+import { useRef, useState, useSyncExternalStore } from "react";
 import { getConfig } from "../config";
 import { matchMedia } from "../helpers/matchMedia";
 import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
-import { useDidHydrateOnce } from "./useDidHydrateOnce";
 import { getDisableSSR } from "./useDisableSSR";
 function _array_like_to_array(arr, len) {
   (len == null || len > arr.length) && (len = arr.length);
@@ -13,9 +12,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
   if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-  if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
 function _define_property(obj, key, value) {
   return key in obj ? Object.defineProperty(obj, key, {
     value,
@@ -24,9 +20,6 @@ function _define_property(obj, key, value) {
     writable: !0
   }) : obj[key] = value, obj;
 }
-function _iterable_to_array(iter) {
-  if (typeof Symbol < "u" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
   var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
   if (_i != null) {
@@ -49,9 +42,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _non_iterable_spread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _object_spread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
@@ -81,9 +71,6 @@ function _object_spread_props(target, source) {
 function _sliced_to_array(arr, i) {
   return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-  return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _unsupported_iterable_to_array(o, minLen) {
   if (o) {
     if (typeof o == "string") return _array_like_to_array(o, minLen);
@@ -146,7 +133,7 @@ function setupMediaListeners() {
     }), update();
   };
   if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
+    setupVersion = mediaVersion, unlisten();
     for (var key in mediaQueryConfig) _loop(key);
   }
 }
@@ -162,46 +149,47 @@ var States = /* @__PURE__ */ new WeakMap();
 function setMediaShouldUpdate(ref, props) {
   return States.set(ref, _object_spread({}, States.get(ref), props));
 }
-function getSnapshot(param) {
-  var touched = param.touched, prev = param.prev, enabled = param.enabled;
-  if (enabled === !1)
-    return prev;
-  var hasntUpdated = !touched || touched.every(function(key) {
-    return mediaState[key] === prev[key];
-  });
-  return hasntUpdated ? prev : mediaState;
+function subscribe(subscriber) {
+  return listeners.add(subscriber), function() {
+    listeners.delete(subscriber);
+  };
 }
-function useMedia(uidIn, componentContext) {
-  var debug = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1, uid = uidIn ?? useRef(), hasHydrated = useDidHydrateOnce(), isHydrated = !isWeb || getDisableSSR(componentContext) || hasHydrated, initialState = isHydrated ? mediaState : initState, componentState = States.get(uid);
+function useMedia(uidIn, componentContext, debug) {
+  var uid = uidIn ?? useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !isWeb ? mediaState : initState) || {}, componentState = States.get(uid);
   componentState || (componentState = {
     prev: initialState
   }, States.set(uid, componentState));
-  var _useState = _sliced_to_array(useState(initialState), 2), state = _useState[0], setState = _useState[1];
-  return useIsomorphicLayoutEffect(function() {
-    var update = function() {
-      setState(function(prev) {
-        var componentState2 = States.get(uid);
-        process.env.NODE_ENV === "development" && debug && console.info("useMedia() update?", getSnapshot(componentState2) !== prev, {
-          componentState: componentState2,
-          touched: _to_consumable_array(componentState2.touched || []),
-          prev: _object_spread({}, componentState2.prev),
-          next: getSnapshot(componentState2),
-          mediaState: _object_spread({}, mediaState)
-        });
-        var next = getSnapshot(componentState2);
-        return next !== prev ? (componentState2.prev = next, next) : prev;
-      });
-    };
-    return update(), listeners.add(update), function() {
-      listeners.delete(update);
-    };
-  }, [
-    uid
-  ]), new Proxy(state, {
+  var getSnapshot = function() {
+    if (!componentState)
+      return initialState;
+    var enabled = componentState.enabled, keys = componentState.keys, _componentState_prev = componentState.prev, prev = _componentState_prev === void 0 ? initialState : _componentState_prev;
+    if (enabled === !1)
+      return prev;
+    var _ref, testKeys = (_ref = (keys != null || enabled) && keys) !== null && _ref !== void 0 ? _ref : null, hasntUpdated = !testKeys || Object.keys(testKeys).every(function(key) {
+      return mediaState[key] === prev[key];
+    });
+    return hasntUpdated ? prev : (componentState.prev = mediaState, mediaState);
+  }, state;
+  if (process.env.TAMAGUI_SYNC_MEDIA_QUERY)
+    state = useSyncExternalStore(subscribe, getSnapshot, function() {
+      return initialState;
+    });
+  else {
+    var _useState = _sliced_to_array(useState(initialState), 2), _state = _useState[0], setState = _useState[1];
+    state = _state, useIsomorphicLayoutEffect(function() {
+      var update = function() {
+        setState(getSnapshot);
+      };
+      return update(), disableSSR || Promise.resolve().then(function() {
+        update();
+      }), subscribe(update);
+    }, []);
+  }
+  return new Proxy(state, {
     get: function(_, key) {
       if (typeof key == "string") {
         var _componentState;
-        (_componentState = componentState).touched || (_componentState.touched = []), componentState.touched.includes(key) || componentState.touched.push(key), process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key);
+        (_componentState = componentState).keys || (_componentState.keys = {}), componentState.keys[key] = !0, process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", 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", "useDidHydrateOnce", "getDisableSSR", "mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "mediaKeyRegex", "isMediaKey", "has", "match", "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", "addListener", "removeListener", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "getSnapshot", "touched", "prev", "enabled", "hasntUpdated", "every", "useMedia", "uidIn", "componentContext", "debug", "uid", "hasHydrated", "isHydrated", "initialState", "componentState", "state", "setState", "console", "info", "delete", "_", "includes", "push", "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", "startsWith", "isWidth", "endsWith", "givenVal"]
+  "mappings": "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",
+  "names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "useRef", "useState", "useSyncExternalStore", "getConfig", "matchMedia", "pseudoDescriptors", "getDisableSSR", "mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "mediaKeyRegex", "isMediaKey", "has", "match", "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", "addListener", "removeListener", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "useMedia", "uidIn", "componentContext", "debug", "uid", "initialState", "componentState", "prev", "getSnapshot", "enabled", "testKeys", "hasntUpdated", "every", "state", "TAMAGUI_SYNC_MEDIA_QUERY", "_state", "setState", "_", "console", "info", "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", "startsWith", "isWidth", "endsWith", "givenVal"]
 }

package/package.json

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

package/src/createComponent.tsx

@@ -765,20 +765,22 @@ export function createComponent<
 
     // only listen for changes if we are using raw theme values or media space, or dynamic media (native)
     // array = space media breakpoints
-    const isMediaArray = splitStyles.hasMedia && Array.isArray(splitStyles.hasMedia)
+    const hasRuntimeMediaKeys = splitStyles.hasMedia && splitStyles.hasMedia !== true
     const shouldListenForMedia =
       didGetVariableValue() ||
-      isMediaArray ||
+      hasRuntimeMediaKeys ||
       (noClassNames && splitStyles.hasMedia === true)
 
-    const mediaListeningKeys = isMediaArray ? (splitStyles.hasMedia as string[]) : null
+    const mediaListeningKeys = hasRuntimeMediaKeys
+      ? (splitStyles.hasMedia as Record<string, boolean>)
+      : null
     if (process.env.NODE_ENV === 'development' && debugProp) {
       console.info(`useMedia() createComponent`, shouldListenForMedia, mediaListeningKeys)
     }
 
     setMediaShouldUpdate(stateRef, {
       enabled: shouldListenForMedia,
-      touched: mediaListeningKeys,
+      keys: mediaListeningKeys,
     })
 
     const {
@@ -1360,7 +1362,7 @@ export function createComponent<
                 elementType,
                 events,
                 isAnimated,
-                isMediaArray,
+                hasRuntimeMediaKeys,
                 isStringElement,
                 mediaListeningKeys,
                 pseudos,

package/src/helpers/getSplitStyles.tsx

@@ -176,7 +176,7 @@ export const getSplitStyles: StyleSplitter = (
 
   let pseudos: PseudoStyles | null = null
   let space: SpaceTokens | null = props.space
-  let hasMedia: boolean | string[] = false
+  let hasMedia: boolean | Record<string, boolean> = false
   let dynamicThemeAccess: boolean | undefined
   let pseudoGroups: Set<string> | undefined
   let mediaGroups: Set<string> | undefined
@@ -830,10 +830,10 @@ export const getSplitStyles: StyleSplitter = (
         hasMedia ||= true
 
         if (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) {
-          if (!Array.isArray(hasMedia)) {
-            hasMedia = []
+          if (typeof hasMedia !== 'object') {
+            hasMedia = {}
           }
-          hasMedia.push(mediaKeyShort)
+          hasMedia[mediaKeyShort] = true
         }
 
         // can bail early

package/src/hooks/useDidHydrateOnce.tsx

@@ -3,21 +3,17 @@ import { useEffect, useSyncExternalStore } from 'react'
 let didHydrateOnce = false
 
 export function useDidHydrateOnceRoot() {
-  if (process.env.TAMAGUI_REACT_19 && process.env.TAMAGUI_TARGET === 'web') {
-    if (!process.env.TAMAGUI_DISABLE_HYDRATION_OPTIMIZATION) {
-      useEffect(() => {
-        const tm = setInterval(() => {
-          if (Date.now() - last > 50) {
-            didHydrateOnce = true
-            clearInterval(tm)
-          }
-        }, 16)
-        return () => {
-          clearInterval(tm)
-        }
-      }, [])
-    }
-  }
+  // useEffect(() => {
+  //   const tm = setInterval(() => {
+  //     if (Date.now() - last > 50) {
+  //       didHydrateOnce = true
+  //       clearInterval(tm)
+  //     }
+  //   }, 16)
+  //   return () => {
+  //     clearInterval(tm)
+  //   }
+  // }, [])
   return true
 }
 
@@ -27,12 +23,11 @@ export function useDidHydrateOnce() {
   if (process.env.TAMAGUI_TARGET !== 'web') {
     return true
   }
-  if (process.env.TAMAGUI_REACT_19) {
-    if (!didHydrateOnce) {
-      last = Date.now()
-    }
-    return didHydrateOnce
-  }
+  // if (process.env.TAMAGUI_REACT_19) {
+  // if (!didHydrateOnce) {
+  //   last = Date.now()
+  // }
+  // }
   return useDidHydrateSync()
 }