@tamagui/web 1.45.2 → 1.45.4

package/dist/esm/hooks/useTheme.js

@@ -1,5 +1,5 @@
-import { isClient, isRSC, isServer, isWeb } from "@tamagui/constants";
-import { useContext, useEffect, useLayoutEffect, useMemo, useState } from "react";
+import { isClient, isServer, isWeb } from "@tamagui/constants";
+import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { getConfig } from "../config";
 import { isDevTools } from "../constants/isDevTools";
 import { getVariable } from "../createVariable";
@@ -10,7 +10,6 @@ import {
 } from "../helpers/ThemeManager";
 import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
 import { GetThemeUnwrapped } from "./getThemeUnwrapped";
-import { useServerRef } from "./useServerHooks";
 const emptyProps = { name: null };
 function getDefaultThemeProxied() {
   const config = getConfig();
@@ -22,10 +21,10 @@ function getDefaultThemeProxied() {
 }
 const useTheme = (props = emptyProps) => {
   var _a;
-  return (isRSC ? null : (_a = useThemeWithState(props)) == null ? void 0 : _a.theme) || getDefaultThemeProxied();
+  return ((_a = useThemeWithState(props)) == null ? void 0 : _a.theme) || getDefaultThemeProxied();
 };
 const useThemeWithState = (props) => {
-  const keys = useServerRef([]);
+  const keys = useRef([]);
   const changedTheme = useChangeThemeEffect(
     props,
     false,
@@ -102,13 +101,6 @@ function getThemeProxied({
 }
 const activeThemeManagers = /* @__PURE__ */ new Set();
 const useChangeThemeEffect = (props, root = false, keys, shouldUpdate) => {
-  if (isRSC) {
-    return {
-      isNewTheme: false,
-      ...createState().state,
-      themeManager: null
-    };
-  }
   const {
     // @ts-expect-error internal use only
     disable
@@ -152,15 +144,8 @@ const useChangeThemeEffect = (props, root = false, keys, shouldUpdate) => {
         activeThemeManagers.add(themeManager);
       }
       const nextState = getShouldUpdateTheme(themeManager);
-      if (nextState) {
-        if (isNewTheme) {
-          themeManager.updateState(nextState, true);
-        }
+      if (nextState || isNewTheme) {
         setThemeState(createState);
-      } else {
-        if (isNewTheme) {
-          setThemeState(createState);
-        }
       }
       const selfListenerDispose = themeManager.onChangeTheme((_a, _b, forced) => {
         if (forced) {
@@ -171,8 +156,7 @@ const useChangeThemeEffect = (props, root = false, keys, shouldUpdate) => {
         const force = shouldUpdate == null ? void 0 : shouldUpdate();
         const doUpdate = force ?? Boolean((keys == null ? void 0 : keys.length) || isNewTheme);
         if (process.env.NODE_ENV === "development" && props.debug) {
-          const logs = { force, doUpdate, props, name, manager, keys };
-          console.log(` \u{1F538} onChange`, themeManager.id, logs);
+          console.log(` \u{1F538} onChange`, themeManager.id, { force, doUpdate, props, name, manager, keys });
         }
         if (doUpdate) {
           setThemeState(createState);
@@ -184,13 +168,14 @@ const useChangeThemeEffect = (props, root = false, keys, shouldUpdate) => {
         activeThemeManagers.delete(themeManager);
       };
     }, [
+      themeManager,
       parentManager,
       isNewTheme,
       props.componentName,
       props.inverse,
       props.name,
       props.reset,
-      themeState.mounted
+      mounted
     ]);
     if (process.env.NODE_ENV === "development") {
       useEffect(() => {

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

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

package/dist/esm/hooks/useThemeName.js

@@ -1,12 +1,7 @@
-import { isRSC, useIsomorphicLayoutEffect } from "@tamagui/constants";
+import { useIsomorphicLayoutEffect } from "@tamagui/constants";
 import { useContext, useState } from "react";
-import { getConfig } from "../config";
 import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
 function useThemeName(opts) {
-  if (isRSC) {
-    const config = getConfig();
-    return config.themes[Object.keys(config.themes)[0]];
-  }
   const manager = useContext(ThemeManagerContext);
   const [name, setName] = useState((manager == null ? void 0 : manager.state.name) || "");
   useIsomorphicLayoutEffect(() => {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useThemeName.tsx"],
-  "mappings": "AAAA,SAAS,OAAO,iCAAiC;AACjD,SAAS,YAAY,gBAAgB;AAErC,SAAS,iBAAiB;AAC1B,SAAS,2BAA2B;AAG7B,SAAS,aAAa,MAAqC;AAChE,MAAI,OAAO;AACT,UAAM,SAAS,UAAU;AACzB,WAAO,OAAO,OAAO,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,CAAC;AAAA,EACpD;AAEA,QAAM,UAAU,WAAW,mBAAmB;AAC9C,QAAM,CAAC,MAAM,OAAO,IAAI,UAAS,mCAAS,MAAM,SAAQ,EAAE;AAE1D,4BAA0B,MAAM;AAC9B,QAAI,CAAC;AAAS;AACd,YAAQ,QAAQ,MAAM,IAAI;AAC1B,WAAO,QAAQ,cAAc,CAAC,MAAMA,aAAY;AAC9C,YAAMC,SAAO,6BAAM,UAASD,SAAQ,MAAM,cAAc,OAAO;AAC/D,UAAI,CAACC;AAAM;AACX,cAAQA,KAAI;AAAA,IACd,CAAC;AAAA,EACH,GAAG,CAAC,mCAAS,MAAM,IAAI,CAAC;AAExB,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,iCAAiC;AAC1C,SAAS,YAAY,gBAAgB;AAErC,SAAS,2BAA2B;AAG7B,SAAS,aAAa,MAAqC;AAChE,QAAM,UAAU,WAAW,mBAAmB;AAC9C,QAAM,CAAC,MAAM,OAAO,IAAI,UAAS,mCAAS,MAAM,SAAQ,EAAE;AAE1D,4BAA0B,MAAM;AAC9B,QAAI,CAAC;AAAS;AACd,YAAQ,QAAQ,MAAM,IAAI;AAC1B,WAAO,QAAQ,cAAc,CAAC,MAAMA,aAAY;AAC9C,YAAMC,SAAO,6BAAM,UAASD,SAAQ,MAAM,cAAc,OAAO;AAC/D,UAAI,CAACC;AAAM;AACX,cAAQA,KAAI;AAAA,IACd,CAAC;AAAA,EACH,GAAG,CAAC,mCAAS,MAAM,IAAI,CAAC;AAExB,SAAO;AACT;",
   "names": ["manager", "name"]
 }

package/dist/esm/views/TamaguiProvider.js

@@ -1,27 +1,17 @@
 import { jsx } from "react/jsx-runtime";
-import { isClient, isRSC, isServer, isWeb } from "@tamagui/constants";
+import { isClient, isServer, isWeb } from "@tamagui/constants";
 import * as React from "react";
+import { AnimationDriverContext } from "../contexts/AnimationDriverContext";
 import { ButtonNestingContext } from "../contexts/ButtonNestingContext";
 import { TextAncestorContext } from "../contexts/TextAncestorContext";
 import { useMediaListeners } from "../hooks/useMedia";
 import { ThemeProvider } from "./ThemeProvider";
-import { AnimationDriverContext } from "../contexts/AnimationDriverContext";
 function TamaguiProvider({
   children,
   disableInjectCSS,
   config,
   ...themePropsProvider
 }) {
-  if (isRSC) {
-    return /* @__PURE__ */ jsx(
-      "span",
-      {
-        style: { display: "contents" },
-        className: `t_${Object.keys(config.themes)[0] || "light"}`,
-        children
-      }
-    );
-  }
   if (!(isWeb && isServer)) {
     useMediaListeners(config);
   }

package/dist/esm/views/TamaguiProvider.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/TamaguiProvider.tsx"],
-  "mappings": "AAkBM;AAlBN,SAAS,UAAU,OAAO,UAAU,aAAa;AACjD,YAAY,WAAW;AAEvB,SAAS,4BAA4B;AACrC,SAAS,2BAA2B;AACpC,SAAS,yBAAyB;AAElC,SAAS,qBAAqB;AAC9B,SAAS,8BAA8B;AAEhC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAyB;AACvB,MAAI,OAAO;AACT,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAO,EAAE,SAAS,WAAW;AAAA,QAC7B,WAAW,KAAK,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,KAAK;AAAA,QAEhD;AAAA;AAAA,IACH;AAAA,EAEJ;AAEA,MAAI,EAAE,SAAS,WAAW;AACxB,sBAAkB,MAAM;AAAA,EAC1B;AAEA,MAAI,UAAU;AAGZ,UAAM,gBAAgB,MAAM;AAG1B,UAAI,SAAS,gBAAgB,UAAU,SAAS,aAAa,GAAG;AAC9D,iBAAS,gBAAgB,UAAU,OAAO,aAAa;AAAA,MACzD;AAEA,UAAI;AAAkB;AACtB,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,YAAY,SAAS,eAAe,OAAO,OAAO,CAAC,CAAC;AAC1D,eAAS,KAAK,YAAY,KAAK;AAC/B,aAAO,MAAM;AACX,iBAAS,KAAK,YAAY,KAAK;AAAA,MACjC;AAAA,IACF,GAAG,CAAC,QAAQ,gBAAgB,CAAC;AAAA,EAC/B;AAEA,SACE,oBAAC,qBAAqB,UAArB,EAA8B,OAAO,OACpC,8BAAC,oBAAoB,UAApB,EAA6B,OAAO,OACnC,8BAAC,uBAAuB,UAAvB,EAAgC,OAAO,OAAO,YAC7C;AAAA,IAAC;AAAA;AAAA,MACC,sBAAsB,OAAO;AAAA,MAC7B,uBAAuB,OAAO;AAAA,MAC7B,GAAG;AAAA,MACJ,cACE,mBAAmB,gBAAgB,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC;AAAA,MAGhE;AAAA;AAAA,EACH,GACF,GACF,GACF;AAEJ;",
+  "mappings": "AA4CU;AA5CV,SAAS,UAAU,UAAU,aAAa;AAC1C,YAAY,WAAW;AAEvB,SAAS,8BAA8B;AACvC,SAAS,4BAA4B;AACrC,SAAS,2BAA2B;AACpC,SAAS,yBAAyB;AAElC,SAAS,qBAAqB;AAEvB,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAyB;AACvB,MAAI,EAAE,SAAS,WAAW;AACxB,sBAAkB,MAAM;AAAA,EAC1B;AAEA,MAAI,UAAU;AAGZ,UAAM,gBAAgB,MAAM;AAG1B,UAAI,SAAS,gBAAgB,UAAU,SAAS,aAAa,GAAG;AAC9D,iBAAS,gBAAgB,UAAU,OAAO,aAAa;AAAA,MACzD;AAEA,UAAI;AAAkB;AACtB,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,YAAY,SAAS,eAAe,OAAO,OAAO,CAAC,CAAC;AAC1D,eAAS,KAAK,YAAY,KAAK;AAC/B,aAAO,MAAM;AACX,iBAAS,KAAK,YAAY,KAAK;AAAA,MACjC;AAAA,IACF,GAAG,CAAC,QAAQ,gBAAgB,CAAC;AAAA,EAC/B;AAEA,SACE,oBAAC,qBAAqB,UAArB,EAA8B,OAAO,OACpC,8BAAC,oBAAoB,UAApB,EAA6B,OAAO,OACnC,8BAAC,uBAAuB,UAAvB,EAAgC,OAAO,OAAO,YAC7C;AAAA,IAAC;AAAA;AAAA,MACC,sBAAsB,OAAO;AAAA,MAC7B,uBAAuB,OAAO;AAAA,MAC7B,GAAG;AAAA,MACJ,cACE,mBAAmB,gBAAgB,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC;AAAA,MAGhE;AAAA;AAAA,EACH,GACF,GACF,GACF;AAEJ;",
   "names": []
 }

package/dist/esm/views/Theme.js

@@ -1,9 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { isWeb } from "@tamagui/constants";
-import React, { Children, cloneElement, forwardRef, isValidElement } from "react";
+import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from "react";
 import { variableToString } from "../createVariable";
 import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
-import { useServerRef } from "../hooks/useServerHooks";
 import { useChangeThemeEffect } from "../hooks/useTheme";
 import { ThemeDebug } from "./ThemeDebug";
 const Theme = forwardRef((props, ref) => {
@@ -34,7 +33,7 @@ Theme["avoidForwardRef"] = true;
 function useThemedChildren(themeState, children, props, isRoot = false) {
   const { themeManager, isNewTheme } = themeState;
   const { shallow, forceClassName } = props;
-  const hasEverThemed = useServerRef(false);
+  const hasEverThemed = useRef(false);
   if (isNewTheme) {
     hasEverThemed.current = true;
   }
@@ -59,17 +58,19 @@ function useThemedChildren(themeState, children, props, isRoot = false) {
   if (isWeb && !props.passPropsToChildren) {
     return wrapThemeElements({
       children: elementsWithContext,
-      themeState
+      themeState,
+      forceClassName
     });
   }
   return elementsWithContext;
 }
 function wrapThemeElements({
   children,
-  themeState
+  themeState,
+  forceClassName
 }) {
   var _a, _b, _c;
-  if (!themeState.isNewTheme) {
+  if (!themeState.isNewTheme && !forceClassName) {
     return /* @__PURE__ */ jsx("span", { className: "_dsp_contents is_Theme", children });
   }
   const themeColor = themeState.theme && themeState.isNewTheme ? variableToString(themeState.theme.color) : "";

package/dist/esm/views/Theme.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "mappings": "AAqCQ;AArCR,SAAS,aAAa;AACtB,OAAO,SAAS,UAAU,cAAc,YAAY,sBAA+B;AAEnF,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAE3D,SAAS,kBAAkB;AAEpB,MAAM,QAAQ,WAAW,CAAC,OAAmB,QAAQ;AAE1D,MAAI,MAAM,SAAS;AACjB,WAAO,MAAM;AAAA,EACf;AAEA,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AAErD,MAAI,WAAW,MAAM,qBAAqB,IACtC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,oBAAoB,GAAG,KAAK,CAAC;AAAA,EACtD,IACA,MAAM;AAEV,MAAI,KAAK;AACP,QAAI;AACF,YAAM,SAAS,KAAK,QAAQ;AAC5B,iBAAW,aAAa,UAAU,EAAE,IAAI,CAAC;AAAA,IAC3C,QAAE;AAAA,IAEF;AAAA,EACF;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,MAAM,UAAU,aAAa;AAC/B,iBACE,oBAAC,cAAW,YAAwB,YAAY,OAC7C,UACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D,CAAC;AAED,MAAM,iBAAiB,IAAI;AAEpB,SAAS,kBACd,YACA,UACA,OAMA,SAAS,OACT;AACA,QAAM,EAAE,cAAc,WAAW,IAAI;AACrC,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,QAAM,gCACJ,cAAc,cAAc,WAAW,kBAAkB;AAE3D,MAAI,CAAC,+BAA+B;AAClC,WAAO;AAAA,EACT;AAKA,MAAI,WAAW,cAAc;AAC3B,QAAI,OAAO,SAAS,QAAQ,QAAQ;AACpC,WAAO,KAAK,IAAI,CAAC,UAAU;AACzB,aAAO,eAAe,KAAK,IACvB;AAAA,QACE;AAAA,QACA;AAAA,QACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,MACF,IACA;AAAA,IACN,CAAC;AAAA,EACH;AAEA,QAAM,sBACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,UACH;AAGF,MAAI,mBAAmB,OAAO;AAC5B,WAAO;AAAA,EACT;AAEA,MAAI,SAAS,CAAC,MAAM,qBAAqB;AACvC,WAAO,kBAAkB;AAAA,MACvB,UAAU;AAAA,MACV;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO;AACT;AAEO,SAAS,kBAAkB;AAAA,EAChC;AAAA,EACA;AACF,GAGG;AAtHH;AAuHE,MAAI,CAAC,WAAW,YAAY;AAC1B,WAAO,oBAAC,UAAK,WAAU,0BAA0B,UAAS;AAAA,EAC5D;AAGA,QAAM,aACJ,WAAW,SAAS,WAAW,aAC3B,iBAAiB,WAAW,MAAM,KAAK,IACvC;AACN,QAAM,aAAa,aACf;AAAA,IACE,OAAO;AAAA,EACT,IACA;AAEJ,QAAM,gBAAe,sBAAW,iBAAX,mBAAyB,kBAAzB,mBAAwC;AAC7D,QAAM,UAAS,gBAAW,iBAAX,mBAAyB;AACxC,QAAM,cAAc,UAAU,gBAAgB,WAAW;AACzD,QAAM,YAAY,WAAW,aAAa;AAE1C,MAAI,iBACF,oBAAC,UAAK,WAAW,GAAG,oCAAoC,OAAO,YAC5D,UACH;AAGF,MAAI,aAAa;AACf,qBACE,oBAAC,UAAK,WAAW,KAAK,oCAAqC,0BAAe;AAAA,EAE9E;AAEA,SAAO;AACT;",
+  "mappings": "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",
   "names": []
 }

package/package.json

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

package/src/createComponent.tsx

@@ -1,11 +1,5 @@
 import { useComposedRefs } from '@tamagui/compose-refs'
-import {
-  isClient,
-  isRSC,
-  isServer,
-  isWeb,
-  useIsomorphicLayoutEffect,
-} from '@tamagui/constants'
+import { isClient, isServer, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
 import { validStyles } from '@tamagui/helpers'
 import React, {
   Children,
@@ -16,8 +10,8 @@ import React, {
   useCallback,
   useContext,
   useId,
-  useMemo,
   useRef,
+  useState,
 } from 'react'
 
 import { getConfig, onConfiguredOnce } from './config'
@@ -33,7 +27,6 @@ import { themeable } from './helpers/themeable'
 import { useShallowSetState } from './helpers/useShallowSetState'
 import { useAnimationDriver } from './hooks/useAnimationDriver'
 import { setMediaShouldUpdate, useMedia } from './hooks/useMedia'
-import { useServerRef, useServerState } from './hooks/useServerHooks'
 import { useThemeWithState } from './hooks/useTheme'
 import { hooks } from './setupHooks'
 import {
@@ -253,7 +246,7 @@ export function createComponent<
     )
     stateRef.current ||= {}
 
-    const hostRef = useServerRef<TamaguiElement>(null)
+    const hostRef = useRef<TamaguiElement>(null)
 
     /**
      * Component state for tracking animations, pseudos
@@ -277,7 +270,7 @@ export function createComponent<
     })()
 
     const usePresence = animationsConfig?.usePresence
-    const presence = (!isRSC && willBeAnimated && usePresence?.()) || null
+    const presence = (willBeAnimated && usePresence?.()) || null
 
     const hasEnterStyle = !!props.enterStyle
 
@@ -293,7 +286,7 @@ export function createComponent<
         ? defaultComponentStateShouldEnter!
         : defaultComponentState!
       : defaultComponentStateMounted!
-    const states = useServerState<TamaguiComponentState>(initialState)
+    const states = useState<TamaguiComponentState>(initialState)
 
     const state = propsIn.forceStyle
       ? { ...states[0], [propsIn.forceStyle]: true }
@@ -327,7 +320,7 @@ export function createComponent<
       ? `is_${props.componentName}`
       : defaultComponentClassName
     const hasTextAncestor = !!(isWeb && isText ? useContext(TextAncestorContext) : false)
-    const languageContext = isRSC ? null : useContext(FontLanguageContext)
+    const languageContext = useContext(FontLanguageContext)
     const isDisabled = props.disabled ?? props.accessibilityState?.disabled
 
     const isTaggable = !Component || typeof Component === 'string'
@@ -439,6 +432,9 @@ export function createComponent<
         ? 'value'
         : 'auto'
 
+    // temp: once we fix above we can disable this
+    const keepStyleSSR = willBeAnimated && animationsConfig?.keepStyleSSR
+
     const splitStyles = useSplitStyles(
       props,
       staticConfig,
@@ -451,8 +447,7 @@ export function createComponent<
         resolveVariablesAs,
         isExiting,
         isAnimated,
-        // temp: once we fix above we can disable this
-        keepStyleSSR: willBeAnimated && animationsConfig?.keepStyleSSR,
+        keepStyleSSR,
       },
       null,
       languageContext || undefined,
@@ -522,7 +517,7 @@ export function createComponent<
     // once you set animation prop don't remove it, you can set to undefined/false
     // reason is animations are heavy - no way around it, and must be run inline here (🙅 loading as a sub-component)
     let animationStyles: any
-    if (!isRSC && willBeAnimated && useAnimations && !isHOC) {
+    if (willBeAnimated && useAnimations && !isHOC) {
       const animations = useAnimations({
         props: propsWithAnimation,
         // if hydrating, send empty style
@@ -636,21 +631,24 @@ export function createComponent<
       })
     }, [shouldSetMounted, state.unmounted])
 
-    let styles: Record<string, any>[]
+    let styles: Record<string, any>[] | undefined
+    const avoidStyle = keepStyleSSR && state.unmounted === true
 
-    if (isStringElement && shouldAvoidClasses && !shouldForcePseudo) {
-      styles = {
-        ...(animationStyles ?? splitStylesStyle),
-      }
-    } else {
-      styles = [animationStyles ?? splitStylesStyle]
-
-      // ugly but for now...
-      if (shouldForcePseudo) {
-        const next = {}
-        styles.forEach((style) => Object.assign(next, style))
-        // @ts-ignore
-        Object.assign(splitStyles.style, next)
+    if (!avoidStyle) {
+      if (isStringElement && shouldAvoidClasses && !shouldForcePseudo) {
+        styles = {
+          ...(animationStyles ?? splitStylesStyle),
+        }
+      } else {
+        styles = [animationStyles ?? splitStylesStyle]
+
+        // ugly but for now...
+        if (shouldForcePseudo) {
+          const next = {}
+          styles.forEach((style) => Object.assign(next, style))
+          // @ts-ignore
+          Object.assign(splitStyles.style, next)
+        }
       }
     }
 
@@ -674,9 +672,9 @@ export function createComponent<
     const className = classList.join(' ')
 
     if (process.env.TAMAGUI_TARGET === 'web') {
-      const style = animationStyles ?? splitStyles.style
+      const style = avoidStyle ? null : animationStyles ?? splitStyles.style
 
-      if (isAnimatedReactNativeWeb) {
+      if (isAnimatedReactNativeWeb && !avoidStyle) {
         viewProps.style = style
       } else if (isReactNative) {
         // TODO these shouldn't really return from getSplitStyles when in Native mode
@@ -705,7 +703,7 @@ export function createComponent<
     // TODO MOVE INTO HOOK
     if (process.env.TAMAGUI_TARGET === 'native') {
       // swap out the right family based on weight/style
-      if (splitStyles.fontFamily) {
+      if (styles && splitStyles.fontFamily) {
         const faceInfo = tamaguiConfig.fontsParsed[splitStyles.fontFamily]?.face
         if (faceInfo) {
           const [weight, style] = (() => {
@@ -755,7 +753,7 @@ export function createComponent<
     )
 
     const events: TamaguiComponentEvents | null =
-      shouldAttach && !isRSC && !isDisabled && !asChild
+      shouldAttach && !isDisabled && !asChild
         ? {
             onPressOut: attachPress
               ? (e) => {

package/src/createTamagui.ts

@@ -1,7 +1,7 @@
-import { isRSC, isWeb } from '@tamagui/constants'
+import { isWeb } from '@tamagui/constants'
 
 import { configListeners, setConfig } from './config'
-import { Variable, getVariableValue } from './createVariable'
+import { Variable } from './createVariable'
 import { createVariables } from './createVariables'
 import { getThemeCSSRules } from './helpers/getThemeCSSRules'
 import {
@@ -203,7 +203,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
         // then, generate CSS from de-duped
         let themeRuleSets: string[] = []
 
-        if (isWeb || isRSC) {
+        if (isWeb) {
           for (const themeName in dedupedThemes) {
             const nextRules = getThemeCSSRules({
               config: configIn,

package/src/helpers/ThemeManager.tsx

@@ -104,7 +104,9 @@ export class ThemeManager {
       }
 
       if (shouldNotify) {
-        this.notify(!!props.forceTheme)
+        queueMicrotask(() => {
+          this.notify(!!props.forceTheme)
+        })
       }
 
       return this.state

package/src/helpers/getSplitStyles.tsx

@@ -2,7 +2,6 @@ import {
   currentPlatform,
   isAndroid,
   isClient,
-  isRSC,
   isServer,
   isWeb,
   useIsomorphicLayoutEffect,
@@ -1226,11 +1225,9 @@ const useInsertEffectCompat = isWeb
 export const useSplitStyles: StyleSplitter = (...args) => {
   const res = getSplitStyles(...args)
 
-  if (!isRSC) {
-    useInsertEffectCompat(() => {
-      insertStyleRules(res.rulesToInsert)
-    }, [res.rulesToInsert])
-  }
+  useInsertEffectCompat(() => {
+    insertStyleRules(res.rulesToInsert)
+  }, [res.rulesToInsert])
 
   return res
 }

package/src/hooks/useAnimationDriver.tsx

@@ -2,9 +2,7 @@ import { useContext } from 'react'
 
 import { AnimationDriverContext } from '../contexts/AnimationDriverContext'
 import { getAnimationDriver } from '../helpers/getAnimationDriver'
-import { isRSC } from '@tamagui/constants'
 
 export const useAnimationDriver = () => {
-  if (isRSC) return getAnimationDriver()
   return useContext(AnimationDriverContext) ?? getAnimationDriver()
 }

package/src/hooks/useStyle.tsx

@@ -1,4 +1,4 @@
-import { isRSC, isWeb } from '@tamagui/constants'
+import { isWeb } from '@tamagui/constants'
 import { useContext } from 'react'
 
 import { FontLanguageContext } from '../contexts/FontLanguageContext'
@@ -24,7 +24,7 @@ export function useStyle<
 ) {
   const isText = base.staticConfig.isText
   const hasTextAncestor = !!(isWeb && isText ? useContext(TextAncestorContext) : false)
-  const languageContext = isRSC ? null : useContext(FontLanguageContext)
+  const languageContext = useContext(FontLanguageContext)
   const themeState = useThemeWithState({})
   const media = useMedia()
   const out = useSplitStyles(

package/src/hooks/useTheme.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-import { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'
-import { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'
+import { isClient, isServer, isWeb } from '@tamagui/constants'
+import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 
 import { getConfig } from '../config'
 import { isDevTools } from '../constants/isDevTools'
@@ -14,7 +14,6 @@ import {
 import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import type { ThemeParsed, ThemeProps } from '../types'
 import { GetThemeUnwrapped } from './getThemeUnwrapped'
-import { useServerRef } from './useServerHooks'
 
 export type ChangedThemeResponse = {
   isNewTheme: boolean
@@ -49,11 +48,11 @@ type UseThemeResult = {
 }
 
 export const useTheme = (props: ThemeProps = emptyProps): UseThemeResult => {
-  return (isRSC ? null : useThemeWithState(props)?.theme) || getDefaultThemeProxied()
+  return useThemeWithState(props)?.theme || getDefaultThemeProxied()
 }
 
 export const useThemeWithState = (props: ThemeProps) => {
-  const keys = useServerRef<string[]>([])
+  const keys = useRef<string[]>([])
 
   const changedTheme = useChangeThemeEffect(
     props,
@@ -158,15 +157,6 @@ export const useChangeThemeEffect = (
   keys?: string[],
   shouldUpdate?: () => boolean | undefined
 ): ChangedThemeResponse => {
-  if (isRSC) {
-    // we need context working for this to work well
-    return {
-      isNewTheme: false,
-      ...createState().state,
-      themeManager: null,
-    }
-  }
-
   const {
     // @ts-expect-error internal use only
     disable,
@@ -186,7 +176,6 @@ export const useChangeThemeEffect = (
 
   const [themeState, setThemeState] = useState<State>(createState)
   const { state, mounted, isNewTheme, themeManager } = themeState
-
   const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)
 
   function getShouldUpdateTheme(
@@ -223,19 +212,13 @@ export const useChangeThemeEffect = (
 
       const nextState = getShouldUpdateTheme(themeManager)
 
-      if (nextState) {
-        if (isNewTheme) {
-          // if it's a new theme we can just update + publish to children
-          themeManager.updateState(nextState, true)
-        }
+      // if (nextState && isNewTheme) {
+      //   // if it's a new theme we can just update + publish to children
+      //   themeManager.updateState(nextState, true)
+      // }
 
-        // if not we will be creating a whole new themeManager
+      if (nextState || isNewTheme) {
         setThemeState(createState)
-      } else {
-        if (isNewTheme) {
-          // need to revert to parent
-          setThemeState(createState)
-        }
       }
 
       // for updateTheme/replaceTheme
@@ -249,9 +232,9 @@ export const useChangeThemeEffect = (
         const force = shouldUpdate?.()
         const doUpdate = force ?? Boolean(keys?.length || isNewTheme)
         if (process.env.NODE_ENV === 'development' && props.debug) {
-          const logs = { force, doUpdate, props, name, manager, keys }
+          // prettier-ignore
           // rome-ignore lint/nursery/noConsoleLog: <explanation>
-          console.log(` 🔸 onChange`, themeManager.id, logs)
+          console.log(` 🔸 onChange`, themeManager.id, { force, doUpdate, props, name, manager, keys })
         }
         if (doUpdate) {
           setThemeState(createState)
@@ -264,13 +247,14 @@ export const useChangeThemeEffect = (
         activeThemeManagers.delete(themeManager)
       }
     }, [
+      themeManager,
       parentManager,
       isNewTheme,
       props.componentName,
       props.inverse,
       props.name,
       props.reset,
-      themeState.mounted,
+      mounted,
     ])
 
     if (process.env.NODE_ENV === 'development') {

package/src/hooks/useThemeName.tsx

@@ -1,16 +1,10 @@
-import { isRSC, useIsomorphicLayoutEffect } from '@tamagui/constants'
+import { useIsomorphicLayoutEffect } from '@tamagui/constants'
 import { useContext, useState } from 'react'
 
-import { getConfig } from '../config'
 import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import { ThemeName } from '../types'
 
 export function useThemeName(opts?: { parent?: true }): ThemeName {
-  if (isRSC) {
-    const config = getConfig()
-    return config.themes[Object.keys(config.themes)[0]] as any
-  }
-
   const manager = useContext(ThemeManagerContext)
   const [name, setName] = useState(manager?.state.name || '')