@tamagui/core 1.0.1-beta.219 → 1.0.1-beta.221

package/dist/cjs/addTheme.js

@@ -25,22 +25,19 @@ var import_constants = require("@tamagui/constants");
 var import_config = require("./config");
 var import_getThemeCSSRules = require("./helpers/getThemeCSSRules");
 var import_themes = require("./helpers/themes");
-function addTheme({
-  name: themeName,
-  theme: themeIn,
-  insertCSS,
-  update
-}) {
+function addTheme(props) {
   var _a;
   const config = (0, import_config.getConfig)();
   if (process.env.NODE_ENV === "development") {
     if (!config) {
-      throw new Error(`Must run createTamagui once before loading theme`);
+      throw new Error(`No config`);
     }
-    if (!update && config.themes[themeName]) {
-      throw new Error(`Already defined theme "${themeName}", use updateTheme to change values`);
+    const theme2 = config.themes[props.name];
+    if (!props.update && theme2) {
+      return { theme: theme2 };
     }
   }
+  const { name: themeName, theme: themeIn, insertCSS } = props;
   const theme = { ...themeIn };
   for (const key in theme) {
     (0, import_themes.ensureThemeVariable)(theme, key);
@@ -56,7 +53,7 @@ function addTheme({
         names: [themeName],
         theme
       });
-      const id = `tamagui_theme_style_${themeName}`;
+      const id = `t_theme_style_${themeName}`;
       const existing = document.querySelector(`#${id}`);
       const style = document.createElement("style");
       style.id = id;

package/dist/cjs/addTheme.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/addTheme.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\n\nimport { getConfig, updateConfig } from './config'\nimport { getThemeCSSRules } from './helpers/getThemeCSSRules'\nimport { ensureThemeVariable, proxyThemeToParents } from './helpers/themes'\nimport { ThemeDefinition, ThemeParsed } from './types'\n\nexport function addTheme({\n  name: themeName,\n  theme: themeIn,\n  insertCSS,\n  update,\n}: {\n  name: string\n  theme: ThemeDefinition\n  insertCSS?: boolean\n  update?: boolean\n}) {\n  const config = getConfig()\n  if (process.env.NODE_ENV === 'development') {\n    if (!config) {\n      throw new Error(`Must run createTamagui once before loading theme`)\n    }\n    if (!update && config.themes[themeName]) {\n      throw new Error(`Already defined theme \"${themeName}\", use updateTheme to change values`)\n    }\n  }\n\n  const theme = { ...themeIn } as ThemeParsed\n  for (const key in theme) {\n    ensureThemeVariable(theme, key)\n  }\n\n  const themeProxied = proxyThemeToParents(themeName, theme, config.themes)\n  config.themes[themeName] = themeProxied\n\n  let cssRules: string[] = []\n\n  if (isWeb) {\n    if (insertCSS) {\n      cssRules = getThemeCSSRules({\n        // @ts-ignore this works but should be fixed types\n        config,\n        themeName,\n        names: [themeName],\n        theme,\n      })\n      const id = `tamagui_theme_style_${themeName}`\n      const existing = document.querySelector(`#${id}`)\n      const style = document.createElement('style')\n      style.id = id\n      style.appendChild(document.createTextNode(cssRules.join('\\n')))\n      document.head.appendChild(style)\n      if (existing) {\n        existing.parentElement?.removeChild(existing)\n      }\n    }\n  }\n\n  updateConfig('themes', { ...config.themes, [themeName]: themeProxied })\n\n  // trigger updates in components\n\n  return {\n    theme: themeProxied,\n    cssRules,\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AAEtB,oBAAwC;AACxC,8BAAiC;AACjC,oBAAyD;AAGlD,SAAS,SAAS;AAAA,EACvB,MAAM;AAAA,EACN,OAAO;AAAA,EACP;AAAA,EACA;AACF,GAKG;AAjBH;AAkBE,QAAM,aAAS,yBAAU;AACzB,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,kDAAkD;AAAA,IACpE;AACA,QAAI,CAAC,UAAU,OAAO,OAAO,YAAY;AACvC,YAAM,IAAI,MAAM,0BAA0B,8CAA8C;AAAA,IAC1F;AAAA,EACF;AAEA,QAAM,QAAQ,EAAE,GAAG,QAAQ;AAC3B,aAAW,OAAO,OAAO;AACvB,2CAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,mBAAe,mCAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,aAAa;AAE3B,MAAI,WAAqB,CAAC;AAE1B,MAAI,wBAAO;AACT,QAAI,WAAW;AACb,qBAAW,0CAAiB;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,uBAAuB;AAClC,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,kCAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,YAAY,aAAa,CAAC;AAItE,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
-  "names": []
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\n\nimport { getConfig, updateConfig } from './config'\nimport { getThemeCSSRules } from './helpers/getThemeCSSRules'\nimport { ensureThemeVariable, proxyThemeToParents } from './helpers/themes'\nimport { ThemeDefinition, ThemeParsed } from './types'\n\nexport function addTheme(props: {\n  name: string\n  theme: Partial<Record<keyof ThemeDefinition, any>>\n  insertCSS?: boolean\n  update?: boolean\n}) {\n  const config = getConfig()\n\n  if (process.env.NODE_ENV === 'development') {\n    if (!config) {\n      throw new Error(`No config`)\n    }\n    const theme = config.themes[props.name]\n    if (!props.update && theme) {\n      return { theme }\n    }\n  }\n\n  const { name: themeName, theme: themeIn, insertCSS } = props\n  const theme = { ...themeIn } as ThemeParsed\n  for (const key in theme) {\n    ensureThemeVariable(theme, key)\n  }\n\n  const themeProxied = proxyThemeToParents(themeName, theme, config.themes)\n  config.themes[themeName] = themeProxied\n\n  let cssRules: string[] = []\n\n  if (isWeb) {\n    if (insertCSS) {\n      cssRules = getThemeCSSRules({\n        // @ts-ignore this works but should be fixed types\n        config,\n        themeName,\n        names: [themeName],\n        theme,\n      })\n      const id = `t_theme_style_${themeName}`\n      const existing = document.querySelector(`#${id}`)\n      const style = document.createElement('style')\n      style.id = id\n      style.appendChild(document.createTextNode(cssRules.join('\\n')))\n      document.head.appendChild(style)\n      if (existing) {\n        existing.parentElement?.removeChild(existing)\n      }\n    }\n  }\n\n  updateConfig('themes', { ...config.themes, [themeName]: themeProxied })\n\n  // trigger updates in components\n  return {\n    theme: themeProxied,\n    cssRules,\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AAEtB,oBAAwC;AACxC,8BAAiC;AACjC,oBAAyD;AAGlD,SAAS,SAAS,OAKtB;AAZH;AAaE,QAAM,aAAS,yBAAU;AAEzB,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM;AAClC,QAAI,CAAC,MAAM,UAAUA,QAAO;AAC1B,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,UAAU,IAAI;AACvD,QAAM,QAAQ,EAAE,GAAG,QAAQ;AAC3B,aAAW,OAAO,OAAO;AACvB,2CAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,mBAAe,mCAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,aAAa;AAE3B,MAAI,WAAqB,CAAC;AAE1B,MAAI,wBAAO;AACT,QAAI,WAAW;AACb,qBAAW,0CAAiB;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,kCAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,YAAY,aAAa,CAAC;AAGtE,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
+  "names": ["theme"]
 }

package/dist/cjs/config.js

@@ -20,7 +20,6 @@ var config_exports = {};
 __export(config_exports, {
   configListeners: () => configListeners,
   getConfig: () => getConfig,
-  getHasConfigured: () => getHasConfigured,
   getThemes: () => getThemes,
   getTokens: () => getTokens,
   onConfiguredOnce: () => onConfiguredOnce,
@@ -45,8 +44,14 @@ const setConfigFont = (name, font, fontParsed) => {
   Object.assign(conf.fonts, { [name]: font });
   Object.assign(conf.fontsParsed, { [`$${name}`]: fontParsed });
 };
-const getHasConfigured = () => !!conf;
-const getConfig = () => conf;
+const getConfig = () => {
+  if (!conf) {
+    throw new Error(
+      process.env.NODE_ENV === "development" ? `Missing tamagui config, you either have a duplicate config, or haven't set it up. Be sure createTamagui is called before rendering.` : `Err0`
+    );
+  }
+  return conf;
+};
 const getTokens = (prefixed) => prefixed ? conf.tokensParsed : conf.tokens;
 const useTokens = getTokens;
 const getThemes = () => conf.themes;
@@ -65,7 +70,6 @@ const updateConfig = (key, value) => {
 0 && (module.exports = {
   configListeners,
   getConfig,
-  getHasConfigured,
   getThemes,
   getTokens,
   onConfiguredOnce,

package/dist/cjs/config.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/config.ts"],
-  "sourcesContent": ["import { ConfigListener, TamaguiInternalConfig, ThemeParsed, Tokens } from './types'\n\nlet conf: TamaguiInternalConfig | null\n\nexport const setConfig = (next: TamaguiInternalConfig) => {\n  conf = next\n  if (configListeners.size) {\n    configListeners.forEach((cb) => cb(next))\n  }\n}\n\nexport const setConfigFont = (name: string, font: any, fontParsed: any) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!conf) throw new Error(`Haven't called createTamagui yet`)\n  }\n  Object.assign(conf!.fonts, { [name]: font })\n  Object.assign(conf!.fontsParsed, { [`$${name}`]: fontParsed })\n}\n\nexport const getHasConfigured = () => !!conf\nexport const getConfig = () => conf!\nexport const getTokens = (prefixed?: boolean): Tokens =>\n  prefixed ? conf!.tokensParsed : conf!.tokens\n\n/**\n * Note: this is the same as `getTokens`\n */\nexport const useTokens = getTokens\n\nexport const getThemes = () => conf!.themes\n\nexport const configListeners = new Set<ConfigListener>()\n\nexport const onConfiguredOnce = (cb: ConfigListener) => {\n  if (conf) {\n    cb(conf)\n  } else {\n    configListeners.add(cb)\n  }\n}\n\nexport const updateConfig = (key: string, value: any) => {\n  Object.assign(key, value)\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,IAAI;AAEG,MAAM,YAAY,CAAC,SAAgC;AACxD,SAAO;AACP,MAAI,gBAAgB,MAAM;AACxB,oBAAgB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;AAAA,EAC1C;AACF;AAEO,MAAM,gBAAgB,CAAC,MAAc,MAAW,eAAoB;AACzE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC;AAAM,YAAM,IAAI,MAAM,kCAAkC;AAAA,EAC/D;AACA,SAAO,OAAO,KAAM,OAAO,EAAE,CAAC,OAAO,KAAK,CAAC;AAC3C,SAAO,OAAO,KAAM,aAAa,EAAE,CAAC,IAAI,SAAS,WAAW,CAAC;AAC/D;AAEO,MAAM,mBAAmB,MAAM,CAAC,CAAC;AACjC,MAAM,YAAY,MAAM;AACxB,MAAM,YAAY,CAAC,aACxB,WAAW,KAAM,eAAe,KAAM;AAKjC,MAAM,YAAY;AAElB,MAAM,YAAY,MAAM,KAAM;AAE9B,MAAM,kBAAkB,oBAAI,IAAoB;AAEhD,MAAM,mBAAmB,CAAC,OAAuB;AACtD,MAAI,MAAM;AACR,OAAG,IAAI;AAAA,EACT,OAAO;AACL,oBAAgB,IAAI,EAAE;AAAA,EACxB;AACF;AAEO,MAAM,eAAe,CAAC,KAAa,UAAe;AACvD,SAAO,OAAO,KAAK,KAAK;AAC1B;",
+  "sourcesContent": ["import { ConfigListener, TamaguiInternalConfig, ThemeParsed, Tokens } from './types'\n\nlet conf: TamaguiInternalConfig | null\n\nexport const setConfig = (next: TamaguiInternalConfig) => {\n  conf = next\n  if (configListeners.size) {\n    configListeners.forEach((cb) => cb(next))\n  }\n}\n\nexport const setConfigFont = (name: string, font: any, fontParsed: any) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!conf) throw new Error(`Haven't called createTamagui yet`)\n  }\n  Object.assign(conf!.fonts, { [name]: font })\n  Object.assign(conf!.fontsParsed, { [`$${name}`]: fontParsed })\n}\n\nexport const getConfig = () => {\n  if (!conf) {\n    throw new Error(\n      process.env.NODE_ENV === 'development'\n        ? `Missing tamagui config, you either have a duplicate config, or haven't set it up. Be sure createTamagui is called before rendering.`\n        : `Err0`\n    )\n  }\n  return conf\n}\nexport const getTokens = (prefixed?: boolean): Tokens =>\n  prefixed ? conf!.tokensParsed : conf!.tokens\n\n/**\n * Note: this is the same as `getTokens`\n */\nexport const useTokens = getTokens\n\nexport const getThemes = () => conf!.themes\n\nexport const configListeners = new Set<ConfigListener>()\n\nexport const onConfiguredOnce = (cb: ConfigListener) => {\n  if (conf) {\n    cb(conf)\n  } else {\n    configListeners.add(cb)\n  }\n}\n\nexport const updateConfig = (key: string, value: any) => {\n  Object.assign(key, value)\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,IAAI;AAEG,MAAM,YAAY,CAAC,SAAgC;AACxD,SAAO;AACP,MAAI,gBAAgB,MAAM;AACxB,oBAAgB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;AAAA,EAC1C;AACF;AAEO,MAAM,gBAAgB,CAAC,MAAc,MAAW,eAAoB;AACzE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC;AAAM,YAAM,IAAI,MAAM,kCAAkC;AAAA,EAC/D;AACA,SAAO,OAAO,KAAM,OAAO,EAAE,CAAC,OAAO,KAAK,CAAC;AAC3C,SAAO,OAAO,KAAM,aAAa,EAAE,CAAC,IAAI,SAAS,WAAW,CAAC;AAC/D;AAEO,MAAM,YAAY,MAAM;AAC7B,MAAI,CAAC,MAAM;AACT,UAAM,IAAI;AAAA,MACR,QAAQ,IAAI,aAAa,gBACrB,wIACA;AAAA,IACN;AAAA,EACF;AACA,SAAO;AACT;AACO,MAAM,YAAY,CAAC,aACxB,WAAW,KAAM,eAAe,KAAM;AAKjC,MAAM,YAAY;AAElB,MAAM,YAAY,MAAM,KAAM;AAE9B,MAAM,kBAAkB,oBAAI,IAAoB;AAEhD,MAAM,mBAAmB,CAAC,OAAuB;AACtD,MAAI,MAAM;AACR,OAAG,IAAI;AAAA,EACT,OAAO;AACL,oBAAgB,IAAI,EAAE;AAAA,EACxB;AACF;AAEO,MAAM,eAAe,CAAC,KAAa,UAAe;AACvD,SAAO,OAAO,KAAK,KAAK;AAC1B;",
   "names": []
 }

package/dist/cjs/{hooks/useUnmountEffect.js → contexts/ButtonNestingContext.js}

@@ -16,17 +16,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var useUnmountEffect_exports = {};
-__export(useUnmountEffect_exports, {
-  useUnmountEffect: () => useUnmountEffect
+var ButtonNestingContext_exports = {};
+__export(ButtonNestingContext_exports, {
+  ButtonNestingContext: () => ButtonNestingContext
 });
-module.exports = __toCommonJS(useUnmountEffect_exports);
+module.exports = __toCommonJS(ButtonNestingContext_exports);
 var import_react = require("react");
-function useUnmountEffect(callback) {
-  return (0, import_react.useEffect)(() => () => callback(), []);
-}
+const ButtonNestingContext = (0, import_react.createContext)(false);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  useUnmountEffect
+  ButtonNestingContext
 });
-//# sourceMappingURL=useUnmountEffect.js.map
+//# sourceMappingURL=ButtonNestingContext.js.map

package/dist/cjs/contexts/ButtonNestingContext.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/contexts/ButtonNestingContext.tsx"],
+  "sourcesContent": ["import { createContext } from 'react'\n\nexport const ButtonNestingContext = createContext(false)\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8B;AAEvB,MAAM,2BAAuB,4BAAc,KAAK;",
+  "names": []
+}

package/dist/cjs/createComponent.js

@@ -36,17 +36,16 @@ var import_compose_refs = require("@tamagui/compose-refs");
 var import_constants = require("@tamagui/constants");
 var import_helpers = require("@tamagui/helpers");
 var import_react_native_use_responder_events = require("@tamagui/react-native-use-responder-events");
-var import_use_force_update = require("@tamagui/use-force-update");
 var import_react = __toESM(require("react"));
 var import_config = require("./config");
 var import_constants2 = require("./constants/constants");
 var import_FontLanguageContext = require("./contexts/FontLanguageContext");
 var import_TextAncestorContext = require("./contexts/TextAncestorContext");
 var import_extendStaticConfig = require("./helpers/extendStaticConfig");
+var import_getRect = require("./helpers/getRect");
 var import_getSplitStyles = require("./helpers/getSplitStyles");
 var import_insertStyleRule = require("./helpers/insertStyleRule");
 var import_mergeProps = require("./helpers/mergeProps");
-var import_mergeTransform = require("./helpers/mergeTransform");
 var import_proxyThemeVariables = require("./helpers/proxyThemeVariables");
 var import_useShallowSetState = require("./helpers/useShallowSetState");
 var import_useElementLayout = require("./hooks/useElementLayout");
@@ -56,7 +55,6 @@ var import_useTheme = require("./hooks/useTheme");
 var import_Pressability = require("./vendor/Pressability");
 var import_Slot = require("./views/Slot");
 var import_Theme = require("./views/Theme");
-import_react.default["keep"];
 process.env.TAMAGUI_TARGET;
 let defaultComponentState = null;
 let defaultComponentStateMounted = null;
@@ -96,7 +94,6 @@ function createComponent(configIn, ParentComponent) {
     }
   })();
   const defaultComponentClassName = `is_${staticConfig.componentName}`;
-  const avoidClassesWhileAnimating = true;
   let defaultNativeStyle;
   let tamaguiDefaultProps;
   let defaultTag;
@@ -112,6 +109,9 @@ function createComponent(configIn, ParentComponent) {
     const { Component, isText, isZStack } = staticConfig;
     const componentName = props.componentName || staticConfig.componentName;
     const componentClassName = props.asChild ? "" : props.componentName ? `is_${props.componentName}` : defaultComponentClassName;
+    const animationsConfig = tamaguiConfig.animations;
+    const useAnimations = animationsConfig == null ? void 0 : animationsConfig.useAnimations;
+    const avoidClassesWhileAnimating = animationsConfig.isReactNative;
     const hasEnterStyle = !!props.enterStyle;
     const needsMount = Boolean((import_constants.isWeb ? import_constants.isClient : true) && (hasEnterStyle || props.animation));
     const states = (0, import_useServerHooks.useServerState)(
@@ -120,15 +120,28 @@ function createComponent(configIn, ParentComponent) {
     const state = propsIn.forceStyle ? { ...states[0], [propsIn.forceStyle]: true } : states[0];
     const setState = states[1];
     const setStateShallow = (0, import_useShallowSetState.useShallowSetState)(setState, debugProp, componentName);
-    const useAnimations = (_a = tamaguiConfig.animations) == null ? void 0 : _a.useAnimations;
-    const hasEverAnimated = (0, import_react.useRef)(false);
+    const stateRef = (0, import_react.useRef)(
+      void 0
+    );
+    stateRef.current ?? (stateRef.current = {});
     const isAnimated = (() => {
       const next = !!(useAnimations && props.animation);
-      if (next && !hasEverAnimated.current) {
-        hasEverAnimated.current = true;
+      if (next && !stateRef.current.hasAnimated) {
+        stateRef.current.hasAnimated = true;
       }
-      return next || hasEverAnimated.current;
+      return next || stateRef.current.hasAnimated;
     })();
+    const usePresence = (_a = tamaguiConfig.animations) == null ? void 0 : _a.usePresence;
+    const presence = !import_constants.isRSC && isAnimated ? usePresence() : null;
+    if (isAnimated && presence) {
+      const presenceState = presence[2];
+      if (presenceState) {
+        if (presenceState.enterVariant)
+          props[presenceState.enterVariant] = true;
+        if (presenceState.exitVariant)
+          props[presenceState.exitVariant] = true;
+      }
+    }
     const isReactNative = Boolean(
       staticConfig.isReactNative || isAnimated && tamaguiConfig.animations.isReactNative
     );
@@ -141,18 +154,22 @@ function createComponent(configIn, ParentComponent) {
         console.group(`%c ${banner}`, "background: yellow;");
         if (!import_constants.isServer) {
           console.log(`state`, state);
-          console.groupCollapsed("props");
-          console.log(props);
-          console.log("order", Object.keys(props));
-          console.groupEnd();
         }
       }
     }
     const shouldAvoidClasses = !import_constants.isWeb || !!(props.animation && avoidClassesWhileAnimating) || !staticConfig.acceptsClassName;
     const shouldForcePseudo = !!propsIn.forceStyle;
     const noClassNames = shouldAvoidClasses || shouldForcePseudo;
-    const forceUpdate = (0, import_use_force_update.useForceUpdate)();
-    const theme = (0, import_useTheme.useTheme)(props.theme, componentName, props, forceUpdate, !noClassNames);
+    const theme = (0, import_useTheme.useTheme)({
+      name: props.theme,
+      componentName,
+      reset: props.reset,
+      inverse: props.themeInverse,
+      disable: props["data-themeable"],
+      debug: props.debug
+    });
+    const themeManager = (0, import_useTheme.getThemeManager)(theme);
+    const themeIsNew = (0, import_useTheme.getThemeIsNewTheme)(theme);
     const shouldSetMounted = needsMount && state.unmounted;
     const setMounted = shouldSetMounted ? () => {
       setTimeout(
@@ -174,6 +191,7 @@ function createComponent(configIn, ParentComponent) {
     let elementType = isText ? (isAnimated ? AnimatedText : null) || BaseTextComponent : (isAnimated ? AnimatedView : null) || BaseViewComponent;
     elementType = Component || elementType;
     const isStringElement = typeof elementType === "string";
+    const isExiting = (presence == null ? void 0 : presence[0]) === false;
     const splitStyles = (0, import_getSplitStyles.useSplitStyles)(
       props,
       staticConfig,
@@ -183,7 +201,8 @@ function createComponent(configIn, ParentComponent) {
         noClassNames,
         dynamicStylesInline: noClassNames,
         hasTextAncestor,
-        resolveVariablesAs: "value"
+        resolveVariablesAs: "value",
+        isExiting
       },
       null,
       languageContext || void 0,
@@ -221,41 +240,15 @@ function createComponent(configIn, ParentComponent) {
     const propsWithAnimation = props;
     let animationStyles;
     if (!import_constants.isRSC && isAnimated && useAnimations) {
-      const animations = useAnimations(propsWithAnimation, {
+      const animations = useAnimations({
+        props: propsWithAnimation,
+        style: splitStylesStyle,
+        presence,
         state,
         pseudos,
         onDidAnimate: props.onDidAnimate,
         hostRef,
-        staticConfig,
-        getStyle({ isExiting, isEntering, exitVariant, enterVariant } = {}) {
-          var _a2, _b2, _c2, _d2;
-          const animationStyle = { ...defaultNativeStyle, ...splitStylesStyle };
-          const enterStyle = isEntering ? enterVariant && ((_a2 = staticConfig.variants) == null ? void 0 : _a2[enterVariant]["true"]) ? (0, import_getSplitStyles.getSubStyle)(
-            "",
-            (_b2 = staticConfig.variants) == null ? void 0 : _b2[enterVariant]["true"],
-            staticConfig,
-            theme,
-            props,
-            state,
-            tamaguiConfig
-          ) : null : null;
-          const exitStyle = isExiting ? exitVariant && ((_c2 = staticConfig.variants) == null ? void 0 : _c2[exitVariant]["true"]) ? (0, import_getSplitStyles.getSubStyle)(
-            "",
-            (_d2 = staticConfig.variants) == null ? void 0 : _d2[exitVariant]["true"],
-            staticConfig,
-            theme,
-            props,
-            state,
-            tamaguiConfig
-          ) : pseudos.exitStyle : null;
-          if (isEntering && enterStyle) {
-            merge(animationStyle, enterStyle);
-          }
-          if (isExiting && exitStyle) {
-            merge(animationStyle, exitStyle);
-          }
-          return animationStyle;
-        }
+        staticConfig
       });
       if (animations) {
         animationStyles = animations.style;
@@ -440,7 +433,7 @@ function createComponent(configIn, ParentComponent) {
     const classList = [
       componentName ? componentClassName : "",
       fontFamilyClassName,
-      theme.className,
+      themeIsNew ? theme.className : "",
       classNames ? Object.values(classNames).join(" ") : ""
     ];
     const className = classList.join(" ");
@@ -573,16 +566,19 @@ function createComponent(configIn, ParentComponent) {
     let space = spaceProp;
     if (state.mediaState && mediaKeys.length) {
       for (const key in state.mediaState) {
-        if (state.mediaState[key] && props[key] && props[key].space !== void 0) {
+        if (key in state.mediaState && key in props && props[key].space !== void 0) {
           space = props[key].space;
         }
       }
     }
-    const themeManager = (0, import_useTheme.getThemeManager)(theme);
-    const shouldSetChildrenThemeToParent = Boolean(
-      themeShallow && themeManager && themeManager.didChangeTheme
-    );
-    const shouldProvideThemeManager = shouldSetChildrenThemeToParent || themeManager && themeManager.didChangeTheme;
+    const themeShouldReset = Boolean(themeShallow && themeManager && themeIsNew);
+    const shouldProvideThemeManager = themeShouldReset || themeManager && themeIsNew;
+    if (shouldProvideThemeManager) {
+      stateRef.current.hasProvidedThemeManager = true;
+    }
+    if (themeShouldReset) {
+      stateRef.current.themeShouldReset = true;
+    }
     const childEls = !children || asChild ? children : (0, import_Theme.wrapThemeManagerContext)(
       spacedChildren({
         separator,
@@ -591,8 +587,8 @@ function createComponent(configIn, ParentComponent) {
         direction: props.spaceDirection || "both",
         isZStack
       }),
-      shouldProvideThemeManager ? themeManager : void 0,
-      shouldSetChildrenThemeToParent
+      stateRef.current.hasProvidedThemeManager ? themeManager : void 0,
+      stateRef.current.themeShouldReset
     );
     let content;
     if (asChild) {
@@ -922,16 +918,6 @@ function mergeConfigDefaultProps(name, props, configDefaults, parentNames, conf)
   }
   return props;
 }
-function merge(base, next) {
-  for (const key in next) {
-    const val = next[key];
-    if (key in import_helpers.stylePropsTransform) {
-      (0, import_mergeTransform.mergeTransform)(base, key, val, true);
-    } else {
-      base[key] = val;
-    }
-  }
-}
 function usePlatformMethods(hostRef) {
   (0, import_constants.useIsomorphicLayoutEffect)(() => {
     const node = hostRef.current;
@@ -943,7 +929,7 @@ function usePlatformMethods(hostRef) {
       if (!node)
         return;
       setTimeout(() => {
-        const { height, left, top, width } = (0, import_useElementLayout.getRect)(node);
+        const { height, left, top, width } = (0, import_getRect.getRect)(node);
         callback(left, top, width, height);
       }, 0);
     };
@@ -968,6 +954,16 @@ const dontComposePressabilityKeys = {
 function getMediaStateObject(obj) {
   return Object.fromEntries(Object.entries(obj).flatMap(([k, v]) => v ? [[`$${k}`, v]] : []));
 }
+const baseDefaults = {
+  opacity: 1
+};
+const transformDefaults = {
+  opacity: 1,
+  scale: 1,
+  rotate: "0deg",
+  rotateY: "0deg",
+  rotateX: "0deg"
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Spacer,