@tamagui/web 1.115.4 → 1.116.0

package/dist/cjs/helpers/themeable.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/themeable.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAGlB,eAAsB,2BA0BhB;AAAA;AAAA;AAAA;AAxBC,SAAS,UACd,WACA,cACA;AAkDA,QAAM,YAjDqB,aAAAA,QAAM,WAAW,SAC1C,OACA,KACA;AACA,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AAEpE,QAAI;AACJ,UAAM,UAAU,cAAc;AAC9B,QAAI;AACF,iBAAW,OAAO,QAAQ,OAAO;AAC/B,cAAM,MAAM,MAAM,GAAG;AACrB,QAAI,QAAQ,WACV,2BAA2B,CAAC,GAC5B,uBAAuB,GAAG,IAAI;AAAA,MAElC;AAGF,UAAM,UAEJ,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAGpD,QAAI,WACF;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,iBAAiB,cAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAGF,QAAI,SAAS;AACX,YAAM,WAAW,QAAQ,UACnB,eAAe,aAAAA,QAAM,WAAW,OAAO;AAC7C,iBACE,4CAAC,YAAU,GAAG,cAAe,GAAG,wBAC7B,oBACH;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT,CAAC;AAGD,mBAAU,cAAc,UACrB,WAAmB,eAAgB,WAAmB,QAAQ,WACjE,KAEO;AAGT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAGlB,eAAsB,2BA0BhB;AAAA;AAAA;AAAA;AAxBC,SAAS,UACd,WACA,cACA;AAoEA,QAAM,YAnEqB,aAAAA,QAAM,WAAW,SAC1C,OACA,KACA;AACA,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AAEpE,QAAI;AACJ,UAAM,UAAU,cAAc;AAC9B,QAAI;AACF,iBAAW,OAAO,QAAQ,OAAO;AAC/B,cAAM,MAAM,MAAM,GAAG;AACrB,QAAI,QAAQ,WACV,2BAA2B,CAAC,GAC5B,uBAAuB,GAAG,IAAI;AAAA,MAElC;AAGF,UAAM,UAEJ,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC,GAY9C,gBAAqC;AAAA,MACzC,eAAe,iBAAiB,cAAc;AAAA,IAChD;AACA,IAAI,WAAW,UACb,cAAc,QAAQ,MAAM,QAE1B,WAAW,UACb,cAAc,OAAO,MAAM,QAEzB,kBAAkB,UACpB,cAAc,UAAU,MAAM,eAE5B,gBAAgB,UAClB,cAAc,QAAQ;AAGxB,QAAI,WACF,4CAAC,sBAAM,uBAAmB,IAAE,GAAG,eAC5B,mBACH;AAGF,QAAI,SAAS;AACX,YAAM,WAAW,QAAQ,UACnB,eAAe,aAAAA,QAAM,WAAW,OAAO;AAC7C,iBACE,4CAAC,YAAU,GAAG,cAAe,GAAG,wBAC7B,oBACH;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT,CAAC;AAGD,mBAAU,cAAc,UACrB,WAAmB,eAAgB,WAAmB,QAAQ,WACjE,KAEO;AAGT;",
   "names": ["React"]
 }

package/dist/cjs/helpers/themeable.native.js

@@ -42,13 +42,13 @@ function themeable(Component, staticConfig) {
         ...rest,
         "data-disable-theme": !0
       })
