@tamagui/web 1.115.5 → 1.116.0

package/dist/esm/hooks/useComponentState.js

@@ -1,11 +1,9 @@
+import { isServer, isWeb } from "@tamagui/constants";
+import { useRef, useState } from "react";
 import {
   defaultComponentState,
-  defaultComponentStateMounted,
-  defaultComponentStateShouldEnter
+  defaultComponentStateMounted
 } from "../defaultComponentState";
-import { useDidHydrateOnce } from "../hooks/useDidHydrateOnce";
-import { useRef, useState } from "react";
-import { isServer, isWeb } from "@tamagui/constants";
 import { createShallowSetState } from "../helpers/createShallowSetState";
 import { isObj } from "../helpers/isObj";
 import { log } from "../helpers/log";
@@ -16,18 +14,20 @@ const useComponentState = (props, { animationDriver, groups }, staticConfig, con
   stateRef.current || (stateRef.current = {});
   const hasAnimationProp = !!("animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSSVars = animationDriver?.supportsCSSVars, curStateRef = stateRef.current, willBeAnimatedClient = !!(!!(hasAnimationProp && !staticConfig.isHOC && useAnimations) || curStateRef.hasAnimated), willBeAnimated = !isServer && willBeAnimatedClient;
   willBeAnimated && !curStateRef.hasAnimated && (curStateRef.hasAnimated = !0);
-  const 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 ? useDidHydrateOnce() : !0, initialState = hasEnterState || !didHydrateOnce && hasRNAnimation ? (
+  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, 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
-    isWeb && !didHydrateOnce ? defaultComponentState : defaultComponentStateShouldEnter
+    defaultComponentState
   ) : defaultComponentStateMounted, disabled = isDisabled(props);
   disabled != null && (initialState.disabled = disabled);
-  const states = useState(initialState), state = props.forceStyle ? { ...states[0], [props.forceStyle]: !0 } : states[0], setState = states[1], isHydrated = state.unmounted === !1 || state.unmounted === "should-enter";
+  const states = useState(initialState), state = props.forceStyle ? { ...states[0], [props.forceStyle]: !0 } : states[0], setState = states[1], isHydrated = state.unmounted === !1;
   let isAnimated = willBeAnimated;
-  isWeb && hasRNAnimation && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, defaultComponentStateMounted), setState({ ...state }));
+  isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, defaultComponentStateMounted), setState({ ...state }));
   let setStateShallow = createShallowSetState(setState, disabled, !1, props.debug);
   if (presenceState && isAnimated && isHydrated && staticConfig.variants) {
     process.env.NODE_ENV === "development" && props.debug === "verbose" && console.warn(`has presenceState ${JSON.stringify(presenceState)}`);
@@ -36,10 +36,10 @@ const useComponentState = (props, { animationDriver, groups }, staticConfig, con
     const 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);
   }
