@tamagui/web 1.80.4 → 1.81.0

package/package.json

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

package/src/createComponent.tsx

@@ -944,7 +944,9 @@ export function createComponent<
           }
           viewProps.style = [...(Array.isArray(style) ? style : [style]), cnStyles]
         } else {
-          viewProps.className = className
+          if (className) {
+            viewProps.className = className
+          }
           viewProps.style = style
         }
       } else {

package/src/helpers/createStyledContext.tsx

@@ -30,13 +30,20 @@ export function createStyledContext<VariantProps extends Record<string, any>>(
     scope,
     ...values
   }: VariantProps & { children?: React.ReactNode; scope: string }) => {
-    const value = useMemo(() => {
+    let current: any
+    try {
+      current = useStyledContext(scope)
+    } catch {
+      // ok
+    }
+    const next = useMemo(() => {
       return {
         // this ! is a workaround for ts error
         ...defaultValues!,
+        ...current,
         ...values,
       }
-    }, [objectIdentityKey(values)])
+    }, [objectIdentityKey(values), current])
     let Provider = OGProvider
     if (scope) {
       let ScopedContext = scopedContexts.get(scope)
@@ -46,7 +53,7 @@ export function createStyledContext<VariantProps extends Record<string, any>>(
       }
       Provider = ScopedContext.Provider
     }
-    return <Provider value={value}>{children}</Provider>
+    return <Provider value={next}>{children}</Provider>
   }
 
   // use consumerComponent just to give a better error message

package/src/helpers/getSplitStyles.tsx

@@ -126,6 +126,15 @@ export const PROP_SPLIT = '-'
 //   dynamicThemeAccess,
 // }
 
