@tamagui/web 1.14.3 → 1.14.5

package/dist/esm/hooks/useTheme.js

@@ -4,7 +4,8 @@ import { getConfig } from "../config.js";
 import { isDevTools } from "../constants/isDevTools.js";
 import { createProxy } from "../helpers/createProxy.js";
 import {
-  ThemeManager
+  ThemeManager,
+  getNonComponentParentManager
 } from "../helpers/ThemeManager.js";
 import { ThemeManagerContext } from "../helpers/ThemeManagerContext.js";
 import { GetThemeUnwrapped } from "./getThemeUnwrapped.js";
@@ -103,7 +104,7 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
       themeManager: null
     };
   }
-  const parentManager = useContext(ThemeManagerContext);
+  const parentManager = getNonComponentParentManager(useContext(ThemeManagerContext));
   const {
     debug,
     // @ts-expect-error internal use only
@@ -129,13 +130,13 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
     );
     return next;
   }
-  function getThemeManagerNextStateIfChanged(manager = themeManager) {
+  function getThemeManagerNextStateIfChanged(manager = themeManager, forceShouldChange = false) {
     const next = getNextThemeManagerState(manager);
     if (!next)
       return;
     if ((disableUpdate == null ? void 0 : disableUpdate()) === true)
       return;
-    if (!manager.getStateShouldChange(next, state))
+    if (!forceShouldChange && !manager.getStateShouldChange(next, state))
       return;
     return next;
   }
@@ -163,13 +164,14 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
         setThemeState(createState);
       }
       const disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme((name, manager) => {
-        if ((keys == null ? void 0 : keys.length) || isNewTheme) {
-          if (process.env.NODE_ENV === "development" && props["debug"] && (keys == null ? void 0 : keys.length)) {
-            console.log(`onChangeTheme`, { props, name, manager, parentManager, keys });
+        const shouldUpdate = Boolean((keys == null ? void 0 : keys.length) || isNewTheme);
+        if (shouldUpdate) {
+          if (process.env.NODE_ENV === "development" && props["debug"]) {
+            console.log(`onChangeTheme`, shouldUpdate, { props, name, manager, keys });
           }
           setThemeState(createState);
         }
-      });
+      }, themeManager.id);
       return () => {
         disposeChangeListener == null ? void 0 : disposeChangeListener();
       };