-    ), contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Theme.Theme, {
-      componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName),
-      name: theme,
+    ), filteredProps = {
+      componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName)
+    };
+    "debug" in props && (filteredProps.debug = props.debug), "theme" in props && (filteredProps.name = props.theme), "themeInverse" in props && (filteredProps.inverse = props.themeInverse), "themeReset" in props && (filteredProps.reset = themeReset);
+    var contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Theme.Theme, {
       "disable-child-theme": !0,
-      debug: props.debug,
-      inverse: themeInverse,
-      reset: themeReset,
+      ...filteredProps,
       children: element
     });
     if (context) {

package/dist/cjs/helpers/themeable.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/themeable.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,eAAkB,2BAGlB,eAAsB;AAEf,SAASA,UACdC,WACAC,cAAoC;AAEpC,MAAMC,qBAAqBC,6BAAAA,QAAMC,WAAW,SAC1CC,OACAC,KAAG;AAEH,QAAM,EAAEC,cAAcC,OAAOC,eAAeC,YAAY,GAAGC,KAAAA,IAASN,OAEhEO,wBACEC,UAAUZ,gBAAAA,OAAAA,SAAAA,aAAcY;AAC9B,QAAIA;AACF,eAAWC,OAAOD,QAAQR,OAAO;AAC/B,YAAMU,MAAMV,MAAMS,GAAAA;AAClB,QAAIC,QAAQC,WACVJ,2BAAAA,yBAA2B,CAAC,IAC5BA,uBAAuBE,GAAAA,IAAOC;MAElC;AAGF,QAAME;;MAEJ,uCAAAC,KAAClB,WAAAA;QAAUM;QAAW,GAAGK;QAAMQ,sBAAkB;;OAG/CC,WACF,uCAAAF,KAACG,oBAAAA;MACCZ,eAAeA,kBAAiBR,gBAAAA,OAAAA,SAAAA,aAAcQ;MAC9Ca,MAAMd;MACNe,uBAAmB;MACnBC,OAAOnB,MAAMmB;MACbC,SAASlB;MACTmB,OAAOhB;gBAENO;;AAIL,QAAIJ,SAAS;AACX,UAAMc,WAAWd,QAAQc,UACnBC,eAAezB,aAAAA,QAAM0B,WAAWhB,OAAAA;AACtCO,iBACE,uCAAAF,KAACS,UAAAA;QAAU,GAAGC;QAAe,GAAGhB;kBAC7BQ;;IAGP;AAEA,WAAOA;EACT,CAAA,GAEMU,YAAiB5B;AACvB4B,mBAAUC,cAAc,WACrB/B,aAAAA,OAAAA,SAAAA,UAAmB+B,iBAAgB/B,aAAAA,OAAAA,SAAAA,UAAmBsB,SAAQ,WAAA,KAG1DQ;AAGT;",
-  "names": ["themeable", "Component", "staticConfig", "withThemeComponent", "React", "forwardRef", "props", "ref", "themeInverse", "theme", "componentName", "themeReset", "rest", "overriddenContextProps", "context", "key", "val", "undefined", "element", "_jsx", "data-disable-theme", "contents", "Theme", "name", "disable-child-theme", "debug", "inverse", "reset", "Provider", "contextValue", "useContext", "withTheme", "displayName"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,eAAkB,2BAGlB,eAAsB;AAEf,SAASA,UACdC,WACAC,cAAoC;AAEpC,MAAMC,qBAAqBC,6BAAAA,QAAMC,WAAW,SAC1CC,OACAC,KAAG;AAEH,QAAM,EAAEC,cAAcC,OAAOC,eAAeC,YAAY,GAAGC,KAAAA,IAASN,OAEhEO,wBACEC,UAAUZ,gBAAAA,OAAAA,SAAAA,aAAcY;AAC9B,QAAIA;AACF,eAAWC,OAAOD,QAAQR,OAAO;AAC/B,YAAMU,MAAMV,MAAMS,GAAAA;AAClB,QAAIC,QAAQC,WACVJ,2BAAAA,yBAA2B,CAAC,IAC5BA,uBAAuBE,GAAAA,IAAOC;MAElC;AAGF,QAAME;;MAEJ,uCAAAC,KAAClB,WAAAA;QAAUM;QAAW,GAAGK;QAAMQ,sBAAkB;;OAY7CC,gBAAqC;MACzCX,eAAeA,kBAAiBR,gBAAAA,OAAAA,SAAAA,aAAcQ;IAChD;AACA,IAAI,WAAWJ,UACbe,cAAcC,QAAQhB,MAAMgB,QAE1B,WAAWhB,UACbe,cAAcE,OAAOjB,MAAMG,QAEzB,kBAAkBH,UACpBe,cAAcG,UAAUlB,MAAME,eAE5B,gBAAgBF,UAClBe,cAAcI,QAAQd;AAGxB,QAAIe,WACF,uCAAAP,KAACQ,oBAAAA;MAAMC,uBAAmB;MAAE,GAAGP;gBAC5BH;;AAIL,QAAIJ,SAAS;AACX,UAAMe,WAAWf,QAAQe,UACnBC,eAAe1B,aAAAA,QAAM2B,WAAWjB,OAAAA;AACtCY,iBACE,uCAAAP,KAACU,UAAAA;QAAU,GAAGC;QAAe,GAAGjB;kBAC7Ba;;IAGP;AAEA,WAAOA;EACT,CAAA,GAEMM,YAAiB7B;AACvB6B,mBAAUC,cAAc,WACrBhC,aAAAA,OAAAA,SAAAA,UAAmBgC,iBAAgBhC,aAAAA,OAAAA,SAAAA,UAAmBsB,SAAQ,WAAA,KAG1DS;AAGT;",
+  "names": ["themeable", "Component", "staticConfig", "withThemeComponent", "React", "forwardRef", "props", "ref", "themeInverse", "theme", "componentName", "themeReset", "rest", "overriddenContextProps", "context", "key", "val", "undefined", "element", "_jsx", "data-disable-theme", "filteredProps", "debug", "name", "inverse", "reset", "contents", "Theme", "disable-child-theme", "Provider", "contextValue", "useContext", "withTheme", "displayName"]
 }

package/dist/cjs/hooks/useComponentState.cjs

@@ -23,10 +23,9 @@ __export(useComponentState_exports, {
   useComponentState: () => useComponentState
 });
 module.exports = __toCommonJS(useComponentState_exports);
-var import_defaultComponentState = require("../defaultComponentState.cjs"),
-  import_useDidHydrateOnce = require("../hooks/useDidHydrateOnce.cjs"),
+var import_constants = require("@tamagui/constants"),
   import_react = require("react"),
-  import_constants = require("@tamagui/constants"),
+  import_defaultComponentState = require("../defaultComponentState.cjs"),
   import_createShallowSetState = require("../helpers/createShallowSetState.cjs"),
   import_isObj = require("../helpers/isObj.cjs"),
   import_log = require("../helpers/log.cjs");
@@ -43,21 +42,25 @@ const useComponentState = (props, {
     willBeAnimatedClient = !!(!!(hasAnimationProp && !staticConfig.isHOC && useAnimations) || curStateRef.hasAnimated),
     willBeAnimated = !import_constants.isServer && willBeAnimatedClient;
   willBeAnimated && !curStateRef.hasAnimated && (curStateRef.hasAnimated = !0);
-  const presence = willBeAnimated && props.animatePresence !== !1 && animationDriver?.usePresence?.() || null,
+  const {
+      disableClassName
+    } = props,
+    presence = willBeAnimated && props.animatePresence !== !1 && animationDriver?.usePresence?.() || null,
     presenceState = presence?.[2],
     isExiting = presenceState?.isPresent === !1,
     isEntering = presenceState?.isPresent === !0 && presenceState.initial !== !1,
     hasEnterStyle = !!props.enterStyle,
-    hasRNAnimation = hasAnimationProp && animationDriver?.isReactNative,
-    hasEnterState = hasEnterStyle || isEntering,
-    didHydrateOnce = willBeAnimated ? (0, import_useDidHydrateOnce.useDidHydrateOnce)() : !0,
-    initialState = hasEnterState || !didHydrateOnce && hasRNAnimation ?
+    hasAnimationThatNeedsHydrate = hasAnimationProp && (animationDriver?.isReactNative || !supportsCSSVars),
+    initialState = hasEnterStyle || isEntering || hasAnimationThatNeedsHydrate ||
+    // disableClassName doesnt work server side, only client, so needs hydrate
+    // this is just for a better ux, supports css variables for light/dark, media queries, etc
+    disableClassName ?
     // on the very first render we switch all spring animation drivers to css rendering
     // this is because we need to use css variables, which they don't support to do proper SSR
     // without flickers of the wrong colors.
     // but once we do that initial hydration and we are in client side rendering mode,
     // we can avoid the extra re-render on mount
-    import_constants.isWeb && !didHydrateOnce ? import_defaultComponentState.defaultComponentState : import_defaultComponentState.defaultComponentStateShouldEnter : import_defaultComponentState.defaultComponentStateMounted,
+    import_defaultComponentState.defaultComponentState : import_defaultComponentState.defaultComponentStateMounted,
     disabled = isDisabled(props);
   disabled != null && (initialState.disabled = disabled);
   const states = (0, import_react.useState)(initialState),
@@ -66,9 +69,9 @@ const useComponentState = (props, {
       [props.forceStyle]: !0
     } : states[0],
     setState = states[1],
-    isHydrated = state.unmounted === !1 || state.unmounted === "should-enter";
+    isHydrated = state.unmounted === !1;
   let isAnimated = willBeAnimated;
-  import_constants.isWeb && hasRNAnimation && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, import_defaultComponentState.defaultComponentStateMounted), setState({
+  import_constants.isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, import_defaultComponentState.defaultComponentStateMounted), setState({
     ...state
   }));
   let setStateShallow = (0, import_createShallowSetState.createShallowSetState)(setState, disabled, !1, props.debug);
@@ -85,15 +88,12 @@ const useComponentState = (props, {
       env = enterVariant ?? enterExitVariant;
     state.unmounted && env && staticConfig.variants[env] ? (process.env.NODE_ENV === "development" && props.debug === "verbose" && console.warn(`Animating presence ENTER "${env}"`), props[env] = !0) : isExiting && exv && (process.env.NODE_ENV === "development" && props.debug === "verbose" && console.warn(`Animating presence EXIT "${exv}"`), props[exv] = exitVariant !== enterExitVariant);
   }
-  let shouldAvoidClasses = !import_constants.isWeb;
-  if (import_constants.isWeb) {
-    const {
-        disableClassName
-      } = props,
-      isAnimatedAndHydrated = isAnimated && !supportsCSSVars && didHydrateOnce && !import_constants.isServer,
-      isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || didHydrateOnce),
-      isDisabledManually = disableClassName && !import_constants.isServer && didHydrateOnce && state.unmounted === !0;
-    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (shouldAvoidClasses = !0, process.env.NODE_ENV === "development" && props.debug && (0, import_log.log)("avoiding className", {
+  let noClass = !import_constants.isWeb || !!props.forceStyle;
+  if (import_constants.isWeb && (!import_constants.isServer || isHydrated)) {
+    const isAnimatedAndHydrated = isAnimated && !supportsCSSVars,
+      isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || !state.unmounted),
+      isDisabledManually = disableClassName && !state.unmounted;
+    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (noClass = !0, process.env.NODE_ENV === "development" && props.debug && (0, import_log.log)("avoiding className", {
       isAnimatedAndHydrated,
       isDisabledManually,
       isClassNameDisabled
@@ -141,7 +141,7 @@ const useComponentState = (props, {
     presenceState,
     setState,
     setStateShallow,
-    shouldAvoidClasses,
+    noClass,
     state,
     stateRef,
     supportsCSSVars,

package/dist/cjs/hooks/useComponentState.cjs.map

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

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

@@ -18,7 +18,7 @@ __export(useComponentState_exports, {
   useComponentState: () => useComponentState
 });
 module.exports = __toCommonJS(useComponentState_exports);
-var import_defaultComponentState = require("../defaultComponentState"), import_useDidHydrateOnce = require("../hooks/useDidHydrateOnce"), import_react = require("react"), import_constants = require("@tamagui/constants"), import_createShallowSetState = require("../helpers/createShallowSetState"), import_isObj = require("../helpers/isObj"), import_log = require("../helpers/log"), useComponentState = function(props, param, staticConfig, config) {
+var import_constants = require("@tamagui/constants"), import_react = require("react"), import_defaultComponentState = require("../defaultComponentState"), import_createShallowSetState = require("../helpers/createShallowSetState"), import_isObj = require("../helpers/isObj"), import_log = require("../helpers/log"), useComponentState = function(props, param, staticConfig, config) {
   var { animationDriver, groups } = param, _animationDriver_usePresence, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, stateRef = (0, import_react.useRef)(void 0);
   stateRef.current || (stateRef.current = {});
   var hasAnimationProp = !!("animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSSVars = animationDriver == null ? void 0 : animationDriver.supportsCSSVars, curStateRef = stateRef.current, willBeAnimatedClient = function() {
@@ -26,20 +26,22 @@ var import_defaultComponentState = require("../defaultComponentState"), import_u
     return !!(next || curStateRef.hasAnimated);
   }(), willBeAnimated = !import_constants.isServer && willBeAnimatedClient;
   willBeAnimated && !curStateRef.hasAnimated && (curStateRef.hasAnimated = !0);
-  var presence = willBeAnimated && props.animatePresence !== !1 && (animationDriver == null || (_animationDriver_usePresence = animationDriver.usePresence) === null || _animationDriver_usePresence === void 0 ? void 0 : _animationDriver_usePresence.call(animationDriver)) || null, presenceState = presence == null ? void 0 : presence[2], isExiting = (presenceState == null ? void 0 : presenceState.isPresent) === !1, isEntering = (presenceState == null ? void 0 : presenceState.isPresent) === !0 && presenceState.initial !== !1, hasEnterStyle = !!props.enterStyle, hasRNAnimation = hasAnimationProp && (animationDriver == null ? void 0 : animationDriver.isReactNative), hasEnterState = hasEnterStyle || isEntering, didHydrateOnce = willBeAnimated ? (0, import_useDidHydrateOnce.useDidHydrateOnce)() : !0, shouldEnter = hasEnterState || !didHydrateOnce && hasRNAnimation, shouldEnterFromUnhydrated = import_constants.isWeb && !didHydrateOnce, initialState = shouldEnter ? (
+  var { disableClassName } = props, presence = willBeAnimated && props.animatePresence !== !1 && (animationDriver == null || (_animationDriver_usePresence = animationDriver.usePresence) === null || _animationDriver_usePresence === void 0 ? void 0 : _animationDriver_usePresence.call(animationDriver)) || null, presenceState = presence == null ? void 0 : presence[2], isExiting = (presenceState == null ? void 0 : presenceState.isPresent) === !1, isEntering = (presenceState == null ? void 0 : presenceState.isPresent) === !0 && presenceState.initial !== !1, hasEnterStyle = !!props.enterStyle, hasAnimationThatNeedsHydrate = hasAnimationProp && ((animationDriver == null ? void 0 : animationDriver.isReactNative) || !supportsCSSVars), hasEnterState = hasEnterStyle || isEntering, shouldEnter = hasEnterState || hasAnimationThatNeedsHydrate || // disableClassName doesnt work server side, only client, so needs hydrate
+  // this is just for a better ux, supports css variables for light/dark, media queries, etc
+  disableClassName, initialState = shouldEnter ? (
     // on the very first render we switch all spring animation drivers to css rendering
     // this is because we need to use css variables, which they don't support to do proper SSR
     // without flickers of the wrong colors.
     // but once we do that initial hydration and we are in client side rendering mode,
     // we can avoid the extra re-render on mount
-    shouldEnterFromUnhydrated ? import_defaultComponentState.defaultComponentState : import_defaultComponentState.defaultComponentStateShouldEnter
+    import_defaultComponentState.defaultComponentState
   ) : import_defaultComponentState.defaultComponentStateMounted, disabled = isDisabled(props);
   disabled != null && (initialState.disabled = disabled);
   var states = (0, import_react.useState)(initialState), state = props.forceStyle ? {
     ...states[0],
     [props.forceStyle]: !0
-  } : states[0], setState = states[1], isHydrated = state.unmounted === !1 || state.unmounted === "should-enter", isAnimated = willBeAnimated;
-  import_constants.isWeb && hasRNAnimation && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, import_defaultComponentState.defaultComponentStateMounted), setState({
+  } : states[0], setState = states[1], isHydrated = state.unmounted === !1, isAnimated = willBeAnimated;
+  import_constants.isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, import_defaultComponentState.defaultComponentStateMounted), setState({
     ...state
   }));
   var setStateShallow = (0, import_createShallowSetState.createShallowSetState)(setState, disabled, !1, props.debug);
@@ -50,10 +52,10 @@ var import_defaultComponentState = require("../defaultComponentState"), import_u
     var exv = exitVariant ?? enterExitVariant, env = enterVariant ?? enterExitVariant;
     state.unmounted && env && staticConfig.variants[env] ? (process.env.NODE_ENV === "development" && props.debug === "verbose" && console.warn(`Animating presence ENTER "${env}"`), props[env] = !0) : isExiting && exv && (process.env.NODE_ENV === "development" && props.debug === "verbose" && console.warn(`Animating presence EXIT "${exv}"`), props[exv] = exitVariant !== enterExitVariant);
   }
-  var shouldAvoidClasses = !import_constants.isWeb;
-  if (import_constants.isWeb) {
-    var { disableClassName } = props, isAnimatedAndHydrated = isAnimated && !supportsCSSVars && didHydrateOnce && !import_constants.isServer, isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || didHydrateOnce), isDisabledManually = disableClassName && !import_constants.isServer && didHydrateOnce && state.unmounted === !0;
-    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (shouldAvoidClasses = !0, process.env.NODE_ENV === "development" && props.debug && (0, import_log.log)("avoiding className", {
+  var noClass = !import_constants.isWeb || !!props.forceStyle;
+  if (import_constants.isWeb && (!import_constants.isServer || isHydrated)) {
+    var isAnimatedAndHydrated = isAnimated && !supportsCSSVars, isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || !state.unmounted), isDisabledManually = disableClassName && !state.unmounted;
+    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (noClass = !0, process.env.NODE_ENV === "development" && props.debug && (0, import_log.log)("avoiding className", {
       isAnimatedAndHydrated,
       isDisabledManually,
       isClassNameDisabled
@@ -102,7 +104,7 @@ var import_defaultComponentState = require("../defaultComponentState"), import_u
     presenceState,
     setState,
     setStateShallow,
-    shouldAvoidClasses,
+    noClass,
     state,
     stateRef,
     supportsCSSVars,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/code/core/web/src/hooks/useComponentState.ts"],
-  "mappings": "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",
-  "names": ["useComponentState", "props", "staticConfig", "config", "animationDriver", "groups", "useAnimations", "stateRef", "useRef", "undefined", "current", "hasAnimationProp", "Boolean", "style", "hasAnimatedStyleValue", "supportsCSSVars", "curStateRef", "willBeAnimatedClient", "next", "isHOC", "hasAnimated", "willBeAnimated", "isServer", "presence", "usePresence", "presenceState", "isExiting", "isPresent", "isEntering", "initial", "hasEnterStyle", "enterStyle", "hasRNAnimation", "isReactNative", "hasEnterState", "didHydrateOnce", "useDidHydrateOnce", "shouldEnter", "shouldEnterFromUnhydrated", "isWeb", "initialState", "defaultComponentState", "defaultComponentStateShouldEnter", "defaultComponentStateMounted", "disabled", "isDisabled", "states", "useState", "state", "forceStyle", "setState", "isHydrated", "unmounted", "isAnimated", "willHydrate", "Object", "assign", "setStateShallow", "createShallowSetState", "debug", "variants", "process", "env", "NODE_ENV", "console", "warn", "JSON", "stringify", "enterVariant", "exitVariant", "enterExitVariant", "custom", "isObj", "exv", "shouldAvoidClasses", "disableClassName", "isAnimatedAndHydrated", "isClassNameDisabled", "acceptsClassName", "disableSSR", "isDisabledManually", "log", "groupName", "group", "listeners", "Set", "emit", "name", "forEach", "l", "subscribe", "cb", "add", "delete", "groupContextState", "og", "pseudo", "keys", "some", "k", "val", "accessibilityState", "accessibilityDisabled"]
+  "mappings": "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",
+  "names": ["useComponentState", "props", "staticConfig", "config", "animationDriver", "groups", "useAnimations", "stateRef", "useRef", "undefined", "current", "hasAnimationProp", "Boolean", "style", "hasAnimatedStyleValue", "supportsCSSVars", "curStateRef", "willBeAnimatedClient", "next", "isHOC", "hasAnimated", "willBeAnimated", "isServer", "disableClassName", "presence", "usePresence", "presenceState", "isExiting", "isPresent", "isEntering", "initial", "hasEnterStyle", "enterStyle", "hasAnimationThatNeedsHydrate", "isReactNative", "hasEnterState", "shouldEnter", "initialState", "defaultComponentState", "defaultComponentStateMounted", "disabled", "isDisabled", "states", "useState", "state", "forceStyle", "setState", "isHydrated", "unmounted", "isAnimated", "isWeb", "willHydrate", "Object", "assign", "setStateShallow", "createShallowSetState", "debug", "variants", "process", "env", "NODE_ENV", "console", "warn", "JSON", "stringify", "enterVariant", "exitVariant", "enterExitVariant", "custom", "isObj", "exv", "noClass", "isAnimatedAndHydrated", "isClassNameDisabled", "acceptsClassName", "disableSSR", "isDisabledManually", "log", "groupName", "group", "listeners", "Set", "emit", "name", "forEach", "l", "subscribe", "cb", "add", "delete", "groupContextState", "og", "pseudo", "keys", "some", "k", "val", "accessibilityState", "accessibilityDisabled"]
 }

package/dist/cjs/hooks/useMedia.cjs

@@ -31,7 +31,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   }), mod);
 var useMedia_exports = {};
 __export(useMedia_exports, {
-  _dmt: () => _dmt,
+  _disableMediaTouch: () => _disableMediaTouch,
   configureMedia: () => configureMedia,
   getMedia: () => getMedia,
   getMediaImportanceIfMoreImportant: () => getMediaImportanceIfMoreImportant,
@@ -49,8 +49,8 @@ __export(useMedia_exports, {
   useMedia: () => useMedia
 });
 module.exports = __toCommonJS(useMedia_exports);
-var import_react = __toESM(require("react")),
-  import_constants = require("@tamagui/constants"),
+var import_constants = require("@tamagui/constants"),
+  import_react = __toESM(require("react")),
   import_config = require("../config.cjs"),
   import_matchMedia = require("../helpers/matchMedia.cjs"),
   import_pseudoDescriptors = require("../helpers/pseudoDescriptors.cjs"),
@@ -96,7 +96,7 @@ const configureMedia = config => {
     for (const key in media) mediaState[key] = mediaQueryDefaultActive?.[key] || !1, mediaKeys.add(`$${key}`);
     Object.assign(mediaQueryConfig, media), initState = {
       ...mediaState
-    }, mediaKeysOrdered = Object.keys(media), config.disableSSR ? setupMediaListeners() : updateCurrentState();
+    }, mediaKeysOrdered = Object.keys(media), setupMediaListeners();
   }
 };
 function unlisten() {
@@ -146,45 +146,42 @@ function subscribe(subscriber) {
     listeners.delete(subscriber);
   };
 }
-function useMedia(uidIn, componentContext, debug) {
-  const uid = uidIn ?? import_react.default.useRef(),
-    disableSSR = (0, import_useDisableSSR.getDisableSSR)(componentContext),
-    initialState = (disableSSR || !import_constants.isWeb ? mediaState : initState) || {};
-  let componentState = States.get(uid);
-  componentState || (componentState = {
-    prev: initialState
-  }, States.set(uid, componentState));
-  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 = import_react.default.useSyncExternalStore(subscribe, getSnapshot, () => initialState);else {
-    const [_state, setState] = import_react.default.useState(initialState);
-    state = _state, (0, import_constants.useIsomorphicLayoutEffect)(() => {
-      function update() {
-        setState(getSnapshot);
-      }
-      return update(), disableSSR || Promise.resolve().then(() => {
-        update();
-      }), subscribe(update);
-    }, []);
+function useMedia(cc, debug) {
+  const initialState = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc) || !import_constants.isWeb ? mediaState : initState,
+    [state, setState] = import_react.default.useState(initialState);
+  let currentKeys;
+  const getCurrentKeys = () => currentKeys;
+  function getSnapshot(cur, keys = cur.lastKeys) {
+    if (!keys) return cur;
+    for (const key of keys) if (mediaState[key] !== cur[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), {
+      ...mediaState,
+      lastKeys: new Set(keys)
+    };
+    return cur;
   }
-  return new Proxy(state, {
+  let isRendering = !0;
+  const isInitialState = state === initialState;
+  return (0, import_constants.useIsomorphicLayoutEffect)(() => {
+    isRendering = !1;
+  }), (0, import_constants.useIsomorphicLayoutEffect)(() => {
+    const update = () => setState(prev => getSnapshot(prev,
+    // because the !didHydrateOnce logic we can't update as we render
+    // we need to get the current keys in case we added
+    // these only ever add keys so likely ok?
+    getCurrentKeys()));
+    return update(), subscribe(update);
+  }, []), new Proxy(state, {
     get(_, key) {
-      if (!disableMediaTouch) 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);
+      if (isRendering && !disableMediaTouch && typeof key == "string" && (!state.lastKeys || !state.lastKeys.has(key) || state[key] !== mediaState[key]) && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), currentKeys ||= /* @__PURE__ */new Set(), currentKeys.add(key), !isInitialState)) {
+        const next = getSnapshot(state, currentKeys);
+        next !== state && setState(next);
+      }
+      return Reflect.get(state, key);
     }
   });
 }
 let disableMediaTouch = !1;
-function _dmt(val) {
+function _disableMediaTouch(val) {
   disableMediaTouch = val;
 }
 function getMediaState(mediaGroups, layout) {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useMedia.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAClB,mBAA2D,+BAE3D,gBAAsC,sBACtC,oBAA2B,kCAC3B,2BAAkC,yCAYlC,uBAA8B;AAEvB,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,GAEnC,gBAAgB,6BAET,aAAa,CAAC,QAA6B;AACtD,MAAI,UAAU,IAAI,GAAG,EAAG,QAAO;AAC/B,MAAI,IAAI,CAAC,MAAM,KAAK;AAClB,UAAM,QAAQ,IAAI,MAAM,aAAa;AACrC,QAAI,MAAO,QAAO,MAAM,CAAC;AAAA,EAC3B;AACA,SAAO;AACT;AAGA,IAAI;AAGJ,MAAM,yBAAyB,OAAO,KAAK,0CAAiB,EAAE;AAE9D,IAAI;AAEG,MAAM,wBAAwB,CAAC,QAAgB;AACpD,MAAI,QAAQ,IAAI,aAAa,iBAAiB,IAAI,CAAC,MAAM;AACvD,UAAM,IAAI,MAAM,eAAe;AAIjC,aADa,yBAAU,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,MAAM,IAAI,QACZ,8BAA0B,0BAAW,yBAAyB;AACpE,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,4BAAS,8BAGT,iBAAiB,cACrB;AAAA,mBAAe,cAGf,SAAS;AAET,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,UAAM,8BAAW,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;AAYA,MAAM,SAAS,oBAAI,QAAyB;AAErC,SAAS,qBACd,KACA,SACA,MACA;AACA,QAAM,MAAM,OAAO,IAAI,GAAG;AAE1B,GAAI,CAAC,OAAO,IAAI,YAAY,WAAW,SACrC,OAAO,IAAI,KAAK;AAAA,IACd,GAAG;AAAA,IACH;AAAA,IACA;AAAA,EACF,CAAC;AAEL;AAOA,SAAS,UAAU,YAAiB;AAClC,mBAAU,IAAI,UAAU,GACjB,MAAM;AACX,cAAU,OAAO,UAAU;AAAA,EAC7B;AACF;AAEO,SAAS,SACd,OACA,kBACA,OACe;AACf,QAAM,MAAM,SAAS,aAAAA,QAAM,OAAO,GAE5B,iBAAa,oCAAc,gBAAgB,GAC3C,gBAAgB,cAAc,CAAC,yBAAQ,aAAa,cAAc,CAAC;AAEzE,MAAI,iBAAiB,OAAO,IAAI,GAAG;AACnC,EAAK,mBACH,iBAAiB,EAAE,MAAM,aAAa,GACtC,OAAO,IAAI,KAAK,cAAc;AAGhC,QAAM,cAAc,MAAM;AACxB,QAAI,CAAC;AACH,aAAO;AAGT,UAAM,EAAE,SAAS,MAAM,OAAO,aAAa,IAAI;AAE/C,QAAI,YAAY;AACd,aAAO;AAGT,UAAM,WAAW,SAAS,WAAW,SAAS;AAI9C,WAFE,CAAC,YAAY,OAAO,KAAK,QAAQ,EAAE,MAAM,CAAC,QAAQ,WAAW,GAAG,MAAM,KAAK,GAAG,CAAC,IAGxE,QAGT,eAAe,OAAO,YACf;AAAA,EACT;AAEA,MAAI;AAEJ,MAAI,QAAQ,IAAI;AACd,YAAQ,aAAAA,QAAM;AAAA,MACZ;AAAA,MACA;AAAA,MACA,MAAM;AAAA,IACR;AAAA,OACK;AACL,UAAM,CAAC,QAAQ,QAAQ,IAAI,aAAAA,QAAM,SAAS,YAAY;AACtD,YAAQ,YAER,4CAA0B,MAAM;AAC9B,eAAS,SAAS;AAChB,iBAAS,WAAW;AAAA,MACtB;AAEA,oBAAO,GAGF,cACH,QAAQ,QAAQ,EAAE,KAAK,MAAM;AAC3B,eAAO;AAAA,MACT,CAAC,GAGI,UAAU,MAAM;AAAA,IACzB,GAAG,CAAC,CAAC;AAAA,EACP;AAEA,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,GAAG,KAAK;AACV,UAAI;AACJ,eAAI,OAAO,OAAQ,aACjB,eAAe,SAAS,CAAC,GACzB,eAAe,KAAK,GAAG,IAAI,IACvB,QAAQ,IAAI,aAAa,iBAAiB,SAC5C,QAAQ,KAAK,oBAAoB,GAAG,IAGjC,QAAQ,IAAI,OAAO,GAAG;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAEA,IAAI,oBAAoB;AAEjB,SAAS,KAAK,KAAc;AACjC,sBAAoB;AACtB;AAEO,SAAS,cACd,aACA,QACA;AACA,sBAAoB;AACpB,MAAI;AACJ,MAAI;AACF,UAAM,OAAO;AAAA,MACX,CAAC,GAAG,WAAW,EAAE,IAAI,CAAC,aACb,CAAC,UAAU,cAAc,UAAU,MAAa,CAAC,CACzD;AAAA,IACH;AAAA,EACF,UAAE;AACA,wBAAoB;AAAA,EACtB;AACA,SAAO;AACT;AAEO,MAAM,oCAAoC,CAC/C,UACA,KACA,iBACA,gBACG;AACH,QAAM,aACJ,eAAe,KAAC,0BAAW,gBAAgB,IACvC,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;",
+  "mappings": "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",
   "names": ["React"]
 }

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

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 )), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var useMedia_exports = {};
 __export(useMedia_exports, {
-  _dmt: () => _dmt,
+  _disableMediaTouch: () => _disableMediaTouch,
   configureMedia: () => configureMedia,
   getMedia: () => getMedia,
   getMediaImportanceIfMoreImportant: () => getMediaImportanceIfMoreImportant,
@@ -41,7 +41,7 @@ __export(useMedia_exports, {
   useMedia: () => useMedia
 });
 module.exports = __toCommonJS(useMedia_exports);
-var import_react = __toESM(require("react")), import_constants = require("@tamagui/constants"), import_config = require("../config"), import_matchMedia = require("../helpers/matchMedia"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors"), import_useDisableSSR = require("./useDisableSSR"), mediaState = (
+var import_constants = require("@tamagui/constants"), import_react = __toESM(require("react")), import_config = require("../config"), import_matchMedia = require("../helpers/matchMedia"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors"), import_useDisableSSR = require("./useDisableSSR"), mediaState = (
   // development only safeguard
   process.env.NODE_ENV === "development" ? new Proxy({}, {
     get(target, key) {
@@ -73,7 +73,7 @@ var import_react = __toESM(require("react")), import_constants = require("@tamag
       mediaState[key] = (mediaQueryDefaultActive == null ? void 0 : mediaQueryDefaultActive[key]) || !1, mediaKeys.add(`$${key}`);
     Object.assign(mediaQueryConfig, media), initState = {
       ...mediaState
-    }, mediaKeysOrdered = Object.keys(media), config.disableSSR ? setupMediaListeners() : updateCurrentState();
+    }, mediaKeysOrdered = Object.keys(media), setupMediaListeners();
   }
 };
 function unlisten() {
@@ -127,51 +127,66 @@ function subscribe(subscriber) {
     listeners.delete(subscriber);
   };
 }
-function useMedia(uidIn, componentContext, debug) {
-  var uid = uidIn ?? import_react.default.useRef(), disableSSR = (0, import_useDisableSSR.getDisableSSR)(componentContext), initialState = (disableSSR || !import_constants.isWeb ? mediaState : initState) || {}, componentState = States.get(uid);
-  componentState || (componentState = {
-    prev: initialState
-  }, States.set(uid, componentState));
-  var getSnapshot = function() {
-    if (!componentState)
-      return initialState;
-    var { enabled, keys, prev = initialState } = componentState;
-    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 = import_react.default.useSyncExternalStore(subscribe, getSnapshot, function() {
-      return initialState;
-    });
-  else {
-    var [_state, setState] = import_react.default.useState(initialState);
-    state = _state, (0, import_constants.useIsomorphicLayoutEffect)(function() {
-      function update() {
-        setState(getSnapshot);
+function useMedia(cc, debug) {
+  var disableSSR = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc), initialState = disableSSR || !import_constants.isWeb ? mediaState : initState, [state, setState] = import_react.default.useState(initialState), currentKeys, getCurrentKeys = function() {
+    return currentKeys;
+  };
+  function getSnapshot(cur) {
+    var keys = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : cur.lastKeys;
+    if (!keys) return cur;
+    var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+    try {
+      for (var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+        var key = _step.value;
+        if (mediaState[key] !== cur[key])
+          return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), {
+            ...mediaState,
+            lastKeys: new Set(keys)
+          };
       }
-      return update(), disableSSR || Promise.resolve().then(function() {
-        update();
-      }), subscribe(update);
-    }, []);
+    } catch (err) {
+      _didIteratorError = !0, _iteratorError = err;
+    } finally {
+      try {
+        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+      } finally {
+        if (_didIteratorError)
+          throw _iteratorError;
+      }
+    }
+    return cur;
   }
-  return new Proxy(state, {
+  var isRendering = !0, isInitialState = state === initialState;
+  return (0, import_constants.useIsomorphicLayoutEffect)(function() {
+    isRendering = !1;
+  }), (0, import_constants.useIsomorphicLayoutEffect)(function() {
+    var update = function() {
+      return setState(function(prev) {
+        return getSnapshot(
+          prev,
+          // because the !didHydrateOnce logic we can't update as we render
+          // we need to get the current keys in case we added
+          // these only ever add keys so likely ok?
+          getCurrentKeys()
+        );
+      });
+    };
+    return update(), subscribe(update);
+  }, []), new Proxy(state, {
     get(_, key) {
-      if (!disableMediaTouch) {
-        if (typeof key == "string") {
-          var _componentState;
-          (_componentState = componentState).keys || (_componentState.keys = {}), componentState.keys[key] = !0, process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key);
+      if (isRendering && !disableMediaTouch && typeof key == "string") {
+        var needsUpdateKeys = !state.lastKeys || !state.lastKeys.has(key);
+        if ((needsUpdateKeys || state[key] !== mediaState[key]) && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), currentKeys || (currentKeys = /* @__PURE__ */ new Set()), currentKeys.add(key), !isInitialState)) {
+          var next = getSnapshot(state, currentKeys);
+          next !== state && setState(next);
         }
-        return Reflect.get(state, key);
       }
+      return Reflect.get(state, key);
     }
   });
 }
 var disableMediaTouch = !1;
-function _dmt(val) {
+function _disableMediaTouch(val) {
   disableMediaTouch = val;
 }
 function getMediaState(mediaGroups, layout) {
@@ -224,7 +239,7 @@ function mediaKeyMatch(key, dimensions) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  _dmt,
+  _disableMediaTouch,
   configureMedia,
   getMedia,
   getMediaImportanceIfMoreImportant,