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

package/dist/index-metro.es.ios.js

@@ -3069,6 +3069,7 @@ const getTypographyTypeWithAncestorValue = (type, typographyTypeInContext) => {
 const _excluded$R = ["accessibilityRole", "base", "small", "medium", "large", "wide", "type", "variant", "color"];
 const TypographyFamilyContext = /*#__PURE__*/createContext(null);
 const TypographyTypeContext = /*#__PURE__*/createContext(null);
+const TypographyVariantContext = /*#__PURE__*/createContext(undefined);
 const TypographyColorContext = /*#__PURE__*/createContext('black');
 function useTypographyColor() {
   return useContext(TypographyColorContext);
@@ -3166,7 +3167,7 @@ function getUniversalFontWeight(type, variant, typographyFamily) {
       ThrowErrorIfInvalidVariant(variant, value, 'regular');
       resolvedVariant = 'regular';
     }
-    webFontWeight[typeName] = resolvedVariant;
+    webFontWeight[typeName] = `${typographyFamily}.${resolvedVariant}`;
     nativeFontFamily[typeName] = `${typographyFamily}.${resolvedVariant}`;
   });
   return {
@@ -3195,22 +3196,34 @@ const TypographyBase = /*#__PURE__*/forwardRef((_ref, ref) => {
     } = _ref,
     otherProps = _objectWithoutProperties(_ref, _excluded$R);
   const sx = useSx();
+
+  // ancestors
   const typographyFamilyInContext = useContext(TypographyFamilyContext);
   const typographyTypeInContext = useContext(TypographyTypeContext);
-  const defaultColor = useTypographyDefaultColor();
+  const typographyVariantInContext = useContext(TypographyVariantContext);
+
+  // family
   const hasTypographyAncestor = typographyFamilyInContext !== null;
   const typographyType = getTypographyTypeWithAncestorValue(type, typographyTypeInContext);
   const baseOrDefaultToBody = (_typographyType$base = typographyType.base) !== null && _typographyType$base !== void 0 ? _typographyType$base : 'body-m';
   const typographyFamily = getTypographyFamilyWithAncestorValue(baseOrDefaultToBody, typographyFamilyInContext);
+
+  // size
   const fontSizeForNativeBase = createNativeBaseFontSize(_objectSpread(_objectSpread({}, type), {}, {
     base: baseOrDefaultToBody
   }));
+
+  // weight
+
   const {
     webFontWeight,
     nativeFontFamily
   } = getUniversalFontWeight(_objectSpread(_objectSpread({}, 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({
@@ -3233,11 +3246,14 @@ const TypographyBase = /*#__PURE__*/forwardRef((_ref, ref) => {
     fontFamily: nativeFontFamily,
     textTransform: typographyFamily === 'contentCaps' ? 'uppercase' : undefined
   }, colorStyles), otherProps));
-  const content = baseOrDefaultToBody ? /*#__PURE__*/jsx(TypographyFamilyContext.Provider, {
-    value: typographyFamily,
-    children: /*#__PURE__*/jsx(TypographyTypeContext.Provider, {
-      value: typographyType,
-      children: text
+  const content = baseOrDefaultToBody ? /*#__PURE__*/jsx(TypographyVariantContext.Provider, {
+    value: variant,
+    children: /*#__PURE__*/jsx(TypographyFamilyContext.Provider, {
+      value: typographyFamily,
+      children: /*#__PURE__*/jsx(TypographyTypeContext.Provider, {
+        value: typographyType,
+        children: text
+      })
     })
   }) : text;
   return color ? /*#__PURE__*/jsx(TypographyColorContext.Provider, {
@@ -11003,17 +11019,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: Platform.OS === 'android' ? 400 : 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: Platform.OS === 'android' ? 400 : theme.typography.types.contentCaps.fontWeight.bold
       }
     },