@tamagui/web 1.68.6 → 1.69.0

package/src/helpers/propMapper.ts

@@ -56,33 +56,37 @@ export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) =>
     );
   }
 
-  if (variants && key in variants) {
-    styleState.curProps[key] = value
+  if (!styleProps.noExpand) {
+    if (variants && key in variants) {
+      styleState.curProps[key] = value
 
-    const variantValue = resolveVariants(key, value, styleProps, styleState, '')
-    if (variantValue) {
-      return variantValue
+      const variantValue = resolveVariants(key, value, styleProps, styleState, '')
+      if (variantValue) {
+        return variantValue
+      }
     }
   }
 
   let shouldReturn = false
 
   // handle shorthands
-  if (key in conf.shorthands) {
-    shouldReturn = true
-    key = conf.shorthands[key]
+  if (!styleProps.disableExpandShorthands) {
+    if (key in conf.shorthands) {
+      shouldReturn = true
+      key = conf.shorthands[key]
+    }
   }
 
   if (value) {
     if (value[0] === '$') {
-      value = getTokenForKey(key, value, styleProps.resolveVariablesAs, styleState)
+      value = getTokenForKey(key, value, styleProps.resolveValues, styleState)
     } else if (isVariable(value)) {
-      value = resolveVariableValue(value, styleProps.resolveVariablesAs)
+      value = resolveVariableValue(value, styleProps.resolveValues)
     }
   }
 
   if (shouldReturn || value != null) {
-    return expandStyle(key, value) || [[key, value]]
+    return (styleProps.noExpand ? null : expandStyle(key, value)) || [[key, value]]
   }
 }
 
@@ -228,39 +232,43 @@ const resolveTokensAndVariants: StyleResolver<Object> = (
     const fKey = conf.shorthands[rKey] || rKey
     const val = value[rKey]
 
-    if (variants && fKey in variants) {
-      // if its a variant expanded, attach to curProps
-      styleState.curProps[fKey] = val
-
-      // avoids infinite loop if variant is matching a style prop
-      // eg: { variants: { flex: { true: { flex: 2 } } } }
-      if (parentVariantKey && parentVariantKey === key) {
-        res[fKey] =
-          // SYNC WITH *1
-          val[0] === '$'
-            ? getTokenForKey(fKey, val, styleProps.resolveVariablesAs, styleState)
-            : val
-      } else {
-        const variantOut = resolveVariants(fKey, val, styleProps, styleState, key)
-
-        // apply, merging sub-styles
-        if (variantOut) {
-          for (const [key, val] of variantOut) {
-            if (val == null) continue
-            if (key in pseudoDescriptors) {
-              res[key] ??= {}
-              Object.assign(res[key], val)
-            } else {
-              res[key] = val
+    if (styleProps.noExpand) {
+      res[fKey] = val
+    } else {
+      if (variants && fKey in variants) {
+        // if its a variant expanded, attach to curProps
+        styleState.curProps[fKey] = val
+
+        // avoids infinite loop if variant is matching a style prop
+        // eg: { variants: { flex: { true: { flex: 2 } } } }
+        if (parentVariantKey && parentVariantKey === key) {
+          res[fKey] =
+            // SYNC WITH *1
+            val[0] === '$'
+              ? getTokenForKey(fKey, val, styleProps.resolveValues, styleState)
+              : val
+        } else {
+          const variantOut = resolveVariants(fKey, val, styleProps, styleState, key)
+
+          // apply, merging sub-styles
+          if (variantOut) {
+            for (const [key, val] of variantOut) {
+              if (val == null) continue
+              if (key in pseudoDescriptors) {
+                res[key] ??= {}
+                Object.assign(res[key], val)
+              } else {
+                res[key] = val
+              }
             }
           }
         }
+        continue
       }
-      continue
     }
 
     if (isVariable(val)) {
-      res[fKey] = resolveVariableValue(val, styleProps.resolveVariablesAs)
+      res[fKey] = resolveVariableValue(val, styleProps.resolveValues)
       continue
     }
 
@@ -268,7 +276,7 @@ const resolveTokensAndVariants: StyleResolver<Object> = (
       const fVal =
         // SYNC WITH *1
         val[0] === '$'
-          ? getTokenForKey(fKey, val, styleProps.resolveVariablesAs, styleState)
+          ? getTokenForKey(fKey, val, styleProps.resolveValues, styleState)
           : val
       res[fKey] = fVal
       continue
@@ -432,11 +440,11 @@ export const getTokenForKey = (
 
 function resolveVariableValue(
   valOrVar: Variable | any,
-  resolveVariablesAs?: ResolveVariableAs
+  resolveValues?: ResolveVariableAs
 ) {
-  if (resolveVariablesAs === 'none') return valOrVar
+  if (resolveValues === 'none') return valOrVar
   if (isVariable(valOrVar)) {
-    if (!isWeb || resolveVariablesAs === 'value') {
+    if (!isWeb || resolveValues === 'value') {
       return valOrVar.val
     }
     return valOrVar.variable

package/src/hooks/useMedia.tsx

@@ -1,21 +1,17 @@
 import { useIsomorphicLayoutEffect } from '@tamagui/constants'
-import { useMemo, useRef, useSyncExternalStore } from 'react'
+import { useRef, useSyncExternalStore } from 'react'
 
 import { getConfig } from '../config'
 import { createProxy } from '../helpers/createProxy'
 import { matchMedia } from '../helpers/matchMedia'
-import { getTokenForKey } from '../helpers/propMapper'
 import { pseudoDescriptors } from '../helpers/pseudoDescriptors'
 import type {
-  GetStyleState,
   MediaQueries,
   MediaQueryKey,
   MediaQueryObject,
   MediaQueryState,
-  ResolveVariableAs,
   TamaguiInternalConfig,
 } from '../types'
-import { useTheme } from './useTheme'
 
 export let mediaState: MediaQueryState =
   // development only safeguard
@@ -245,75 +241,6 @@ export function useMedia(uid?: any): UseMediaState {
   })
 }
 
-/**
- *
- * @deprecated use useProps instead which is the same but also expands shorthands (which you can disable)
- *
- * Useful for more complex components that need access to the currently active props,
- * accounting for the currently active media queries.
- *
- * Use sparingly, it will loop props and trigger re-render on all media queries.
- *
- * */
-export function useMediaPropsActive<A extends Object>(
-  props: A,
-  opts?: {
-    expandShorthands?: boolean
-    resolveValues?: ResolveVariableAs
-  }
-): {
-  // remove all media
-  [Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key]
-} {
-  const media = useMedia()
-  const resolveAs = opts?.resolveValues || 'none'
-  const theme = resolveAs ? useTheme() : null
-  const styleState = { theme } as Partial<GetStyleState>
-  const shouldExpandShorthands = opts?.expandShorthands
-
-  return useMemo(() => {
-    const config = getConfig()
-    const next = {} as A
-    const importancesUsed = {}
-    const propNames = Object.keys(props)
-    const len = propNames.length
-
-    for (let i = 0; i < len; i++) {
-      let key = propNames[i]
-      const val = props[key]
-      if (key[0] === '$') {
-        const mediaKey = key.slice(1)
-        if (!media[mediaKey]) continue
-        if (val && typeof val === 'object') {
-          const subKeys = Object.keys(val)
-          for (let j = subKeys.length; j--; j >= 0) {
-            let subKey = subKeys[j]
-            const value = getTokenForKey(subKey, val[subKey], resolveAs, styleState)
-            if (shouldExpandShorthands) {
-              subKey = config.shorthands[subKey] || subKey
-            }
-            mergeMediaByImportance(next, mediaKey, subKey, value, importancesUsed, true)
-          }
-        }
-      } else {
-        if (shouldExpandShorthands) {
-          key = config.shorthands[key] || key
-        }
-        mergeMediaByImportance(
-          next,
-          '',
-          key,
-          getTokenForKey(key, val, resolveAs, styleState),
-          importancesUsed,
-          true
-        )
-      }
-    }
-
-    return next
-  }, [media, props, theme, resolveAs])
-}
-
 export const getMediaImportanceIfMoreImportant = (
   mediaKey: string,
   key: string,

package/src/hooks/useProps.tsx

@@ -1,24 +1,91 @@
-import { ResolveVariableAs } from '../types'
-import { useMediaPropsActive } from './useMedia'
+import { useContext } from 'react'
+
+import { ComponentContext } from '../contexts/ComponentContext'
+import { defaultComponentStateMounted } from '../defaultComponentState'
+import { useSplitStyles } from '../helpers/getSplitStyles'
+import { ResolveVariableAs, SplitStyleProps, StaticConfig } from '../types'
+import { Stack } from '../views/Stack'
+import { useMedia } from './useMedia'
+import { useThemeWithState } from './useTheme'
+
+type UsePropsOptions = Pick<
+  SplitStyleProps,
+  'noExpand' | 'noNormalize' | 'noClassNames' | 'resolveValues'
+> & {
+  disableExpandShorthands?: boolean
+  forComponent?: { staticConfig: StaticConfig }
+}
+
+type FlattenedProps<A> = {
+  // remove all media
+  [Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key]
+}
 
 /**
- * Will flatten any media styles down + expand all shorthands.
+ * Returns props and style as a single object, expanding and merging shorthands and media queries.
  *
- * Use sparingly, it will loop props and trigger re-render on all media queries.
+ * Use sparingly, it will loop props and trigger re-render on all media queries you access.
  *
  * */
 export function useProps<A extends Object>(
   props: A,
-  opts?: {
-    disableExpandShorthands?: boolean
-    resolveValues?: ResolveVariableAs
+  opts?: UsePropsOptions
+): FlattenedProps<A> {
+  const [propsOut, styleOut] = usePropsAndStyle(props, {
+    ...opts,
+    noExpand: true,
+    noNormalize: true,
+    resolveValues: 'none',
+  })
+  return {
+    ...propsOut,
+    ...styleOut,
   }
-): {
-  // remove all media
-  [Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key]
-} {
-  return useMediaPropsActive(props, {
-    expandShorthands: !opts?.disableExpandShorthands,
-    resolveValues: opts?.resolveValues,
+}
+
+/**
+ * Returns only style values fully resolved and flattened with merged media queries and shorthands with all theme and token values resolved.
+ *
+ * Use sparingly, it will loop props and trigger re-render on all media queries you access.
+ *
+ * */
+export function useStyle<A extends Object>(
+  props: A,
+  opts?: UsePropsOptions
+): FlattenedProps<A> {
+  return usePropsAndStyle(props, opts)[1]
+}
+
+/**
+ * Returns [props, styles] fully resolved and flattened with merged media queries and shorthands with all theme and token values resolved.
+ *
+ * Use sparingly, it will loop props and trigger re-render on all media queries you access.
+ *
+ * */
+export function usePropsAndStyle<A extends Object>(
+  props: A,
+  opts?: UsePropsOptions
+): [FlattenedProps<A>, FlattenedProps<A>] {
+  const staticConfig = opts?.forComponent?.staticConfig ?? Stack.staticConfig
+  const [themeState, theme] = useThemeWithState({
+    componentName: staticConfig.componentName,
   })
+  const componentContext = useContext(ComponentContext)
+  const media = useMedia()
+  const splitStyles = useSplitStyles(
+    props,
+    staticConfig,
+    theme,
+    themeState.state.name,
+    defaultComponentStateMounted,
+    {
+      isAnimated: false,
+      mediaState: media,
+      noClassNames: true,
+      ...opts,
+    },
+    null,
+    componentContext
+  )
+  return [splitStyles.viewProps, splitStyles.style] as any
 }

package/src/index.ts

@@ -55,13 +55,11 @@ export {
   mediaState,
   useMedia,
   getMedia,
-  useMediaPropsActive,
   mediaObjectToString,
   mediaQueryConfig,
 } from './hooks/useMedia'
 export * from './hooks/useTheme'
 export * from './hooks/useThemeName'
-export * from './hooks/useStyle'
 export * from './hooks/useAnimationDriver'
 export * from './hooks/useIsTouchDevice'
 export * from './hooks/useProps'

package/src/types.tsx

@@ -39,7 +39,19 @@ export type DebugProp = boolean | 'break' | 'verbose' | 'visualize' | 'profile'
 export type TamaguiComponentPropsBase = {
   target?: string
   hitSlop?: PressableProps['hitSlop']
-  asChild?: boolean | 'except-style'
+  /**
+   * When truthy passes through all props to a single child element, and avoids rendering its own element.
+   * Must pass just one child React element that will receive all the props.
+   *
+   * The option "except-style" will avoid passing any style related props.
+   *
+   * The option "web" will map all React Native style props to web props (onPress becomes onClick).
+   *
+   * The option "except-style-web" combines the except-style and web options.
+   *
+   */
+  asChild?: boolean | 'except-style' | 'except-style-web' | 'web'
+
   dangerouslySetInnerHTML?: { __html: string }
   children?: any | any[]
 
@@ -1802,7 +1814,10 @@ export type ResolveVariableAs = 'auto' | 'value' | 'variable' | 'none'
 export type SplitStyleProps = {
   mediaState?: Record<string, boolean>
   noClassNames?: boolean
-  resolveVariablesAs?: ResolveVariableAs
+  noExpand?: boolean
+  noNormalize?: boolean
+  resolveValues?: ResolveVariableAs
+  disableExpandShorthands?: boolean
   fallbackProps?: Record<string, any>
   hasTextAncestor?: boolean
   // for animations

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;AAsBd,OAAO,EAEL,SAAS,EAIT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EACZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAGV,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,4DAopC3B;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"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAaN,MAAM,OAAO,CAAA;AAsBd,OAAO,EAEL,SAAS,EAIT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EACZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAGV,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,4DA2pC3B;AAeD,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/helpers/createStyledContext.d.ts

@@ -1,10 +1,15 @@
 import React from 'react';
 export type StyledContext<Props extends Object = any> = Omit<React.Context<Props>, 'Provider'> & {
     context: React.Context<Props>;
-    props: Object;
-    Provider: React.ProviderExoticComponent<Partial<Props> & {
+    props: Object | undefined;
+    Provider: React.ProviderExoticComponent<Partial<Props | undefined> & {
         children?: React.ReactNode;
+        scope?: string;
     }>;
+    useStyledContext: (scope?: string) => Props;
+};
+export declare function createStyledContext<VariantProps extends Record<string, any>>(defaultValues?: VariantProps): StyledContext<VariantProps>;
+export type ScopedProps<P, K extends string> = P & {
+    [Key in `__scope${K}`]?: string;
 };
-export declare function createStyledContext<VariantProps extends Record<string, any>>(props: VariantProps): StyledContext<VariantProps>;
 //# sourceMappingURL=createStyledContext.d.ts.map

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,CAAA;IACb,QAAQ,EAAE,KAAK,CAAC,uBAAuB,CACrC,OAAO,CAAC,KAAK,CAAC,GAAG;QACf,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,wBAAgB,mBAAmB,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1E,KAAK,EAAE,YAAY,GAClB,aAAa,CAAC,YAAY,CAAC,CAwB7B"}
+{"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"}

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,EAMb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AAyBjB,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,aAkpC5B,CAAA;AAqDD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cAuBF,CAAA;AA0BD,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,EAMb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AAwBjB,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,aA8pC5B,CAAA;AAsDD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AA0BD,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,EAGjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAOjB,eAAO,MAAM,UAAU,EAAE,UAiExB,CAAA;AAgGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA;AAqID,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,wDAED,QAAQ,aAAa,CAAC,QAqFnC,CAAA"}
+{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAGjB,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;AAyID,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,wDAED,QAAQ,aAAa,CAAC,QAqFnC,CAAA"}

package/types/hooks/useMedia.d.ts

@@ -1,4 +1,4 @@
-import type { MediaQueries, MediaQueryKey, MediaQueryObject, MediaQueryState, ResolveVariableAs, TamaguiInternalConfig } from '../types';
+import type { MediaQueries, MediaQueryKey, MediaQueryObject, MediaQueryState, TamaguiInternalConfig } from '../types';
 export declare let mediaState: MediaQueryState;
 export declare const mediaQueryConfig: MediaQueries;
 export declare const getMedia: () => MediaQueryState;
@@ -18,22 +18,6 @@ type UpdateState = {
 };
 export declare function setMediaShouldUpdate(ref: any, props: UpdateState): WeakMap<any, UpdateState>;
 export declare function useMedia(uid?: any): UseMediaState;
-/**
- *
- * @deprecated use useProps instead which is the same but also expands shorthands (which you can disable)
- *
- * Useful for more complex components that need access to the currently active props,
- * accounting for the currently active media queries.
- *
- * Use sparingly, it will loop props and trigger re-render on all media queries.
- *
- * */
-export declare function useMediaPropsActive<A extends Object>(props: A, opts?: {
-    expandShorthands?: boolean;
-    resolveValues?: ResolveVariableAs;
-}): {
-    [Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key];
-};
 export declare const getMediaImportanceIfMoreImportant: (mediaKey: string, key: string, importancesUsed: Record<string, number>, isSizeMedia: boolean) => number | null;
 export declare function mergeMediaByImportance(onto: Record<string, any>, mediaKey: string, key: string, value: any, importancesUsed: Record<string, number>, isSizeMedia: boolean, importanceBump?: number): boolean;
 export declare function mediaObjectToString(query: string | MediaQueryObject, key?: string): string;

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

@@ -1 +1 @@
-{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAEV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAGjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,YAKL,CAAA;AAIjC,eAAO,MAAM,oBAAoB,uBAEhC,CAAA;AAOD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAiB3D,CAAA;AAaD,wBAAgB,mBAAmB,SA+BlC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,QAM9D;AAsBD,KAAK,aAAa,GAAG;KAClB,GAAG,IAAI,aAAa,GAAG,OAAO;CAChC,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAYD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,aAAa,CA6CjD;AAED;;;;;;;;;KASK;AACL,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAClD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IACL,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,aAAa,CAAC,EAAE,iBAAiB,CAAA;CAClC,GACA;KAEA,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAgDA;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAQrB,CAAA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,WAAW,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,WAiBxB;AASD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,UAwBjF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,UAE1C;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,WAY9C"}
+{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAEjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,YAKL,CAAA;AAIjC,eAAO,MAAM,oBAAoB,uBAEhC,CAAA;AAOD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAiB3D,CAAA;AAaD,wBAAgB,mBAAmB,SA+BlC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,QAM9D;AAsBD,KAAK,aAAa,GAAG;KAClB,GAAG,IAAI,aAAa,GAAG,OAAO;CAChC,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAYD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,aAAa,CA6CjD;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAQrB,CAAA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,WAAW,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,WAiBxB;AASD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,UAwBjF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,UAE1C;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,WAY9C"}

package/types/hooks/useProps.d.ts

@@ -1,14 +1,33 @@
-import { ResolveVariableAs } from '../types';
+import { SplitStyleProps, StaticConfig } from '../types';
+type UsePropsOptions = Pick<SplitStyleProps, 'noExpand' | 'noNormalize' | 'noClassNames' | 'resolveValues'> & {
+    disableExpandShorthands?: boolean;
+    forComponent?: {
+        staticConfig: StaticConfig;
+    };
+};
+type FlattenedProps<A> = {
+    [Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key];
+};
 /**
- * Will flatten any media styles down + expand all shorthands.
+ * Returns props and style as a single object, expanding and merging shorthands and media queries.
  *
- * Use sparingly, it will loop props and trigger re-render on all media queries.
+ * Use sparingly, it will loop props and trigger re-render on all media queries you access.
  *
  * */
-export declare function useProps<A extends Object>(props: A, opts?: {
-    disableExpandShorthands?: boolean;
-    resolveValues?: ResolveVariableAs;
-}): {
-    [Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key];
-};
+export declare function useProps<A extends Object>(props: A, opts?: UsePropsOptions): FlattenedProps<A>;
+/**
+ * Returns only style values fully resolved and flattened with merged media queries and shorthands with all theme and token values resolved.
+ *
+ * Use sparingly, it will loop props and trigger re-render on all media queries you access.
+ *
+ * */
+export declare function useStyle<A extends Object>(props: A, opts?: UsePropsOptions): FlattenedProps<A>;
+/**
+ * Returns [props, styles] fully resolved and flattened with merged media queries and shorthands with all theme and token values resolved.
+ *
+ * Use sparingly, it will loop props and trigger re-render on all media queries you access.
+ *
+ * */
+export declare function usePropsAndStyle<A extends Object>(props: A, opts?: UsePropsOptions): [FlattenedProps<A>, FlattenedProps<A>];
+export {};
 //# sourceMappingURL=useProps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useProps.d.ts","sourceRoot":"","sources":["../../src/hooks/useProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAG5C;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvC,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IACL,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,aAAa,CAAC,EAAE,iBAAiB,CAAA;CAClC,GACA;KAEA,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAKA"}
+{"version":3,"file":"useProps.d.ts","sourceRoot":"","sources":["../../src/hooks/useProps.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAqB,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAK3E,KAAK,eAAe,GAAG,IAAI,CACzB,eAAe,EACf,UAAU,GAAG,aAAa,GAAG,cAAc,GAAG,eAAe,CAC9D,GAAG;IACF,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,YAAY,CAAC,EAAE;QAAE,YAAY,EAAE,YAAY,CAAA;KAAE,CAAA;CAC9C,CAAA;AAED,KAAK,cAAc,CAAC,CAAC,IAAI;KAEtB,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAAA;AAED;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvC,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,cAAc,CAAC,CAAC,CAAC,CAWnB;AAED;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvC,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,cAAc,CAAC,CAAC,CAAC,CAEnB;AAED;;;;;KAKK;AACL,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAC/C,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAuBxC"}

package/types/index.d.ts

@@ -36,10 +36,9 @@ export * from './helpers/themeable';
 export * from './helpers/themes';
 export * from './helpers/createShallowSetState';
 export * from './helpers/withStaticProperties';
-export { configureMedia, mediaState, useMedia, getMedia, useMediaPropsActive, mediaObjectToString, mediaQueryConfig, } from './hooks/useMedia';
+export { configureMedia, mediaState, useMedia, getMedia, mediaObjectToString, mediaQueryConfig, } from './hooks/useMedia';
 export * from './hooks/useTheme';
 export * from './hooks/useThemeName';
-export * from './hooks/useStyle';
 export * from './hooks/useAnimationDriver';
 export * from './hooks/useIsTouchDevice';
 export * from './hooks/useProps';

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,oBAAoB,CAAA;AAElC,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA;AAEnC,OAAO,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACT,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,aAAa,GACd,MAAM,UAAU,CAAA;AAEjB,cAAc,uBAAuB,CAAA;AAErC,cAAc,6BAA6B,CAAA;AAE3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,gCAAgC,CAAA;AAE9C,OAAO,EACL,cAAc,EACd,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,kBAAkB,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAEhC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iCAAiC,CAAA;AAE/C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAElC,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,oBAAoB,CAAA;AAElC,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA;AAEnC,OAAO,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACT,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,aAAa,GACd,MAAM,UAAU,CAAA;AAEjB,cAAc,uBAAuB,CAAA;AAErC,cAAc,6BAA6B,CAAA;AAE3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,gCAAgC,CAAA;AAE9C,OAAO,EACL,cAAc,EACd,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,kBAAkB,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAEhC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iCAAiC,CAAA;AAE/C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAElC,cAAc,cAAc,CAAA"}

package/types/types.d.ts

@@ -16,7 +16,18 @@ export type DebugProp = boolean | 'break' | 'verbose' | 'visualize' | 'profile';
 export type TamaguiComponentPropsBase = {
     target?: string;
     hitSlop?: PressableProps['hitSlop'];
-    asChild?: boolean | 'except-style';
+    /**
+     * When truthy passes through all props to a single child element, and avoids rendering its own element.
+     * Must pass just one child React element that will receive all the props.
+     *
+     * The option "except-style" will avoid passing any style related props.
+     *
+     * The option "web" will map all React Native style props to web props (onPress becomes onClick).
+     *
+     * The option "except-style-web" combines the except-style and web options.
+     *
+     */
+    asChild?: boolean | 'except-style' | 'except-style-web' | 'web';
     dangerouslySetInnerHTML?: {
         __html: string;
     };
@@ -927,7 +938,10 @@ export type ResolveVariableAs = 'auto' | 'value' | 'variable' | 'none';
 export type SplitStyleProps = {
     mediaState?: Record<string, boolean>;
     noClassNames?: boolean;
-    resolveVariablesAs?: ResolveVariableAs;
+    noExpand?: boolean;
+    noNormalize?: boolean;
+    resolveValues?: ResolveVariableAs;
+    disableExpandShorthands?: boolean;
     fallbackProps?: Record<string, any>;
     hasTextAncestor?: boolean;
     isAnimated: boolean;