@tamagui/web 1.89.5 → 1.89.7

package/src/createComponent.tsx

@@ -629,6 +629,7 @@ export function createComponent<
 
     // hide strategy will set this opacity = 0 until measured
     if (props.group && props.untilMeasured === 'hide' && !curState.hasMeasured) {
+      splitStyles.style ||= {}
       splitStyles.style.opacity = 0
     }
 
@@ -715,7 +716,7 @@ export function createComponent<
       const animations = useAnimations({
         props: propsWithAnimation,
         // if hydrating, send empty style
-        style: splitStylesStyle,
+        style: splitStylesStyle || {},
         presence,
         componentState: state,
         styleProps,
@@ -1072,6 +1073,7 @@ export function createComponent<
         staticConfig
       )
     }
+
     if (useChildrenResult) {
       content = useChildrenResult
     } else {
@@ -1108,8 +1110,8 @@ export function createComponent<
             // capture just initial width and height if they exist
             // will have top, left, width, height (not x, y)
             layout: {
-              width: fromPx(splitStyles.style.width as any),
-              height: fromPx(splitStyles.style.height as any),
+              width: fromPx(splitStyles.style?.width as any),
+              height: fromPx(splitStyles.style?.height as any),
             } as any,
           },
         },

package/src/helpers/getSplitStyles.tsx