@@ -208,7 +210,8 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
     };
     if (prev == null ? void 0 : prev.themeManager) {
       themeManager2 = prev.themeManager;
-      const nextState = getThemeManagerNextStateIfChanged(themeManager2);
+      const forceChange = Boolean(keys == null ? void 0 : keys.length);
+      const nextState = getThemeManagerNextStateIfChanged(themeManager2, forceChange);
       if (nextState) {
         state2 = nextState;
         if (!prev.isNewTheme || !isWeb) {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useTheme.tsx"],
-  "sourcesContent": ["/* eslint-disable no-console */\nimport { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'\nimport { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'\n\nimport { getConfig } from '../config.js'\nimport { isDevTools } from '../constants/isDevTools.js'\nimport { isVariable } from '../createVariable.js'\nimport { createProxy } from '../helpers/createProxy.js'\nimport {\n  ThemeManager,\n  ThemeManagerState,\n  hasNoThemeUpdatingProps,\n} from '../helpers/ThemeManager.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport type { ThemeParsed, ThemeProps } from '../types.js'\nimport { GetThemeUnwrapped } from './getThemeUnwrapped.js'\nimport { useServerRef } from './useServerHooks.js'\n\nexport type ChangedThemeResponse = {\n  isNewTheme: boolean\n  themeManager: ThemeManager | null\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n}\n\ntype State = {\n  state: ThemeManagerState\n  themeManager: ThemeManager\n  isNewTheme: boolean\n  mounted?: boolean\n}\n\nconst emptyProps = { name: null }\n\nfunction getDefaultThemeProxied() {\n  const config = getConfig()\n  const name = Object.keys(config.themes)[0]\n  return getThemeProxied({\n    theme: config.themes[name],\n    name,\n  })\n}\n\nexport const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {\n  return (isRSC ? null : useThemeWithState(props)?.theme) || getDefaultThemeProxied()\n}\n\nexport const useThemeWithState = (props: ThemeProps) => {\n  const keys = useServerRef<string[]>([])\n\n  const changedTheme = useChangeThemeEffect(\n    props,\n    false,\n    keys.current,\n    isClient\n      ? () => {\n          return props.shouldUpdate?.() ?? keys.current.length === 0\n        }\n      : undefined\n  )\n\n  const { themeManager, theme, name, className } = changedTheme\n\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {\n    console.groupCollapsed('  \uD83D\uDD39 useTheme =>', name)\n    const logs = { ...props, name, className, ...(isDevTools && { theme }) }\n    for (const key in logs) {\n      console.log('  ', key, logs[key])\n    }\n    console.groupEnd()\n  }\n\n  if (!changedTheme.theme) {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn('No theme found', name, props, themeManager)\n    }\n    return null\n  }\n\n  const proxiedTheme = useMemo(() => {\n    return getThemeProxied(changedTheme as any, keys.current)\n  }, [theme, name, className, themeManager])\n\n  return {\n    ...changedTheme,\n    theme: proxiedTheme,\n  }\n}\n\nexport function getThemeProxied(\n  {\n    theme,\n    themeManager,\n  }: Partial<ChangedThemeResponse> & {\n    theme: ThemeParsed\n  },\n  keys?: string[]\n) {\n  return createProxy(theme, {\n    has(_, key) {\n      if (typeof key === 'string') {\n        if (key[0] === '$') key = key.slice(1)\n        return themeManager?.allKeys.has(key)\n      }\n      return Reflect.has(theme, key)\n    },\n    get(_, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (\n        key === '__proto__' ||\n        key === '$typeof' ||\n        typeof key !== 'string' ||\n        !themeManager\n      ) {\n        return Reflect.get(_, key)\n      }\n\n      // auto convert variables to plain\n      const keyString = key[0] === '$' ? key.slice(1) : key\n      const val = themeManager.getValue(keyString)\n\n      if (val && keys) {\n        return new Proxy(val as any, {\n          // when they touch the actual value we only track it\n          // if its a variable (web), its ignored!\n          get(_, subkey) {\n            if (subkey === 'val' && !keys.includes(keyString)) {\n              keys.push(keyString)\n            }\n            return Reflect.get(val as any, subkey)\n          },\n        })\n      }\n\n      return val\n    },\n  })\n}\n\nexport const activeThemeManagers = new Set<ThemeManager>()\n\nexport const useChangeThemeEffect = (\n  props: ThemeProps,\n  root = false,\n  keys?: string[],\n  disableUpdate?: () => boolean\n): ChangedThemeResponse => {\n  if (isRSC) {\n    // we need context working for this to work well\n    return {\n      isNewTheme: false,\n      ...createState().state,\n      themeManager: null,\n    }\n  }\n  const parentManager = useContext(ThemeManagerContext)\n\n  const {\n    debug,\n    // @ts-expect-error internal use only\n    disable,\n  } = props\n\n  if (disable) {\n    if (!parentManager) throw `\u274C`\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      themeManager: parentManager,\n    }\n  }\n\n  const [themeState, setThemeState] = useState<State>(createState)\n  const { state, themeManager, mounted, isNewTheme } = themeState\n  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)\n  const shouldReturnParentState = isInversingOnMount\n\n  function getNextThemeManagerState(manager = themeManager) {\n    const next = manager.getState(\n      props,\n      parentManager === themeManager ? parentManager.parentManager : parentManager\n    )\n    return next\n  }\n\n  function getThemeManagerNextStateIfChanged(manager = themeManager) {\n    const next = getNextThemeManagerState(manager)\n    if (!next) return\n    if (disableUpdate?.() === true) return\n    if (!manager.getStateShouldChange(next, state)) return\n    return next\n  }\n\n  if (!isServer) {\n    useEffect(() => {\n      // SSR safe inverse (because server can't know prefers scheme)\n      // could be done through fancy selectors like how we do prefers-media\n      // but may be a bit of explosion of selectors\n      if (props.inverse && !mounted) {\n        setThemeState({ ...themeState, mounted: true })\n        return\n      }\n\n      if (!isNewTheme) return\n      if (!themeManager) return\n\n      activeThemeManagers.add(themeManager)\n\n      return () => {\n        activeThemeManagers.delete(themeManager)\n      }\n    }, [isNewTheme, themeManager, state, debug])\n\n    // listen for parent change + notify children change\n    useLayoutEffect(() => {\n      const nextState = getThemeManagerNextStateIfChanged(themeManager)\n\n      if (nextState) {\n        if (isNewTheme) {\n          // if it's a new theme we can just update + publish to children\n          themeManager.updateState(nextState, true)\n        }\n        // if not we will be creating a whole new themeManager\n        setThemeState(createState)\n      }\n\n      const disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {\n        if (keys?.length || isNewTheme) {\n          if (process.env.NODE_ENV === 'development' && props['debug'] && keys?.length) {\n            console.log(`onChangeTheme`, { props, name, manager, parentManager, keys })\n          }\n          setThemeState(createState)\n        }\n      })\n\n      return () => {\n        disposeChangeListener?.()\n      }\n    }, [\n      parentManager,\n      isNewTheme,\n      props.componentName,\n      props.inverse,\n      props.name,\n      props.reset,\n    ])\n  }\n\n  if (shouldReturnParentState) {\n    if (!parentManager) throw 'impossible'\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      className: isInversingOnMount ? '' : parentManager.state.className,\n      themeManager: parentManager,\n    }\n  }\n\n  return {\n    ...state,\n    isNewTheme,\n    themeManager,\n  }\n\n  function createState(prev?: State): State {\n    if (prev && disableUpdate?.()) {\n      return prev\n    }\n\n    //  returns previous theme manager if no change\n    let themeManager: ThemeManager\n    let state: ThemeManagerState | undefined\n\n    const getNewThemeManager = () => {\n      return new ThemeManager(props, root ? 'root' : parentManager)\n    }\n\n    if (prev?.themeManager) {\n      themeManager = prev.themeManager\n\n      const nextState = getThemeManagerNextStateIfChanged(themeManager)\n\n      if (nextState) {\n        state = nextState\n\n        if (!prev.isNewTheme || !isWeb) {\n          themeManager = getNewThemeManager()\n        } else {\n          themeManager.updateState(nextState, true)\n        }\n      }\n    } else {\n      themeManager = getNewThemeManager()\n    }\n\n    const isNewTheme = Boolean(\n      themeManager !== parentManager ||\n        (prev && themeManager.state.name !== prev.state.name)\n    )\n\n    // only inverse relies on this for ssr\n    const mounted = !props.inverse ? true : root || prev?.mounted\n\n    if (!state) {\n      state = isNewTheme ? { ...themeManager.state } : { ...parentManager!.state }\n    }\n\n    const response = {\n      state,\n      themeManager,\n      isNewTheme,\n      mounted,\n    }\n\n    if (process.env.NODE_ENV === 'development' && props['debug']) {\n      console.groupCollapsed(` \uD83D\uDD37 useChangeThemeEffect createState`)\n      console.log({ props, parentManager, themeManager, prev, response })\n      console.groupEnd()\n    }\n\n    return response\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable no-console */\nimport { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'\nimport { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'\n\nimport { getConfig } from '../config.js'\nimport { isDevTools } from '../constants/isDevTools.js'\nimport { isVariable } from '../createVariable.js'\nimport { createProxy } from '../helpers/createProxy.js'\nimport {\n  ThemeManager,\n  ThemeManagerState,\n  getNonComponentParentManager,\n  hasNoThemeUpdatingProps,\n} from '../helpers/ThemeManager.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport type { ThemeParsed, ThemeProps } from '../types.js'\nimport { GetThemeUnwrapped } from './getThemeUnwrapped.js'\nimport { useServerRef } from './useServerHooks.js'\n\nexport type ChangedThemeResponse = {\n  isNewTheme: boolean\n  themeManager: ThemeManager | null\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n}\n\ntype State = {\n  state: ThemeManagerState\n  themeManager: ThemeManager\n  isNewTheme: boolean\n  mounted?: boolean\n}\n\nconst emptyProps = { name: null }\n\nfunction getDefaultThemeProxied() {\n  const config = getConfig()\n  const name = Object.keys(config.themes)[0]\n  return getThemeProxied({\n    theme: config.themes[name],\n    name,\n  })\n}\n\nexport const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {\n  return (isRSC ? null : useThemeWithState(props)?.theme) || getDefaultThemeProxied()\n}\n\nexport const useThemeWithState = (props: ThemeProps) => {\n  const keys = useServerRef<string[]>([])\n\n  const changedTheme = useChangeThemeEffect(\n    props,\n    false,\n    keys.current,\n    isClient\n      ? () => {\n          return props.shouldUpdate?.() ?? keys.current.length === 0\n        }\n      : undefined\n  )\n\n  const { themeManager, theme, name, className } = changedTheme\n\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {\n    console.groupCollapsed('  \uD83D\uDD39 useTheme =>', name)\n    const logs = { ...props, name, className, ...(isDevTools && { theme }) }\n    for (const key in logs) {\n      console.log('  ', key, logs[key])\n    }\n    console.groupEnd()\n  }\n\n  if (!changedTheme.theme) {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn('No theme found', name, props, themeManager)\n    }\n    return null\n  }\n\n  const proxiedTheme = useMemo(() => {\n    return getThemeProxied(changedTheme as any, keys.current)\n  }, [theme, name, className, themeManager])\n\n  return {\n    ...changedTheme,\n    theme: proxiedTheme,\n  }\n}\n\nexport function getThemeProxied(\n  {\n    theme,\n    themeManager,\n  }: Partial<ChangedThemeResponse> & {\n    theme: ThemeParsed\n  },\n  keys?: string[]\n) {\n  return createProxy(theme, {\n    has(_, key) {\n      if (typeof key === 'string') {\n        if (key[0] === '$') key = key.slice(1)\n        return themeManager?.allKeys.has(key)\n      }\n      return Reflect.has(theme, key)\n    },\n    get(_, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (\n        key === '__proto__' ||\n        key === '$typeof' ||\n        typeof key !== 'string' ||\n        !themeManager\n      ) {\n        return Reflect.get(_, key)\n      }\n\n      // auto convert variables to plain\n      const keyString = key[0] === '$' ? key.slice(1) : key\n      const val = themeManager.getValue(keyString)\n\n      if (val && keys) {\n        return new Proxy(val as any, {\n          // when they touch the actual value we only track it\n          // if its a variable (web), its ignored!\n          get(_, subkey) {\n            if (subkey === 'val' && !keys.includes(keyString)) {\n              keys.push(keyString)\n            }\n            return Reflect.get(val as any, subkey)\n          },\n        })\n      }\n\n      return val\n    },\n  })\n}\n\nexport const activeThemeManagers = new Set<ThemeManager>()\n\nexport const useChangeThemeEffect = (\n  props: ThemeProps,\n  root = false,\n  keys?: string[],\n  disableUpdate?: () => boolean\n): ChangedThemeResponse => {\n  if (isRSC) {\n    // we need context working for this to work well\n    return {\n      isNewTheme: false,\n      ...createState().state,\n      themeManager: null,\n    }\n  }\n\n  const parentManager = getNonComponentParentManager(useContext(ThemeManagerContext))\n\n  const {\n    debug,\n    // @ts-expect-error internal use only\n    disable,\n  } = props\n\n  if (disable) {\n    if (!parentManager) throw `\u274C`\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      themeManager: parentManager,\n    }\n  }\n\n  const [themeState, setThemeState] = useState<State>(createState)\n  const { state, themeManager, mounted, isNewTheme } = themeState\n  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)\n  const shouldReturnParentState = isInversingOnMount\n\n  function getNextThemeManagerState(manager = themeManager) {\n    const next = manager.getState(\n      props,\n      parentManager === themeManager ? parentManager.parentManager : parentManager\n    )\n    return next\n  }\n\n  function getThemeManagerNextStateIfChanged(\n    manager = themeManager,\n    forceShouldChange = false\n  ) {\n    const next = getNextThemeManagerState(manager)\n    if (!next) return\n    if (disableUpdate?.() === true) return\n    if (!forceShouldChange && !manager.getStateShouldChange(next, state)) return\n    return next\n  }\n\n  if (!isServer) {\n    useEffect(() => {\n      // SSR safe inverse (because server can't know prefers scheme)\n      // could be done through fancy selectors like how we do prefers-media\n      // but may be a bit of explosion of selectors\n      if (props.inverse && !mounted) {\n        setThemeState({ ...themeState, mounted: true })\n        return\n      }\n\n      if (!isNewTheme) return\n      if (!themeManager) return\n\n      activeThemeManagers.add(themeManager)\n\n      return () => {\n        activeThemeManagers.delete(themeManager)\n      }\n    }, [isNewTheme, themeManager, state, debug])\n\n    // listen for parent change + notify children change\n    useLayoutEffect(() => {\n      const nextState = getThemeManagerNextStateIfChanged(themeManager)\n\n      if (nextState) {\n        if (isNewTheme) {\n          // if it's a new theme we can just update + publish to children\n          themeManager.updateState(nextState, true)\n        }\n        // if not we will be creating a whole new themeManager\n        setThemeState(createState)\n      }\n\n      const disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {\n        const shouldUpdate = Boolean(keys?.length || isNewTheme)\n        if (shouldUpdate) {\n          if (process.env.NODE_ENV === 'development' && props['debug']) {\n            console.log(`onChangeTheme`, shouldUpdate, { props, name, manager, keys })\n          }\n          setThemeState(createState)\n        }\n      }, themeManager.id)\n\n      return () => {\n        disposeChangeListener?.()\n      }\n    }, [\n      parentManager,\n      isNewTheme,\n      props.componentName,\n      props.inverse,\n      props.name,\n      props.reset,\n    ])\n  }\n\n  if (shouldReturnParentState) {\n    if (!parentManager) throw 'impossible'\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      className: isInversingOnMount ? '' : parentManager.state.className,\n      themeManager: parentManager,\n    }\n  }\n\n  return {\n    ...state,\n    isNewTheme,\n    themeManager,\n  }\n\n  function createState(prev?: State): State {\n    if (prev && disableUpdate?.()) {\n      return prev\n    }\n\n    //  returns previous theme manager if no change\n    let themeManager: ThemeManager\n    let state: ThemeManagerState | undefined\n\n    const getNewThemeManager = () => {\n      return new ThemeManager(props, root ? 'root' : parentManager)\n    }\n\n    if (prev?.themeManager) {\n      themeManager = prev.themeManager\n\n      // this could be a bit better, problem is on toggling light/dark the state is actually\n      // showing light even when the last was dark. but technically allso onChangeTheme should\n      // basically always call on a change, so i'm wondering if we even need the shouldUpdate\n      // at all anymore. this forces updates onChangeTheme for all dynamic style accessed components\n      // which is correct, potentially in the future we can avoid forceChange and just know to\n      // update if keys.length is set + onChangeTheme called\n      const forceChange = Boolean(keys?.length)\n\n      const nextState = getThemeManagerNextStateIfChanged(themeManager, forceChange)\n\n      if (nextState) {\n        state = nextState\n\n        if (!prev.isNewTheme || !isWeb) {\n          themeManager = getNewThemeManager()\n        } else {\n          themeManager.updateState(nextState, true)\n        }\n      }\n    } else {\n      themeManager = getNewThemeManager()\n    }\n\n    const isNewTheme = Boolean(\n      themeManager !== parentManager ||\n        (prev && themeManager.state.name !== prev.state.name)\n    )\n\n    // only inverse relies on this for ssr\n    const mounted = !props.inverse ? true : root || prev?.mounted\n\n    if (!state) {\n      state = isNewTheme ? { ...themeManager.state } : { ...parentManager!.state }\n    }\n\n    const response = {\n      state,\n      themeManager,\n      isNewTheme,\n      mounted,\n    }\n\n    if (process.env.NODE_ENV === 'development' && props['debug']) {\n      console.groupCollapsed(` \uD83D\uDD37 useChangeThemeEffect createState`)\n      console.log({ props, parentManager, themeManager, prev, response })\n      console.groupEnd()\n    }\n\n    return response\n  }\n}\n"],
+  "mappings": "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",
   "names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
 }

package/dist/esm/hooks/useTheme.mjs

@@ -4,7 +4,8 @@ import { getConfig } from "../config.js";
 import { isDevTools } from "../constants/isDevTools.js";
 import { createProxy } from "../helpers/createProxy.js";
 import {
-  ThemeManager
+  ThemeManager,
+  getNonComponentParentManager
 } from "../helpers/ThemeManager.js";
 import { ThemeManagerContext } from "../helpers/ThemeManagerContext.js";
 import { GetThemeUnwrapped } from "./getThemeUnwrapped.js";
@@ -103,7 +104,7 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
       themeManager: null
     };
   }
-  const parentManager = useContext(ThemeManagerContext);
+  const parentManager = getNonComponentParentManager(useContext(ThemeManagerContext));
   const {
     debug,
     // @ts-expect-error internal use only
@@ -129,13 +130,13 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
     );
     return next;
   }
-  function getThemeManagerNextStateIfChanged(manager = themeManager) {
+  function getThemeManagerNextStateIfChanged(manager = themeManager, forceShouldChange = false) {
     const next = getNextThemeManagerState(manager);
     if (!next)
       return;
     if ((disableUpdate == null ? void 0 : disableUpdate()) === true)
       return;
-    if (!manager.getStateShouldChange(next, state))
+    if (!forceShouldChange && !manager.getStateShouldChange(next, state))
       return;
     return next;
   }
@@ -163,13 +164,14 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
         setThemeState(createState);
       }
       const disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme((name, manager) => {
-        if ((keys == null ? void 0 : keys.length) || isNewTheme) {
-          if (process.env.NODE_ENV === "development" && props["debug"] && (keys == null ? void 0 : keys.length)) {
-            console.log(`onChangeTheme`, { props, name, manager, parentManager, keys });
+        const shouldUpdate = Boolean((keys == null ? void 0 : keys.length) || isNewTheme);
+        if (shouldUpdate) {
+          if (process.env.NODE_ENV === "development" && props["debug"]) {
+            console.log(`onChangeTheme`, shouldUpdate, { props, name, manager, keys });
           }
           setThemeState(createState);
         }
-      });
+      }, themeManager.id);
       return () => {
         disposeChangeListener == null ? void 0 : disposeChangeListener();
       };
