@ornikar/kitt-universal 29.4.1-canary.ee3a5de11ca14467578621a40a921148838ee329.0 → 29.4.1

package/dist/index-node-22.17.cjs.web.js

@@ -3080,6 +3080,7 @@ const getTypographyTypeWithAncestorValue = (type, typographyTypeInContext) => {
 
 const TypographyFamilyContext = /*#__PURE__*/react.createContext(null);
 const TypographyTypeContext = /*#__PURE__*/react.createContext(null);
+const TypographyVariantContext = /*#__PURE__*/react.createContext(undefined);
 const TypographyColorContext = /*#__PURE__*/react.createContext('black');
 function useTypographyColor() {
   return react.useContext(TypographyColorContext);
@@ -3178,7 +3179,7 @@ function getUniversalFontWeight(type, variant, typographyFamily) {
       ThrowErrorIfInvalidVariant(variant, value, 'regular');
       resolvedVariant = 'regular';
     }
-    webFontWeight[typeName] = resolvedVariant;
+    webFontWeight[typeName] = `${typographyFamily}.${resolvedVariant}`;
     nativeFontFamily[typeName] = `${typographyFamily}.${resolvedVariant}`;
   });
   return {
@@ -3205,24 +3206,36 @@ const TypographyBase = /*#__PURE__*/react.forwardRef(({
   ...otherProps
 }, ref) => {
   const sx = nativeBase.useSx();
+
+  // ancestors
   const typographyFamilyInContext = react.useContext(TypographyFamilyContext);
   const typographyTypeInContext = react.useContext(TypographyTypeContext);
-  const defaultColor = useTypographyDefaultColor();
+  const typographyVariantInContext = react.useContext(TypographyVariantContext);
+
+  // family
   const hasTypographyAncestor = typographyFamilyInContext !== null;
   const typographyType = getTypographyTypeWithAncestorValue(type, typographyTypeInContext);
   const baseOrDefaultToBody = typographyType.base ?? 'body-m';
   const typographyFamily = getTypographyFamilyWithAncestorValue(baseOrDefaultToBody, typographyFamilyInContext);
+
+  // size
   const fontSizeForNativeBase = createNativeBaseFontSize({
     ...type,
     base: baseOrDefaultToBody
   });
+
+  // weight
+
   const {
     webFontWeight,
     nativeFontFamily
   } = getUniversalFontWeight({
     ...type,
     base: baseOrDefaultToBody
-  }, variant, typographyFamily);
+  }, !variant && typographyType === typographyTypeInContext ? typographyVariantInContext : variant, typographyFamily);
+
+  // color
+  const defaultColor = useTypographyDefaultColor();
   const currentColor = !color && !hasTypographyAncestor ? defaultColor : color;
   const currentColorValue = getTypographyColorValue(currentColor);
   const colorStyles = sx({
@@ -3247,11 +3260,14 @@ const TypographyBase = /*#__PURE__*/react.forwardRef(({
     ...colorStyles,
     ...otherProps
   });
-  const content = baseOrDefaultToBody ? /*#__PURE__*/jsxRuntime.jsx(TypographyFamilyContext.Provider, {
-    value: typographyFamily,
-    children: /*#__PURE__*/jsxRuntime.jsx(TypographyTypeContext.Provider, {
-      value: typographyType,
-      children: text
+  const content = baseOrDefaultToBody ? /*#__PURE__*/jsxRuntime.jsx(TypographyVariantContext.Provider, {
+    value: variant,
+    children: /*#__PURE__*/jsxRuntime.jsx(TypographyFamilyContext.Provider, {
+      value: typographyFamily,
+      children: /*#__PURE__*/jsxRuntime.jsx(TypographyTypeContext.Provider, {
+        value: typographyType,
+        children: text
+      })
     })
   }) : text;
   return color ? /*#__PURE__*/jsxRuntime.jsx(TypographyColorContext.Provider, {
@@ -10202,17 +10218,19 @@ function createKittNativeBaseCustomTheme(theme, appTheme) {
     fontWeights: {
       headings: {
         regular: theme.typography.types.headings.fontWeight.regular,
+        semibold: theme.typography.types.headings.fontWeight.semibold,
         bold: theme.typography.types.headings.fontWeight.bold
       },
       bodies: {
-        regular: theme.typography.types.bodies.fontWeight.regular
-        // TODO [https://ornikar.atlassian.net/browse/CME-767] This quick fix should be replaced by a 700 in every case, and native font weights should be handled by expo-fonts
+        regular: theme.typography.types.bodies.fontWeight.regular,
+        // TODO [expo@>=53]: Check if still needed with new expo-fonts version
+        bold: theme.typography.types.bodies.fontWeight.bold
       },
       labels: {
         semibold: theme.typography.types.labels.fontWeight.semibold
       },
       contentCaps: {
-        // TODO [https://ornikar.atlassian.net/browse/CME-767] This quick fix should be replaced by a 700 in every case, and native font weights should be handled by expo-fonts
+        // TODO [expo@>=53]: Check if still needed with new expo-fonts version
         bold: theme.typography.types.contentCaps.fontWeight.bold
       }
     },