@tamagui/web 1.46.2 → 1.47.1

package/src/hooks/useMedia.tsx

@@ -1,5 +1,5 @@
 import { useIsomorphicLayoutEffect } from '@tamagui/constants'
-import { useMemo, useSyncExternalStore } from 'react'
+import { useMemo, useRef, useSyncExternalStore } from 'react'
 
 import { getConfig } from '../config'
 import { createProxy } from '../helpers/createProxy'
@@ -12,7 +12,6 @@ import type {
   MediaQueryState,
   TamaguiInternalConfig,
 } from '../types'
-import { useSafeRef } from './useSafeRef'
 
 export let mediaState: MediaQueryState =
   // development only safeguard
@@ -36,10 +35,14 @@ export let mediaState: MediaQueryState =
     : ({} as any)
 
 export const mediaQueryConfig: MediaQueries = {}
+
 export const getMedia = () => mediaState
+
 export const mediaKeys = new Set<string>() // with $ prefix
+
 export const isMediaKey = (key: string) =>
-  mediaKeys.has(key) || key.startsWith('$platform-') || key.startsWith('$theme-')
+  mediaKeys.has(key) ||
+  (key[0] === '$' && (key.startsWith('$platform-') || key.startsWith('$theme-')))
 
 // for SSR capture it at time of startup
 let initState: MediaQueryState