@@ -189,7 +189,6 @@ export const getSplitStyles: StyleSplitter = (
   let dynamicThemeAccess: boolean | undefined
   let pseudoGroups: Set<string> | undefined
   let mediaGroups: Set<string> | undefined
-  let style: ViewStyleWithPseudos = {}
   let className = (props.className as string) || '' // existing classNames
   let mediaStylesSeen = 0
 
@@ -204,7 +203,7 @@ export const getSplitStyles: StyleSplitter = (
     styleProps,
     componentState,
     staticConfig,
-    style,
+    style: null,
     theme,
     usedKeys,
     viewProps,
@@ -295,9 +294,12 @@ export const getSplitStyles: StyleSplitter = (
           if (isValidClassName || isMediaOrPseudo) {
             if (shouldDoClasses) {
               mergeClassName(transforms, classNames, keyInit, valInit, isMediaOrPseudo)
-              delete style[keyInit]
+              if (styleState.style) {
+                delete styleState.style[keyInit]
+              }
             } else {
-              style[keyInit] = reverseMapClassNameToValue(keyInit, valInit)
+              styleState.style ||= {}
+              styleState.style[keyInit] = reverseMapClassNameToValue(keyInit, valInit)
               delete classNames[keyInit]
             }
             continue
@@ -374,6 +376,7 @@ export const getSplitStyles: StyleSplitter = (
 
     if (!isValidStyleKeyInit) {
       if (keyInit.startsWith('_style') && isObj(valInit)) {
+        styleState.style ||= {}
         Object.assign(styleState.style, valInit)
         continue
       }
@@ -613,7 +616,8 @@ export const getSplitStyles: StyleSplitter = (
       valInit !== 'unset' &&
       (valInitType === 'number' || (valInitType === 'string' && valInit[0] !== '$'))
     ) {
-      style[keyInit] = valInit
+      styleState.style ||= {}
+      styleState.style[keyInit] = valInit
       continue
     }
 
@@ -645,7 +649,7 @@ export const getSplitStyles: StyleSplitter = (
             curProps: { ...styleState.curProps },
           })
           log('expanded', expanded, '\nusedKeys', { ...usedKeys }, '\ncurrent', {
-            ...style,
+            ...styleState.style,
           })
         }
       } catch {
@@ -789,7 +793,7 @@ export const getSplitStyles: StyleSplitter = (
               if (
                 defaultValues != null &&
                 !(pkey in usedKeys) &&
-                !(pkey in styleState.style)
+                (!styleState.style || !(pkey in styleState.style))
               ) {
                 mergeStyle(styleState, pkey, defaultValues)
               }
@@ -996,8 +1000,9 @@ export const getSplitStyles: StyleSplitter = (
               space = valInit.space
               continue
             }
+            styleState.style ||= {}
             mergeMediaByImportance(
-              style,
+              styleState.style,
               mediaKeyShort,
               subKey,
               mediaStyle[subKey],
@@ -1040,7 +1045,7 @@ export const getSplitStyles: StyleSplitter = (
     if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
       try {
         log(` ✔️ expand complete`, keyInit)
-        log('style', { ...style })
+        log('style', { ...styleState.style })
         log('transforms', { ...transforms })
         log('viewProps', { ...viewProps })
       } catch {
@@ -1066,6 +1071,7 @@ export const getSplitStyles: StyleSplitter = (
           if (style['$$css']) {
             Object.assign(styleState.classNames, style)
           } else {
+            styleState.style ||= {}
             Object.assign(styleState.style, style)
           }
         }
@@ -1076,12 +1082,14 @@ export const getSplitStyles: StyleSplitter = (
   const avoidNormalize = styleProps.noNormalize === false
 
   if (!avoidNormalize) {
-    fixStyles(style)
+    if (styleState.style) {
+      fixStyles(styleState.style)
 
-    // shouldn't this be better? but breaks some tests weirdly, need to check
-    // if (isWeb && !staticConfig.isReactNative) {
-    if (isWeb && !staticConfig.isReactNative) {
-      styleToCSS(style)
+      // shouldn't this be better? but breaks some tests weirdly, need to check
+      // if (isWeb && !staticConfig.isReactNative) {
+      if (isWeb && !staticConfig.isReactNative) {
+        styleToCSS(styleState.style)
+      }
     }
 
     // these are only the flat transforms
@@ -1097,10 +1105,11 @@ export const getSplitStyles: StyleSplitter = (
       // so basically we sort until we get to a duplicate... we could sort even smarter but
       // this should work for most (all?) of our cases since the order preservation really only needs to apply
       // to the "flat" transform props
+      styleState.style ||= {}
       Object.entries(styleState.transforms)
         .sort(([a], [b]) => a.localeCompare(b))
         .forEach(([key, val]) => {
-          mergeTransform(style, key, val, true)
+          mergeTransform(styleState.style!, key, val, true)
         })
     }
 
@@ -1110,9 +1119,9 @@ export const getSplitStyles: StyleSplitter = (
         !staticConfig.isReactNative &&
         !staticConfig.isHOC &&
         (styleProps.isAnimated && !conf.animations.supportsCSSVars ? false : true) &&
-        Array.isArray(style.transform)
+        Array.isArray(styleState.style?.transform)
       ) {
-        style.transform = transformsToString(style.transform) as any
+        styleState.style.transform = transformsToString(styleState.style.transform) as any
       }
     }
 
@@ -1122,29 +1131,31 @@ export const getSplitStyles: StyleSplitter = (
         if (shouldDoClasses) {
           for (const key in parentSplitStyles.classNames) {
             const val = parentSplitStyles.classNames[key]
-            if (key in style || key in classNames) continue
+            if ((styleState.style && key in styleState.style) || key in classNames)
+              continue
             classNames[key] = val
           }
         }
       }
       if (!shouldDoClasses) {
         for (const key in parentSplitStyles.style) {
-          if (key in classNames || key in style) continue
-          style[key] = parentSplitStyles.style[key]
+          if (key in classNames || (styleState.style && key in styleState.style)) continue
+          styleState.style ||= {}
+          styleState.style[key] = parentSplitStyles.style[key]
         }
       }
     }
   }
 
   if (process.env.TAMAGUI_TARGET === 'web') {
-    if (shouldDoClasses) {
+    if (styleState.style && shouldDoClasses) {
       let retainedStyles: ViewStyleWithPseudos | undefined
       let shouldRetain = false
 
-      if (style['$$css']) {
+      if (styleState.style['$$css']) {
         // avoid re-processing for rnw
       } else {
-        const atomic = getStylesAtomic(style)
+        const atomic = getStylesAtomic(styleState.style)
 
         for (const atomicStyle of atomic) {
           const key = atomicStyle.property
@@ -1162,7 +1173,7 @@ export const getSplitStyles: StyleSplitter = (
 
           if (isAnimatedAndAnimateOnly) {
             retainedStyles ||= {}
-            retainedStyles[key] = style[key]
+            retainedStyles[key] = styleState.style[key]
           } else if (nonAnimatedAnimateOnly) {
             retainedStyles ||= {}
             retainedStyles[key] = atomicStyle.value
@@ -1182,12 +1193,12 @@ export const getSplitStyles: StyleSplitter = (
 
         if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
           console.groupCollapsed(`🔹 getSplitStyles final style object`)
-          console.info(style)
+          console.info(styleState.style)
           console.groupEnd()
         }
 
         if (shouldRetain || !IS_STATIC) {
-          style = retainedStyles || {}
+          styleState.style = retainedStyles || {}
         }
       }
 
@@ -1265,8 +1276,7 @@ export const getSplitStyles: StyleSplitter = (
     hasMedia,
     fontFamily: styleState.fontFamily,
     viewProps,
-    // @ts-expect-error
-    style,
+    style: styleState.style as any,
     pseudos,
     classNames,
     rulesToInsert,
@@ -1277,7 +1287,8 @@ export const getSplitStyles: StyleSplitter = (
 
   // native: swap out the right family based on weight/style
   if (process.env.TAMAGUI_TARGET === 'native') {
-    if (style.fontFamily) {
+    const style = styleState.style
+    if (style?.fontFamily) {
       const faceInfo = getFont(style.fontFamily as string)?.face
       if (faceInfo) {
         const overrideFace =
@@ -1296,21 +1307,23 @@ export const getSplitStyles: StyleSplitter = (
     }
   }
 
-  // merge className and style back into viewProps:
-  let fontFamily =
-    isText || isInput
-      ? styleState.fontFamily || staticConfig.defaultProps?.fontFamily
-      : null
-  if (fontFamily && fontFamily[0] === '$') {
-    fontFamily = fontFamily.slice(1)
-  }
-  const fontFamilyClassName = fontFamily ? `font_${fontFamily}` : ''
   const asChild = props.asChild
   const asChildExceptStyleLike =
     asChild === 'except-style' || asChild === 'except-style-web'
 
   if (!asChildExceptStyleLike) {
+    const style = styleState.style
+
     if (process.env.TAMAGUI_TARGET === 'web') {
+      // merge className and style back into viewProps:
+      let fontFamily =
+        isText || isInput
+          ? styleState.fontFamily || staticConfig.defaultProps?.fontFamily
+          : null
+      if (fontFamily && fontFamily[0] === '$') {
+        fontFamily = fontFamily.slice(1)
+      }
+      const fontFamilyClassName = fontFamily ? `font_${fontFamily}` : ''
       const groupClassName = props.group ? `t_group_${props.group}` : ''
       const componentNameFinal = props.componentName || staticConfig.componentName
       const componentClassName =
@@ -1324,9 +1337,8 @@ export const getSplitStyles: StyleSplitter = (
       if (props.className) classList.push(props.className)
       const finalClassName = classList.join(' ')
 
-      if (styleProps.noExpand) {
+      if (styleProps.noMergeStyle) {
         // this is passed in by useProps() and we want to avoid all .style setting then
-        // TODO make it its own attribute
         if (finalClassName) {
           viewProps.className = finalClassName
         }
@@ -1335,7 +1347,9 @@ export const getSplitStyles: StyleSplitter = (
         !conf.animations.supportsCSSVars &&
         isReactNative
       ) {
-        viewProps.style = style as any
+        if (style) {
+          viewProps.style = style as any
+        }
       } else if (isReactNative) {
         const cnStyles = { $$css: true }
         for (const name of finalClassName.split(' ')) {
@@ -1346,12 +1360,13 @@ export const getSplitStyles: StyleSplitter = (
         if (finalClassName) {
           viewProps.className = finalClassName
         }
-        viewProps.style = style as any
+        if (style) {
+          viewProps.style = style as any
+        }
       }
     } else {
       // this is passed in by useProps() and we want to avoid all .style setting then
-      // TODO make it its own attribute
-      if (!styleProps.noExpand) {
+      if (style && !styleProps.noMergeStyle) {
         // native assign styles
         viewProps.style = style as any
       }
@@ -1369,7 +1384,6 @@ export const getSplitStyles: StyleSplitter = (
           componentState,
           transforms,
           viewProps,
-          viewPropsOrder: Object.keys(viewProps),
           rulesToInsert,
           parentSplitStyles,
         }
@@ -1425,7 +1439,7 @@ function mergeStyle(
   val: any,
   disableNormalize = false
 ) {
-  const { classNames, viewProps, style, usedKeys, styleProps } = styleState
+  const { classNames, viewProps, usedKeys, styleProps } = styleState
   if (isWeb && val?.[0] === '_') {
     classNames[key] = val
     usedKeys[key] ||= 1
@@ -1438,7 +1452,8 @@ function mergeStyle(
     if (key in validStylesOnBaseProps) {
       viewProps[key] = out
     } else {
-      style[key] = out
+      styleState.style ||= {}
+      styleState.style[key] = out
     }
   }
 }

package/src/hooks/useProps.tsx

@@ -61,7 +61,7 @@ export function useStyle<A extends StyleLikeObject>(
   props: A,
   opts?: UsePropsOptions
 ): PropsWithoutMediaStyles<A> {
-  return usePropsAndStyle(props, opts)[1]
+  return usePropsAndStyle(props, opts)[1] || {}
 }
 
 /**
@@ -90,6 +90,7 @@ export function usePropsAndStyle<A extends StyleLikeObject>(
       isAnimated: false,
       mediaState: media,
       noSkip: true,
+      noMergeStyle: true,
       noClassNames: true,
       resolveValues: 'auto',
       ...opts,
@@ -97,5 +98,5 @@ export function usePropsAndStyle<A extends StyleLikeObject>(
     null,
     componentContext
   )
-  return [splitStyles.viewProps, splitStyles.style, theme, media] as any
+  return [splitStyles.viewProps, splitStyles.style || {}, theme, media] as any
 }

package/src/types.tsx

@@ -1519,7 +1519,7 @@ export type PropMappedValue = [string, any][] | undefined
 type FlatTransforms = Record<string, any>
 
 export type GetStyleState = {
-  style: TextStyleProps
+  style: TextStyleProps | null
   usedKeys: Record<string, number>
   classNames: ClassNamesObject
   staticConfig: StaticConfig
@@ -1871,6 +1871,7 @@ export type SplitStyleProps = {
   noExpand?: boolean
   noNormalize?: boolean | 'values'
   noSkip?: boolean
+  noMergeStyle?: boolean
   resolveValues?: ResolveVariableAs
   disableExpandShorthands?: boolean
   fallbackProps?: Record<string, any>
@@ -2002,7 +2003,7 @@ export type RulesToInsert = StyleObject[]
 
 export type GetStyleResult = {
   pseudos?: PseudoStyles | null
-  style: ViewStyle
+  style: ViewStyle | null
   classNames: ClassNamesObject
   rulesToInsert: RulesToInsert
   viewProps: StackProps & Record<string, any>

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAYN,MAAM,OAAO,CAAA;AAuBd,OAAO,KAAK,EAEV,SAAS,EAMT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAElB,YAAY,EAEZ,gBAAgB,EAEhB,cAAc,EAMf,MAAM,SAAS,CAAA;AAiBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAopC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,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,KAYN,MAAM,OAAO,CAAA;AAuBd,OAAO,KAAK,EAEV,SAAS,EAMT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAElB,YAAY,EAEZ,gBAAgB,EAEhB,cAAc,EAMf,MAAM,SAAS,CAAA;AAiBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAspC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AA6BhF,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;AA8B7B,eAAO,MAAM,cAAc,EAAE,aAiuC5B,CAAA;AA2DD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AA6BhF,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;AA8B7B,eAAO,MAAM,cAAc,EAAE,aA+uC5B,CAAA;AA4DD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,cA2BF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"useProps.d.ts","sourceRoot":"","sources":["../../src/hooks/useProps.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EACd,MAAM,UAAU,CAAA;AAKjB,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,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI;KAEtC,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAAA;AAED,KAAK,eAAe,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,MAAM,CAAA;AAElE;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,eAAe,EAChD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,uBAAuB,CAAC,CAAC,CAAC,CAW5B;AAED;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,eAAe,EAChD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,uBAAuB,CAAC,CAAC,CAAC,CAE5B;AAED;;;;;KAKK;AACL,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,eAAe,EACxD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,aAAa,CAAC,CAyBtF"}
+{"version":3,"file":"useProps.d.ts","sourceRoot":"","sources":["../../src/hooks/useProps.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EACd,MAAM,UAAU,CAAA;AAKjB,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,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI;KAEtC,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAAA;AAED,KAAK,eAAe,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,MAAM,CAAA;AAElE;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,eAAe,EAChD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,uBAAuB,CAAC,CAAC,CAAC,CAW5B;AAED;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,eAAe,EAChD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,uBAAuB,CAAC,CAAC,CAAC,CAE5B;AAED;;;;;KAKK;AACL,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,eAAe,EACxD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE,eAAe,GACrB,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,aAAa,CAAC,CA0BtF"}

package/types/types.d.ts

@@ -776,7 +776,7 @@ export type TamaguiProviderProps = Partial<Omit<ThemeProviderProps, 'children'>>
 export type PropMappedValue = [string, any][] | undefined;
 type FlatTransforms = Record<string, any>;
 export type GetStyleState = {
-    style: TextStyleProps;
+    style: TextStyleProps | null;
     usedKeys: Record<string, number>;
     classNames: ClassNamesObject;
     staticConfig: StaticConfig;
@@ -960,6 +960,7 @@ export type SplitStyleProps = {
     noExpand?: boolean;
     noNormalize?: boolean | 'values';
     noSkip?: boolean;
+    noMergeStyle?: boolean;
     resolveValues?: ResolveVariableAs;
     disableExpandShorthands?: boolean;
     fallbackProps?: Record<string, any>;
@@ -1063,7 +1064,7 @@ export type GestureReponderEvent = Exclude<View['props']['onResponderMove'], voi
 export type RulesToInsert = StyleObject[];
 export type GetStyleResult = {
     pseudos?: PseudoStyles | null;
-    style: ViewStyle;
+    style: ViewStyle | null;
     classNames: ClassNamesObject;
     rulesToInsert: RulesToInsert;
     viewProps: StackProps & Record<string, any>;