-  let shouldAvoidClasses = !isWeb;
-  if (isWeb) {
-    const { disableClassName } = props, isAnimatedAndHydrated = isAnimated && !supportsCSSVars && didHydrateOnce && !isServer, isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || didHydrateOnce), isDisabledManually = disableClassName && !isServer && didHydrateOnce && state.unmounted === !0;
-    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (shouldAvoidClasses = !0, process.env.NODE_ENV === "development" && props.debug && log("avoiding className", {
+  let noClass = !isWeb || !!props.forceStyle;
+  if (isWeb && (!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 && log("avoiding className", {
       isAnimatedAndHydrated,
       isDisabledManually,
       isClassNameDisabled
@@ -86,7 +86,7 @@ const useComponentState = (props, { animationDriver, groups }, staticConfig, con
     presenceState,
     setState,
     setStateShallow,
-    shouldAvoidClasses,
+    noClass,
     state,
     stateRef,
     supportsCSSVars,

package/dist/esm/hooks/useComponentState.js.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/esm/hooks/useComponentState.mjs

@@ -1,7 +1,6 @@
-import { defaultComponentState, defaultComponentStateMounted, defaultComponentStateShouldEnter } from "../defaultComponentState.mjs";
-import { useDidHydrateOnce } from "../hooks/useDidHydrateOnce.mjs";
-import { useRef, useState } from "react";
 import { isServer, isWeb } from "@tamagui/constants";
+import { useRef, useState } from "react";
+import { defaultComponentState, defaultComponentStateMounted } from "../defaultComponentState.mjs";
 import { createShallowSetState } from "../helpers/createShallowSetState.mjs";
 import { isObj } from "../helpers/isObj.mjs";
 import { log } from "../helpers/log.mjs";
@@ -18,21 +17,25 @@ const useComponentState = (props, {
     willBeAnimatedClient = !!(!!(hasAnimationProp && !staticConfig.isHOC && useAnimations) || curStateRef.hasAnimated),
     willBeAnimated = !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 ? 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
-    isWeb && !didHydrateOnce ? defaultComponentState : defaultComponentStateShouldEnter : defaultComponentStateMounted,
+    defaultComponentState : defaultComponentStateMounted,
     disabled = isDisabled(props);
   disabled != null && (initialState.disabled = disabled);
   const states = useState(initialState),
@@ -41,9 +44,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;
-  isWeb && hasRNAnimation && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, defaultComponentStateMounted), setState({
+  isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, defaultComponentStateMounted), setState({
     ...state
   }));
   let setStateShallow = createShallowSetState(setState, disabled, !1, props.debug);
@@ -60,15 +63,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 = !isWeb;
-  if (isWeb) {
-    const {
-        disableClassName
-      } = props,
-      isAnimatedAndHydrated = isAnimated && !supportsCSSVars && didHydrateOnce && !isServer,
-      isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || didHydrateOnce),
-      isDisabledManually = disableClassName && !isServer && didHydrateOnce && state.unmounted === !0;
-    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (shouldAvoidClasses = !0, process.env.NODE_ENV === "development" && props.debug && log("avoiding className", {
+  let noClass = !isWeb || !!props.forceStyle;
+  if (isWeb && (!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 && log("avoiding className", {
       isAnimatedAndHydrated,
       isDisabledManually,
       isClassNameDisabled
@@ -116,7 +116,7 @@ const useComponentState = (props, {
     presenceState,
     setState,
     setStateShallow,
-    shouldAvoidClasses,
+    noClass,
     state,
     stateRef,
     supportsCSSVars,

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

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

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

@@ -1,7 +1,6 @@
-import { defaultComponentState, defaultComponentStateMounted, defaultComponentStateShouldEnter } from "../defaultComponentState";
-import { useDidHydrateOnce } from "../hooks/useDidHydrateOnce";
-import { useRef, useState } from "react";
 import { isServer, isWeb } from "@tamagui/constants";
+import { useRef, useState } from "react";
+import { defaultComponentState, defaultComponentStateMounted } from "../defaultComponentState";
 import { createShallowSetState } from "../helpers/createShallowSetState";
 import { isObj } from "../helpers/isObj";
 import { log } from "../helpers/log";
@@ -13,20 +12,22 @@ var useComponentState = function(props, param, staticConfig, config) {
     return !!(next || curStateRef.hasAnimated);
   }(), willBeAnimated = !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?.[2], isExiting = presenceState?.isPresent === !1, isEntering = presenceState?.isPresent === !0 && presenceState.initial !== !1, hasEnterStyle = !!props.enterStyle, hasRNAnimation = hasAnimationProp && animationDriver?.isReactNative, hasEnterState = hasEnterStyle || isEntering, didHydrateOnce = willBeAnimated ? useDidHydrateOnce() : !0, shouldEnter = hasEnterState || !didHydrateOnce && hasRNAnimation, shouldEnterFromUnhydrated = 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?.[2], isExiting = presenceState?.isPresent === !1, isEntering = presenceState?.isPresent === !0 && presenceState.initial !== !1, hasEnterStyle = !!props.enterStyle, hasAnimationThatNeedsHydrate = hasAnimationProp && (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 ? defaultComponentState : defaultComponentStateShouldEnter
+    defaultComponentState
   ) : defaultComponentStateMounted, disabled = isDisabled(props);
   disabled != null && (initialState.disabled = disabled);
   var states = 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;
-  isWeb && hasRNAnimation && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, defaultComponentStateMounted), setState({
+  } : states[0], setState = states[1], isHydrated = state.unmounted === !1, isAnimated = willBeAnimated;
+  isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && state.unmounted === !0 && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, defaultComponentStateMounted), setState({
     ...state
   }));
   var setStateShallow = createShallowSetState(setState, disabled, !1, props.debug);
@@ -37,10 +38,10 @@ var useComponentState = function(props, param, staticConfig, config) {
     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 = !isWeb;
-  if (isWeb) {
-    var { disableClassName } = props, isAnimatedAndHydrated = isAnimated && !supportsCSSVars && didHydrateOnce && !isServer, isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || didHydrateOnce), isDisabledManually = disableClassName && !isServer && didHydrateOnce && state.unmounted === !0;
-    (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (shouldAvoidClasses = !0, process.env.NODE_ENV === "development" && props.debug && log("avoiding className", {
+  var noClass = !isWeb || !!props.forceStyle;
+  if (isWeb && (!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 && log("avoiding className", {
       isAnimatedAndHydrated,
       isDisabledManually,
       isClassNameDisabled
@@ -89,7 +90,7 @@ var useComponentState = function(props, param, staticConfig, config) {
     presenceState,
     setState,
     setStateShallow,
-    shouldAvoidClasses,
+    noClass,
     state,
     stateRef,
     supportsCSSVars,

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

package/dist/esm/hooks/useMedia.js

@@ -1,5 +1,5 @@
-import React from "react";
 import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
+import React from "react";
 import { getConfig, getSetting } from "../config";
 import { matchMedia } from "../helpers/matchMedia";
 import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
@@ -41,7 +41,7 @@ const configureMedia = (config) => {
     mediaVersion++;
     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();
+    Object.assign(mediaQueryConfig, media), initState = { ...mediaState }, mediaKeysOrdered = Object.keys(media), setupMediaListeners();
   }
 };
 function unlisten() {
@@ -86,46 +86,47 @@ function subscribe(subscriber) {
     listeners.delete(subscriber);
   };
 }
-function useMedia(uidIn, componentContext, debug) {
-  const uid = uidIn ?? React.useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !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 = React.useSyncExternalStore(
-      subscribe,
-      getSnapshot,
-      () => initialState
-    );
-  else {
-    const [_state, setState] = React.useState(initialState);
-    state = _state, useIsomorphicLayoutEffect(() => {
-      function update() {
-        setState(getSnapshot);
-      }
-      return update(), disableSSR || Promise.resolve().then(() => {
-        update();
-      }), subscribe(update);
-    }, []);
+function useMedia(cc, debug) {
+  const initialState = getSetting("disableSSR") || getDisableSSR(cc) || !isWeb ? mediaState : initState, [state, setState] = React.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 useIsomorphicLayoutEffect(() => {
+    isRendering = !1;
+  }), 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) {
@@ -167,7 +168,7 @@ function mediaKeyMatch(key, dimensions) {
   });
 }
 export {
-  _dmt,
+  _disableMediaTouch,
   configureMedia,
   getMedia,
   getMediaImportanceIfMoreImportant,

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

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

package/dist/esm/hooks/useMedia.mjs

@@ -1,5 +1,5 @@
-import React from "react";
 import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
+import React from "react";
 import { getConfig, getSetting } from "../config.mjs";
 import { matchMedia } from "../helpers/matchMedia.mjs";
 import { pseudoDescriptors } from "../helpers/pseudoDescriptors.mjs";
@@ -45,7 +45,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() {
@@ -95,45 +95,42 @@ function subscribe(subscriber) {
     listeners.delete(subscriber);
   };
 }
-function useMedia(uidIn, componentContext, debug) {
-  const uid = uidIn ?? React.useRef(),
-    disableSSR = getDisableSSR(componentContext),
-    initialState = (disableSSR || !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 = React.useSyncExternalStore(subscribe, getSnapshot, () => initialState);else {
-    const [_state, setState] = React.useState(initialState);
-    state = _state, useIsomorphicLayoutEffect(() => {
-      function update() {
-        setState(getSnapshot);
-      }
-      return update(), disableSSR || Promise.resolve().then(() => {
-        update();
-      }), subscribe(update);
-    }, []);
+function useMedia(cc, debug) {
+  const initialState = getSetting("disableSSR") || getDisableSSR(cc) || !isWeb ? mediaState : initState,
+    [state, setState] = React.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 useIsomorphicLayoutEffect(() => {
+    isRendering = !1;
+  }), 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) {
@@ -174,5 +171,5 @@ function mediaKeyMatch(key, dimensions) {
     return isMax ? givenVal < expectedVal : givenVal > expectedVal;
   });
 }
-export { _dmt, configureMedia, getMedia, getMediaImportanceIfMoreImportant, getMediaKeyImportance, getMediaState, isMediaKey, mediaKeyMatch, mediaKeyToQuery, mediaKeys, mediaObjectToString, mediaQueryConfig, mediaState, setMediaShouldUpdate, setupMediaListeners, useMedia };
+export { _disableMediaTouch, configureMedia, getMedia, getMediaImportanceIfMoreImportant, getMediaKeyImportance, getMediaState, isMediaKey, mediaKeyMatch, mediaKeyToQuery, mediaKeys, mediaObjectToString, mediaQueryConfig, mediaState, setMediaShouldUpdate, setupMediaListeners, useMedia };
 //# sourceMappingURL=useMedia.mjs.map