@tamagui/web 2.0.0-1768326993354 → 2.0.0-1768427228811

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "2.0.0-1768326993354",
+  "version": "2.0.0-1768427228811",
   "type": "module",
   "source": "src/index.ts",
   "main": "dist/cjs",
@@ -28,16 +28,16 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "2.0.0-1768326993354",
-    "@tamagui/constants": "2.0.0-1768326993354",
-    "@tamagui/helpers": "2.0.0-1768326993354",
-    "@tamagui/is-equal-shallow": "2.0.0-1768326993354",
-    "@tamagui/normalize-css-color": "2.0.0-1768326993354",
-    "@tamagui/timer": "2.0.0-1768326993354",
-    "@tamagui/types": "2.0.0-1768326993354",
-    "@tamagui/use-did-finish-ssr": "2.0.0-1768326993354",
-    "@tamagui/use-event": "2.0.0-1768326993354",
-    "@tamagui/use-force-update": "2.0.0-1768326993354"
+    "@tamagui/compose-refs": "2.0.0-1768427228811",
+    "@tamagui/constants": "2.0.0-1768427228811",
+    "@tamagui/helpers": "2.0.0-1768427228811",
+    "@tamagui/is-equal-shallow": "2.0.0-1768427228811",
+    "@tamagui/normalize-css-color": "2.0.0-1768427228811",
+    "@tamagui/timer": "2.0.0-1768427228811",
+    "@tamagui/types": "2.0.0-1768427228811",
+    "@tamagui/use-did-finish-ssr": "2.0.0-1768427228811",
+    "@tamagui/use-event": "2.0.0-1768427228811",
+    "@tamagui/use-force-update": "2.0.0-1768427228811"
   },
   "peerDependencies": {
     "react": "*",
@@ -45,7 +45,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-1768326993354",
+    "@tamagui/build": "2.0.0-1768427228811",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",

package/src/createComponent.tsx

@@ -298,6 +298,9 @@ export function createComponent<
       : undefined
     let overriddenContextProps: GenericProps | null = null
 
+    const componentContext = React.useContext(ComponentContext)
+    const hasTextAncestor = !!(isWeb && isText ? componentContext.inText : false)
+
     if (
       !process.env.TAMAGUI_IS_CORE_NODE &&
       process.env.NODE_ENV === 'development' &&
@@ -316,8 +319,27 @@ export function createComponent<
 
     // merge both default props and styled context props - ensure order is preserved
     if (styledContextValue || defaultProps) {
+      // For nested text, override base Text defaults to use CSS inheritance
+      // Only override if using base defaults, not styled component explicit values
+      let effectiveDefaults = defaultProps
+      if (
+        process.env.TAMAGUI_TARGET === 'web' &&
+        isText &&
+        hasTextAncestor &&
+        defaultProps
+      ) {
+        effectiveDefaults = { ...defaultProps }
+        if (effectiveDefaults.fontFamily === 'unset')
+          effectiveDefaults.fontFamily = 'inherit'
+        if (effectiveDefaults.whiteSpace === 'pre-wrap')
+          effectiveDefaults.whiteSpace = 'inherit'
+        if (!effectiveDefaults.color) effectiveDefaults.color = 'inherit'
+        if (!effectiveDefaults.letterSpacing) effectiveDefaults.letterSpacing = 'inherit'
+        if (!effectiveDefaults.textTransform) effectiveDefaults.textTransform = 'inherit'
+      }
+
       const [nextProps, overrides] = mergeComponentProps(
-        defaultProps,
+        effectiveDefaults,
         styledContextValue,
         propsIn
       )
@@ -392,7 +414,6 @@ export function createComponent<
       }, [componentName])
     }
 
-    const componentContext = React.useContext(ComponentContext)
     const groupContextParent = React.useContext(GroupContext)
     const animationDriver = componentContext.animationDriver
     const useAnimations = animationDriver?.useAnimations as UseAnimationHook | undefined
@@ -484,8 +505,6 @@ export function createComponent<
 
     if (process.env.NODE_ENV === 'development' && time) time`use-state`
 
-    const hasTextAncestor = !!(isWeb && isText ? componentContext.inText : false)
-
     const isTaggable = !Component || typeof Component === 'string'
     const tagProp = props.tag
     // default to tag, fallback to component (when both strings)
@@ -1403,6 +1422,15 @@ export function createComponent<
       )
     }
 
+    // Text components set inText context for children so nested Text can inherit styles
+    if (process.env.TAMAGUI_TARGET === 'web' && isText && !hasTextAncestor) {
+      content = (
+        <ComponentContext.Provider {...componentContext} inText={true}>
+          {content}
+        </ComponentContext.Provider>
+      )
+    }
+
     if (process.env.NODE_ENV === 'development' && time) time`group-context`
 
     content =

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAoBtC,OAAO,KAAK,EASV,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EAQf,MAAM,SAAS,CAAA;AAYhB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AA8J9D,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,wEAq2C3B"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAoBtC,OAAO,KAAK,EASV,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EAQf,MAAM,SAAS,CAAA;AAYhB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AA8J9D,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,wEAi4C3B"}

package/types/createTheme.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createTheme.d.ts","sourceRoot":"","sources":["../src/createTheme.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEvC,KAAK,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AAExD;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,KAAK,SAAS,YAAY,EAAE,OAAO,KAAK,KAAG,KAEtE,CAAA"}