+function isValidStyleKey(key: string, staticConfig: StaticConfig) {
+  const validStyleProps =
+    staticConfig.validStyles ?? (staticConfig.isText ? stylePropsText : validStyles)
+  return (
+    key in validStyleProps ||
+    (staticConfig.acceptTokens && key in staticConfig.acceptTokens)
+  )
+}
+
 export const getSplitStyles: StyleSplitter = (
   props,
   staticConfig,
@@ -162,7 +171,6 @@ export const getSplitStyles: StyleSplitter = (
     acceptsClassName,
   } = staticConfig
 
-  const validStyleProps = isText ? stylePropsText : validStyles
   const viewProps: GetStyleResult['viewProps'] = {}
   const mediaState = styleProps.mediaState || globalMediaState
   const usedKeys: Record<string, number> = {}
@@ -296,13 +304,12 @@ export const getSplitStyles: StyleSplitter = (
     }
 
     const valInitType = typeof valInit
-
-    styleState.curProps[keyInit] = valInit
+    const isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig)
 
     // TODO this is duplicated! but seems to be fixing some bugs so leaving got now
     if (process.env.TAMAGUI_TARGET === 'web') {
       if (valInitType === 'string' && valInit[0] === '_') {
-        if (keyInit in validStyleProps || keyInit.includes('-')) {
+        if (isValidStyleKeyInit || keyInit.includes('-')) {
           if (process.env.NODE_ENV === 'development' && debug) {
             log(`Adding compiled style ${keyInit}: ${valInit}`)
           }
@@ -319,6 +326,8 @@ export const getSplitStyles: StyleSplitter = (
       }
     }
 
+    styleState.curProps[keyInit] = valInit
+
     if (process.env.TAMAGUI_TARGET === 'native') {
       if (!isAndroid) {
         // only works in android
@@ -529,7 +538,6 @@ export const getSplitStyles: StyleSplitter = (
      * for if there's a pseudo/media returned from it.
      */
 
-    const isValidStyleKeyInit = keyInit in validStyleProps
     const isShorthand = keyInit in shorthands
 
     let isVariant = !isValidStyleKeyInit && variants && keyInit in variants
@@ -1059,7 +1067,7 @@ export const getSplitStyles: StyleSplitter = (
         // is HOC we can just pass through the styles as props
         // this fixes issues where style prop got merged with wrong priority
         !isHOC &&
-        (key in validStyleProps ||
+        (isValidStyleKey(key, staticConfig) ||
           (process.env.TAMAGUI_TARGET === 'native' && isAndroid && key === 'elevation'))
       ) {
         mergeStyle(styleState, key, val)

package/src/helpers/objectIdentityKey.tsx

@@ -4,7 +4,7 @@ export function objectIdentityKey(obj: Object) {
     k += key
     const arg = obj[key]
     let type = typeof arg
-    if (!arg || type !== 'object') {
+    if (!arg || (type !== 'object' && type !== 'function')) {
       k += type + arg
     } else if (cache.has(arg)) {
       k += cache.get(arg)

package/src/helpers/propMapper.ts

@@ -378,7 +378,7 @@ export const getTokenForKey = (
     return value
   }
 
-  const { theme, conf = getConfig(), context, fontFamily } = styleState
+  const { theme, conf = getConfig(), context, fontFamily, staticConfig } = styleState
 
   const tokensParsed = conf.tokensParsed
   let valOrVar: any
@@ -394,42 +394,52 @@ export const getTokenForKey = (
       hasSet = true
       valOrVar = conf.specificTokens[value]
     } else {
-      switch (key) {
-        case 'fontFamily': {
-          const fontsParsed = context?.language
-            ? getFontsForLanguage(conf.fontsParsed, context.language)
-            : conf.fontsParsed
-          valOrVar = fontsParsed[value]?.family || value
-          lastFontFamilyToken = value
+      const customTokenAccept = staticConfig?.acceptTokens?.[key]
+      if (customTokenAccept) {
+        const val = tokensParsed[customTokenAccept][value]
+        if (val) {
+          valOrVar = val
           hasSet = true
-          break
         }
-        case 'fontSize':
-        case 'lineHeight':
-        case 'letterSpacing':
-        case 'fontWeight': {
-          const defaultFont = conf.defaultFont || '$body'
-          const fam = fontFamily || defaultFont
-          if (fam) {
+      } else {
+        switch (key) {
+          case 'fontFamily': {
             const fontsParsed = context?.language
               ? getFontsForLanguage(conf.fontsParsed, context.language)
               : conf.fontsParsed
-            const font = fontsParsed[fam] || fontsParsed[defaultFont]
-            valOrVar = font?.[fontShorthand[key] || key]?.[value] || value
+            valOrVar = fontsParsed[value]?.family || value
+            lastFontFamilyToken = value
             hasSet = true
+            break
+          }
+          case 'fontSize':
+          case 'lineHeight':
+          case 'letterSpacing':
+          case 'fontWeight': {
+            const defaultFont = conf.defaultFont || '$body'
+            const fam = fontFamily || defaultFont
+            if (fam) {
+              const fontsParsed = context?.language
+                ? getFontsForLanguage(conf.fontsParsed, context.language)
+                : conf.fontsParsed
+              const font = fontsParsed[fam] || fontsParsed[defaultFont]
+              valOrVar = font?.[fontShorthand[key] || key]?.[value] || value
+              hasSet = true
+            }
+            break
           }
-          break
         }
-      }
-      for (const cat in tokenCategories) {
-        if (key in tokenCategories[cat]) {
-          const res = tokensParsed[cat][value]
-          if (res != null) {
-            valOrVar = res
-            hasSet = true
+        for (const cat in tokenCategories) {
+          if (key in tokenCategories[cat]) {
+            const res = tokensParsed[cat][value]
+            if (res != null) {
+              valOrVar = res
+              hasSet = true
+            }
           }
         }
       }
+
       if (!hasSet) {
         const spaceVar = tokensParsed.space[value]
         if (spaceVar != null) {

package/src/styled.tsx

@@ -5,15 +5,19 @@ import type { GetRef } from './interfaces/GetRef'
 import { getReactNativeConfig } from './setupReactNative'
 import type {
   GetProps,
+  GetTokenString,
   GetVariantValues,
   MediaProps,
   PseudoProps,
   StaticConfig,
   StylableComponent,
   TamaguiComponent,
+  ThemeValueByCategory,
+  Tokens,
   VariantDefinitions,
   VariantSpreadFunction,
 } from './types'
+import { Stack } from './views/Stack'
 
 type GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<
   any,
@@ -49,7 +53,8 @@ type AreVariantsUndefined<V> = V extends undefined
 
 export function styled<
   ParentComponent extends StylableComponent,
-  Variants extends VariantDefinitions<ParentComponent> | void
+  Variants extends VariantDefinitions<ParentComponent> | void,
+  StyledStaticConfig extends Partial<StaticConfig>
 >(
   ComponentIn: ParentComponent,
   // this should be Partial<GetProps<ParentComponent>> but causes excessively deep type issues
@@ -60,7 +65,7 @@ export function styled<
     context?: StyledContext
     acceptsClassName?: boolean
   },
-  staticExtractionOptions?: Partial<StaticConfig>
+  staticExtractionOptions?: StyledStaticConfig
 ) {
   // do type stuff at top for easier readability
 
@@ -83,7 +88,14 @@ export function styled<
           | (Key extends keyof OurVariantProps ? OurVariantProps[Key] : undefined)
       }
 
-  type OurPropsBaseBase = ParentPropsBase & MergedVariants
+  type AcceptedTokens = StyledStaticConfig['acceptTokens']
+  type CustomTokenProps = AcceptedTokens extends Object
+    ? {
+        [Key in keyof AcceptedTokens]: ThemeValueByCategory<AcceptedTokens[Key]>
+      }
+    : {}
+
+  type OurPropsBaseBase = ParentPropsBase & MergedVariants & CustomTokenProps
 
   /**
    * de-opting a bit of type niceness because were hitting depth issues too soon
@@ -94,16 +106,15 @@ export function styled<
    * that would give you nicely merged pseudo sub-styles but its just too much for TS
    * so now pseudos wont be nicely typed inside media queries, but at least we can nest
    */
-  type OurPropsBase = OurPropsBaseBase
 
   type Props = Variants extends void
     ? GetProps<ParentComponent>
     : // start with base props
-      OurPropsBase &
+      OurPropsBaseBase &
         // add in pseudo
         PseudoProps<Partial<OurPropsBaseBase>> &
         // add in media
-        MediaProps<Partial<OurPropsBase>>
+        MediaProps<Partial<OurPropsBaseBase>>
 
   type ParentStaticProperties = {
     [Key in Exclude<

package/src/types.tsx

@@ -1144,7 +1144,7 @@ export type ThemeValueFallbackZIndex =
       WebStyleValueUniversal
     >
 
-type GetTokenString<A> = A extends string | number ? `$${A}` : `$${string}`
+export type GetTokenString<A> = A extends string | number ? `$${A}` : `$${string}`
 
 export type SpecificTokens<
   Record = Tokens,
@@ -1279,7 +1279,7 @@ export type ThemeValueByCategory<K extends string | number | symbol> = K extends
   ? FontLetterSpacingTokens
   : K extends keyof Tokens
   ? // fallback to user-defined tokens
-    GetTokenString<Tokens[K]>
+    GetTokenString<keyof Tokens[K]>
   : never
 
 type FontKeys = 'fontFamily'
@@ -1628,9 +1628,11 @@ export type StaticConfigPublic = {
   validStyles?: { [key: string]: boolean }
 
   /**
-   * (compiler) If these props are encountered, bail on all optimization.
+   * Accept Tamagui tokens for these props (key for the prop key, val for the token category)
    */
-  deoptProps?: Set<string>
+  acceptTokens?: {
+    [key: string]: keyof Tokens
+  }
 
   /**
    * (compiler) If these props are encountered, leave them un-extracted.
@@ -1643,14 +1645,6 @@ export type StaticConfigPublic = {
    */
   inlineWhenUnflattened?: Set<string>
 
-  /**
-   * (compiler) A bit odd, only for more advanced hierarchies.
-   * Indicates that the component will set this prop so the
-   * static extraction can ensure it sets them to ={undefined}
-   * so they get overriddent. In the future, this can be smarter.
-   */
-  ensureOverriddenProp?: { [key: string]: boolean }
-
   /**
    * Auto-detected, but can override. Wraps children to space them on top
    */
@@ -1691,13 +1685,6 @@ type StaticConfigBase = StaticConfigPublic & {
    */
   memo?: boolean
 
-  /**
-   * By default if styled() doesn't recognize a parent Tamagui component or specific react-native views,
-   * it will assume the passed in component only accepts style={} for react-native compatibility.
-   * Setting `acceptsClassName: true` indicates Tamagui can pass in className props.
-   */
-  acceptsClassName?: boolean
-
   /**
    * Used internally for handling focus
    */

package/src/views/Text.tsx

@@ -80,8 +80,6 @@ export const Text = createComponent<TextProps, Text, TextPropsBase>({
     },
   },
 
-  deoptProps: new Set(process.env.TAMAGUI_TARGET === 'web' ? [] : ['ellipse']),
-
   validStyles: {
     ...validStyles,
     ...stylePropsTextOnly,

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAaN,MAAM,OAAO,CAAA;AAuBd,OAAO,EAEL,SAAS,EAMT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,cAAc,EACd,YAAY,EAEZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAKV,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,UAAU,GAAG,SAAS,GAAG,EAAE,EACtD,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,8DA8sC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,qEAqCjB,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,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":"AAIA,OAAO,KAaN,MAAM,OAAO,CAAA;AAuBd,OAAO,EAEL,SAAS,EAMT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,cAAc,EACd,YAAY,EAEZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAKV,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,UAAU,GAAG,SAAS,GAAG,EAAE,EACtD,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,8DAgtC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,qEAqCjB,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,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}

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

@@ -1 +1 @@
-{"version":3,"file":"createStyledContext.d.ts","sourceRoot":"","sources":["../../src/helpers/createStyledContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AAIjE,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,GAAG,IAAI,IAAI,CAC1D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EACpB,UAAU,CACX,GAAG;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CACrC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,GAAG;QAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;QAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CACF,CAAA;IACD,gBAAgB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;CAC5C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1E,aAAa,CAAC,EAAE,YAAY,GAC3B,aAAa,CAAC,YAAY,CAAC,CA2C7B;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,GAAG;KAAG,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM;CAAE,CAAA"}
+{"version":3,"file":"createStyledContext.d.ts","sourceRoot":"","sources":["../../src/helpers/createStyledContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAA;AAIjE,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,GAAG,IAAI,IAAI,CAC1D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EACpB,UAAU,CACX,GAAG;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CACrC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,GAAG;QAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;QAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CACF,CAAA;IACD,gBAAgB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;CAC5C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1E,aAAa,CAAC,EAAE,YAAY,GAC3B,aAAa,CAAC,YAAY,CAAC,CAkD7B;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,GAAG;KAAG,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM;CAAE,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AA4BjB,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;AAuB7B,eAAO,MAAM,cAAc,EAAE,aAgsC5B,CAAA;AA2DD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAqBD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AA4BjB,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;AAgC7B,eAAO,MAAM,cAAc,EAAE,aA+rC5B,CAAA;AA2DD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAqBD,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAOjB,eAAO,MAAM,UAAU,EAAE,UAuFxB,CAAA;AAgGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA;AA6ID,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,wDAED,QAAQ,aAAa,CAAC,QAuFnC,CAAA"}
+{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAOjB,eAAO,MAAM,UAAU,EAAE,UAuFxB,CAAA;AAgGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA;AA6ID,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,wDAED,QAAQ,aAAa,CAAC,QAiGnC,CAAA"}

package/types/styled.d.ts

@@ -1,6 +1,6 @@
 import { StyledContext } from './helpers/createStyledContext';
 import type { GetRef } from './interfaces/GetRef';
-import type { GetProps, GetVariantValues, MediaProps, PseudoProps, StaticConfig, StylableComponent, TamaguiComponent, VariantDefinitions, VariantSpreadFunction } from './types';
+import type { GetProps, GetVariantValues, MediaProps, PseudoProps, StaticConfig, StylableComponent, TamaguiComponent, ThemeValueByCategory, VariantDefinitions, VariantSpreadFunction } from './types';
 type GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<any, any, infer P> ? P : GetProps<A>;
 type GetVariantProps<A extends StylableComponent> = A extends TamaguiComponent<any, any, any, infer V> ? V : {};
 type GetVariantAcceptedValues<V> = V extends Object ? {
@@ -8,12 +8,12 @@ type GetVariantAcceptedValues<V> = V extends Object ? {
 } : undefined;
 type ValueOf<T> = T[keyof T];
 type AreVariantsUndefined<V> = V extends undefined ? true : ValueOf<V> extends undefined ? true : false;
-export declare function styled<ParentComponent extends StylableComponent, Variants extends VariantDefinitions<ParentComponent> | void>(ComponentIn: ParentComponent, options?: GetProps<ParentComponent> & {
+export declare function styled<ParentComponent extends StylableComponent, Variants extends VariantDefinitions<ParentComponent> | void, StyledStaticConfig extends Partial<StaticConfig>>(ComponentIn: ParentComponent, options?: GetProps<ParentComponent> & {
     name?: string;
     variants?: Variants | undefined;
     defaultVariants?: GetVariantAcceptedValues<Variants>;
     context?: StyledContext;
     acceptsClassName?: boolean;
-}, staticExtractionOptions?: Partial<StaticConfig>): TamaguiComponent<Variants extends void ? GetProps<ParentComponent> : GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }) & PseudoProps<Partial<GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; })>> & MediaProps<Partial<GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; })>>, GetRef<ParentComponent>, GetBaseProps<ParentComponent>, AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }, { [Key_1 in Exclude<keyof ParentComponent, "defaultProps" | "propTypes" | "staticConfig" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key_1]; }>;
+}, staticExtractionOptions?: StyledStaticConfig): TamaguiComponent<Variants extends void ? GetProps<ParentComponent> : GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }) & (StyledStaticConfig["acceptTokens"] extends Object ? { [Key_1 in keyof StyledStaticConfig["acceptTokens"]]: ThemeValueByCategory<StyledStaticConfig["acceptTokens"][Key_1]>; } : {}) & PseudoProps<Partial<GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }) & (StyledStaticConfig["acceptTokens"] extends Object ? { [Key_1 in keyof StyledStaticConfig["acceptTokens"]]: ThemeValueByCategory<StyledStaticConfig["acceptTokens"][Key_1]>; } : {})>> & MediaProps<Partial<GetBaseProps<ParentComponent> & (AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }) & (StyledStaticConfig["acceptTokens"] extends Object ? { [Key_1 in keyof StyledStaticConfig["acceptTokens"]]: ThemeValueByCategory<StyledStaticConfig["acceptTokens"][Key_1]>; } : {})>>, GetRef<ParentComponent>, GetBaseProps<ParentComponent>, AreVariantsUndefined<Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>> extends true ? GetVariantProps<ParentComponent> : AreVariantsUndefined<GetVariantProps<ParentComponent>> extends true ? Variants extends undefined ? {} : GetVariantAcceptedValues<Variants> : { [Key in keyof GetVariantProps<ParentComponent> | keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)]?: (Key extends keyof GetVariantProps<ParentComponent> ? GetVariantProps<ParentComponent>[Key] : undefined) | (Key extends keyof (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>) ? (Variants extends undefined ? {} : GetVariantAcceptedValues<Variants>)[Key] : undefined) | undefined; }, { [Key_2 in Exclude<keyof ParentComponent, "defaultProps" | "propTypes" | "staticConfig" | "extractable" | "styleable" | "$$typeof">]: ParentComponent[Key_2]; }>;
 export {};
 //# sourceMappingURL=styled.d.ts.map

package/types/styled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAEhB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAC5B,KAAK,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAC9C,IAAI,GACJ,OAAO,CAAC,CAAC,CAAC,SAAS,SAAS,GAC5B,IAAI,GACJ,KAAK,CAAA;AAET,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAE3D,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,yuGAuLhD"}
+{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EACV,QAAQ,EAER,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EAEpB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAGhB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAC5B,KAAK,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAC9C,IAAI,GACJ,OAAO,CAAC,CAAC,CAAC,SAAS,SAAS,GAC5B,IAAI,GACJ,KAAK,CAAA;AAET,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAC3D,kBAAkB,SAAS,OAAO,CAAC,YAAY,CAAC,EAEhD,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,kBAAkB,8wHA6L7C"}

package/types/types.d.ts

@@ -637,7 +637,7 @@ export type ThemeValueFallbackSize = GetThemeValueFallbackFor<AllowedValueSettin
 export type ThemeValueFallbackColor = ThemeValueFallback | GetThemeValueFallbackFor<AllowedValueSettingColor, never, SomewhatSpecificColorValue, UnionableString | UnionableNumber, WebStyleValueUniversal>;
 export type ThemeValueFallbackRadius = ThemeValueFallback | GetThemeValueFallbackFor<AllowedValueSettingRadius, never, UnionableNumber, UnionableNumber, WebStyleValueUniversal>;
 export type ThemeValueFallbackZIndex = ThemeValueFallback | GetThemeValueFallbackFor<AllowedValueSettingZIndex, never, UnionableNumber, UnionableNumber, WebStyleValueUniversal>;
-type GetTokenString<A> = A extends string | number ? `$${A}` : `$${string}`;
+export type GetTokenString<A> = A extends string | number ? `$${A}` : `$${string}`;
 export type SpecificTokens<Record = Tokens, RK extends keyof Record = keyof Record> = RK extends string ? `$${RK}.${keyof Record[RK] extends string | number ? keyof Record[RK] : never}` : never;
 export type SpecificTokensSpecial = TamaguiSettings extends {
     autocompleteSpecificTokens: infer Val;
@@ -677,7 +677,7 @@ type ParseFont<A extends GenericFont> = {
     face: TokenPrefixedIfExists<A['face']>;
 };
 type TokenPrefixedIfExists<A> = A extends Object ? TokenPrefixed<A> : {};
-export type ThemeValueByCategory<K extends string | number | symbol> = K extends 'theme' ? ThemeTokens : K extends 'size' ? SizeTokens : K extends 'font' ? FontTokens : K extends 'fontSize' ? FontSizeTokens : K extends 'space' ? SpaceTokens : K extends 'color' ? ColorTokens : K extends 'zIndex' ? ZIndexTokens : K extends 'lineHeight' ? FontLineHeightTokens : K extends 'fontWeight' ? FontWeightTokens : K extends 'letterSpacing' ? FontLetterSpacingTokens : K extends keyof Tokens ? GetTokenString<Tokens[K]> : never;
+export type ThemeValueByCategory<K extends string | number | symbol> = K extends 'theme' ? ThemeTokens : K extends 'size' ? SizeTokens : K extends 'font' ? FontTokens : K extends 'fontSize' ? FontSizeTokens : K extends 'space' ? SpaceTokens : K extends 'color' ? ColorTokens : K extends 'zIndex' ? ZIndexTokens : K extends 'lineHeight' ? FontLineHeightTokens : K extends 'fontWeight' ? FontWeightTokens : K extends 'letterSpacing' ? FontLetterSpacingTokens : K extends keyof Tokens ? GetTokenString<keyof Tokens[K]> : never;
 type FontKeys = 'fontFamily';
 type FontSizeKeys = 'fontSize';
 type FontWeightKeys = 'fontWeight';
@@ -847,9 +847,11 @@ export type StaticConfigPublic = {
         [key: string]: boolean;
     };
     /**
-     * (compiler) If these props are encountered, bail on all optimization.
+     * Accept Tamagui tokens for these props (key for the prop key, val for the token category)
      */
-    deoptProps?: Set<string>;
+    acceptTokens?: {
+        [key: string]: keyof Tokens;
+    };
     /**
      * (compiler) If these props are encountered, leave them un-extracted.
      */
@@ -859,15 +861,6 @@ export type StaticConfigPublic = {
      * Only applies to style attributes
      */
     inlineWhenUnflattened?: Set<string>;
-    /**
-     * (compiler) A bit odd, only for more advanced hierarchies.
-     * Indicates that the component will set this prop so the
-     * static extraction can ensure it sets them to ={undefined}
-     * so they get overriddent. In the future, this can be smarter.
-     */
-    ensureOverriddenProp?: {
-        [key: string]: boolean;
-    };
     /**
      * Auto-detected, but can override. Wraps children to space them on top
      */
@@ -901,12 +894,6 @@ type StaticConfigBase = StaticConfigPublic & {
      * Memoize the component
      */
     memo?: boolean;
-    /**
-     * By default if styled() doesn't recognize a parent Tamagui component or specific react-native views,
-     * it will assume the passed in component only accepts style={} for react-native compatibility.
-     * Setting `acceptsClassName: true` indicates Tamagui can pass in className props.
-     */
-    acceptsClassName?: boolean;
     /**
      * Used internally for handling focus
      */