@@ -208,7 +210,8 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
     };
     if (prev == null ? void 0 : prev.themeManager) {
       themeManager2 = prev.themeManager;
-      const nextState = getThemeManagerNextStateIfChanged(themeManager2);
+      const forceChange = Boolean(keys == null ? void 0 : keys.length);
+      const nextState = getThemeManagerNextStateIfChanged(themeManager2, forceChange);
       if (nextState) {
         state2 = nextState;
         if (!prev.isNewTheme || !isWeb) {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useTheme.tsx"],
-  "sourcesContent": ["/* eslint-disable no-console */\nimport { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'\nimport { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'\n\nimport { getConfig } from '../config.js'\nimport { isDevTools } from '../constants/isDevTools.js'\nimport { isVariable } from '../createVariable.js'\nimport { createProxy } from '../helpers/createProxy.js'\nimport {\n  ThemeManager,\n  ThemeManagerState,\n  hasNoThemeUpdatingProps,\n} from '../helpers/ThemeManager.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport type { ThemeParsed, ThemeProps } from '../types.js'\nimport { GetThemeUnwrapped } from './getThemeUnwrapped.js'\nimport { useServerRef } from './useServerHooks.js'\n\nexport type ChangedThemeResponse = {\n  isNewTheme: boolean\n  themeManager: ThemeManager | null\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n}\n\ntype State = {\n  state: ThemeManagerState\n  themeManager: ThemeManager\n  isNewTheme: boolean\n  mounted?: boolean\n}\n\nconst emptyProps = { name: null }\n\nfunction getDefaultThemeProxied() {\n  const config = getConfig()\n  const name = Object.keys(config.themes)[0]\n  return getThemeProxied({\n    theme: config.themes[name],\n    name,\n  })\n}\n\nexport const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {\n  return (isRSC ? null : useThemeWithState(props)?.theme) || getDefaultThemeProxied()\n}\n\nexport const useThemeWithState = (props: ThemeProps) => {\n  const keys = useServerRef<string[]>([])\n\n  const changedTheme = useChangeThemeEffect(\n    props,\n    false,\n    keys.current,\n    isClient\n      ? () => {\n          return props.shouldUpdate?.() ?? keys.current.length === 0\n        }\n      : undefined\n  )\n\n  const { themeManager, theme, name, className } = changedTheme\n\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {\n    console.groupCollapsed('  \uD83D\uDD39 useTheme =>', name)\n    const logs = { ...props, name, className, ...(isDevTools && { theme }) }\n    for (const key in logs) {\n      console.log('  ', key, logs[key])\n    }\n    console.groupEnd()\n  }\n\n  if (!changedTheme.theme) {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn('No theme found', name, props, themeManager)\n    }\n    return null\n  }\n\n  const proxiedTheme = useMemo(() => {\n    return getThemeProxied(changedTheme as any, keys.current)\n  }, [theme, name, className, themeManager])\n\n  return {\n    ...changedTheme,\n    theme: proxiedTheme,\n  }\n}\n\nexport function getThemeProxied(\n  {\n    theme,\n    themeManager,\n  }: Partial<ChangedThemeResponse> & {\n    theme: ThemeParsed\n  },\n  keys?: string[]\n) {\n  return createProxy(theme, {\n    has(_, key) {\n      if (typeof key === 'string') {\n        if (key[0] === '$') key = key.slice(1)\n        return themeManager?.allKeys.has(key)\n      }\n      return Reflect.has(theme, key)\n    },\n    get(_, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (\n        key === '__proto__' ||\n        key === '$typeof' ||\n        typeof key !== 'string' ||\n        !themeManager\n      ) {\n        return Reflect.get(_, key)\n      }\n\n      // auto convert variables to plain\n      const keyString = key[0] === '$' ? key.slice(1) : key\n      const val = themeManager.getValue(keyString)\n\n      if (val && keys) {\n        return new Proxy(val as any, {\n          // when they touch the actual value we only track it\n          // if its a variable (web), its ignored!\n          get(_, subkey) {\n            if (subkey === 'val' && !keys.includes(keyString)) {\n              keys.push(keyString)\n            }\n            return Reflect.get(val as any, subkey)\n          },\n        })\n      }\n\n      return val\n    },\n  })\n}\n\nexport const activeThemeManagers = new Set<ThemeManager>()\n\nexport const useChangeThemeEffect = (\n  props: ThemeProps,\n  root = false,\n  keys?: string[],\n  disableUpdate?: () => boolean\n): ChangedThemeResponse => {\n  if (isRSC) {\n    // we need context working for this to work well\n    return {\n      isNewTheme: false,\n      ...createState().state,\n      themeManager: null,\n    }\n  }\n  const parentManager = useContext(ThemeManagerContext)\n\n  const {\n    debug,\n    // @ts-expect-error internal use only\n    disable,\n  } = props\n\n  if (disable) {\n    if (!parentManager) throw `\u274C`\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      themeManager: parentManager,\n    }\n  }\n\n  const [themeState, setThemeState] = useState<State>(createState)\n  const { state, themeManager, mounted, isNewTheme } = themeState\n  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)\n  const shouldReturnParentState = isInversingOnMount\n\n  function getNextThemeManagerState(manager = themeManager) {\n    const next = manager.getState(\n      props,\n      parentManager === themeManager ? parentManager.parentManager : parentManager\n    )\n    return next\n  }\n\n  function getThemeManagerNextStateIfChanged(manager = themeManager) {\n    const next = getNextThemeManagerState(manager)\n    if (!next) return\n    if (disableUpdate?.() === true) return\n    if (!manager.getStateShouldChange(next, state)) return\n    return next\n  }\n\n  if (!isServer) {\n    useEffect(() => {\n      // SSR safe inverse (because server can't know prefers scheme)\n      // could be done through fancy selectors like how we do prefers-media\n      // but may be a bit of explosion of selectors\n      if (props.inverse && !mounted) {\n        setThemeState({ ...themeState, mounted: true })\n        return\n      }\n\n      if (!isNewTheme) return\n      if (!themeManager) return\n\n      activeThemeManagers.add(themeManager)\n\n      return () => {\n        activeThemeManagers.delete(themeManager)\n      }\n    }, [isNewTheme, themeManager, state, debug])\n\n    // listen for parent change + notify children change\n    useLayoutEffect(() => {\n      const nextState = getThemeManagerNextStateIfChanged(themeManager)\n\n      if (nextState) {\n        if (isNewTheme) {\n          // if it's a new theme we can just update + publish to children\n          themeManager.updateState(nextState, true)\n        }\n        // if not we will be creating a whole new themeManager\n        setThemeState(createState)\n      }\n\n      const disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {\n        if (keys?.length || isNewTheme) {\n          if (process.env.NODE_ENV === 'development' && props['debug'] && keys?.length) {\n            console.log(`onChangeTheme`, { props, name, manager, parentManager, keys })\n          }\n          setThemeState(createState)\n        }\n      })\n\n      return () => {\n        disposeChangeListener?.()\n      }\n    }, [\n      parentManager,\n      isNewTheme,\n      props.componentName,\n      props.inverse,\n      props.name,\n      props.reset,\n    ])\n  }\n\n  if (shouldReturnParentState) {\n    if (!parentManager) throw 'impossible'\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      className: isInversingOnMount ? '' : parentManager.state.className,\n      themeManager: parentManager,\n    }\n  }\n\n  return {\n    ...state,\n    isNewTheme,\n    themeManager,\n  }\n\n  function createState(prev?: State): State {\n    if (prev && disableUpdate?.()) {\n      return prev\n    }\n\n    //  returns previous theme manager if no change\n    let themeManager: ThemeManager\n    let state: ThemeManagerState | undefined\n\n    const getNewThemeManager = () => {\n      return new ThemeManager(props, root ? 'root' : parentManager)\n    }\n\n    if (prev?.themeManager) {\n      themeManager = prev.themeManager\n\n      const nextState = getThemeManagerNextStateIfChanged(themeManager)\n\n      if (nextState) {\n        state = nextState\n\n        if (!prev.isNewTheme || !isWeb) {\n          themeManager = getNewThemeManager()\n        } else {\n          themeManager.updateState(nextState, true)\n        }\n      }\n    } else {\n      themeManager = getNewThemeManager()\n    }\n\n    const isNewTheme = Boolean(\n      themeManager !== parentManager ||\n        (prev && themeManager.state.name !== prev.state.name)\n    )\n\n    // only inverse relies on this for ssr\n    const mounted = !props.inverse ? true : root || prev?.mounted\n\n    if (!state) {\n      state = isNewTheme ? { ...themeManager.state } : { ...parentManager!.state }\n    }\n\n    const response = {\n      state,\n      themeManager,\n      isNewTheme,\n      mounted,\n    }\n\n    if (process.env.NODE_ENV === 'development' && props['debug']) {\n      console.groupCollapsed(` \uD83D\uDD37 useChangeThemeEffect createState`)\n      console.log({ props, parentManager, themeManager, prev, response })\n      console.groupEnd()\n    }\n\n    return response\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable no-console */\nimport { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'\nimport { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'\n\nimport { getConfig } from '../config.js'\nimport { isDevTools } from '../constants/isDevTools.js'\nimport { isVariable } from '../createVariable.js'\nimport { createProxy } from '../helpers/createProxy.js'\nimport {\n  ThemeManager,\n  ThemeManagerState,\n  getNonComponentParentManager,\n  hasNoThemeUpdatingProps,\n} from '../helpers/ThemeManager.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport type { ThemeParsed, ThemeProps } from '../types.js'\nimport { GetThemeUnwrapped } from './getThemeUnwrapped.js'\nimport { useServerRef } from './useServerHooks.js'\n\nexport type ChangedThemeResponse = {\n  isNewTheme: boolean\n  themeManager: ThemeManager | null\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n}\n\ntype State = {\n  state: ThemeManagerState\n  themeManager: ThemeManager\n  isNewTheme: boolean\n  mounted?: boolean\n}\n\nconst emptyProps = { name: null }\n\nfunction getDefaultThemeProxied() {\n  const config = getConfig()\n  const name = Object.keys(config.themes)[0]\n  return getThemeProxied({\n    theme: config.themes[name],\n    name,\n  })\n}\n\nexport const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {\n  return (isRSC ? null : useThemeWithState(props)?.theme) || getDefaultThemeProxied()\n}\n\nexport const useThemeWithState = (props: ThemeProps) => {\n  const keys = useServerRef<string[]>([])\n\n  const changedTheme = useChangeThemeEffect(\n    props,\n    false,\n    keys.current,\n    isClient\n      ? () => {\n          return props.shouldUpdate?.() ?? keys.current.length === 0\n        }\n      : undefined\n  )\n\n  const { themeManager, theme, name, className } = changedTheme\n\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {\n    console.groupCollapsed('  \uD83D\uDD39 useTheme =>', name)\n    const logs = { ...props, name, className, ...(isDevTools && { theme }) }\n    for (const key in logs) {\n      console.log('  ', key, logs[key])\n    }\n    console.groupEnd()\n  }\n\n  if (!changedTheme.theme) {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn('No theme found', name, props, themeManager)\n    }\n    return null\n  }\n\n  const proxiedTheme = useMemo(() => {\n    return getThemeProxied(changedTheme as any, keys.current)\n  }, [theme, name, className, themeManager])\n\n  return {\n    ...changedTheme,\n    theme: proxiedTheme,\n  }\n}\n\nexport function getThemeProxied(\n  {\n    theme,\n    themeManager,\n  }: Partial<ChangedThemeResponse> & {\n    theme: ThemeParsed\n  },\n  keys?: string[]\n) {\n  return createProxy(theme, {\n    has(_, key) {\n      if (typeof key === 'string') {\n        if (key[0] === '$') key = key.slice(1)\n        return themeManager?.allKeys.has(key)\n      }\n      return Reflect.has(theme, key)\n    },\n    get(_, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (\n        key === '__proto__' ||\n        key === '$typeof' ||\n        typeof key !== 'string' ||\n        !themeManager\n      ) {\n        return Reflect.get(_, key)\n      }\n\n      // auto convert variables to plain\n      const keyString = key[0] === '$' ? key.slice(1) : key\n      const val = themeManager.getValue(keyString)\n\n      if (val && keys) {\n        return new Proxy(val as any, {\n          // when they touch the actual value we only track it\n          // if its a variable (web), its ignored!\n          get(_, subkey) {\n            if (subkey === 'val' && !keys.includes(keyString)) {\n              keys.push(keyString)\n            }\n            return Reflect.get(val as any, subkey)\n          },\n        })\n      }\n\n      return val\n    },\n  })\n}\n\nexport const activeThemeManagers = new Set<ThemeManager>()\n\nexport const useChangeThemeEffect = (\n  props: ThemeProps,\n  root = false,\n  keys?: string[],\n  disableUpdate?: () => boolean\n): ChangedThemeResponse => {\n  if (isRSC) {\n    // we need context working for this to work well\n    return {\n      isNewTheme: false,\n      ...createState().state,\n      themeManager: null,\n    }\n  }\n\n  const parentManager = getNonComponentParentManager(useContext(ThemeManagerContext))\n\n  const {\n    debug,\n    // @ts-expect-error internal use only\n    disable,\n  } = props\n\n  if (disable) {\n    if (!parentManager) throw `\u274C`\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      themeManager: parentManager,\n    }\n  }\n\n  const [themeState, setThemeState] = useState<State>(createState)\n  const { state, themeManager, mounted, isNewTheme } = themeState\n  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)\n  const shouldReturnParentState = isInversingOnMount\n\n  function getNextThemeManagerState(manager = themeManager) {\n    const next = manager.getState(\n      props,\n      parentManager === themeManager ? parentManager.parentManager : parentManager\n    )\n    return next\n  }\n\n  function getThemeManagerNextStateIfChanged(\n    manager = themeManager,\n    forceShouldChange = false\n  ) {\n    const next = getNextThemeManagerState(manager)\n    if (!next) return\n    if (disableUpdate?.() === true) return\n    if (!forceShouldChange && !manager.getStateShouldChange(next, state)) return\n    return next\n  }\n\n  if (!isServer) {\n    useEffect(() => {\n      // SSR safe inverse (because server can't know prefers scheme)\n      // could be done through fancy selectors like how we do prefers-media\n      // but may be a bit of explosion of selectors\n      if (props.inverse && !mounted) {\n        setThemeState({ ...themeState, mounted: true })\n        return\n      }\n\n      if (!isNewTheme) return\n      if (!themeManager) return\n\n      activeThemeManagers.add(themeManager)\n\n      return () => {\n        activeThemeManagers.delete(themeManager)\n      }\n    }, [isNewTheme, themeManager, state, debug])\n\n    // listen for parent change + notify children change\n    useLayoutEffect(() => {\n      const nextState = getThemeManagerNextStateIfChanged(themeManager)\n\n      if (nextState) {\n        if (isNewTheme) {\n          // if it's a new theme we can just update + publish to children\n          themeManager.updateState(nextState, true)\n        }\n        // if not we will be creating a whole new themeManager\n        setThemeState(createState)\n      }\n\n      const disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {\n        const shouldUpdate = Boolean(keys?.length || isNewTheme)\n        if (shouldUpdate) {\n          if (process.env.NODE_ENV === 'development' && props['debug']) {\n            console.log(`onChangeTheme`, shouldUpdate, { props, name, manager, keys })\n          }\n          setThemeState(createState)\n        }\n      }, themeManager.id)\n\n      return () => {\n        disposeChangeListener?.()\n      }\n    }, [\n      parentManager,\n      isNewTheme,\n      props.componentName,\n      props.inverse,\n      props.name,\n      props.reset,\n    ])\n  }\n\n  if (shouldReturnParentState) {\n    if (!parentManager) throw 'impossible'\n    return {\n      isNewTheme: false,\n      ...parentManager.state,\n      className: isInversingOnMount ? '' : parentManager.state.className,\n      themeManager: parentManager,\n    }\n  }\n\n  return {\n    ...state,\n    isNewTheme,\n    themeManager,\n  }\n\n  function createState(prev?: State): State {\n    if (prev && disableUpdate?.()) {\n      return prev\n    }\n\n    //  returns previous theme manager if no change\n    let themeManager: ThemeManager\n    let state: ThemeManagerState | undefined\n\n    const getNewThemeManager = () => {\n      return new ThemeManager(props, root ? 'root' : parentManager)\n    }\n\n    if (prev?.themeManager) {\n      themeManager = prev.themeManager\n\n      // this could be a bit better, problem is on toggling light/dark the state is actually\n      // showing light even when the last was dark. but technically allso onChangeTheme should\n      // basically always call on a change, so i'm wondering if we even need the shouldUpdate\n      // at all anymore. this forces updates onChangeTheme for all dynamic style accessed components\n      // which is correct, potentially in the future we can avoid forceChange and just know to\n      // update if keys.length is set + onChangeTheme called\n      const forceChange = Boolean(keys?.length)\n\n      const nextState = getThemeManagerNextStateIfChanged(themeManager, forceChange)\n\n      if (nextState) {\n        state = nextState\n\n        if (!prev.isNewTheme || !isWeb) {\n          themeManager = getNewThemeManager()\n        } else {\n          themeManager.updateState(nextState, true)\n        }\n      }\n    } else {\n      themeManager = getNewThemeManager()\n    }\n\n    const isNewTheme = Boolean(\n      themeManager !== parentManager ||\n        (prev && themeManager.state.name !== prev.state.name)\n    )\n\n    // only inverse relies on this for ssr\n    const mounted = !props.inverse ? true : root || prev?.mounted\n\n    if (!state) {\n      state = isNewTheme ? { ...themeManager.state } : { ...parentManager!.state }\n    }\n\n    const response = {\n      state,\n      themeManager,\n      isNewTheme,\n      mounted,\n    }\n\n    if (process.env.NODE_ENV === 'development' && props['debug']) {\n      console.groupCollapsed(` \uD83D\uDD37 useChangeThemeEffect createState`)\n      console.log({ props, parentManager, themeManager, prev, response })\n      console.groupEnd()\n    }\n\n    return response\n  }\n}\n"],
+  "mappings": "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",
   "names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
 }

package/dist/esm/index.js

@@ -8,8 +8,6 @@ export * from "./createTokens.js";
 export * from "./createVariable.js";
 export * from "./createVariables.js";
 export * from "./insertFont.js";
-export * from "./addTheme.js";
-export * from "./updateTheme.js";
 export * from "./styled.js";
 export * from "./types.js";
 export * from "./setupReactNative.js";
@@ -40,7 +38,6 @@ export * from "./helpers/themeable.js";
 export * from "./helpers/withStaticProperties.js";
 export * from "./helpers/normalizeColor.js";
 export * from "./contexts/ButtonNestingContext.js";
-export * from "./hooks/useId.js";
 export * from "./hooks/useIsTouchDevice.js";
 import {
   configureMedia,

package/dist/esm/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["export * from './Tamagui.js'\nexport * from './createComponent.js'\nexport * from './createShorthands.js'\nexport * from './createTheme.js'\nexport * from './createTamagui.js'\nexport * from './createFont.js'\nexport * from './createTokens.js'\nexport * from './createVariable.js'\nexport * from './createVariables.js'\nexport * from './insertFont.js'\nexport * from './addTheme.js'\nexport * from './updateTheme.js'\nexport * from './styled.js'\nexport * from './types.js'\nexport * from './setupReactNative.js'\n\nexport {\n  getConfig,\n  getThemes,\n  getTokens,\n  onConfiguredOnce,\n  updateConfig,\n} from './config.js'\n\nexport * from './constants/constants.js'\n\nexport * from './helpers/useShallowSetState.js'\nexport * from './helpers/getVariantExtras.js'\nexport * from './helpers/getAnimationDriver.js'\nexport * from './helpers/getExpandedShorthands.js'\nexport * from './helpers/getSplitStyles.js'\nexport * from './helpers/getStylesAtomic'\nexport * from './helpers/pseudoDescriptors.js'\nexport * from './helpers/mergeProps.js'\nexport * from './helpers/expandStyles.js'\nexport * from './helpers/isTamaguiElement.js'\nexport * from './helpers/isTamaguiComponent.js'\nexport * from './helpers/matchMedia'\nexport * from './helpers/themes.js'\nexport * from './helpers/getThemeCSSRules.js'\nexport * from './helpers/proxyThemeVariables.js'\nexport * from './helpers/themeable.js'\nexport * from './helpers/withStaticProperties.js'\nexport * from './helpers/normalizeColor.js'\n\nexport * from './contexts/ButtonNestingContext.js'\n\nexport * from './hooks/useId.js'\nexport * from './hooks/useIsTouchDevice.js'\n\nexport {\n  configureMedia,\n  getMedia,\n  mediaState,\n  useMedia,\n  useMediaPropsActive,\n  mediaObjectToString,\n  mediaQueryConfig,\n} from './hooks/useMedia.js'\nexport * from './hooks/useTheme.js'\nexport * from './hooks/useThemeName.js'\nexport * from './hooks/useSafeRef.js'\nexport * from './hooks/useStyle.js'\nexport * from './hooks/useAnimationDriver.js'\n\nexport * from './views/Slot.js'\nexport * from './views/Stack.js'\nexport * from './views/Text.js'\nexport * from './contexts/TextAncestorContext.js'\nexport * from './views/Theme.js'\nexport * from './views/ThemeProvider.js'\nexport * from './views/FontLanguage'\nexport * from './views/TamaguiProvider.js'\nexport * from './views/AnimationDriverProvider.js'\n\nexport * from '@tamagui/use-force-update'\nexport * from '@tamagui/use-did-finish-ssr'\nexport * from '@tamagui/use-event'\nexport * from '@tamagui/compose-refs'\nexport * from '@tamagui/helpers'\nexport * from '@tamagui/constants'\n\nexport * from './setupHooks.js'\n"],
-  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
+  "sourcesContent": ["export * from './Tamagui.js'\nexport * from './createComponent.js'\nexport * from './createShorthands.js'\nexport * from './createTheme.js'\nexport * from './createTamagui.js'\nexport * from './createFont.js'\nexport * from './createTokens.js'\nexport * from './createVariable.js'\nexport * from './createVariables.js'\nexport * from './insertFont.js'\nexport * from './styled.js'\nexport * from './types.js'\nexport * from './setupReactNative.js'\n\nexport {\n  getConfig,\n  getThemes,\n  getTokens,\n  onConfiguredOnce,\n  updateConfig,\n} from './config.js'\n\nexport * from './constants/constants.js'\n\nexport * from './helpers/useShallowSetState.js'\nexport * from './helpers/getVariantExtras.js'\nexport * from './helpers/getAnimationDriver.js'\nexport * from './helpers/getExpandedShorthands.js'\nexport * from './helpers/getSplitStyles.js'\nexport * from './helpers/getStylesAtomic'\nexport * from './helpers/pseudoDescriptors.js'\nexport * from './helpers/mergeProps.js'\nexport * from './helpers/expandStyles.js'\nexport * from './helpers/isTamaguiElement.js'\nexport * from './helpers/isTamaguiComponent.js'\nexport * from './helpers/matchMedia'\nexport * from './helpers/themes.js'\nexport * from './helpers/getThemeCSSRules.js'\nexport * from './helpers/proxyThemeVariables.js'\nexport * from './helpers/themeable.js'\nexport * from './helpers/withStaticProperties.js'\nexport * from './helpers/normalizeColor.js'\n\nexport * from './contexts/ButtonNestingContext.js'\n\nexport * from './hooks/useIsTouchDevice.js'\n\nexport {\n  configureMedia,\n  getMedia,\n  mediaState,\n  useMedia,\n  useMediaPropsActive,\n  mediaObjectToString,\n  mediaQueryConfig,\n} from './hooks/useMedia.js'\nexport * from './hooks/useTheme.js'\nexport * from './hooks/useThemeName.js'\nexport * from './hooks/useSafeRef.js'\nexport * from './hooks/useStyle.js'\nexport * from './hooks/useAnimationDriver.js'\n\nexport * from './views/Slot.js'\nexport * from './views/Stack.js'\nexport * from './views/Text.js'\nexport * from './contexts/TextAncestorContext.js'\nexport * from './views/Theme.js'\nexport * from './views/ThemeProvider.js'\nexport * from './views/FontLanguage'\nexport * from './views/TamaguiProvider.js'\nexport * from './views/AnimationDriverProvider.js'\n\nexport * from '@tamagui/use-force-update'\nexport * from '@tamagui/use-did-finish-ssr'\nexport * from '@tamagui/use-event'\nexport * from '@tamagui/compose-refs'\nexport * from '@tamagui/helpers'\nexport * from '@tamagui/constants'\n\nexport * from './setupHooks.js'\n"],
+  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
   "names": []
 }

package/dist/esm/index.mjs

@@ -8,8 +8,6 @@ export * from "./createTokens.js";
 export * from "./createVariable.js";
 export * from "./createVariables.js";
 export * from "./insertFont.js";
-export * from "./addTheme.js";
-export * from "./updateTheme.js";
 export * from "./styled.js";
 export * from "./types.js";
 export * from "./setupReactNative.js";
@@ -40,7 +38,6 @@ export * from "./helpers/themeable.js";
 export * from "./helpers/withStaticProperties.js";
 export * from "./helpers/normalizeColor.js";
 export * from "./contexts/ButtonNestingContext.js";
-export * from "./hooks/useId.js";
 export * from "./hooks/useIsTouchDevice.js";
 import {
   configureMedia,

package/dist/esm/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["export * from './Tamagui.js'\nexport * from './createComponent.js'\nexport * from './createShorthands.js'\nexport * from './createTheme.js'\nexport * from './createTamagui.js'\nexport * from './createFont.js'\nexport * from './createTokens.js'\nexport * from './createVariable.js'\nexport * from './createVariables.js'\nexport * from './insertFont.js'\nexport * from './addTheme.js'\nexport * from './updateTheme.js'\nexport * from './styled.js'\nexport * from './types.js'\nexport * from './setupReactNative.js'\n\nexport {\n  getConfig,\n  getThemes,\n  getTokens,\n  onConfiguredOnce,\n  updateConfig,\n} from './config.js'\n\nexport * from './constants/constants.js'\n\nexport * from './helpers/useShallowSetState.js'\nexport * from './helpers/getVariantExtras.js'\nexport * from './helpers/getAnimationDriver.js'\nexport * from './helpers/getExpandedShorthands.js'\nexport * from './helpers/getSplitStyles.js'\nexport * from './helpers/getStylesAtomic'\nexport * from './helpers/pseudoDescriptors.js'\nexport * from './helpers/mergeProps.js'\nexport * from './helpers/expandStyles.js'\nexport * from './helpers/isTamaguiElement.js'\nexport * from './helpers/isTamaguiComponent.js'\nexport * from './helpers/matchMedia'\nexport * from './helpers/themes.js'\nexport * from './helpers/getThemeCSSRules.js'\nexport * from './helpers/proxyThemeVariables.js'\nexport * from './helpers/themeable.js'\nexport * from './helpers/withStaticProperties.js'\nexport * from './helpers/normalizeColor.js'\n\nexport * from './contexts/ButtonNestingContext.js'\n\nexport * from './hooks/useId.js'\nexport * from './hooks/useIsTouchDevice.js'\n\nexport {\n  configureMedia,\n  getMedia,\n  mediaState,\n  useMedia,\n  useMediaPropsActive,\n  mediaObjectToString,\n  mediaQueryConfig,\n} from './hooks/useMedia.js'\nexport * from './hooks/useTheme.js'\nexport * from './hooks/useThemeName.js'\nexport * from './hooks/useSafeRef.js'\nexport * from './hooks/useStyle.js'\nexport * from './hooks/useAnimationDriver.js'\n\nexport * from './views/Slot.js'\nexport * from './views/Stack.js'\nexport * from './views/Text.js'\nexport * from './contexts/TextAncestorContext.js'\nexport * from './views/Theme.js'\nexport * from './views/ThemeProvider.js'\nexport * from './views/FontLanguage'\nexport * from './views/TamaguiProvider.js'\nexport * from './views/AnimationDriverProvider.js'\n\nexport * from '@tamagui/use-force-update'\nexport * from '@tamagui/use-did-finish-ssr'\nexport * from '@tamagui/use-event'\nexport * from '@tamagui/compose-refs'\nexport * from '@tamagui/helpers'\nexport * from '@tamagui/constants'\n\nexport * from './setupHooks.js'\n"],
-  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
+  "sourcesContent": ["export * from './Tamagui.js'\nexport * from './createComponent.js'\nexport * from './createShorthands.js'\nexport * from './createTheme.js'\nexport * from './createTamagui.js'\nexport * from './createFont.js'\nexport * from './createTokens.js'\nexport * from './createVariable.js'\nexport * from './createVariables.js'\nexport * from './insertFont.js'\nexport * from './styled.js'\nexport * from './types.js'\nexport * from './setupReactNative.js'\n\nexport {\n  getConfig,\n  getThemes,\n  getTokens,\n  onConfiguredOnce,\n  updateConfig,\n} from './config.js'\n\nexport * from './constants/constants.js'\n\nexport * from './helpers/useShallowSetState.js'\nexport * from './helpers/getVariantExtras.js'\nexport * from './helpers/getAnimationDriver.js'\nexport * from './helpers/getExpandedShorthands.js'\nexport * from './helpers/getSplitStyles.js'\nexport * from './helpers/getStylesAtomic'\nexport * from './helpers/pseudoDescriptors.js'\nexport * from './helpers/mergeProps.js'\nexport * from './helpers/expandStyles.js'\nexport * from './helpers/isTamaguiElement.js'\nexport * from './helpers/isTamaguiComponent.js'\nexport * from './helpers/matchMedia'\nexport * from './helpers/themes.js'\nexport * from './helpers/getThemeCSSRules.js'\nexport * from './helpers/proxyThemeVariables.js'\nexport * from './helpers/themeable.js'\nexport * from './helpers/withStaticProperties.js'\nexport * from './helpers/normalizeColor.js'\n\nexport * from './contexts/ButtonNestingContext.js'\n\nexport * from './hooks/useIsTouchDevice.js'\n\nexport {\n  configureMedia,\n  getMedia,\n  mediaState,\n  useMedia,\n  useMediaPropsActive,\n  mediaObjectToString,\n  mediaQueryConfig,\n} from './hooks/useMedia.js'\nexport * from './hooks/useTheme.js'\nexport * from './hooks/useThemeName.js'\nexport * from './hooks/useSafeRef.js'\nexport * from './hooks/useStyle.js'\nexport * from './hooks/useAnimationDriver.js'\n\nexport * from './views/Slot.js'\nexport * from './views/Stack.js'\nexport * from './views/Text.js'\nexport * from './contexts/TextAncestorContext.js'\nexport * from './views/Theme.js'\nexport * from './views/ThemeProvider.js'\nexport * from './views/FontLanguage'\nexport * from './views/TamaguiProvider.js'\nexport * from './views/AnimationDriverProvider.js'\n\nexport * from '@tamagui/use-force-update'\nexport * from '@tamagui/use-did-finish-ssr'\nexport * from '@tamagui/use-event'\nexport * from '@tamagui/compose-refs'\nexport * from '@tamagui/helpers'\nexport * from '@tamagui/constants'\n\nexport * from './setupHooks.js'\n"],
+  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
   "names": []
 }

package/dist/esm/styled.js

@@ -38,7 +38,7 @@ function styled(ComponentIn, options, staticExtractionOptions) {
       const isText = Boolean(
         (staticExtractionOptions == null ? void 0 : staticExtractionOptions.isText) || (parentStaticConfig == null ? void 0 : parentStaticConfig.isText)
       );
-      const acceptsClassName = acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative);
+      const acceptsClassName = acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative || (parentStaticConfig == null ? void 0 : parentStaticConfig.isHOC) && (parentStaticConfig == null ? void 0 : parentStaticConfig.acceptsClassName));
       const conf = {
         ...staticExtractionOptions,
         ...!isPlainStyledComponent && {
@@ -62,6 +62,11 @@ function styled(ComponentIn, options, staticExtractionOptions) {
     }
   })();
   const component = createComponent(staticConfigProps || {}, Component);
+  for (const key in ComponentIn) {
+    if (key in component)
+      continue;
+    component[key] = ComponentIn[key];
+  }
   return component;
 }
 export {

package/dist/esm/styled.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/styled.tsx"],
-  "sourcesContent": ["import { stylePropsAll } from '@tamagui/helpers'\nimport { forwardRef } from 'react'\n\nimport { createComponent } from './createComponent.js'\nimport { ReactNativeStaticConfigs } from './setupReactNative.js'\nimport type {\n  GetProps,\n  GetVariantValues,\n  MediaProps,\n  PseudoProps,\n  StaticConfig,\n  StylableComponent,\n  TamaguiComponent,\n  TamaguiElement,\n  VariantDefinitions,\n  VariantSpreadFunction,\n} from './types.js'\n\n// TODO may be able to use this in the options?: arg below directly\nexport type StyledOptions<ParentComponent extends StylableComponent> =\n  GetProps<ParentComponent> & {\n    name?: string\n    variants?: VariantDefinitions<ParentComponent> | undefined\n    defaultVariants?: { [key: string]: any }\n  }\n\ntype GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  infer P\n>\n  ? P\n  : GetProps<A>\n\ntype GetVariantProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  any,\n  infer V\n>\n  ? V\n  : {}\n\nexport function styled<\n  ParentComponent extends StylableComponent,\n  Variants extends VariantDefinitions<ParentComponent> | void = VariantDefinitions<ParentComponent> | void\n>(\n  ComponentIn: ParentComponent,\n  // this should be Partial<GetProps<ParentComponent>> but causes excessively deep type issues\n  options?: GetProps<ParentComponent> & {\n    name?: string\n    variants?: Variants | undefined\n    // thought i had this typed, but can't get it linked\n    defaultVariants?: { [key: string]: any }\n    acceptsClassName?: boolean\n  },\n  staticExtractionOptions?: Partial<StaticConfig>\n) {\n  // validate not using a variant over an existing valid style\n  if (process.env.NODE_ENV !== 'production') {\n    if (!ComponentIn) {\n      throw new Error(`No component given to styled()`)\n    }\n    if (options?.variants) {\n      for (const key in options.variants) {\n        if (key in stylePropsAll) {\n          console.error(\n            `Invalid variant key overlaps with style key: ${key}. Tamagui prevents defining variants that use valid style keys to reduce complexity and confusion.`\n          )\n        }\n      }\n    }\n  }\n\n  const parentStaticConfig =\n    'staticConfig' in ComponentIn ? (ComponentIn.staticConfig as StaticConfig) : null\n\n  const isPlainStyledComponent =\n    !!parentStaticConfig &&\n    !(parentStaticConfig.isReactNative || parentStaticConfig.isHOC)\n\n  const Component: any = isPlainStyledComponent\n    ? ComponentIn\n    : parentStaticConfig?.Component || ComponentIn\n\n  const isReactNative = Boolean(\n    ReactNativeStaticConfigs.has(Component) ||\n      staticExtractionOptions?.isReactNative ||\n      ReactNativeStaticConfigs.has(parentStaticConfig?.Component) ||\n      parentStaticConfig?.isReactNative\n  )\n\n  const staticConfigProps = (() => {\n    if (options) {\n      const {\n        variants,\n        name,\n        defaultVariants,\n        acceptsClassName: acceptsClassNameProp,\n        ...defaultProps\n      } = options\n      if (defaultVariants) {\n        Object.assign(defaultProps, defaultVariants)\n      }\n\n      const nativeConf =\n        (isReactNative && ReactNativeStaticConfigs.get(Component)) || null\n\n      const isText = Boolean(\n        staticExtractionOptions?.isText || parentStaticConfig?.isText\n      )\n      const acceptsClassName =\n        acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative)\n\n      const conf: Partial<StaticConfig> = {\n        ...staticExtractionOptions,\n        ...(!isPlainStyledComponent && {\n          Component,\n        }),\n        // this type gets messed up by options?: Partial<GetProps<ParentComponent>> above\n        // take away the Partial<> and it's fine\n        variants,\n        defaultProps,\n        defaultVariants,\n        componentName: name || parentStaticConfig?.componentName,\n        isReactNative,\n        isText,\n        acceptsClassName,\n        ...nativeConf,\n      }\n\n      // bail on non className views as well\n      if (defaultProps.children || !acceptsClassName) {\n        conf.neverFlatten = true\n      }\n\n      return conf\n    }\n  })()\n\n  const component = createComponent(staticConfigProps || {}, Component)\n\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  type ParentPropsBase = GetBaseProps<ParentComponent>\n  type ParentVariants = GetVariantProps<ParentComponent>\n\n  type OurVariants = Variants extends void\n    ? {}\n    : {\n        [Key in keyof Variants]?: Variants[Key] extends VariantSpreadFunction<\n          any,\n          infer Val\n        >\n          ? Val\n          : GetVariantValues<keyof Variants[Key]>\n      }\n\n  type VariantProps = Omit<ParentVariants, keyof OurVariants> & OurVariants\n  type OurPropsBase = ParentPropsBase & VariantProps\n\n  type Props = Variants extends void\n    ? GetProps<ParentComponent>\n    : // start with base props\n      OurPropsBase &\n        // add in media (+ pseudos nested)\n        MediaProps<Partial<OurPropsBase>> &\n        // add in pseudos\n        PseudoProps<Partial<OurPropsBase>>\n\n  type StyledComponent = TamaguiComponent<\n    Props,\n    TamaguiElement,\n    ParentPropsBase,\n    ParentVariants & OurVariants\n  >\n\n  return component as StyledComponent\n}\n\n// sanity check types\n// import { Stack } from './views/Stack'\n// const X = styled(Stack, {\n//   variants: {\n//     size: {\n//       '...size': (val) => {\n//         return {\n//           pointerEvents: 'auto'\n//         }\n//       }\n//     },\n//     disabled: {\n//       true: {\n//         alignContent: 'center',\n//         opacity: 0.5,\n//         pointerEvents: 'none',\n//       },\n//     },\n//   } as const\n// })\n// // type variants = GetStyledVariants<typeof X>\n// const y = <X disabled size=\"$10\" />\n"],
-  "mappings": "AAAA,SAAS,qBAAqB;AAG9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBAAyB,0BAA0B;AAErD,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;AAqCpE,SAAO;AACT;",
+  "sourcesContent": ["import { stylePropsAll } from '@tamagui/helpers'\nimport { forwardRef } from 'react'\n\nimport { createComponent } from './createComponent.js'\nimport { ReactNativeStaticConfigs } from './setupReactNative.js'\nimport type {\n  GetProps,\n  GetVariantValues,\n  MediaProps,\n  PseudoProps,\n  StaticConfig,\n  StylableComponent,\n  TamaguiComponent,\n  TamaguiElement,\n  VariantDefinitions,\n  VariantSpreadFunction,\n} from './types.js'\n\n// TODO may be able to use this in the options?: arg below directly\nexport type StyledOptions<ParentComponent extends StylableComponent> =\n  GetProps<ParentComponent> & {\n    name?: string\n    variants?: VariantDefinitions<ParentComponent> | undefined\n    defaultVariants?: { [key: string]: any }\n  }\n\ntype GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  infer P\n>\n  ? P\n  : GetProps<A>\n\ntype GetVariantProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  any,\n  infer V\n>\n  ? V\n  : {}\n\nexport function styled<\n  ParentComponent extends StylableComponent,\n  Variants extends VariantDefinitions<ParentComponent> | void = VariantDefinitions<ParentComponent> | void\n>(\n  ComponentIn: ParentComponent,\n  // this should be Partial<GetProps<ParentComponent>> but causes excessively deep type issues\n  options?: GetProps<ParentComponent> & {\n    name?: string\n    variants?: Variants | undefined\n    // thought i had this typed, but can't get it linked\n    defaultVariants?: { [key: string]: any }\n    acceptsClassName?: boolean\n  },\n  staticExtractionOptions?: Partial<StaticConfig>\n) {\n  // validate not using a variant over an existing valid style\n  if (process.env.NODE_ENV !== 'production') {\n    if (!ComponentIn) {\n      throw new Error(`No component given to styled()`)\n    }\n    if (options?.variants) {\n      for (const key in options.variants) {\n        if (key in stylePropsAll) {\n          console.error(\n            `Invalid variant key overlaps with style key: ${key}. Tamagui prevents defining variants that use valid style keys to reduce complexity and confusion.`\n          )\n        }\n      }\n    }\n  }\n\n  const parentStaticConfig =\n    'staticConfig' in ComponentIn ? (ComponentIn.staticConfig as StaticConfig) : null\n\n  const isPlainStyledComponent =\n    !!parentStaticConfig &&\n    !(parentStaticConfig.isReactNative || parentStaticConfig.isHOC)\n\n  const Component: any = isPlainStyledComponent\n    ? ComponentIn\n    : parentStaticConfig?.Component || ComponentIn\n\n  const isReactNative = Boolean(\n    ReactNativeStaticConfigs.has(Component) ||\n      staticExtractionOptions?.isReactNative ||\n      ReactNativeStaticConfigs.has(parentStaticConfig?.Component) ||\n      parentStaticConfig?.isReactNative\n  )\n\n  const staticConfigProps = (() => {\n    if (options) {\n      const {\n        variants,\n        name,\n        defaultVariants,\n        acceptsClassName: acceptsClassNameProp,\n        ...defaultProps\n      } = options\n      if (defaultVariants) {\n        Object.assign(defaultProps, defaultVariants)\n      }\n\n      const nativeConf =\n        (isReactNative && ReactNativeStaticConfigs.get(Component)) || null\n\n      const isText = Boolean(\n        staticExtractionOptions?.isText || parentStaticConfig?.isText\n      )\n      const acceptsClassName =\n        acceptsClassNameProp ??\n        (isPlainStyledComponent ||\n          isReactNative ||\n          (parentStaticConfig?.isHOC && parentStaticConfig?.acceptsClassName))\n\n      const conf: Partial<StaticConfig> = {\n        ...staticExtractionOptions,\n        ...(!isPlainStyledComponent && {\n          Component,\n        }),\n        // this type gets messed up by options?: Partial<GetProps<ParentComponent>> above\n        // take away the Partial<> and it's fine\n        variants,\n        defaultProps,\n        defaultVariants,\n        componentName: name || parentStaticConfig?.componentName,\n        isReactNative,\n        isText,\n        acceptsClassName,\n        ...nativeConf,\n      }\n\n      // bail on non className views as well\n      if (defaultProps.children || !acceptsClassName) {\n        conf.neverFlatten = true\n      }\n\n      return conf\n    }\n  })()\n\n  const component = createComponent(staticConfigProps || {}, Component)\n\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  type ParentPropsBase = GetBaseProps<ParentComponent>\n  type ParentVariants = GetVariantProps<ParentComponent>\n\n  type OurVariants = Variants extends void\n    ? {}\n    : {\n        [Key in keyof Variants]?: Variants[Key] extends VariantSpreadFunction<\n          any,\n          infer Val\n        >\n          ? Val\n          : GetVariantValues<keyof Variants[Key]>\n      }\n\n  type VariantProps = Omit<ParentVariants, keyof OurVariants> & OurVariants\n  type OurPropsBase = ParentPropsBase & VariantProps\n\n  type Props = Variants extends void\n    ? GetProps<ParentComponent>\n    : // start with base props\n      OurPropsBase &\n        // add in media (+ pseudos nested)\n        MediaProps<Partial<OurPropsBase>> &\n        // add in pseudos\n        PseudoProps<Partial<OurPropsBase>>\n\n  type ParentStaticProperties = {\n    [Key in Exclude<\n      keyof ParentComponent,\n      'defaultProps' | 'propTypes' | '$$typeof' | 'staticConfig' | 'extractable'\n    >]: ParentComponent[Key]\n  }\n\n  type StyledComponent = TamaguiComponent<\n    Props,\n    TamaguiElement,\n    ParentPropsBase,\n    ParentVariants & OurVariants,\n    ParentStaticProperties\n  >\n\n  for (const key in ComponentIn) {\n    if (key in component) continue\n    // @ts-expect-error assigning static properties over\n    component[key] = ComponentIn[key]\n  }\n\n  return component as any as StyledComponent\n}\n\n// sanity check types\n// import { Stack } from './views/Stack'\n// const X = styled(Stack, {\n//   variants: {\n//     size: {\n//       '...size': (val) => {\n//         return {\n//           pointerEvents: 'auto'\n//         }\n//       }\n//     },\n//     disabled: {\n//       true: {\n//         alignContent: 'center',\n//         opacity: 0.5,\n//         pointerEvents: 'none',\n//       },\n//     },\n//   } as const\n// })\n// // type variants = GetStyledVariants<typeof X>\n// const y = <X disabled size=\"$10\" />\n"],
+  "mappings": "AAAA,SAAS,qBAAqB;AAG9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;AA6CpE,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/styled.mjs

@@ -38,7 +38,7 @@ function styled(ComponentIn, options, staticExtractionOptions) {
       const isText = Boolean(
         (staticExtractionOptions == null ? void 0 : staticExtractionOptions.isText) || (parentStaticConfig == null ? void 0 : parentStaticConfig.isText)
       );
-      const acceptsClassName = acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative);
+      const acceptsClassName = acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative || (parentStaticConfig == null ? void 0 : parentStaticConfig.isHOC) && (parentStaticConfig == null ? void 0 : parentStaticConfig.acceptsClassName));
       const conf = {
         ...staticExtractionOptions,
         ...!isPlainStyledComponent && {
@@ -62,6 +62,11 @@ function styled(ComponentIn, options, staticExtractionOptions) {
     }
   })();
   const component = createComponent(staticConfigProps || {}, Component);
