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

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

@@ -3086,6 +3086,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);
@@ -3184,7 +3185,7 @@ function getUniversalFontWeight(type, variant, typographyFamily) {
       ThrowErrorIfInvalidVariant(variant, value, 'regular');
       resolvedVariant = 'regular';
     }
-    webFontWeight[typeName] = resolvedVariant;
+    webFontWeight[typeName] = `${typographyFamily}.${resolvedVariant}`;
     nativeFontFamily[typeName] = `${typographyFamily}.${resolvedVariant}`;
   });
   return {
@@ -3211,24 +3212,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({
@@ -3253,11 +3266,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, {
@@ -4157,10 +4173,11 @@ function ModalBehaviour({
 }
 ModalBehaviour.CloseButton = CloseButton$1;
 
-function Overlay({
+const Overlay = /*#__PURE__*/React.forwardRef(({
   onPress
-}) {
+}, ref) => {
   return /*#__PURE__*/jsxRuntime.jsx(Pressable, {
+    ref: ref,
     accessibilityRole: "none",
     position: "absolute",
     top: "0",
@@ -4170,9 +4187,9 @@ function Overlay({
     backgroundColor: "kitt.overlay.dark",
     onPress: onPress
   });
-}
+});
 
-function CardModalRotationContainer(props) {
+const CardModalRotationContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
   return /*#__PURE__*/jsxRuntime.jsx(View, {
     paddingX: "kitt.cardModal.overlayPadding.horizontal",
     paddingY: "kitt.cardModal.overlayPadding.vertical",
@@ -4182,9 +4199,10 @@ function CardModalRotationContainer(props) {
     _web: {
       maxHeight: '100svh'
     },
-    ...props
+    ...props,
+    ref: ref
   });
-}
+});
 
 function NativeOpacityAnimation$2({
   visible,
@@ -8982,16 +9000,17 @@ const getIconButtonColor = messageType => {
   }
 };
 
-function BaseMessage({
+const BaseMessage = /*#__PURE__*/React.forwardRef(({
   type = 'info',
   children,
   hasNoRadius,
   centeredText,
   insets,
   onDismiss
-}) {
+}, ref) => {
   const color = getColorByType(type);
   return /*#__PURE__*/jsxRuntime.jsxs(HStack, {
+    ref: ref,
     alignItems: "flex-start",
     justifyContent: "space-between",
     minHeight: "kitt.feedbackMessage.minHeight",
@@ -9033,7 +9052,7 @@ function BaseMessage({
       })
     }) : null]
   });
-}
+});
 
 function Message({
   type = 'info',
@@ -11011,17 +11030,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: reactNative.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: reactNative.Platform.OS === 'android' ? 400 : theme.typography.types.contentCaps.fontWeight.bold
       }
     },
@@ -11770,14 +11791,15 @@ NavigationModal.Body = Body;
 NavigationModal.Footer = Footer;
 NavigationModal.ModalBehaviour = NavigationModalBehaviour;
 
-function Notification({
+const Notification = /*#__PURE__*/React.forwardRef(({
   type,
   children,
   centeredText,
   insets,
   onDismiss
-}) {
+}, ref) => {
   return /*#__PURE__*/jsxRuntime.jsx(BaseMessage, {
+    ref: ref,
     hasNoRadius: true,
     type: type,
     centeredText: centeredText,
@@ -11785,7 +11807,7 @@ function Notification({
     onDismiss: onDismiss,
     children: children
   });
-}
+});
 
 const AnimatedCircle = Animated__default.createAnimatedComponent(Svg.Circle);
 function AnimatedLoaderCircle({