@tamagui/web 1.13.4 → 1.14.0

package/src/hooks/useTheme.tsx

@@ -1,9 +1,10 @@
 /* eslint-disable no-console */
 import { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'
-import { useContext, useEffect, useMemo, useState } from 'react'
+import { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'
 
 import { getConfig } from '../config.js'
 import { isDevTools } from '../constants/isDevTools.js'
+import { isVariable } from '../createVariable.js'
 import { createProxy } from '../helpers/createProxy.js'
 import {
   ThemeManager,
@@ -16,13 +17,20 @@ import { GetThemeUnwrapped } from './getThemeUnwrapped.js'
 import { useServerRef } from './useServerHooks.js'
 
 export type ChangedThemeResponse = {
+  isNewTheme: boolean
   themeManager: ThemeManager | null
   name: string
-  isNewTheme?: boolean
   theme?: ThemeParsed | null
   className?: string
 }
 
+type State = {
+  state: ThemeManagerState
+  themeManager: ThemeManager
+  isNewTheme: boolean
+  mounted?: boolean
+}
+
 const emptyProps = { name: null }
 
 function getDefaultThemeProxied() {
@@ -39,11 +47,12 @@ export const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {
 }
 
 export const useThemeWithState = (props: ThemeProps) => {
-  const keys = useServerRef([])
+  const keys = useServerRef<string[]>([])
 
   const changedTheme = useChangeThemeEffect(
     props,
     false,
+    keys.current,
     isClient
       ? () => {
           return props.shouldUpdate?.() ?? keys.current.length === 0
@@ -51,22 +60,15 @@ export const useThemeWithState = (props: ThemeProps) => {
       : undefined
   )
 
-  const { themeManager, isNewTheme, theme, name, className } = changedTheme
+  const { themeManager, theme, name, className } = changedTheme
 
-  if (process.env.NODE_ENV === 'development') {
-    // ensure we aren't creating too many ThemeManagers
-    // prettier-ignore
-    if (isWeb && isNewTheme && className === themeManager?.parentManager?.state.className) {
-      console.error('Should always change, duplicating ThemeMananger bug', themeManager)
-    }
-    if (props.debug === 'verbose') {
-      console.groupCollapsed('  🔹 useTheme =>', name)
-      const logs = { ...props, name, className, ...(isDevTools && { theme }) }
-      for (const key in logs) {
-        console.log('  ', key, logs[key])
-      }
-      console.groupEnd()
+  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
+    console.groupCollapsed('  🔹 useTheme =>', name)
+    const logs = { ...props, name, className, ...(isDevTools && { theme }) }
+    for (const key in logs) {
+      console.log('  ', key, logs[key])
     }
+    console.groupEnd()
   }
 
   if (!changedTheme.theme) {
@@ -77,8 +79,8 @@ export const useThemeWithState = (props: ThemeProps) => {
   }
 
   const proxiedTheme = useMemo(() => {
-    return getThemeProxied(changedTheme as any)
-  }, [theme, isNewTheme, name, className, themeManager])
+    return getThemeProxied(changedTheme as any, keys.current)
+  }, [theme, name, className, themeManager])
 
   return {
     ...changedTheme,
@@ -86,14 +88,15 @@ export const useThemeWithState = (props: ThemeProps) => {
   }
 }
 
-export function getThemeProxied({
-  theme,
-  themeManager,
-  keys,
-}: Partial<ChangedThemeResponse> & {
-  theme: ThemeParsed
-  keys?: React.RefObject<string[]>
-}) {
+export function getThemeProxied(
+  {
+    theme,
+    themeManager,
+  }: Partial<ChangedThemeResponse> & {
+    theme: ThemeParsed
+  },
+  keys?: string[]
+) {
   return createProxy(theme, {
     has(_, key) {
       if (typeof key === 'string') {
@@ -107,7 +110,6 @@ export function getThemeProxied({
         return theme
       }
       if (
-        key === 'undefined' ||
         key === '__proto__' ||
         key === '$typeof' ||
         typeof key !== 'string' ||
@@ -115,25 +117,24 @@ export function getThemeProxied({
       ) {
         return Reflect.get(_, key)
       }
-      const keyString = key
+
       // auto convert variables to plain
-      if (key[0] === '$') {
-        key = key.slice(1)
-      }
-      const val = themeManager.getValue(key)
-      const currentKeys = keys?.current
-      if (val && currentKeys) {
+      const keyString = key[0] === '$' ? key.slice(1) : key
+      const val = themeManager.getValue(keyString)
+
+      if (val && keys) {
         return new Proxy(val as any, {
           // when they touch the actual value we only track it
           // if its a variable (web), its ignored!
           get(_, subkey) {
-            if (subkey === 'val' && !currentKeys.includes(keyString)) {
-              currentKeys.push(keyString)
+            if (subkey === 'val' && !keys.includes(keyString)) {
+              keys.push(keyString)
             }
             return Reflect.get(val as any, subkey)
           },
         })
       }
+
       return val
     },
   })
@@ -144,11 +145,13 @@ export const activeThemeManagers = new Set<ThemeManager>()
 export const useChangeThemeEffect = (
   props: ThemeProps,
   root = false,
+  keys?: string[],
   disableUpdate?: () => boolean
 ): ChangedThemeResponse => {
   if (isRSC) {
     // we need context working for this to work well
     return {
+      isNewTheme: false,
       ...createState().state,
       themeManager: null,
     }
@@ -164,25 +167,35 @@ export const useChangeThemeEffect = (
   if (disable) {
     if (!parentManager) throw `❌`
     return {
-      ...parentManager.state,
       isNewTheme: false,
+      ...parentManager.state,
       themeManager: parentManager,
     }
   }
 
-  type State = {
-    isNewTheme: boolean
-    state: ThemeManagerState
-    themeManager: ThemeManager
-    mounted?: boolean
+  const [themeState, setThemeState] = useState<State>(createState)
+  const { state, themeManager, mounted, isNewTheme } = themeState
+  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)
+  const shouldReturnParentState = isInversingOnMount
+
+  function getNextThemeManagerState(manager = themeManager) {
+    const next = manager.getState(
+      props,
+      parentManager === themeManager ? parentManager.parentManager : parentManager
+    )
+    return next
   }
 
-  const [themeState, setThemeState] = useState<State>(createState)
-  const { isNewTheme, state, themeManager, mounted } = themeState
+  function getThemeManagerNextStateIfChanged(manager = themeManager) {
+    const next = getNextThemeManagerState(manager)
+    if (!next) return
+    if (disableUpdate?.() === true) return
+    if (!manager.getStateShouldChange(next, state)) return
+    return next
+  }
 
   if (!isServer) {
     useEffect(() => {
-      if (disable) return
       // SSR safe inverse (because server can't know prefers scheme)
       // could be done through fancy selectors like how we do prefers-media
       // but may be a bit of explosion of selectors
@@ -190,85 +203,124 @@ export const useChangeThemeEffect = (
         setThemeState({ ...themeState, mounted: true })
         return
       }
+
+      if (!isNewTheme) return
+      if (!themeManager) return
+
       activeThemeManagers.add(themeManager)
-      // const disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {
-      //   // console.log('hi', props, state, name, manager)
-      //   if (state.theme !== manager.state.theme) {
-      //     console.warn('now update to', manager.state.name)
-      //     updateState(manager)
-      //   }
-      // })
+
       return () => {
         activeThemeManagers.delete(themeManager)
-        // disposeChangeListener?.()
       }
-    }, [disable, state, isNewTheme, debug])
-  }
+    }, [isNewTheme, themeManager, state, debug])
 
-  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)
-  const shouldReturnParentState = hasNoThemeUpdatingProps(props) || isInversingOnMount
+    // listen for parent change + notify children change
+    useLayoutEffect(() => {
+      const nextState = getThemeManagerNextStateIfChanged(themeManager)
+
+      if (nextState) {
+        if (isNewTheme) {
+          // if it's a new theme we can just update + publish to children
+          themeManager.updateState(nextState, true)
+        }
+        // if not we will be creating a whole new themeManager
+        setThemeState(createState)
+      }
+
+      const disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {
+        if (keys?.length || isNewTheme) {
+          if (process.env.NODE_ENV === 'development' && props['debug'] && keys?.length) {
+            console.log(`onChangeTheme`, { props, name, manager, parentManager, keys })
+          }
+          setThemeState(createState)
+        }
+      })
+
+      return () => {
+        disposeChangeListener?.()
+      }
+    }, [
+      parentManager,
+      isNewTheme,
+      props.componentName,
+      props.inverse,
+      props.name,
+      props.reset,
+    ])
+  }
 
   if (shouldReturnParentState) {
     if (!parentManager) throw 'impossible'
-    // prettier-ignore
-    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') console.log('useTheme hasNoThemeUpdatingProps', parentManager.state.name, 'isInversingOnMount', isInversingOnMount)
     return {
+      isNewTheme: false,
       ...parentManager.state,
       className: isInversingOnMount ? '' : parentManager.state.className,
       themeManager: parentManager,
-      isNewTheme: false,
     }
   }
 
-  // run inline in render
-  updateState()
-
   return {
     ...state,
     isNewTheme,
     themeManager,
   }
 
-  function createState(prev?: State) {
+  function createState(prev?: State): State {
     if (prev && disableUpdate?.()) {
       return prev
     }
-    // returns previous theme manager if no change
-    const _ = new ThemeManager(props, root ? 'root' : parentManager)
-    const isNewTheme = _ !== parentManager
-    // prettier-ignore
 
-    // if (prev?.isNewTheme && _.state.theme !== parentManager?.state.theme) {
-    //   console.warn('notify')
-    //   _.notify()
-    // }
+    //  returns previous theme manager if no change
+    let themeManager: ThemeManager
+    let state: ThemeManagerState | undefined
+
+    const getNewThemeManager = () => {
+      return new ThemeManager(props, root ? 'root' : parentManager)
+    }
+
+    if (prev?.themeManager) {
+      themeManager = prev.themeManager
+
+      const nextState = getThemeManagerNextStateIfChanged(themeManager)
+
+      if (nextState) {
+        state = nextState
+
+        if (!prev.isNewTheme || !isWeb) {
+          themeManager = getNewThemeManager()
+        } else {
+          themeManager.updateState(nextState, true)
+        }
+      }
+    } else {
+      themeManager = getNewThemeManager()
+    }
+
+    const isNewTheme = Boolean(
+      themeManager !== parentManager ||
+        (prev && themeManager.state.name !== prev.state.name)
+    )
 
     // only inverse relies on this for ssr
     const mounted = !props.inverse ? true : root || prev?.mounted
-    return {
-      // ThemeManager returns parentManager if no change
+
+    if (!state) {
+      state = isNewTheme ? { ...themeManager.state } : { ...parentManager!.state }
+    }
+
+    const response = {
+      state,
+      themeManager,
       isNewTheme,
-      state: { ..._.state },
-      themeManager: _,
       mounted,
     }
-  }
 
-  function updateState(updatingManager?: ThemeManager) {
-    if (disableUpdate?.()) {
-      return
-    }
-    const manager = updatingManager ?? themeManager
-    const next = manager.getState(props, parentManager)
-    const shouldChange = manager.getStateShouldChange(next, isNewTheme ? state : null)
-    // console.log(`got it`, next, isNewTheme, shouldChange, { ...updatingManager?.state })
-    if (shouldChange) {
-      setThemeState(createState)
-    } else {
-      if (!next && parentManager?.state.name !== state.name) {
-        // were changing back to parent state
-        setThemeState(createState)
-      }
+    if (process.env.NODE_ENV === 'development' && props['debug']) {
+      console.groupCollapsed(` 🔷 useChangeThemeEffect createState`)
+      console.log({ props, parentManager, themeManager, prev, response })
+      console.groupEnd()
     }
+
+    return response
   }
 }

package/src/types.tsx

@@ -32,7 +32,7 @@ export type SpaceDirection = 'vertical' | 'horizontal' | 'both'
 
 export type TamaguiElement = HTMLElement | View
 
-export type DebugProp = boolean | 'break' | 'verbose'
+export type DebugProp = boolean | 'break' | 'verbose' | 'visualize'
 
 // base props that are accepted by createComponent (additional to react-native-web)
 
@@ -335,7 +335,7 @@ export interface ThemeProps {
   componentName?: string
   children?: any
   reset?: boolean
-  debug?: DebugProp
+  debug?: DebugProp | any
   inverse?: boolean
   // on the web, for portals we need to re-insert className
   forceClassName?: boolean

package/src/views/Theme.tsx

@@ -1,5 +1,5 @@
 import { isWeb } from '@tamagui/constants'
-import { Children, cloneElement, isValidElement } from 'react'
+import { Children, cloneElement, isValidElement, useEffect, useId, useMemo } from 'react'
 
 import { variableToString } from '../createVariable.js'
 import { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'
@@ -9,15 +9,41 @@ import type { ThemeProps } from '../types.js'
 
 export function Theme(props: ThemeProps) {
   // @ts-expect-error only for internal views
-  if (props.disable) return props.children
+  if (props.disable) {
+    return props.children
+  }
+
   const isRoot = !!props['_isRoot']
   const themeState = useChangeThemeEffect(props, isRoot)
-  const children = props['data-themeable']
+
+  let children = props['data-themeable']
     ? Children.map(props.children, (child) =>
         cloneElement(child, { ['data-themeable']: true })
       )
     : props.children
 
+  if (process.env.NODE_ENV === 'development') {
+    if (props['debug'] === 'visualize') {
+      children = (
+        <div style={{ display: 'inline', border: '1px solid #ccc' }}>
+          <code>
+            <pre>
+              &lt;Theme /&gt;&nbsp;
+              {JSON.stringify({
+                name: themeState.themeManager?.state.name,
+                parent: themeState.themeManager?.state.parentName,
+                id: themeState.themeManager?.id,
+                parentId: themeState.themeManager?.parentManager?.id,
+                isNew: themeState.isNewTheme,
+              })}
+            </pre>
+          </code>
+          {children}
+        </div>
+      )
+    }
+  }
+
   return useThemedChildren(themeState, children, props, isRoot)
 }
 
@@ -31,14 +57,23 @@ export function useThemedChildren(
   },
   isRoot = false
 ) {
-  const { themeManager, isNewTheme, className, theme } = themeState
+  const { themeManager, className, theme, isNewTheme } = themeState
   const { shallow, forceClassName } = options
   const hasEverThemed = useServerRef(false)
   if (isNewTheme) {
     hasEverThemed.current = true
   }
 
-  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {
+  const shouldRenderChildrenWithTheme =
+    isNewTheme || hasEverThemed.current || forceClassName || isRoot
+
+  return useMemo(() => {
+    // console.warn(`re-render Theme`)
+
+    if (!shouldRenderChildrenWithTheme) {
+      return children
+    }
+
     // be sure to memoize shouldReset to avoid reparenting
     let next = Children.toArray(children)
 
@@ -57,24 +92,6 @@ export function useThemedChildren(
       })
     }
 
-    // tried this but themes css doesn't fully like it
-    // if (shouldAttachClassName && options.passPropsToChildren) {
-    //   next = next.map((child: any) => {
-    //     const childStyle = child.props?.style
-    //     console.log('pass it down', className, child.props.className || '')
-    //     const newProps = {
-    //       className: (child.props.className || '') + ' ' + className,
-    //       style: Array.isArray(childStyle)
-    //         ? [colorStyle, ...childStyle]
-    //         : {
-    //             ...colorStyle,
-    //             ...childStyle,
-    //           },
-    //     }
-    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child
-    //   })
-    // }
-
     const wrapped = (
       <ThemeManagerContext.Provider value={themeManager}>
         {next}
@@ -93,14 +110,19 @@ export function useThemedChildren(
       }
 
       return (
-        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>
+        <span className={`${className || ''} _dsp_contents is_Theme`} style={colorStyle}>
           {wrapped}
         </span>
       )
     }
 
     return wrapped
-  }
-
-  return children
+  }, [
+    shouldRenderChildrenWithTheme,
+    themeManager,
+    children,
+    theme,
+    isNewTheme,
+    className,
+  ])
 }

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAWN,MAAM,OAAO,CAAA;AAiBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAqBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAeD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA8B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,4DAswBpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,0DA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAYN,MAAM,OAAO,CAAA;AAiBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAqBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAeD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA8B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,4DAsyBpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,0DA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}

package/types/helpers/ThemeManager.d.ts

@@ -16,6 +16,7 @@ export type ThemeManagerState = {
 export declare function hasNoThemeUpdatingProps(props: ThemeProps): boolean;
 export declare class ThemeManager {
     props: ThemeProps;
+    id: number;
     themeListeners: Set<ThemeListener>;
     parentManager: ThemeManager | null;
     state: ThemeManagerState;

package/types/helpers/ThemeManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManager.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAErD,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;AAE9E,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IACnC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAID,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,UAAU,WAExD;AAED,qBAAa,YAAY;IAMd,KAAK,EAAE,UAAU;IAL1B,cAAc,qBAA2B;IACzC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAO;IACzC,KAAK,EAAE,iBAAiB,CAAa;gBAG5B,KAAK,GAAE,UAAe,EAC7B,aAAa,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IA+B1D,WAAW,CACT,KAAK,GAAE,UAAU,GAAG;QAAE,UAAU,CAAC,EAAE,WAAW,CAAA;KAAqB,EACnE,MAAM,UAAO;IAsBf,iBAAiB,CACf,KAAK,aAAa,EAClB,KAAK,GAAE,iBAAiB,GAAG,IAAiB,EAC5C,aAAa,sBAAqB;IAYpC,oBAAoB,CAClB,SAAS,EAAE,iBAAiB,GAAG,IAAI,EACnC,KAAK,GAAE,iBAAiB,GAAG,IAAiB;IAQ9C,QAAQ,CAAC,KAAK,aAAa,EAAE,aAAa,sBAAqB;IAO/D,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAO;IACnC,IAAI,OAAO,gBAMV;IAGD,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,iBAAiB;IAiB/C,MAAM;IAIN,aAAa,CAAC,EAAE,EAAE,aAAa;CAMhC"}
+{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManager.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAErD,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;AAE9E,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IACnC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAID,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,UAAU,WAExD;AAID,qBAAa,YAAY;IAOd,KAAK,EAAE,UAAU;IAN1B,EAAE,SAAQ;IACV,cAAc,qBAA2B;IACzC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAO;IACzC,KAAK,EAAE,iBAAiB,CAAa;gBAG5B,KAAK,GAAE,UAAe,EAC7B,aAAa,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IAiC1D,WAAW,CACT,KAAK,GAAE,UAAU,GAAG;QAAE,UAAU,CAAC,EAAE,WAAW,CAAA;KAAqB,EACnE,MAAM,UAAO;IAuBf,iBAAiB,CACf,KAAK,aAAa,EAClB,KAAK,GAAE,iBAAiB,GAAG,IAAiB,EAC5C,aAAa,sBAAqB;IAYpC,oBAAoB,CAClB,SAAS,EAAE,iBAAiB,GAAG,IAAI,EACnC,KAAK,GAAE,iBAAiB,GAAG,IAAiB;IAQ9C,QAAQ,CAAC,KAAK,aAAa,EAAE,aAAa,sBAAqB;IAO/D,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAO;IACnC,IAAI,OAAO,gBAMV;IAGD,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,iBAAiB;IAiB/C,MAAM;IAIN,aAAa,CAAC,EAAE,EAAE,aAAa;CAMhC"}

package/types/helpers/getSplitStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EAMd,eAAe,EACf,kBAAkB,EAElB,qBAAqB,EACrB,cAAc,EACd,WAAW,EAEZ,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,gCAAgC,CAAA;AAkBvC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,UAAU,EAAE,gBAAgB,CAAA;IAC5B,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,eAAe,CAAA;IACtB,IAAI,EAAE,qBAAqB,CAAA;IAC3B,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAsFhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,EACtB,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAqB7B,eAAO,MAAM,cAAc,EAAE,aAgyB5B,CAAA;AA0FD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cA6BF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA;AA2BD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EAMd,eAAe,EACf,kBAAkB,EAElB,qBAAqB,EACrB,cAAc,EACd,WAAW,EAEZ,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,gCAAgC,CAAA;AAkBvC,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,UAAU,EAAE,gBAAgB,CAAA;IAC5B,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,eAAe,CAAA;IACtB,IAAI,EAAE,qBAAqB,CAAA;IAC3B,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAsFhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,EACtB,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAqB7B,eAAO,MAAM,cAAc,EAAE,aAwxB5B,CAAA;AA0FD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cA6BF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA;AA2BD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA"}

package/types/hooks/useTheme.d.ts

@@ -1,25 +1,23 @@
-/// <reference types="react" />
 import { ThemeManager } from '../helpers/ThemeManager.js';
 import type { ThemeParsed, ThemeProps } from '../types.js';
 export type ChangedThemeResponse = {
+    isNewTheme: boolean;
     themeManager: ThemeManager | null;
     name: string;
-    isNewTheme?: boolean;
     theme?: ThemeParsed | null;
     className?: string;
 };
 export declare const useTheme: (props?: ThemeProps) => ThemeParsed;
 export declare const useThemeWithState: (props: ThemeProps) => {
     theme: ThemeParsed;
+    isNewTheme: boolean;
     themeManager: ThemeManager | null;
     name: string;
-    isNewTheme?: boolean | undefined;
     className?: string | undefined;
 } | null;
-export declare function getThemeProxied({ theme, themeManager, keys, }: Partial<ChangedThemeResponse> & {
+export declare function getThemeProxied({ theme, themeManager, }: Partial<ChangedThemeResponse> & {
     theme: ThemeParsed;
-    keys?: React.RefObject<string[]>;
-}): ThemeParsed;
+}, keys?: string[]): ThemeParsed;
 export declare const activeThemeManagers: Set<ThemeManager>;
-export declare const useChangeThemeEffect: (props: ThemeProps, root?: boolean, disableUpdate?: () => boolean) => ChangedThemeResponse;
+export declare const useChangeThemeEffect: (props: ThemeProps, root?: boolean, keys?: string[], disableUpdate?: () => boolean) => ChangedThemeResponse;
 //# sourceMappingURL=useTheme.d.ts.map

package/types/hooks/useTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":";AAOA,OAAO,EACL,YAAY,EAGb,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAI1D,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAaD,eAAO,MAAM,QAAQ,WAAW,UAAU,KAAgB,WAEzD,CAAA;AAED,eAAO,MAAM,iBAAiB,UAAW,UAAU;;kBAtBnC,YAAY,GAAG,IAAI;UAC3B,MAAM;;;QAmEb,CAAA;AAED,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,YAAY,EACZ,IAAI,GACL,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG;IACjC,KAAK,EAAE,WAAW,CAAA;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;CACjC,eA4CA;AAED,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAE1D,eAAO,MAAM,oBAAoB,UACxB,UAAU,kCAED,MAAM,OAAO,KAC5B,oBA8HF,CAAA"}
+{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAQA,OAAO,EACL,YAAY,EAGb,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAI1D,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAoBD,eAAO,MAAM,QAAQ,WAAW,UAAU,KAAgB,WAEzD,CAAA;AAED,eAAO,MAAM,iBAAiB,UAAW,UAAU;;gBA7BrC,OAAO;kBACL,YAAY,GAAG,IAAI;UAC3B,MAAM;;QAmEb,CAAA;AAED,wBAAgB,eAAe,CAC7B,EACE,KAAK,EACL,YAAY,GACb,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG;IACjC,KAAK,EAAE,WAAW,CAAA;CACnB,EACD,IAAI,CAAC,EAAE,MAAM,EAAE,eA2ChB;AAED,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAE1D,eAAO,MAAM,oBAAoB,UACxB,UAAU,yBAEV,MAAM,EAAE,kBACC,MAAM,OAAO,KAC5B,oBAgLF,CAAA"}

package/types/types.d.ts

@@ -9,7 +9,7 @@ import type { ThemeProviderProps } from './views/ThemeProvider.js';
 export type { MediaStyleObject, StyleObject } from '@tamagui/helpers';
 export type SpaceDirection = 'vertical' | 'horizontal' | 'both';
 export type TamaguiElement = HTMLElement | View;
-export type DebugProp = boolean | 'break' | 'verbose';
+export type DebugProp = boolean | 'break' | 'verbose' | 'visualize';
 type DivAttributes = HTMLAttributes<HTMLDivElement>;
 export type TamaguiReactElement<P = any> = React.ReactElement<P> & {
     type: TamaguiComponent;
@@ -199,7 +199,7 @@ export interface ThemeProps {
     componentName?: string;
     children?: any;
     reset?: boolean;
-    debug?: DebugProp;
+    debug?: DebugProp | any;
     inverse?: boolean;
     forceClassName?: boolean;
     shouldUpdate?: () => boolean;