+  for (const key in ComponentIn) {
+    if (key in component)
+      continue;
+    component[key] = ComponentIn[key];
+  }
   return component;
 }
 export {

package/dist/esm/styled.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/styled.tsx"],
-  "sourcesContent": ["import { stylePropsAll } from '@tamagui/helpers'\nimport { forwardRef } from 'react'\n\nimport { createComponent } from './createComponent.js'\nimport { ReactNativeStaticConfigs } from './setupReactNative.js'\nimport type {\n  GetProps,\n  GetVariantValues,\n  MediaProps,\n  PseudoProps,\n  StaticConfig,\n  StylableComponent,\n  TamaguiComponent,\n  TamaguiElement,\n  VariantDefinitions,\n  VariantSpreadFunction,\n} from './types.js'\n\n// TODO may be able to use this in the options?: arg below directly\nexport type StyledOptions<ParentComponent extends StylableComponent> =\n  GetProps<ParentComponent> & {\n    name?: string\n    variants?: VariantDefinitions<ParentComponent> | undefined\n    defaultVariants?: { [key: string]: any }\n  }\n\ntype GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  infer P\n>\n  ? P\n  : GetProps<A>\n\ntype GetVariantProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  any,\n  infer V\n>\n  ? V\n  : {}\n\nexport function styled<\n  ParentComponent extends StylableComponent,\n  Variants extends VariantDefinitions<ParentComponent> | void = VariantDefinitions<ParentComponent> | void\n>(\n  ComponentIn: ParentComponent,\n  // this should be Partial<GetProps<ParentComponent>> but causes excessively deep type issues\n  options?: GetProps<ParentComponent> & {\n    name?: string\n    variants?: Variants | undefined\n    // thought i had this typed, but can't get it linked\n    defaultVariants?: { [key: string]: any }\n    acceptsClassName?: boolean\n  },\n  staticExtractionOptions?: Partial<StaticConfig>\n) {\n  // validate not using a variant over an existing valid style\n  if (process.env.NODE_ENV !== 'production') {\n    if (!ComponentIn) {\n      throw new Error(`No component given to styled()`)\n    }\n    if (options?.variants) {\n      for (const key in options.variants) {\n        if (key in stylePropsAll) {\n          console.error(\n            `Invalid variant key overlaps with style key: ${key}. Tamagui prevents defining variants that use valid style keys to reduce complexity and confusion.`\n          )\n        }\n      }\n    }\n  }\n\n  const parentStaticConfig =\n    'staticConfig' in ComponentIn ? (ComponentIn.staticConfig as StaticConfig) : null\n\n  const isPlainStyledComponent =\n    !!parentStaticConfig &&\n    !(parentStaticConfig.isReactNative || parentStaticConfig.isHOC)\n\n  const Component: any = isPlainStyledComponent\n    ? ComponentIn\n    : parentStaticConfig?.Component || ComponentIn\n\n  const isReactNative = Boolean(\n    ReactNativeStaticConfigs.has(Component) ||\n      staticExtractionOptions?.isReactNative ||\n      ReactNativeStaticConfigs.has(parentStaticConfig?.Component) ||\n      parentStaticConfig?.isReactNative\n  )\n\n  const staticConfigProps = (() => {\n    if (options) {\n      const {\n        variants,\n        name,\n        defaultVariants,\n        acceptsClassName: acceptsClassNameProp,\n        ...defaultProps\n      } = options\n      if (defaultVariants) {\n        Object.assign(defaultProps, defaultVariants)\n      }\n\n      const nativeConf =\n        (isReactNative && ReactNativeStaticConfigs.get(Component)) || null\n\n      const isText = Boolean(\n        staticExtractionOptions?.isText || parentStaticConfig?.isText\n      )\n      const acceptsClassName =\n        acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative)\n\n      const conf: Partial<StaticConfig> = {\n        ...staticExtractionOptions,\n        ...(!isPlainStyledComponent && {\n          Component,\n        }),\n        // this type gets messed up by options?: Partial<GetProps<ParentComponent>> above\n        // take away the Partial<> and it's fine\n        variants,\n        defaultProps,\n        defaultVariants,\n        componentName: name || parentStaticConfig?.componentName,\n        isReactNative,\n        isText,\n        acceptsClassName,\n        ...nativeConf,\n      }\n\n      // bail on non className views as well\n      if (defaultProps.children || !acceptsClassName) {\n        conf.neverFlatten = true\n      }\n\n      return conf\n    }\n  })()\n\n  const component = createComponent(staticConfigProps || {}, Component)\n\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  type ParentPropsBase = GetBaseProps<ParentComponent>\n  type ParentVariants = GetVariantProps<ParentComponent>\n\n  type OurVariants = Variants extends void\n    ? {}\n    : {\n        [Key in keyof Variants]?: Variants[Key] extends VariantSpreadFunction<\n          any,\n          infer Val\n        >\n          ? Val\n          : GetVariantValues<keyof Variants[Key]>\n      }\n\n  type VariantProps = Omit<ParentVariants, keyof OurVariants> & OurVariants\n  type OurPropsBase = ParentPropsBase & VariantProps\n\n  type Props = Variants extends void\n    ? GetProps<ParentComponent>\n    : // start with base props\n      OurPropsBase &\n        // add in media (+ pseudos nested)\n        MediaProps<Partial<OurPropsBase>> &\n        // add in pseudos\n        PseudoProps<Partial<OurPropsBase>>\n\n  type StyledComponent = TamaguiComponent<\n    Props,\n    TamaguiElement,\n    ParentPropsBase,\n    ParentVariants & OurVariants\n  >\n\n  return component as StyledComponent\n}\n\n// sanity check types\n// import { Stack } from './views/Stack'\n// const X = styled(Stack, {\n//   variants: {\n//     size: {\n//       '...size': (val) => {\n//         return {\n//           pointerEvents: 'auto'\n//         }\n//       }\n//     },\n//     disabled: {\n//       true: {\n//         alignContent: 'center',\n//         opacity: 0.5,\n//         pointerEvents: 'none',\n//       },\n//     },\n//   } as const\n// })\n// // type variants = GetStyledVariants<typeof X>\n// const y = <X disabled size=\"$10\" />\n"],
-  "mappings": "AAAA,SAAS,qBAAqB;AAG9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBAAyB,0BAA0B;AAErD,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;AAqCpE,SAAO;AACT;",
+  "sourcesContent": ["import { stylePropsAll } from '@tamagui/helpers'\nimport { forwardRef } from 'react'\n\nimport { createComponent } from './createComponent.js'\nimport { ReactNativeStaticConfigs } from './setupReactNative.js'\nimport type {\n  GetProps,\n  GetVariantValues,\n  MediaProps,\n  PseudoProps,\n  StaticConfig,\n  StylableComponent,\n  TamaguiComponent,\n  TamaguiElement,\n  VariantDefinitions,\n  VariantSpreadFunction,\n} from './types.js'\n\n// TODO may be able to use this in the options?: arg below directly\nexport type StyledOptions<ParentComponent extends StylableComponent> =\n  GetProps<ParentComponent> & {\n    name?: string\n    variants?: VariantDefinitions<ParentComponent> | undefined\n    defaultVariants?: { [key: string]: any }\n  }\n\ntype GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  infer P\n>\n  ? P\n  : GetProps<A>\n\ntype GetVariantProps<A extends StylableComponent> = A extends TamaguiComponent<\n  any,\n  any,\n  any,\n  infer V\n>\n  ? V\n  : {}\n\nexport function styled<\n  ParentComponent extends StylableComponent,\n  Variants extends VariantDefinitions<ParentComponent> | void = VariantDefinitions<ParentComponent> | void\n>(\n  ComponentIn: ParentComponent,\n  // this should be Partial<GetProps<ParentComponent>> but causes excessively deep type issues\n  options?: GetProps<ParentComponent> & {\n    name?: string\n    variants?: Variants | undefined\n    // thought i had this typed, but can't get it linked\n    defaultVariants?: { [key: string]: any }\n    acceptsClassName?: boolean\n  },\n  staticExtractionOptions?: Partial<StaticConfig>\n) {\n  // validate not using a variant over an existing valid style\n  if (process.env.NODE_ENV !== 'production') {\n    if (!ComponentIn) {\n      throw new Error(`No component given to styled()`)\n    }\n    if (options?.variants) {\n      for (const key in options.variants) {\n        if (key in stylePropsAll) {\n          console.error(\n            `Invalid variant key overlaps with style key: ${key}. Tamagui prevents defining variants that use valid style keys to reduce complexity and confusion.`\n          )\n        }\n      }\n    }\n  }\n\n  const parentStaticConfig =\n    'staticConfig' in ComponentIn ? (ComponentIn.staticConfig as StaticConfig) : null\n\n  const isPlainStyledComponent =\n    !!parentStaticConfig &&\n    !(parentStaticConfig.isReactNative || parentStaticConfig.isHOC)\n\n  const Component: any = isPlainStyledComponent\n    ? ComponentIn\n    : parentStaticConfig?.Component || ComponentIn\n\n  const isReactNative = Boolean(\n    ReactNativeStaticConfigs.has(Component) ||\n      staticExtractionOptions?.isReactNative ||\n      ReactNativeStaticConfigs.has(parentStaticConfig?.Component) ||\n      parentStaticConfig?.isReactNative\n  )\n\n  const staticConfigProps = (() => {\n    if (options) {\n      const {\n        variants,\n        name,\n        defaultVariants,\n        acceptsClassName: acceptsClassNameProp,\n        ...defaultProps\n      } = options\n      if (defaultVariants) {\n        Object.assign(defaultProps, defaultVariants)\n      }\n\n      const nativeConf =\n        (isReactNative && ReactNativeStaticConfigs.get(Component)) || null\n\n      const isText = Boolean(\n        staticExtractionOptions?.isText || parentStaticConfig?.isText\n      )\n      const acceptsClassName =\n        acceptsClassNameProp ??\n        (isPlainStyledComponent ||\n          isReactNative ||\n          (parentStaticConfig?.isHOC && parentStaticConfig?.acceptsClassName))\n\n      const conf: Partial<StaticConfig> = {\n        ...staticExtractionOptions,\n        ...(!isPlainStyledComponent && {\n          Component,\n        }),\n        // this type gets messed up by options?: Partial<GetProps<ParentComponent>> above\n        // take away the Partial<> and it's fine\n        variants,\n        defaultProps,\n        defaultVariants,\n        componentName: name || parentStaticConfig?.componentName,\n        isReactNative,\n        isText,\n        acceptsClassName,\n        ...nativeConf,\n      }\n\n      // bail on non className views as well\n      if (defaultProps.children || !acceptsClassName) {\n        conf.neverFlatten = true\n      }\n\n      return conf\n    }\n  })()\n\n  const component = createComponent(staticConfigProps || {}, Component)\n\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  // get parent props without pseudos and medias so we can rebuild both with new variants\n  type ParentPropsBase = GetBaseProps<ParentComponent>\n  type ParentVariants = GetVariantProps<ParentComponent>\n\n  type OurVariants = Variants extends void\n    ? {}\n    : {\n        [Key in keyof Variants]?: Variants[Key] extends VariantSpreadFunction<\n          any,\n          infer Val\n        >\n          ? Val\n          : GetVariantValues<keyof Variants[Key]>\n      }\n\n  type VariantProps = Omit<ParentVariants, keyof OurVariants> & OurVariants\n  type OurPropsBase = ParentPropsBase & VariantProps\n\n  type Props = Variants extends void\n    ? GetProps<ParentComponent>\n    : // start with base props\n      OurPropsBase &\n        // add in media (+ pseudos nested)\n        MediaProps<Partial<OurPropsBase>> &\n        // add in pseudos\n        PseudoProps<Partial<OurPropsBase>>\n\n  type ParentStaticProperties = {\n    [Key in Exclude<\n      keyof ParentComponent,\n      'defaultProps' | 'propTypes' | '$$typeof' | 'staticConfig' | 'extractable'\n    >]: ParentComponent[Key]\n  }\n\n  type StyledComponent = TamaguiComponent<\n    Props,\n    TamaguiElement,\n    ParentPropsBase,\n    ParentVariants & OurVariants,\n    ParentStaticProperties\n  >\n\n  for (const key in ComponentIn) {\n    if (key in component) continue\n    // @ts-expect-error assigning static properties over\n    component[key] = ComponentIn[key]\n  }\n\n  return component as any as StyledComponent\n}\n\n// sanity check types\n// import { Stack } from './views/Stack'\n// const X = styled(Stack, {\n//   variants: {\n//     size: {\n//       '...size': (val) => {\n//         return {\n//           pointerEvents: 'auto'\n//         }\n//       }\n//     },\n//     disabled: {\n//       true: {\n//         alignContent: 'center',\n//         opacity: 0.5,\n//         pointerEvents: 'none',\n//       },\n//     },\n//   } as const\n// })\n// // type variants = GetStyledVariants<typeof X>\n// const y = <X disabled size=\"$10\" />\n"],
+  "mappings": "AAAA,SAAS,qBAAqB;AAG9B,SAAS,uBAAuB;AAChC,SAAS,gCAAgC;AAuClC,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBACJ,kBAAkB,cAAe,YAAY,eAAgC;AAE/E,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,QAAM,YAAiB,yBACnB,eACA,yDAAoB,cAAa;AAErC,QAAM,gBAAgB;AAAA,IACpB,yBAAyB,IAAI,SAAS,MACpC,mEAAyB,kBACzB,yBAAyB,IAAI,yDAAoB,SAAS,MAC1D,yDAAoB;AAAA,EACxB;AAEA,QAAM,qBAAqB,MAAM;AAC/B,QAAI,SAAS;AACX,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB,GAAG;AAAA,MACL,IAAI;AACJ,UAAI,iBAAiB;AACnB,eAAO,OAAO,cAAc,eAAe;AAAA,MAC7C;AAEA,YAAM,aACH,iBAAiB,yBAAyB,IAAI,SAAS,KAAM;AAEhE,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AACA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL;AAGA,UAAI,aAAa,YAAY,CAAC,kBAAkB;AAC9C,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,GAAG,SAAS;AA6CpE,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/views/ThemeDebug.js

@@ -1,21 +1,36 @@
 import { jsxs } from "react/jsx-runtime";
+import { useForceUpdate } from "@tamagui/use-force-update";
+import { useEffect, useState } from "react";
 function ThemeDebug({
   themeState,
   themeProps,
-  children,
-  onChangeCount
+  children
 }) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   if (process.env.NODE_ENV === "development") {
+    const [onChangeCount, setOnChangeCount] = useState(0);
+    const rerender = useForceUpdate();
+    useEffect(() => {
+      var _a2, _b2;
+      (_b2 = (_a2 = themeState.themeManager) == null ? void 0 : _a2.parentManager) == null ? void 0 : _b2.onChangeTheme((name, manager) => {
+        setOnChangeCount((p) => ++p);
+        console.warn(`theme changed`, name);
+      });
+    }, [themeState.themeManager]);
+    useEffect(() => {
+      const tm = setInterval(rerender, 100);
+      return () => clearTimeout(tm);
+    }, []);
     return /* @__PURE__ */ jsxs(
       "div",
       {
         style: {
           whiteSpace: "pre",
-          background: "green",
-          display: "inline",
+          background: "var(--background)",
+          display: "inline-block",
           border: "1px solid #ccc",
-          margin: 20
+          margin: 20,
+          color: "red"
         },
         children: [
           /* @__PURE__ */ jsxs("code", { children: [
@@ -30,7 +45,11 @@ function ThemeDebug({
                 id: (_b = themeState.themeManager) == null ? void 0 : _b.id,
                 parentId: (_d = (_c = themeState.themeManager) == null ? void 0 : _c.parentManager) == null ? void 0 : _d.id,
                 isNew: themeState.isNewTheme,
-                onChangeCount
+                onChangeCount,
+                listening: [...((_e = themeState.themeManager) == null ? void 0 : _e["_listeningIds"]) || []].join(
+                  ","
+                ),
+                _numChangeEventsSent: (_f = themeState.themeManager) == null ? void 0 : _f["_numChangeEventsSent"]
               },
               null,
               2

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/views/ThemeDebug.tsx"],
-  "sourcesContent": ["import { ChangedThemeResponse } from '../hooks/useTheme.js'\nimport { ThemeProps } from '../types.js'\n\nexport function ThemeDebug({\n  themeState,\n  themeProps,\n  children,\n  onChangeCount,\n}: {\n  themeState: ChangedThemeResponse\n  themeProps: ThemeProps\n  onChangeCount?: number\n  children: any\n}) {\n  if (process.env.NODE_ENV === 'development') {\n    return (\n      <div\n        style={{\n          whiteSpace: 'pre',\n          background: 'green',\n          display: 'inline',\n          border: '1px solid #ccc',\n          margin: 20,\n        }}\n      >\n        <code>\n          &lt;Theme /&gt;&nbsp;\n          {JSON.stringify(\n            {\n              name: themeState.name,\n              className: themeState.className,\n              inverse: themeProps.inverse,\n              forceClassName: themeProps.forceClassName,\n              parent: themeState.themeManager?.state.parentName,\n              id: themeState.themeManager?.id,\n              parentId: themeState.themeManager?.parentManager?.id,\n              isNew: themeState.isNewTheme,\n              onChangeCount,\n            },\n            null,\n            2\n          )}\n        </code>\n        {children}\n      </div>\n    )\n  }\n  return children\n}\n"],
-  "mappings": "AAyBQ;AAtBD,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAKG;AAbH;AAcE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAO;AAAA,UACL,YAAY;AAAA,UACZ,YAAY;AAAA,UACZ,SAAS;AAAA,UACT,QAAQ;AAAA,UACR,QAAQ;AAAA,QACV;AAAA,QAEA;AAAA,+BAAC,UAAK;AAAA;AAAA,YAEH,KAAK;AAAA,cACJ;AAAA,gBACE,MAAM,WAAW;AAAA,gBACjB,WAAW,WAAW;AAAA,gBACtB,SAAS,WAAW;AAAA,gBACpB,gBAAgB,WAAW;AAAA,gBAC3B,SAAQ,gBAAW,iBAAX,mBAAyB,MAAM;AAAA,gBACvC,KAAI,gBAAW,iBAAX,mBAAyB;AAAA,gBAC7B,WAAU,sBAAW,iBAAX,mBAAyB,kBAAzB,mBAAwC;AAAA,gBAClD,OAAO,WAAW;AAAA,gBAClB;AAAA,cACF;AAAA,cACA;AAAA,cACA;AAAA,YACF;AAAA,aACF;AAAA,UACC;AAAA;AAAA;AAAA,IACH;AAAA,EAEJ;AACA,SAAO;AACT;",
-  "names": []
+  "sourcesContent": ["import { useForceUpdate } from '@tamagui/use-force-update'\nimport { useEffect, useState } from 'react'\n\nimport { ChangedThemeResponse } from '../hooks/useTheme.js'\nimport { ThemeProps } from '../types.js'\n\nexport function ThemeDebug({\n  themeState,\n  themeProps,\n  children,\n}: {\n  themeState: ChangedThemeResponse\n  themeProps: ThemeProps\n  children: any\n}) {\n  if (process.env.NODE_ENV === 'development') {\n    const [onChangeCount, setOnChangeCount] = useState(0)\n    const rerender = useForceUpdate()\n\n    useEffect(() => {\n      themeState.themeManager?.parentManager?.onChangeTheme((name, manager) => {\n        setOnChangeCount((p) => ++p)\n        console.warn(`theme changed`, name)\n      })\n    }, [themeState.themeManager])\n\n    useEffect(() => {\n      // to refresh _listeningIds every so often\n      const tm = setInterval(rerender, 100)\n      return () => clearTimeout(tm)\n    }, [])\n\n    return (\n      <div\n        style={{\n          whiteSpace: 'pre',\n          background: 'var(--background)',\n          display: 'inline-block',\n          border: '1px solid #ccc',\n          margin: 20,\n          color: 'red',\n        }}\n      >\n        <code>\n          &lt;Theme /&gt;&nbsp;\n          {JSON.stringify(\n            {\n              name: themeState.name,\n              className: themeState.className,\n              inverse: themeProps.inverse,\n              forceClassName: themeProps.forceClassName,\n              parent: themeState.themeManager?.state.parentName,\n              id: themeState.themeManager?.id,\n              parentId: themeState.themeManager?.parentManager?.id,\n              isNew: themeState.isNewTheme,\n              onChangeCount,\n              listening: [...(themeState.themeManager?.['_listeningIds'] || [])].join(\n                ','\n              ),\n              _numChangeEventsSent: themeState.themeManager?.['_numChangeEventsSent'],\n            },\n            null,\n            2\n          )}\n        </code>\n        {children}\n      </div>\n    )\n  }\n  return children\n}\n"],
+  "mappings": "AA2CQ;AA3CR,SAAS,sBAAsB;AAC/B,SAAS,WAAW,gBAAgB;AAK7B,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAdH;AAeE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC;AACpD,UAAM,WAAW,eAAe;AAEhC,cAAU,MAAM;AAnBpB,UAAAA,KAAAC;AAoBM,OAAAA,OAAAD,MAAA,WAAW,iBAAX,gBAAAA,IAAyB,kBAAzB,gBAAAC,IAAwC,cAAc,CAAC,MAAM,YAAY;AACvE,yBAAiB,CAAC,MAAM,EAAE,CAAC;AAC3B,gBAAQ,KAAK,iBAAiB,IAAI;AAAA,MACpC;AAAA,IACF,GAAG,CAAC,WAAW,YAAY,CAAC;AAE5B,cAAU,MAAM;AAEd,YAAM,KAAK,YAAY,UAAU,GAAG;AACpC,aAAO,MAAM,aAAa,EAAE;AAAA,IAC9B,GAAG,CAAC,CAAC;AAEL,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAO;AAAA,UACL,YAAY;AAAA,UACZ,YAAY;AAAA,UACZ,SAAS;AAAA,UACT,QAAQ;AAAA,UACR,QAAQ;AAAA,UACR,OAAO;AAAA,QACT;AAAA,QAEA;AAAA,+BAAC,UAAK;AAAA;AAAA,YAEH,KAAK;AAAA,cACJ;AAAA,gBACE,MAAM,WAAW;AAAA,gBACjB,WAAW,WAAW;AAAA,gBACtB,SAAS,WAAW;AAAA,gBACpB,gBAAgB,WAAW;AAAA,gBAC3B,SAAQ,gBAAW,iBAAX,mBAAyB,MAAM;AAAA,gBACvC,KAAI,gBAAW,iBAAX,mBAAyB;AAAA,gBAC7B,WAAU,sBAAW,iBAAX,mBAAyB,kBAAzB,mBAAwC;AAAA,gBAClD,OAAO,WAAW;AAAA,gBAClB;AAAA,gBACA,WAAW,CAAC,KAAI,gBAAW,iBAAX,mBAA0B,qBAAoB,CAAC,CAAE,EAAE;AAAA,kBACjE;AAAA,gBACF;AAAA,gBACA,uBAAsB,gBAAW,iBAAX,mBAA0B;AAAA,cAClD;AAAA,cACA;AAAA,cACA;AAAA,YACF;AAAA,aACF;AAAA,UACC;AAAA;AAAA;AAAA,IACH;AAAA,EAEJ;AACA,SAAO;AACT;",
+  "names": ["_a", "_b"]
 }