@tamagui/web 1.121.12 → 1.122.0

package/src/hooks/useTheme.tsx

@@ -1,12 +1,19 @@
-import React from 'react'
 import { isClient, isIos, isServer, isWeb } from '@tamagui/constants'
-
+import {
+  useContext,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+  type MutableRefObject,
+} from 'react'
 import { getConfig, getSetting } from '../config'
 import type { Variable } from '../createVariable'
 import { getVariable } from '../createVariable'
 import type { ThemeManagerState } from '../helpers/ThemeManager'
 import { ThemeManager, getHasThemeUpdatingProps } from '../helpers/ThemeManager'
-import { ThemeManagerIDContext } from '../helpers/ThemeManagerContext'
+import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import { isEqualShallow } from '../helpers/createShallowSetState'
 import type {
   DebugProp,
@@ -32,16 +39,6 @@ export type ChangedThemeResponse = {
 
 const emptyProps = { name: null }
 
-let cached: any
-function getDefaultThemeProxied() {
-  if (cached) return cached
-  const config = getConfig()
-  const name = config.themes.light ? 'light' : Object.keys(config.themes)[0]
-  const defaultTheme = config.themes[name]
-  cached = getThemeProxied({ theme: defaultTheme, name })
-  return cached
-}
-
 export type ThemeGettable<Val> = Val & {
   /**
    * Tries to return an optimized value that avoids the need for re-rendering:
@@ -87,39 +84,19 @@ export type UseThemeResult = {
 
 export const useTheme = (props: ThemeProps = emptyProps) => {
   const [_, theme] = useThemeWithState(props)
-  const res = theme || getDefaultThemeProxied()
+  const res = theme
   return res as UseThemeResult
 }
 
 export const useThemeWithState = (
   props: UseThemeWithStateProps
 ): [ChangedThemeResponse, ThemeParsed] => {
-  const keys = React.useRef<string[]>([])
-
-  const changedThemeState = useChangeThemeEffect(
-    props,
-    false,
-    keys.current,
-    !isServer
-      ? () => {
-          const next =
-            props.shouldUpdate?.() ?? (keys.current.length > 0 ? true : undefined)
-
-          if (
-            process.env.NODE_ENV === 'development' &&
-            typeof props.debug === 'string' &&
-            props.debug !== 'profile'
-          ) {
-            console.info(
-              `  🎨 useTheme() shouldUpdate? tracking keys ${keys.current.length} ${props.shouldUpdate?.()}`,
-              next
-            )
-          }
+  const keys = useRef<string[] | null>(null)
 
-          return next
-        }
-      : undefined
-  )
+  const changedThemeState = useChangeThemeEffect(props, false, keys)
+
+  // @ts-expect-error
+  if (process.env.NODE_ENV === 'development' && globalThis.time) time`theme-change-effect`
 
   const { themeManager, state } = changedThemeState
 
@@ -135,15 +112,17 @@ export const useThemeWithState = (
     }
   }
 
-  const themeProxied = React.useMemo(() => {
+  const themeProxied = useMemo(() => {
     // reset keys on new theme
-    keys.current = []
+    if (keys.current) {
+      keys.current = null
+    }
 
     if (!themeManager || !state?.theme) {
       return {}
     }
 
-    return getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug)
+    return getThemeProxied(state, props.deopt, keys, themeManager, props.debug)
   }, [state?.theme, themeManager, props.deopt, props.debug])
 
   if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
@@ -161,11 +140,11 @@ export const useThemeWithState = (
   return [changedThemeState, themeProxied]
 }
 
-export function getThemeProxied(
+function getThemeProxied(
   { theme, name, scheme }: ThemeManagerState,
   deopt = false,
-  themeManager?: ThemeManager,
-  keys?: string[],
+  keys: MutableRefObject<string[] | null>,
+  themeManager: ThemeManager,
   debug?: DebugProp
 ): UseThemeResult {
   if (!theme) return {}
@@ -173,18 +152,17 @@ export function getThemeProxied(
   const config = getConfig()
 
   function track(key: string) {
-    if (keys && !keys.includes(key)) {
-      if (!keys.length) {
-        // tracking new key for first time, do an update check
-        setTimeout(() => {
-          themeManager?.selfUpdate()
-        })
-      }
+    if (!keys.current) {
+      keys.current = []
 
-      keys.push(key)
-      if (process.env.NODE_ENV === 'development' && debug) {
-        console.info(` 🎨 useTheme() tracking new key: ${key}`)
-      }
+      // tracking new key for first time, do an update check
+      setTimeout(() => {
+        themeManager?.selfUpdate()
+      })
+    }
+    keys.current.push(key)
+    if (process.env.NODE_ENV === 'development' && debug) {
+      console.info(` 🎨 useTheme() tracking new key: ${key}`)
     }
   }
 
@@ -349,15 +327,41 @@ const preventWarnSetState =
         return ogLog(a, ...args)
       }
 
+function getShouldUpdateTheme(
+  props: UseThemeWithStateProps,
+  parentManager: ThemeManager | null,
+  keys: MutableRefObject<string[] | null> | undefined,
+  themeState: ChangedThemeResponse | undefined,
+  nextState?: ThemeManagerState | null,
+  forceShouldChange = false
+) {
+  if (isServer) return
+  if (
+    !forceShouldChange &&
+    !keys?.current &&
+    (!themeState || !themeState.isNewTheme) &&
+    !getHasThemeUpdatingProps(props)
+  ) {
+    return
+  }
+  const next = nextState || themeState?.themeManager?.getState(props, parentManager)
+  if (forceShouldChange) {
+    return next
+  }
+  if (!next || next.theme === themeState?.state?.theme) {
+    return
+  }
+  return next
+}
+
 export const useChangeThemeEffect = (
   props: UseThemeWithStateProps,
   isRoot = false,
-  keys?: string[],
-  shouldUpdate?: () => boolean | undefined
+  keys?: MutableRefObject<string[] | null>
 ): ChangedThemeResponse => {
   const { disable } = props
-  const parentManagerId = React.useContext(ThemeManagerIDContext)
-  const parentManager = getThemeManager(parentManagerId)
+  const parentManager = useContext(ThemeManagerContext)
+  const shouldAlwaysUpdate = props.needsUpdate?.() === true ? true : undefined
 
   if ((!isRoot && !parentManager) || disable) {
     return {
@@ -379,34 +383,23 @@ export const useChangeThemeEffect = (
   //   }
   // }
 
-  const [themeState, setThemeState] = React.useState<ChangedThemeResponse>(createState)
+  const [themeState, setThemeState] = useState<ChangedThemeResponse>(createState)
 
   const { state, mounted, isNewTheme, themeManager, prevState } = themeState
   const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)
 
-  function getShouldUpdateTheme(
-    manager = themeManager,
-    nextState?: ThemeManagerState | null,
-    prevState: ThemeManagerState | undefined = state,
-    forceShouldChange = false
-  ) {
-    const forceUpdate = shouldUpdate?.()
-    if (!manager || (!forceShouldChange && forceUpdate === false)) return
-    const next = nextState || manager.getState(props, parentManager)
-    if (forceShouldChange) {
-      return next
-    }
-    if (!next) return
-    if (forceUpdate !== true && !manager.getStateShouldChange(next, prevState)) {
-      return
-    }
-    return next
-  }
-
   if (process.env.TAMAGUI_TARGET === 'native') {
     if (themeManager) {
-      if (getShouldUpdateTheme(themeManager)) {
-        const next = createState(themeState)
+      const nextState = getShouldUpdateTheme(
+        props,
+        parentManager,
+        keys,
+        themeState,
+        undefined,
+        shouldAlwaysUpdate
+      )
+      if (nextState) {
+        const next = createState(themeState, undefined, nextState)
         if (next.state?.name !== themeState.state?.name) {
           setThemeState(next)
           console.error = preventWarnSetState
@@ -418,15 +411,17 @@ export const useChangeThemeEffect = (
   }
 
   if (!isServer) {
-    React.useLayoutEffect(() => {
-      // one homepage breaks on useTheme() in MetaTheme if this isnt set up
-      if (themeManager && state && prevState && state !== prevState) {
-        themeManager.notify()
-      }
-    }, [state])
+    if (process.env.TAMAGUI_TARGET === 'web') {
+      useLayoutEffect(() => {
+        // one homepage breaks on useTheme() in MetaTheme if this isnt set up
+        if (themeManager && state && prevState && state !== prevState) {
+          themeManager.notify()
+        }
+      }, [state])
+    }
 
     // listen for parent change + notify children change
-    React.useEffect(() => {
+    useEffect(() => {
       if (!themeManager) return
 
       // SSR safe inverse (because server can't know prefers scheme)
@@ -442,9 +437,27 @@ export const useChangeThemeEffect = (
         return
       }
 
-      if (isNewTheme || getShouldUpdateTheme(themeManager)) {
+      if (isNewTheme || isRoot) {
         activeThemeManagers.add(themeManager)
-        setThemeState(createState)
+
+        if (process.env.NODE_ENV === 'development') {
+          if (isRoot) {
+            globalThis['TamaguiRootThemeManager'] ||= themeManager
+          }
+        }
+      }
+
+      const updated = getShouldUpdateTheme(
+        props,
+        parentManager,
+        keys,
+        themeState,
+        undefined,
+        shouldAlwaysUpdate
+      )
+
+      if (updated) {
+        setThemeState((prev) => createState(prev, undefined, updated))
       }
 
       // for updateTheme/replaceTheme
@@ -461,14 +474,14 @@ export const useChangeThemeEffect = (
         (name, manager, forced) => {
           const force =
             forced ||
-            shouldUpdate?.() ||
+            (!isServer ? (keys?.current ? true : undefined) : undefined) ||
             props.deopt ||
             // this fixes themeable() not updating with the new fastSchemeChange setting
             (process.env.TAMAGUI_TARGET === 'native'
               ? props['disable-child-theme']
               : undefined)
 
-          const shouldTryUpdate = force ?? Boolean(keys?.length || isNewTheme)
+          const shouldTryUpdate = force ?? Boolean(keys?.current || isNewTheme)
 
           if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
             // prettier-ignore
@@ -483,7 +496,9 @@ export const useChangeThemeEffect = (
           }
 
           if (shouldTryUpdate) {
-            setThemeState((prev) => createState(prev, force))
+            setThemeState((prev) => {
+              return createState(prev, true)
+            })
           }
         },
         themeManager.id
@@ -508,7 +523,7 @@ export const useChangeThemeEffect = (
     ])
 
     if (process.env.NODE_ENV === 'development' && props.debug !== 'profile') {
-      React.useEffect(() => {
+      useEffect(() => {
         globalThis['TamaguiThemeManagers'] ??= new Set()
         globalThis['TamaguiThemeManagers'].add(themeManager)
         return () => {
@@ -538,8 +553,12 @@ export const useChangeThemeEffect = (
     themeManager,
   }
 
-  function createState(prev?: ChangedThemeResponse, force = false): ChangedThemeResponse {
-    if (prev && shouldUpdate?.() === false && !force) {
+  function createState(
+    prev?: ChangedThemeResponse,
+    force = false,
+    foundNextState?: ThemeManagerState
+  ): ChangedThemeResponse {
+    if (prev && !foundNextState && !keys?.current && !force) {
       return prev
     }
 
@@ -549,10 +568,7 @@ export const useChangeThemeEffect = (
     const hasThemeUpdatingProps = getHasThemeUpdatingProps(props)
 
     if (hasThemeUpdatingProps) {
-      const getNewThemeManager = () => {
-        return new ThemeManager(props, isRoot ? 'root' : parentManager)
-      }
-
+      const parentManagerProp = isRoot ? 'root' : parentManager
       if (prev?.themeManager) {
         themeManager = prev.themeManager
 
@@ -562,33 +578,44 @@ export const useChangeThemeEffect = (
         // at all anymore. this forces updates onChangeTheme for all dynamic style accessed components
         // which is correct, potentially in the future we can avoid forceChange and just know to
         // update if keys.length is set + onChangeTheme called
-        const forceChange = force || Boolean(keys?.length)
-        const next = themeManager.getState(props, parentManager)
-        const nextState = getShouldUpdateTheme(
-          themeManager,
-          next,
-          prev.state,
-          forceChange
-        )
+        const forceChange =
+          force || shouldAlwaysUpdate || (keys?.current ? true : undefined)
+
+        let nextState: ThemeManagerState | null | undefined = null
+
+        // avoid some work if we already found it
+        if (foundNextState) {
+          nextState = foundNextState
+        } else {
+          const next = themeManager.getState(props, parentManager)
+          nextState = getShouldUpdateTheme(
+            props,
+            parentManager,
+            keys,
+            prev,
+            next,
+            forceChange
+          )
+        }
 
         if (nextState) {
           state = nextState
 
           if (!prev.isNewTheme && !isRoot) {
-            themeManager = getNewThemeManager()
+            themeManager = new ThemeManager(props, parentManagerProp)
           } else {
             themeManager.updateState(nextState)
           }
         } else {
           if (prev.isNewTheme) {
             // reset to parent
-            if (parentManager && !next) {
+            if (parentManager && !nextState) {
               themeManager = parentManager
             }
           }
         }
       } else {
-        themeManager = getNewThemeManager()
+        themeManager = new ThemeManager(props, parentManagerProp)
         state = { ...themeManager.state }
       }
     }
@@ -615,7 +642,10 @@ export const useChangeThemeEffect = (
       themeManager,
       isNewTheme,
       mounted,
-      inversed: props.inverse,
+    }
+
+    if (props.inverse) {
+      response.inversed = true
     }
 
     const shouldReturnPrev =

package/src/hooks/useThemeName.tsx

@@ -1,12 +1,10 @@
-import React from 'react'
 import { useIsomorphicLayoutEffect } from '@tamagui/constants'
-
-import { ThemeManagerIDContext } from '../helpers/ThemeManagerContext'
+import React from 'react'
+import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import type { ThemeName } from '../types'
-import { getThemeManager } from './useTheme'
 
 export function useThemeName(opts?: { parent?: true }): ThemeName {
-  const manager = getThemeManager(React.useContext(ThemeManagerIDContext)!)
+  const manager = React.useContext(ThemeManagerContext)!
   const [name, setName] = React.useState(manager?.state.name || '')
 
   useIsomorphicLayoutEffect(() => {

package/src/setupHooks.ts

@@ -27,13 +27,7 @@ type InternalHooks = {
     staticConfig: StaticConfig
   ) => any
 
-  useChildren?: (
-    elementType: any,
-    children: any,
-    viewProps: Record<string, any>,
-    events: TamaguiComponentEvents | null,
-    staticConfig: StaticConfig
-  ) => any
+  useChildren?: (elementType: any, children: any, viewProps: Record<string, any>) => any
 
   getBaseViews?: () => {
     View: any

package/src/types.tsx

@@ -159,11 +159,11 @@ export type CreateTokens<Val extends VariableVal = VariableVal> = Record<
   string,
   { [key: GenericKey]: Val }
 > & {
-  color: { [key: GenericKey]: Val }
-  space: { [key: GenericKey]: Val }
-  size: { [key: GenericKey]: Val }
-  radius: { [key: GenericKey]: Val }
-  zIndex: { [key: GenericKey]: Val }
+  color?: { [key: GenericKey]: Val }
+  space?: { [key: GenericKey]: Val }
+  size?: { [key: GenericKey]: Val }
+  radius?: { [key: GenericKey]: Val }
+  zIndex?: { [key: GenericKey]: Val }
 }
 
 export type TokenCategories = 'color' | 'space' | 'size' | 'radius' | 'zIndex'
@@ -174,11 +174,11 @@ type Tokenify<A extends GenericTokens> = Omit<
   },
   TokenCategories
 > & {
-  color: TokenifyRecord<A['color']>
-  space: TokenifyRecord<A['space']>
-  size: TokenifyRecord<A['size']>
-  radius: TokenifyRecord<A['radius']>
-  zIndex: TokenifyRecord<A['zIndex']>
+  color: TokenifyRecord<A extends { color: any } ? A['color'] : {}>
+  space: TokenifyRecord<A extends { space: any } ? A['space'] : {}>
+  size: TokenifyRecord<A extends { size: any } ? A['size'] : {}>
+  radius: TokenifyRecord<A extends { radius: any } ? A['radius'] : {}>
+  zIndex: TokenifyRecord<A extends { zIndex: any } ? A['zIndex'] : {}>
 }
 
 type TokenifyRecord<A extends Object> = {
@@ -394,7 +394,7 @@ export type ThemeParsed = {
 export type Tokens = TamaguiConfig['tokens']
 
 export type TokensParsed = {
-  [Key in keyof Tokens]: TokenPrefixed<Tokens[Key]>
+  [Key in keyof Required<Tokens>]: TokenPrefixed<Tokens[Key]>
 }
 
 type TokenPrefixed<A extends { [key: string]: any }> = {
@@ -434,8 +434,6 @@ export interface ThemeProps {
   inverse?: boolean
   // on the web, for portals we need to re-insert className
   forceClassName?: boolean
-  // allows for forcing the auto-update behavior
-  shouldUpdate?: () => boolean | undefined
 
   // used internally for shallow themes
   shallow?: boolean
@@ -445,6 +443,7 @@ export interface ThemeProps {
 export type UseThemeWithStateProps = ThemeProps & {
   deopt?: boolean
   disable?: boolean
+  needsUpdate?: () => boolean
 }
 
 type ArrayIntersection<A extends any[]> = A[keyof A]
@@ -2150,8 +2149,9 @@ export type PropMapper = (
   key: string,
   value: any,
   state: GetStyleState,
-  subProps?: Record<string, any>
-) => PropMappedValue
+  disabled: boolean,
+  map: (key: string, val: any) => void
+) => void
 
 export type GenericVariantDefinitions = {
   [key: string]: {

package/src/views/Theme.tsx

@@ -2,12 +2,12 @@ import { isWeb } from '@tamagui/constants'
 import type { MutableRefObject } from 'react'
 import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from 'react'
 import { variableToString } from '../createVariable'
-import { ThemeManagerIDContext } from '../helpers/ThemeManagerContext'
+import { log } from '../helpers/log'
+import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import type { ChangedThemeResponse } from '../hooks/useTheme'
 import { useChangeThemeEffect } from '../hooks/useTheme'
 import type { ThemeProps } from '../types'
 import { ThemeDebug } from './ThemeDebug'
-import { log } from '../helpers/log'
 
 export const Theme = forwardRef(function Theme({ children, ...props }: ThemeProps, ref) {
   // @ts-expect-error only for internal views
@@ -50,7 +50,7 @@ export const Theme = forwardRef(function Theme({ children, ...props }: ThemeProp
 
   return getThemedChildren(themeState, finalChildren, props, isRoot, stateRef)
 })
-Theme['displayName'] = 'Theme'
+
 Theme['avoidForwardRef'] = true
 
 export function getThemedChildren(
@@ -119,9 +119,9 @@ export function getThemedChildren(
   }
 
   const elementsWithContext = (
-    <ThemeManagerIDContext.Provider value={themeManager.id}>
+    <ThemeManagerContext.Provider value={themeManager}>
       {next}
-    </ThemeManagerIDContext.Provider>
+    </ThemeManagerContext.Provider>
   )
 
   if (forceClassName === false) {

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAkBzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAG/E,OAAO,KAAK,EAEV,SAAS,EAGT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAElB,YAAY,EAEZ,gBAAgB,EAChB,cAAc,EAMf,MAAM,SAAS,CAAA;AAchB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAuF9D,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAqlC3B;AAoBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,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,KAAK,MAAM,OAAO,CAAA;AAkBzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAG/E,OAAO,KAAK,EAEV,SAAS,EAGT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAElB,YAAY,EAEZ,gBAAgB,EAChB,cAAc,EAMf,MAAM,SAAS,CAAA;AAahB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAuF9D,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEA8kC3B;AAoBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}

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

@@ -1 +1 @@
-{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManager.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAEpE,KAAK,aAAa,GAAG,CACnB,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,OAAO,GAAG,MAAM,KACrB,IAAI,CAAA;AAET,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,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IAIrB,aAAa,CAAC,EAAE,OAAO,CAAA;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAID,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,UAAU,WAEzD;AAID,qBAAa,YAAY;IAOd,KAAK,EAAE,UAAU;IAN1B,EAAE,SAAI;IACN,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;IA6B1D,oBAAoB,CAClB,KAAK,GAAE,UAAU,GAAG;QAAE,UAAU,CAAC,EAAE,WAAW,CAAA;KAAqB,EACnE,YAAY,UAAO;IAkBrB,UAAU;IAUV,WAAW,CAAC,SAAS,EAAE,iBAAiB,EAAE,YAAY,UAAO;IAgB7D,iBAAiB,CACf,KAAK,aAAa,EAClB,KAAK,GAAE,iBAAiB,GAAG,IAAiB,EAC5C,aAAa,sBAAqB;IAapC,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;IAED,MAAM,CAAC,MAAM,UAAQ;IAQrB,aAAa,CAAC,EAAE,aAAa,CAAA;IAE7B,UAAU;IAIV,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAiBzD;AA4KD,KAAK,iBAAiB,GAAG,YAAY,GAAG,SAAS,CAAA;AAKjD,wBAAgB,WAAW,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,uDAY7D"}
+{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManager.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAEpE,KAAK,aAAa,GAAG,CACnB,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,OAAO,GAAG,MAAM,KACrB,IAAI,CAAA;AAET,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,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IAIrB,aAAa,CAAC,EAAE,OAAO,CAAA;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAID,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,UAAU,WAEzD;AAID,qBAAa,YAAY;IAOd,KAAK,EAAE,UAAU;IAN1B,EAAE,SAAI;IACN,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;IA6B1D,oBAAoB,CAClB,KAAK,GAAE,UAAU,GAAG;QAAE,UAAU,CAAC,EAAE,WAAW,CAAA;KAAqB,EACnE,YAAY,UAAO;IAkBrB,UAAU;IAUV,WAAW,CAAC,SAAS,EAAE,iBAAiB,EAAE,YAAY,UAAO;IAgB7D,iBAAiB,CACf,KAAK,aAAa,EAClB,KAAK,GAAE,iBAAiB,GAAG,IAAiB,EAC5C,aAAa,sBAAqB;IAapC,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;IAED,MAAM,CAAC,MAAM,UAAQ;IAQrB,aAAa,CAAC,EAAE,aAAa,CAAA;IAE7B,UAAU;IAIV,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAiBzD;AA6KD,KAAK,iBAAiB,GAAG,YAAY,GAAG,SAAS,CAAA;AAKjD,wBAAgB,WAAW,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,uDAY7D"}

package/types/helpers/ThemeManagerContext.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-export declare const ThemeManagerIDContext: React.Context<number>;
+import type { ThemeManager } from './ThemeManager';
+export declare const ThemeManagerContext: React.Context<ThemeManager | null>;
 //# sourceMappingURL=ThemeManagerContext.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ThemeManagerContext.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManagerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,qBAAqB,uBAAiC,CAAA"}
+{"version":3,"file":"ThemeManagerContext.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManagerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD,eAAO,MAAM,mBAAmB,oCAAiD,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"expandStyle.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAa/C,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,eAAe,CA+CpE"}
+{"version":3,"file":"expandStyle.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQ/C,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,eAAe,CA+CpE"}

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

@@ -1 +1 @@
-{"version":3,"file":"expandStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyles.ts"],"names":[],"mappings":"AAIA,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QA2BnD"}
+{"version":3,"file":"expandStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyles.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QA2BnD"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AA2BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,aAqyC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,SAiCF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAa5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AA2BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,aA0xC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,SAkCF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAa5B,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAQ/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,YAmKA"}
+{"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAQ/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,YAoKA"}

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

@@ -1 +1 @@
-{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA8BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AAwOD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAW9D;AAGD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,QAEjC;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QAqC5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAuBxD"}
+{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA8BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AAiOD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAW9D;AAGD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,QAEjC;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QAqC5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAuBxD"}

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

@@ -1 +1 @@
-{"version":3,"file":"normalizeValueWithProperty.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeValueWithProperty.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgBH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,SAAK,GAAG,GAAG,CAiBzE;AAKD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAwCxE"}
+{"version":3,"file":"normalizeValueWithProperty.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeValueWithProperty.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,SAAK,GAAG,GAAG,CAiBzE;AAKD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAwCxE"}

package/types/helpers/propMapper.d.ts

@@ -1,6 +1,5 @@
 import type { GetStyleState, PropMapper, ResolveVariableAs, TamaguiInternalConfig } from '../types';
 export declare const propMapper: PropMapper;
 export declare function getFontFamilyFromNameOrVariable(input: any, conf: TamaguiInternalConfig): string | undefined;
-export declare const getPropMappedFontFamily: (expanded?: any) => any;
 export declare const getTokenForKey: (key: string, value: string, resolveAs: ResolveVariableAs | undefined, styleState: Partial<GetStyleState>) => any;
 //# sourceMappingURL=propMapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,UAAU,EAAE,UAyExB,CAAA;AAmGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA;AAiJD,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,aACF,iBAAiB,0BAChB,OAAO,CAAC,aAAa,CAAC,QAmGnC,CAAA"}
+{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,UAAU,EAAE,UAoExB,CAAA;AAmGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAsJD,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,aACF,iBAAiB,0BAChB,OAAO,CAAC,aAAa,CAAC,QAmGnC,CAAA"}