@@ -179,18 +182,19 @@ function subscribe(subscriber: any) {
 }
 
 export function useMedia(uid?: any, debug?: any): UseMediaState {
-  const internal = useSafeRef<UseMediaInternalState>(undefined as any)
-  if (!internal.current) {
-    internal.current = {
-      prev: initState,
-    }
-  }
+  const internal = useRef<UseMediaInternalState | undefined>()
+
   const state = useSyncExternalStore<MediaQueryState>(
     subscribe,
     () => {
+      if (!internal.current) {
+        return initState
+      }
+
       const { touched, prev } = internal.current
       const componentState = uid ? shouldUpdate.get(uid) : undefined
-      if (componentState?.enabled === false) {
+
+      if (!componentState?.enabled === false) {
         return prev
       }
 
@@ -215,6 +219,7 @@ export function useMedia(uid?: any, debug?: any): UseMediaState {
     return new Proxy(state, {
       get(_, key) {
         if (typeof key === 'string') {
+          internal.current ||= { prev: initState }
           internal.current.touched ||= new Set()
           internal.current.touched.add(key)
         }

package/src/hooks/useStyle.tsx

@@ -3,11 +3,12 @@ import { useContext } from 'react'
 
 import { FontLanguageContext } from '../contexts/FontLanguageContext'
 import { TextAncestorContext } from '../contexts/TextAncestorContext'
+import { defaultComponentState } from '../createComponent'
 import { useSplitStyles } from '../helpers/getSplitStyles'
 import {
   DebugProp,
   GetProps,
-  SplitStyleState,
+  SplitStyleProps,
   TamaguiComponent,
   TextNonStyleProps,
 } from '../types'
@@ -20,17 +21,19 @@ export function useStyle<
 >(
   base: Component,
   style: StyleProps,
-  options?: Partial<SplitStyleState> & { debug?: DebugProp }
+  options?: Partial<SplitStyleProps> & { debug?: DebugProp }
 ) {
   const isText = base.staticConfig.isText
   const hasTextAncestor = !!(isWeb && isText ? useContext(TextAncestorContext) : false)
   const languageContext = useContext(FontLanguageContext)
-  const themeState = useThemeWithState({})
+  const [themeState] = useThemeWithState({})
   const media = useMedia()
   const out = useSplitStyles(
     style as any,
     base.staticConfig,
-    themeState!,
+    themeState.state.theme!,
+    themeState.state.name,
+    defaultComponentState,
     {
       ...(options as any),
       mediaState: media,

package/src/hooks/useTheme.tsx

@@ -3,7 +3,6 @@ import { isClient, isServer, isWeb } from '@tamagui/constants'
 import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 
 import { getConfig } from '../config'
-import { isDevTools } from '../constants/isDevTools'
 import { getVariable } from '../createVariable'
 import { createProxy } from '../helpers/createProxy'
 import {
@@ -13,17 +12,9 @@ import {
 } from '../helpers/ThemeManager'
 import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import type { ThemeParsed, ThemeProps } from '../types'
-import { GetThemeUnwrapped } from './getThemeUnwrapped'
+import { GetThemeUnwrapped, getThemeUnwrapped } from './getThemeUnwrapped'
 
 export type ChangedThemeResponse = {
-  isNewTheme: boolean
-  themeManager: ThemeManager | null
-  name: string
-  theme?: ThemeParsed | null
-  className?: string
-}
-
-type State = {
   state: ThemeManagerState
   themeManager: ThemeManager
   isNewTheme: boolean
@@ -34,10 +25,8 @@ const emptyProps = { name: null }
 
 function getDefaultThemeProxied() {
   const config = getConfig()
-  const name = Object.keys(config.themes)[0]
   return getThemeProxied({
-    theme: config.themes[name],
-    name,
+    theme: config.themes[Object.keys(config.themes)[0]],
   })
 }
 
@@ -47,63 +36,61 @@ type UseThemeResult = {
   }
 }
 
-export const useTheme = (props: ThemeProps = emptyProps): UseThemeResult => {
-  return useThemeWithState(props)?.theme || getDefaultThemeProxied()
+export const useTheme = (props: ThemeProps = emptyProps) => {
+  const [_, theme] = useThemeWithState(props)
+  const res = theme || getDefaultThemeProxied()
+  return res as UseThemeResult
 }
 
-export const useThemeWithState = (props: ThemeProps) => {
+export const useThemeWithState = (
+  props: ThemeProps
+): [ChangedThemeResponse, ThemeParsed] => {
   const keys = useRef<string[]>([])
 
-  const changedTheme = useChangeThemeEffect(
+  const changedThemeState = useChangeThemeEffect(
     props,
     false,
     keys.current,
-    isClient
+    !isServer
       ? () => {
           return props.shouldUpdate?.() ?? (keys.current.length > 0 ? true : undefined)
         }
       : undefined
   )
 
-  const { themeManager, theme, name, className } = changedTheme
-
-  if (!changedTheme.theme) {
-    if (process.env.NODE_ENV === 'development') {
-      console.warn('No theme found', name, props, themeManager)
-    }
-    return null
+  const { themeManager, state } = changedThemeState
+  const { theme, name, className } = state
+  if (!theme) {
+    throw `❌`
   }
 
-  const proxiedTheme = useMemo(() => {
-    return getThemeProxied(changedTheme as any, keys.current)
+  const themeProxied = useMemo(() => {
+    return getThemeProxied(
+      {
+        theme,
+        themeManager,
+      },
+      keys.current
+    )
   }, [theme, name, className, themeManager])
 
-  const result = {
-    ...changedTheme,
-    theme: proxiedTheme,
-  }
-
   if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
     console.groupCollapsed('  🔹 useTheme =>', name)
-    const logs = { props, changedTheme, ...(isDevTools && { theme }) }
-    for (const key in logs) {
-      // rome-ignore lint/nursery/noConsoleLog: <explanation>
-      console.log(' · ', key, logs[key])
-    }
     // rome-ignore lint/nursery/noConsoleLog: <explanation>
-    console.log('returning state', result)
+    console.log('returning state', changedThemeState, 'from props', props)
     console.groupEnd()
   }
 
-  return result
+  return [changedThemeState, themeProxied]
 }
 
 export function getThemeProxied(
   {
     theme,
     themeManager,
-  }: Partial<ChangedThemeResponse> & {
+  }: {
     theme: ThemeParsed
+    themeManager?: ThemeManager
   },
   keys?: string[]
 ): UseThemeResult {
@@ -122,7 +109,7 @@ export function getThemeProxied(
       if (typeof key === 'string' && keys) {
         // auto convert variables to plain
         const keyString = key[0] === '$' ? key.slice(1) : key
-        const val = themeManager!.getValue(keyString)
+        const val = themeManager?.getValue(keyString)
         if (val && typeof val === 'object') {
           return new Proxy(val as any, {
             // when they touch the actual value we only track it
@@ -169,12 +156,12 @@ export const useChangeThemeEffect = (
     if (!parentManager) throw `❌`
     return {
       isNewTheme: false,
-      ...parentManager.state,
+      state: parentManager.state,
       themeManager: parentManager,
     }
   }
 
-  const [themeState, setThemeState] = useState<State>(createState)
+  const [themeState, setThemeState] = useState<ChangedThemeResponse>(createState)
   const { state, mounted, isNewTheme, themeManager } = themeState
   const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)
 
@@ -272,19 +259,21 @@ export const useChangeThemeEffect = (
     if (!parentManager) throw '❌'
     return {
       isNewTheme: false,
-      ...parentManager.state,
-      className: '',
       themeManager: parentManager,
+      state: {
+        ...parentManager.state,
+        className: '',
+      },
     }
   }
 
   return {
-    ...state,
+    state,
     isNewTheme,
     themeManager,
   }
 
-  function createState(prev?: State, force = false): State {
+  function createState(prev?: ChangedThemeResponse, force = false): ChangedThemeResponse {
     if (prev && shouldUpdate?.() === false) {
       return prev
     }

package/src/index.ts

@@ -25,6 +25,7 @@ export * from './constants/constants'
 
 export * from './helpers/createStyledContext'
 export * from './helpers/expandStyles'
+export * from './helpers/propMapper'
 export * from './helpers/getAnimationDriver'
 export * from './helpers/getExpandedShorthands'
 export * from './helpers/getSplitStyles'
@@ -56,7 +57,6 @@ export {
 } from './hooks/useMedia'
 export * from './hooks/useTheme'
 export * from './hooks/useThemeName'
-export * from './hooks/useSafeRef'
 export * from './hooks/useStyle'
 export * from './hooks/useAnimationDriver'
 export * from './hooks/useIsTouchDevice'

package/src/types.tsx

@@ -26,8 +26,8 @@ import type {
 } from 'react-native'
 
 import type { Variable } from './createVariable'
-import type { ResolveVariableTypes } from './helpers/createPropMapper'
 import { StyledContext } from './helpers/createStyledContext'
+import type { ResolveVariableTypes } from './helpers/propMapper'
 import type { FontLanguageProps, LanguageContextType } from './views/FontLanguage.types'
 import type { ThemeProviderProps } from './views/ThemeProvider'
 
@@ -53,7 +53,7 @@ export type LoadedComponents = {
   nameToInfo: Record<
     string,
     {
-      staticConfig: StaticConfigParsed
+      staticConfig: StaticConfig
     }
   >
 }
@@ -1238,7 +1238,7 @@ export type Styleable<Props, Ref> = <
 >(
   a: X
 ) => ReactComponentWithRef<CustomProps & Omit<Props, keyof CustomProps>, Ref> & {
-  staticConfig: StaticConfigParsed
+  staticConfig: StaticConfig
   styleable: Styleable<Props, Ref>
 }
 
@@ -1256,7 +1256,7 @@ export type TamaguiComponent<
   }
 
 type StaticComponentObject<Props, Ref> = {
-  staticConfig: StaticConfigParsed
+  staticConfig: StaticConfig
 
   /** @deprecated use `styleable` instead (same functionality, better name) */
   extractable: <X>(a: X, opts?: Partial<StaticConfig>) => X
@@ -1279,52 +1279,42 @@ export type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, 'children'>>
 
 export type PropMappedValue = [string, any][] | undefined
 
+type FlatTransforms = Record<string, any>
+
 export type GetStyleState = {
   style: TextStyleProps
   usedKeys: Record<string, number>
   classNames: ClassNamesObject
-  staticConfig: StaticConfigParsed
+  staticConfig: StaticConfig
   theme: ThemeParsed
   props: Record<string, any>
   curProps: Record<string, any>
   viewProps: Record<string, any>
-  state: SplitStyleState
+  styleProps: SplitStyleProps
+  componentState: TamaguiComponentState
   conf: TamaguiInternalConfig
   languageContext?: FontLanguageProps
-  avoidDefaultProps?: boolean
   avoidMergeTransform?: boolean
   fontFamily?: string
   debug?: DebugProp
+  transforms?: FlatTransforms
 }
 
 export type StyleResolver<Response = PropMappedValue> = (
   key: string,
   value: any,
+  props: SplitStyleProps,
   state: GetStyleState,
-  defaultProps: any,
-  returnVariablesAs: 'auto' | 'value',
-  parentVariantKey: string,
-  avoidDefaultProps?: boolean
+  parentVariantKey: string
 ) => Response
 
 export type PropMapper = (
   key: string,
   value: any,
   state: GetStyleState,
-  subProps?: Record<string, any>,
-  avoidDefaultProps?: boolean
+  subProps?: Record<string, any>
 ) => PropMappedValue
 
-export type StaticConfigParsed = StaticConfig & {
-  parsed: true
-  propMapper: PropMapper
-  variantsParsed?: {
-    [key: string]: {
-      [key: string]: any
-    }
-  }
-}
-
 export type GenericVariantDefinitions = {
   [key: string]: {
     [key: string]:
@@ -1336,6 +1326,8 @@ export type GenericVariantDefinitions = {
 }
 
 export type StaticConfigPublic = {
+  defaultProps?: Record<string, any>
+
   /**
    * (compiler) If you need to pass context or something, prevents from ever
    * flattening. The 'jsx' option means it will never flatten. if you
@@ -1407,11 +1399,6 @@ type StaticConfigBase = StaticConfigPublic & {
    */
   componentName?: string
 
-  /**
-   * Same as React.defaultProps, be sure to sync
-   */
-  defaultProps: Record<string, any>
-
   /**
    * Merges into defaultProps later on, used internally yonly
    */
@@ -1884,13 +1871,12 @@ export type TamaguiComponentState = {
   }
 }
 
-export type SplitStyleState = TamaguiComponentState & {
+export type SplitStyleProps = {
   mediaState?: Record<string, boolean>
   noClassNames?: boolean
   resolveVariablesAs?: ResolveVariableTypes
   fallbackProps?: Record<string, any>
   hasTextAncestor?: boolean
-
   // for animations
   isAnimated: boolean
   isExiting?: boolean
@@ -1953,7 +1939,7 @@ export type UniversalAnimatedNumber<A> = {
 export type AnimationDriver<A extends AnimationConfig = AnimationConfig> = {
   isReactNative?: boolean
   keepStyleSSR?: boolean
-  // supportsCSSVariables?: boolean
+  supportsCSSVars?: boolean
   useAnimations: UseAnimationHook
   usePresence: () => UsePresenceResult
   useAnimatedNumber: (initial: number) => UniversalAnimatedNumber<any>
@@ -1980,8 +1966,9 @@ export type UseAnimationHook = (props: {
   props: Record<string, any>
   presence?: UsePresenceResult | null
   hostRef: RefObject<HTMLElement | View>
-  staticConfig: StaticConfigParsed
-  state: SplitStyleState
+  staticConfig: StaticConfig
+  styleProps: SplitStyleProps
+  componentState: TamaguiComponentState
   theme: ThemeParsed
   pseudos: PseudoProps<ViewStyle> | null
   onDidAnimate?: any

package/src/views/Stack.tsx

@@ -8,10 +8,7 @@ export type Stack = TamaguiElement
 
 export const Stack = createComponent<StackProps, Stack, StackPropsBase>({
   acceptsClassName: true,
-  defaultProps: {
-    ...stackDefaultStyles,
-    flexDirection: 'column',
-  },
+  defaultProps: stackDefaultStyles,
   validStyles,
 })
 

package/src/views/Theme.tsx

@@ -125,8 +125,8 @@ export function wrapThemeElements({
 
   // in order to provide currentColor, set color by default
   const themeColor =
-    themeState.theme && themeState.isNewTheme
-      ? variableToString(themeState.theme.color)
+    themeState.state.theme && themeState.isNewTheme
+      ? variableToString(themeState.state.theme.color)
       : ''
   const colorStyle = themeColor
     ? {
@@ -137,7 +137,7 @@ export function wrapThemeElements({
   const parentScheme = themeState.themeManager?.parentManager?.scheme
   const scheme = themeState.themeManager?.scheme
   const isInversing = scheme && parentScheme && scheme !== parentScheme
-  const className = themeState.className || ''
+  const className = themeState.state.className || ''
 
   let themedChildren = (
     <span className={`${className} _dsp_contents is_Theme`} style={colorStyle}>

package/src/views/ThemeDebug.tsx

@@ -71,8 +71,8 @@ export function ThemeDebug({
             <Theme {id} /> 
             {JSON.stringify(
               {
-                name: themeState.name,
-                className: themeState.className,
+                name: themeState.state.name,
+                className: themeState.state.className,
                 inverse: themeProps.inverse,
                 forceClassName: themeProps.forceClassName,
                 parent: themeState.themeManager?.state.parentName,

package/types/constants/constants.d.ts

@@ -1,21 +1,6 @@
 export declare const THEME_NAME_SEPARATOR = "_";
 export declare const THEME_CLASSNAME_PREFIX = "t_";
-export declare const webOnlyDefaultStyles: {
-    display: string;
-    flexBasis: string;
-    boxSizing: string;
-    position: string;
-    minHeight: number;
-    minWidth: number;
-};
 export declare const stackDefaultStyles: {
-    display: string;
-    flexBasis: string;
-    boxSizing: string;
-    position: string;
-    minHeight: number;
-    minWidth: number;
     alignItems: string;
-    flexShrink: number;
 };
 //# sourceMappingURL=constants.d.ts.map

package/types/constants/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,MAAM,CAAA;AACvC,eAAO,MAAM,sBAAsB,OAAO,CAAA;AAE1C,eAAO,MAAM,oBAAoB;;;;;;;CAOhC,CAAA;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;CAI9B,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,MAAM,CAAA;AACvC,eAAO,MAAM,sBAAsB,OAAO,CAAA;AAE1C,eAAO,MAAM,kBAAkB;;CAE9B,CAAA"}

package/types/createComponent.d.ts

@@ -1,14 +1,11 @@
 import React from 'react';
-import { DebugProp, SpaceDirection, SpaceValue, SpacerProps, StaticConfig, StaticConfigParsed, TamaguiComponent, TamaguiComponentState, TamaguiElement } from './types';
+import { DebugProp, SpaceDirection, SpaceValue, SpacerProps, StaticConfig, TamaguiComponent, TamaguiComponentState, TamaguiElement } from './types';
 export declare const defaultComponentState: TamaguiComponentState;
 export declare const mouseUps: Set<Function>;
-export declare function createComponent<ComponentPropTypes extends Object = {}, Ref = TamaguiElement, BaseProps = never>(staticConfigIn: Partial<StaticConfig> | StaticConfigParsed): TamaguiComponent<ComponentPropTypes, Ref, BaseProps, {}>;
-export declare const Unspaced: {
-    (props: {
-        children?: any;
-    }): any;
-    isUnspaced: boolean;
-};
+export declare function createComponent<ComponentPropTypes extends Object = {}, Ref = TamaguiElement, BaseProps = never>(staticConfig: StaticConfig): TamaguiComponent<ComponentPropTypes, Ref, BaseProps, {}>;
+export declare function Unspaced(props: {
+    children?: any;
+}): any;
 export declare const Spacer: TamaguiComponent<SpacerProps, TamaguiElement, never, {}>;
 export type SpacedChildrenProps = {
     isZStack?: boolean;

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,UAAU,EACV,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAwBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,cAAc,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,4DAo1B3D;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,UAAU,CAAA;IAClB,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,mBAkGxD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAWN,MAAM,OAAO,CAAA;AAgBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAUhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAwBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,4DA+1B3B;AAGD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAMD,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,UAAU,CAAA;IAClB,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,mBAkGxD"}

package/types/createTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAGnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA6S1B"}
+{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAGnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA4S1B"}

package/types/helpers/ThemeManager.d.ts

@@ -14,7 +14,7 @@ export type ThemeManagerState = {
     parentName?: string;
     componentName?: string;
 };
-export declare function getHasThemeUpdatingProps(props: ThemeProps): string | boolean | undefined;
+export declare function getHasThemeUpdatingProps(props: ThemeProps): boolean;
 export declare class ThemeManager {
     props: ThemeProps;
     id: number;

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,UAAU,CAAA;AAElD,KAAK,aAAa,GAAG,CACnB,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,OAAO,KACZ,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,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAID,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,UAAU,gCAEzD;AAID,qBAAa,YAAY;IASd,KAAK,EAAE,UAAU;IAR1B,EAAE,SAAQ;IACV,WAAW,UAAQ;IACnB,cAAc,qBAA2B;IACzC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAO;IACzC,KAAK,EAAE,iBAAiB,CAAa;IACrC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAO;gBAG7B,KAAK,GAAE,UAAe,EAC7B,eAAe,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IA8B5D,WAAW,CACT,KAAK,GAAE,UAAU,GAAG;QAAE,UAAU,CAAC,EAAE,WAAW,CAAA;KAAqB,EACnE,YAAY,UAAO;IAsCrB,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,CAAC,MAAM,UAAQ;IAIrB,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM;CAalD;AAkKD,wBAAgB,4BAA4B,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,4CAe9E"}
+{"version":3,"file":"ThemeManager.d.ts","sourceRoot":"","sources":["../../src/helpers/ThemeManager.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAElD,KAAK,aAAa,GAAG,CACnB,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,OAAO,KACZ,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,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAID,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,UAAU,WAEzD;AAID,qBAAa,YAAY;IASd,KAAK,EAAE,UAAU;IAR1B,EAAE,SAAQ;IACV,WAAW,UAAQ;IACnB,cAAc,qBAA2B;IACzC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAO;IACzC,KAAK,EAAE,iBAAiB,CAAa;IACrC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAO;gBAG7B,KAAK,GAAE,UAAe,EAC7B,eAAe,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IA8B5D,WAAW,CACT,KAAK,GAAE,UAAU,GAAG;QAAE,UAAU,CAAC,EAAE,WAAW,CAAA;KAAqB,EACnE,YAAY,UAAO;IAsCrB,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,GAAE,iBAA8B;IAiB3D,MAAM,CAAC,MAAM,UAAQ;IAIrB,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM;CAalD;AAsKD,wBAAgB,4BAA4B,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,4CAe9E"}

package/types/helpers/getSplitStyles.d.ts

@@ -1,17 +1,13 @@
-import type { DebugProp, GetStyleResult, GetStyleState, SplitStyleState, StaticConfigParsed, TextStyleProps, ThemeParsed } from '../types';
+import type { DebugProp, GetStyleResult, GetStyleState, SplitStyleProps, StaticConfig, TamaguiComponentState, TextStyleProps, ThemeParsed } from '../types';
 import type { LanguageContextType } from '../views/FontLanguage.types';
 export type SplitStyles = ReturnType<typeof getSplitStyles>;
 export type SplitStyleResult = ReturnType<typeof getSplitStyles>;
 type StyleSplitter = (props: {
     [key: string]: any;
-}, staticConfig: StaticConfigParsed, themeState: {
-    theme: ThemeParsed;
-    name: string;
-}, state: SplitStyleState, parentSplitStyles?: GetStyleResult | null, languageContext?: LanguageContextType, elementType?: string, debug?: DebugProp) => GetStyleResult;
+}, staticConfig: StaticConfig, theme: ThemeParsed, themeName: string, componentState: TamaguiComponentState, styleProps: SplitStyleProps, parentSplitStyles?: GetStyleResult | null, languageContext?: LanguageContextType, elementType?: string, debug?: DebugProp) => GetStyleResult;
 export declare const PROP_SPLIT = "-";
 export declare const getSplitStyles: StyleSplitter;
-export declare const getSubStyle: (styleState: GetStyleState, subKey: string, styleIn: Object, avoidDefaultProps?: boolean, avoidMergeTransform?: boolean) => TextStyleProps;
+export declare const getSubStyle: (styleState: GetStyleState, subKey: string, styleIn: Object, avoidMergeTransform?: boolean) => TextStyleProps;
 export declare const useSplitStyles: StyleSplitter;
-export type FlatTransforms = Record<string, any>;
 export {};
 //# sourceMappingURL=getSplitStyles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAEV,SAAS,EACT,cAAc,EACd,aAAa,EAMb,eAAe,EACf,kBAAkB,EAGlB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAuBtE,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,kBAAkB,EAChC,UAAU,EAAE;IACV,KAAK,EAAE,WAAW,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;CACb,EACD,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;AAS7B,eAAO,MAAM,cAAc,EAAE,aA29B5B,CAAA;AAkFD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cA6BF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA;AA6BD,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":"AAiCA,OAAO,KAAK,EAEV,SAAS,EACT,cAAc,EACd,aAAa,EAMb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAuBtE,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,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAuB7B,eAAO,MAAM,cAAc,EAAE,aA4+B5B,CAAA;AAoDD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cAuBF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA"}

package/types/helpers/getVariantExtras.d.ts

@@ -1,5 +1,5 @@
 import { GenericFonts, GetStyleState } from '../types';
 import { LanguageContextType } from '../views/FontLanguage.types';
-export declare function getVariantExtras(styleState: GetStyleState, defaultProps?: any, avoidDefaultProps?: boolean): any;
+export declare function getVariantExtras(styleState: GetStyleState): any;
 export declare function getFontsForLanguage(fonts: GenericFonts, language: LanguageContextType): any;
 //# sourceMappingURL=getVariantExtras.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAGjE,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,aAAa,EACzB,YAAY,CAAC,EAAE,GAAG,EAClB,iBAAiB,UAAQ,OAkD1B;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}
+{"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAGjE,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,OAqCzD;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}

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

@@ -1 +1 @@
-{"version":3,"file":"isTamaguiComponent.d.ts","sourceRoot":"","sources":["../../src/helpers/isTamaguiComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,MAAM,UAAU,CAAA;AAE3D,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,IAAI,EAAE,CAAC,EACP,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,IAAI,CAAC,GAAG;IACb,YAAY,EAAE,YAAY,CAAA;CAC3B,CAGA"}
+{"version":3,"file":"isTamaguiComponent.d.ts","sourceRoot":"","sources":["../../src/helpers/isTamaguiComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,IAAI,EAAE,CAAC,EACP,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,IAAI,CAAC,GAAG;IACb,YAAY,EAAE,YAAY,CAAA;CAC3B,CAGA"}

package/types/helpers/mergeProps.d.ts

@@ -12,6 +12,6 @@
  *   - shorthands can be expanded before merging
  */
 type AnyRecord = Record<string, any>;
-export declare const mergeProps: (a: Object, b?: Object, leaveOutClassNames?: boolean, inverseShorthands?: AnyRecord) => readonly [AnyRecord, AnyRecord];
+export declare const mergeProps: (a: Object, b?: Object, inverseShorthands?: AnyRecord) => AnyRecord;
 export {};
 //# sourceMappingURL=mergeProps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEpC,eAAO,MAAM,UAAU,MAClB,MAAM,MACL,MAAM,oDAEU,SAAS,oCAa9B,CAAA"}
+{"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEpC,eAAO,MAAM,UAAU,MAAO,MAAM,MAAM,MAAM,sBAAsB,SAAS,cAW9E,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"normalizeColor.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeColor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAA;AAEnD,eAAO,MAAM,IAAI,iBAAW,CAAA;AAC5B,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAY,CAAA;AAE9B,eAAO,MAAM,cAAc,WAAY,MAAM,GAAG,IAAI,YAAY,MAAM,uBAkBrE,CAAA"}
+{"version":3,"file":"normalizeColor.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeColor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAA;AAEnD,eAAO,MAAM,IAAI,iBAAW,CAAA;AAC5B,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAY,CAAA;AAE9B,eAAO,MAAM,cAAc,WAAY,MAAM,GAAG,IAAI,YAAY,MAAM,uBAmBrE,CAAA"}

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;AAUH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,CA0B7E;AA8CD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAyCxE"}
+{"version":3,"file":"normalizeValueWithProperty.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeValueWithProperty.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,CAY7E;AAKD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAyCxE"}