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

package/dist/index.es.js

@@ -3101,6 +3101,7 @@ var getTypographyTypeWithAncestorValue = function (type, typographyTypeInContext
 var _excluded$R = ["accessibilityRole", "base", "small", "medium", "large", "wide", "type", "variant", "color"];
 var TypographyFamilyContext = /*#__PURE__*/createContext(null);
 var TypographyTypeContext = /*#__PURE__*/createContext(null);
+var TypographyVariantContext = /*#__PURE__*/createContext(undefined);
 var TypographyColorContext = /*#__PURE__*/createContext('black');
 function useTypographyColor() {
   return useContext(TypographyColorContext);
@@ -3196,7 +3197,7 @@ function getUniversalFontWeight(type, variant, typographyFamily) {
       ThrowErrorIfInvalidVariant(variant, value, 'regular');
       resolvedVariant = 'regular';
     }
-    webFontWeight[typeName] = resolvedVariant;
+    webFontWeight[typeName] = "".concat(typographyFamily, ".").concat(resolvedVariant);
     nativeFontFamily[typeName] = "".concat(typographyFamily, ".").concat(resolvedVariant);
   });
   return {
@@ -3224,21 +3225,33 @@ var TypographyBase = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     color = _ref2.color,
     otherProps = _objectWithoutProperties(_ref2, _excluded$R);
   var sx = useSx();
+
+  // ancestors
   var typographyFamilyInContext = useContext(TypographyFamilyContext);
   var typographyTypeInContext = useContext(TypographyTypeContext);
-  var defaultColor = useTypographyDefaultColor();
+  var typographyVariantInContext = useContext(TypographyVariantContext);
+
+  // family
   var hasTypographyAncestor = typographyFamilyInContext !== null;
   var typographyType = getTypographyTypeWithAncestorValue(type, typographyTypeInContext);
   var baseOrDefaultToBody = (_typographyType$base = typographyType.base) !== null && _typographyType$base !== void 0 ? _typographyType$base : 'body-m';
   var typographyFamily = getTypographyFamilyWithAncestorValue(baseOrDefaultToBody, typographyFamilyInContext);
+
+  // size
   var fontSizeForNativeBase = createNativeBaseFontSize(_objectSpread(_objectSpread({}, type), {}, {
     base: baseOrDefaultToBody
   }));
+
+  // weight
+
   var _getUniversalFontWeig = getUniversalFontWeight(_objectSpread(_objectSpread({}, type), {}, {
       base: baseOrDefaultToBody
-    }), variant, typographyFamily),
+    }), !variant && typographyType === typographyTypeInContext ? typographyVariantInContext : variant, typographyFamily),
     webFontWeight = _getUniversalFontWeig.webFontWeight,
     nativeFontFamily = _getUniversalFontWeig.nativeFontFamily;
+
+  // color
+  var defaultColor = useTypographyDefaultColor();
   var currentColor = !color && !hasTypographyAncestor ? defaultColor : color;
   var currentColorValue = getTypographyColorValue(currentColor);
   var colorStyles = sx({
@@ -3264,11 +3277,14 @@ var TypographyBase = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     fontFamily: nativeFontFamily,
     textTransform: typographyFamily === 'contentCaps' ? 'uppercase' : undefined
   }, colorStyles), otherProps));
-  var content = baseOrDefaultToBody ? /*#__PURE__*/jsx(TypographyFamilyContext.Provider, {
-    value: typographyFamily,
-    children: /*#__PURE__*/jsx(TypographyTypeContext.Provider, {
-      value: typographyType,
-      children: text
+  var 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, {
@@ -4183,9 +4199,10 @@ function ModalBehaviour(_ref2) {
 }
 ModalBehaviour.CloseButton = CloseButton$1;
 
-function Overlay(_ref) {
+var Overlay = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onPress = _ref.onPress;
   return /*#__PURE__*/jsx(Pressable, {
+    ref: ref,
     accessibilityRole: "none",
     position: "absolute",
     top: "0",
@@ -4195,10 +4212,10 @@ function Overlay(_ref) {
     backgroundColor: "kitt.overlay.dark",
     onPress: onPress
   });
-}
+});
 
-function CardModalRotationContainer(props) {
-  return /*#__PURE__*/jsx(View, _objectSpread({
+var CardModalRotationContainer = /*#__PURE__*/forwardRef(function (props, ref) {
+  return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({
     paddingX: "kitt.cardModal.overlayPadding.horizontal",
     paddingY: "kitt.cardModal.overlayPadding.vertical",
     maxWidth: "kitt.cardModal.maxWidthWithPadding",
@@ -4207,8 +4224,10 @@ function CardModalRotationContainer(props) {
     _web: {
       maxHeight: '100svh'
     }
-  }, props));
-}
+  }, props), {}, {
+    ref: ref
+  }));
+});
 
 function NativeOpacityAnimation$2(_ref) {
   var visible = _ref.visible,
@@ -9207,7 +9226,7 @@ var getIconButtonColor = function (messageType) {
   }
 };
 
-function BaseMessage(_ref) {
+var BaseMessage = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$type = _ref.type,
     type = _ref$type === void 0 ? 'info' : _ref$type,
     children = _ref.children,
@@ -9217,6 +9236,7 @@ function BaseMessage(_ref) {
     onDismiss = _ref.onDismiss;
   var color = getColorByType(type);
   return /*#__PURE__*/jsxs(HStack, {
+    ref: ref,
     alignItems: "flex-start",
     justifyContent: "space-between",
     minHeight: "kitt.feedbackMessage.minHeight",
@@ -9258,7 +9278,7 @@ function BaseMessage(_ref) {
       })
     }) : null]
   });
-}
+});
 
 function Message(_ref) {
   var _ref$type = _ref.type,
@@ -11229,17 +11249,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
       }
     },
@@ -11988,13 +12010,14 @@ NavigationModal.Body = Body;
 NavigationModal.Footer = Footer;
 NavigationModal.ModalBehaviour = NavigationModalBehaviour;
 
-function Notification(_ref) {
+var Notification = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var type = _ref.type,
     children = _ref.children,
     centeredText = _ref.centeredText,
     insets = _ref.insets,
     onDismiss = _ref.onDismiss;
   return /*#__PURE__*/jsx(BaseMessage, {
+    ref: ref,
     hasNoRadius: true,
     type: type,
     centeredText: centeredText,
@@ -12002,7 +12025,7 @@ function Notification(_ref) {
     onDismiss: onDismiss,
     children: children
   });
-}
+});
 
 var AnimatedCircle = Animated.createAnimatedComponent(Circle$1);
 function AnimatedLoaderCircle(_ref) {