@tamagui/web 1.77.1 → 1.79.0

package/src/helpers/getSplitStyles.tsx

@@ -77,8 +77,6 @@ import {
 import { getPropMappedFontFamily, propMapper } from './propMapper'
 import { pseudoDescriptors, pseudoPriorities } from './pseudoDescriptors'
 
-const fontFamilyKey = 'fontFamily'
-
 // bugfix for some reason it gets reset
 const IS_STATIC = process.env.IS_STATIC === 'is_static'
 
@@ -188,7 +186,7 @@ export const getSplitStyles: StyleSplitter = (
    * Not the biggest fan of creating an object but it is a nice API
    */
   const styleState: GetStyleState = {
-    curProps: Object.assign({}, props),
+    curProps: { ...props },
     classNames,
     conf,
     props,
@@ -274,7 +272,7 @@ export const getSplitStyles: StyleSplitter = (
         if (process.env.TAMAGUI_TARGET === 'web') {
           // add container style
           const identifier = `t_group_${valInit}`
-          const containerType = conf.settings.webContainerType || 'size'
+          const containerType = conf.settings.webContainerType || 'inline-size'
           const containerCSS = {
             identifier,
             property: 'container',
@@ -623,7 +621,7 @@ export const getSplitStyles: StyleSplitter = (
     if (isText) {
       if (
         valInit &&
-        (keyInit === fontFamilyKey || keyInit === shorthands[fontFamilyKey]) &&
+        (keyInit === 'fontFamily' || keyInit === shorthands['fontFamily']) &&
         valInit in conf.fontsParsed
       ) {
         styleState.fontFamily = valInit
@@ -1032,7 +1030,7 @@ export const getSplitStyles: StyleSplitter = (
               mediaState[mediaKeyShort],
               importanceBump
             )
-            if (key === fontFamilyKey) {
+            if (key === 'fontFamily') {
               styleState.fontFamily = mediaStyle.fontFamily as string
             }
           }

package/src/helpers/propMapper.ts

@@ -24,6 +24,13 @@ export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) =>
     if (key === 'elevationAndroid') return
   }
 
+  if (value === 'unset') {
+    const unsetVal = styleStateIn.conf.unset?.[key]
+    if (unsetVal != null) {
+      value = unsetVal
+    }
+  }
+
   // we use this for the sub-props like pseudos so we need to overwrite the "props" in styleState
   // fallbackProps is awkward thanks to static
   // also we need to override the props here because subStyles pass in a sub-style props object
@@ -85,7 +92,15 @@ export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) =>
   }
 
   if (shouldReturn || value != null) {
-    return (styleProps.noExpand ? null : expandStyle(key, value)) || [[key, value]]
+    const result = (styleProps.noExpand ? null : expandStyle(key, value)) || [
+      [key, value],
+    ]
+
+    if (key === 'fontFamily') {
+      fontFamilyCache.set(result, lastFontFamilyToken)
+    }
+
+    return result
   }
 }
 
@@ -348,6 +363,8 @@ const fontShorthand = {
   fontWeight: 'weight',
 }
 
+let lastFontFamilyToken: any = null
+
 export const getTokenForKey = (
   key: string,
   value: string,
@@ -380,6 +397,7 @@ export const getTokenForKey = (
             ? getFontsForLanguage(conf.fontsParsed, context.language)
             : conf.fontsParsed
           valOrVar = fontsParsed[value]?.family || value
+          lastFontFamilyToken = value
           hasSet = true
           break
         }

package/src/types.tsx

@@ -112,7 +112,7 @@ export type TamaguiComponentPropsBaseBase = {
   tabIndex?: string | number
 
   /**
-   * Equivalent to role="" attribute on web for accesibility
+   * Equivalent to role="" attribute on web for accessibility
    */
   role?: Role
 
@@ -539,7 +539,7 @@ type GetAltThemeNames<S> =
 type SpacerPropsBase = {
   size?: SpaceValue
   flex?: boolean | number
-  direction?: SpaceDirection
+  direction?: SpaceDirection | 'unset'
 }
 
 type SpacerOwnProps = SpacerPropsBase &
@@ -629,7 +629,7 @@ type GenericTamaguiSettings = {
    *
    *   1. Only use light/dark changes of themes at the root of your app
    *   2. Don't use <Theme inverse> or themeInverse
-   *   3. Always change light/dark alongside the Appearance.colorSheme
+   *   3. Always change light/dark alongside the Appearance.colorScheme
    *
    * Then this feature is safe to turn on and will significantly speed up dark/light re-renders.
    */
@@ -652,7 +652,16 @@ type GenericTamaguiSettings = {
 
 export type TamaguiSettings = TamaguiConfig['settings']
 
+type AllStyleProps = keyof StackStyleProps
+
+export type BaseStyleProps = {
+  [Key in keyof TextStylePropsBase]?: TextStyleProps[Key] | GetThemeValueForKey<Key>
+} & {
+  [Key in keyof StackStylePropsBase]?: StackStyleProps[Key] | GetThemeValueForKey<Key>
+}
+
 export type CreateTamaguiProps = {
+  unset?: BaseStyleProps
   reactNative?: any
   shorthands?: CreateShorthands
   media?: GenericTamaguiConfig['media']
@@ -1184,18 +1193,19 @@ export type ThemeValueGet<K extends string | number | symbol> = K extends 'theme
   ? FontLetterSpacingTokens
   : never
 
+export type GetThemeValueForKey<K extends string | symbol | number> =
+  | ThemeValueGet<K>
+  | ThemeValueFallback
+  | (TamaguiSettings extends { autocompleteSpecificTokens: infer Val }
+      ? Val extends true | undefined
+        ? SpecificTokens
+        : never
+      : never)
+
 export type WithThemeValues<T extends object> = {
   [K in keyof T]: ThemeValueGet<K> extends never
-    ? T[K]
-    :
-        | ThemeValueGet<K>
-        | Exclude<T[K], string>
-        | ThemeValueFallback
-        | (TamaguiSettings extends { autocompleteSpecificTokens: infer Val }
-            ? Val extends true | undefined
-              ? SpecificTokens
-              : never
-            : never)
+    ? T[K] | 'unset'
+    : GetThemeValueForKey<K> | Exclude<T[K], string> | 'unset'
 }
 
 type NarrowShorthands = Narrow<Shorthands>
@@ -1320,7 +1330,12 @@ type OmitRemovedNonWebProps = 'onLayout' | keyof GestureResponderHandlers
 
 export type StackNonStyleProps = Omit<
   ViewProps,
-  'display' | 'children' | OmitRemovedNonWebProps | keyof ExtendBaseStackProps | 'style'
+  | 'pointerEvents'
+  | 'display'
+  | 'children'
+  | OmitRemovedNonWebProps
+  | keyof ExtendBaseStackProps
+  | 'style'
 > &
   ExtendBaseStackProps &
   TamaguiComponentPropsBase & {
@@ -1506,7 +1521,7 @@ export type StaticConfigPublic = {
   inlineWhenUnflattened?: Set<string>
 
   /**
-   * (compiler) A bit odd, only for more advanced heirarchies.
+   * (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.
@@ -1514,7 +1529,7 @@ export type StaticConfigPublic = {
   ensureOverriddenProp?: { [key: string]: boolean }
 
   /**
-   * Auto-detected, but can ovverride. Wraps children to space them on top
+   * Auto-detected, but can override. Wraps children to space them on top
    */
   isZStack?: boolean
 
@@ -1524,7 +1539,7 @@ export type StaticConfigPublic = {
   isReactNative?: boolean
 
   /**
-   * By default if styled() doesn't recognize a parent Tamagui compoent or specific react-native views,
+   * 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.
    */
@@ -1544,7 +1559,7 @@ type StaticConfigBase = StaticConfigPublic & {
   componentName?: string
 
   /**
-   * Merges into defaultProps later on, used internally yonly
+   * Merges into defaultProps later on, used internally only
    */
   defaultVariants?: { [key: string]: any }
 
@@ -1554,7 +1569,7 @@ type StaticConfigBase = StaticConfigPublic & {
   memo?: boolean
 
   /**
-   * By default if styled() doesn't recognize a parent Tamagui compoent or specific react-native views,
+   * 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.
    */

package/src/views/Text.tsx

@@ -12,21 +12,25 @@ const ellipseStyle = {
 
 export type Text = TamaguiTextElement
 
+const defaultWebStyle = {
+  display: 'inline',
+  boxSizing: 'border-box',
+  wordWrap: 'break-word',
+  margin: 0,
+}
+
 export const Text = createComponent<TextProps, Text, TextPropsBase>({
   acceptsClassName: true,
   isText: true,
 
-  defaultProps:
-    process.env.TAMAGUI_TARGET === 'web'
-      ? {
-          display: 'inline',
-          boxSizing: 'border-box',
-          wordWrap: 'break-word',
-          margin: 0,
-        }
+  defaultProps: {
+    fontFamily: 'unset',
+    ...(process.env.TAMAGUI_TARGET === 'web'
+      ? defaultWebStyle
       : {
           suppressHighlighting: true,
-        },
+        }),
+  },
 
   inlineWhenUnflattened: new Set(['fontFamily']),
 

package/types/createComponent.d.ts

@@ -11,7 +11,7 @@ export type SpacedChildrenProps = {
     children?: React.ReactNode;
     space?: SpaceValue;
     spaceFlex?: boolean | number;
-    direction?: SpaceDirection;
+    direction?: SpaceDirection | 'unset';
     separator?: React.ReactNode;
     debug?: DebugProp;
 };

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,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,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,8DAsrC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,4DAqCjB,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,mBAiGxD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAaN,MAAM,OAAO,CAAA;AAuBd,OAAO,EAEL,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,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,8DAsrC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,4DAqCjB,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/createTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAiBA,OAAO,EACL,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA+Q1B"}
+{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAiBA,OAAO,EACL,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAmR1B"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AA8BjB,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,aAurC5B,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":"AAkCA,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,aAurC5B,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,UAqExB,CAAA;AAgGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA;AA2ID,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,wDAED,QAAQ,aAAa,CAAC,QAsFnC,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,UAoFxB,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"}

package/types/hooks/useConfiguration.d.ts

@@ -7,6 +7,7 @@ export declare const useConfiguration: () => {
     language: Partial<{
         [x: string]: import("..").FontLanguages;
     }> | null;
+    unset?: import("..").BaseStyleProps | undefined;
     reactNative?: any;
     selectionStyles?: ((theme: Record<string, string>) => {
         backgroundColor?: any;
@@ -67,7 +68,7 @@ export declare const useConfiguration: () => {
         autocompleteSpecificTokens?: (boolean | "except-special") | undefined;
         mediaPropOrder?: boolean | undefined;
         fastSchemeChange?: boolean | undefined;
-        webContainerType?: "size" | "inherit" | "initial" | "revert" | "revert-layer" | "unset" | "normal" | "inline-size" | undefined;
+        webContainerType?: "unset" | "size" | "inherit" | "initial" | "revert" | "revert-layer" | "normal" | "inline-size" | undefined;
     };
     tokens: Omit<{
         [x: string]: {

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

@@ -1 +1 @@
-{"version":3,"file":"useConfiguration.d.ts","sourceRoot":"","sources":["../../src/hooks/useConfiguration.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAQ5B,CAAA"}
+{"version":3,"file":"useConfiguration.d.ts","sourceRoot":"","sources":["../../src/hooks/useConfiguration.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAQ5B,CAAA"}

package/types/types.d.ts

@@ -75,7 +75,7 @@ export type TamaguiComponentPropsBaseBase = {
      */
     tabIndex?: string | number;
     /**
-     * Equivalent to role="" attribute on web for accesibility
+     * Equivalent to role="" attribute on web for accessibility
      */
     role?: Role;
     /**
@@ -337,7 +337,7 @@ type GetAltThemeNames<S> = (S extends `${string}_${infer Alt}` ? GetAltThemeName
 type SpacerPropsBase = {
     size?: SpaceValue;
     flex?: boolean | number;
-    direction?: SpaceDirection;
+    direction?: SpaceDirection | 'unset';
 };
 type SpacerOwnProps = SpacerPropsBase & WithThemeShorthandsPseudosMediaAnimation<SpacerPropsBase>;
 export type SpacerProps = Omit<StackProps, 'flex' | 'direction' | 'size'> & SpacerOwnProps;
@@ -405,7 +405,7 @@ type GenericTamaguiSettings = {
      *
      *   1. Only use light/dark changes of themes at the root of your app
      *   2. Don't use <Theme inverse> or themeInverse
-     *   3. Always change light/dark alongside the Appearance.colorSheme
+     *   3. Always change light/dark alongside the Appearance.colorScheme
      *
      * Then this feature is safe to turn on and will significantly speed up dark/light re-renders.
      */
@@ -417,7 +417,13 @@ type GenericTamaguiSettings = {
     webContainerType?: 'normal' | 'size' | 'inline-size' | 'inherit' | 'initial' | 'revert' | 'revert-layer' | 'unset';
 };
 export type TamaguiSettings = TamaguiConfig['settings'];
+export type BaseStyleProps = {
+    [Key in keyof TextStylePropsBase]?: TextStyleProps[Key] | GetThemeValueForKey<Key>;
+} & {
+    [Key in keyof StackStylePropsBase]?: StackStyleProps[Key] | GetThemeValueForKey<Key>;
+};
 export type CreateTamaguiProps = {
+    unset?: BaseStyleProps;
     reactNative?: any;
     shorthands?: CreateShorthands;
     media?: GenericTamaguiConfig['media'];
@@ -666,10 +672,11 @@ export type ThemeValueGet<K extends string | number | symbol> = K extends 'theme
     width: SpaceTokens;
     height: SpaceTokens;
 } : SpaceTokens | ThemeValueFallbackSpace : K extends ColorKeys ? ColorTokens | ThemeValueFallbackColor : K extends ZIndexKeys ? ZIndexTokens | ThemeValueFallbackZIndex : K extends LineHeightKeys ? FontLineHeightTokens : K extends FontWeightKeys ? FontWeightTokens : K extends FontLetterSpacingKeys ? FontLetterSpacingTokens : never;
+export type GetThemeValueForKey<K extends string | symbol | number> = ThemeValueGet<K> | ThemeValueFallback | (TamaguiSettings extends {
+    autocompleteSpecificTokens: infer Val;
+} ? Val extends true | undefined ? SpecificTokens : never : never);
 export type WithThemeValues<T extends object> = {
-    [K in keyof T]: ThemeValueGet<K> extends never ? T[K] : ThemeValueGet<K> | Exclude<T[K], string> | ThemeValueFallback | (TamaguiSettings extends {
-        autocompleteSpecificTokens: infer Val;
-    } ? Val extends true | undefined ? SpecificTokens : never : never);
+    [K in keyof T]: ThemeValueGet<K> extends never ? T[K] | 'unset' : GetThemeValueForKey<K> | Exclude<T[K], string> | 'unset';
 };
 type NarrowShorthands = Narrow<Shorthands>;
 export type Longhands = NarrowShorthands[keyof NarrowShorthands];
@@ -735,7 +742,7 @@ export interface ExtendBaseTextProps {
 }
 type LooseCombinedObjects<A extends Object, B extends Object> = A | B | (A & B);
 type OmitRemovedNonWebProps = 'onLayout' | keyof GestureResponderHandlers;
-export type StackNonStyleProps = Omit<ViewProps, 'display' | 'children' | OmitRemovedNonWebProps | keyof ExtendBaseStackProps | 'style'> & ExtendBaseStackProps & TamaguiComponentPropsBase & {
+export type StackNonStyleProps = Omit<ViewProps, 'pointerEvents' | 'display' | 'children' | OmitRemovedNonWebProps | keyof ExtendBaseStackProps | 'style'> & ExtendBaseStackProps & TamaguiComponentPropsBase & {
     style?: StyleProp<LooseCombinedObjects<React.CSSProperties, ViewStyle>>;
 };
 export type StackStyleProps = WithThemeShorthandsPseudosMediaAnimation<StackStylePropsBase>;
@@ -836,7 +843,7 @@ export type StaticConfigPublic = {
      */
     inlineWhenUnflattened?: Set<string>;
     /**
-     * (compiler) A bit odd, only for more advanced heirarchies.
+     * (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.
@@ -845,7 +852,7 @@ export type StaticConfigPublic = {
         [key: string]: boolean;
     };
     /**
-     * Auto-detected, but can ovverride. Wraps children to space them on top
+     * Auto-detected, but can override. Wraps children to space them on top
      */
     isZStack?: boolean;
     /**
@@ -853,7 +860,7 @@ export type StaticConfigPublic = {
      */
     isReactNative?: boolean;
     /**
-     * By default if styled() doesn't recognize a parent Tamagui compoent or specific react-native views,
+     * 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.
      */
@@ -868,7 +875,7 @@ type StaticConfigBase = StaticConfigPublic & {
      */
     componentName?: string;
     /**
-     * Merges into defaultProps later on, used internally yonly
+     * Merges into defaultProps later on, used internally only
      */
     defaultVariants?: {
         [key: string]: any;
@@ -878,7 +885,7 @@ type StaticConfigBase = StaticConfigPublic & {
      */
     memo?: boolean;
     /**
-     * By default if styled() doesn't recognize a parent Tamagui compoent or specific react-native views,
+     * 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.
      */