@quintype/native-components 2.30.2--alt-story-layout-beta → 2.30.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/native-components",
-  "version": "2.30.2--alt-story-layout-beta",
+  "version": "2.30.2",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/components/Header/index.js

@@ -12,12 +12,35 @@ import { headerStyles } from "./styles";
 
 export const Header = (props) => {
   const { theme } = useContext(AppTheme);
-  const styles = headerStyles(theme, props.noBorder);
+  const { noBorder, centerAlignLogo } = props || {};
+  const styles = headerStyles(theme, noBorder, centerAlignLogo);
   const headerStyle = StyleSheet.flatten([styles.header, props.style]);
   const logoComponentStyle = StyleSheet.flatten([
     styles.logoComponentStyle,
     props.logoComponentStyle,
   ]);
+  if (centerAlignLogo) {
+    return (
+      <View style={styles.header}>
+        <View style={styles.leftContainer}>
+          {props.leftComponent && props.leftComponent}
+        </View>
+          {props.logoComponent && (
+            <TouchableOpacity
+              style={logoComponentStyle}
+              onPress={props.onPress}
+              testID={COMP_GENERAL_CONSTANTS.headerLogoTouch}
+            >
+              {props.logoComponent}
+            </TouchableOpacity>
+          )}
+        <View style={styles.rightContainer}>
+          {props.rightComponent && props.rightComponent}
+        </View>
+      </View>
+    )
+  }
+
   return (
     <View style={headerStyle}>
       <View>

package/src/components/Header/styles.js

@@ -1,19 +1,35 @@
 import { StyleSheet } from 'react-native';
 
-export const headerStyles = (appThemeContext, noBorder) => {
+export const headerStyles = (appThemeContext, noBorder, centerAlignLogo) => {
   const { COLORS, DARK_MODE } = appThemeContext;
-  return StyleSheet.create({
+  const headerContainerStyles = {
     header: {
       height: 48,
       backgroundColor: DARK_MODE ? COLORS.MONO6 : COLORS.BRAND_WHITE,
       flexDirection: 'row',
       alignItems: 'center',
-      justifyContent: 'space-between',
+      justifyContent: centerAlignLogo ? 'center' : 'space-between',
       paddingHorizontal: 10,
       borderBottomColor: noBorder
         ? (DARK_MODE ? COLORS.BRAND_WHITE : COLORS.BRAND_BLACK)
         : (DARK_MODE ? COLORS.MONO6 : COLORS.BRAND5),
       borderBottomWidth: StyleSheet.hairlineWidth,
-    },
-  });
+    }
+  }
+
+  if (centerAlignLogo) {
+    return StyleSheet.create({
+      ...headerContainerStyles,
+      leftContainer: {
+        flex: 1, // Takes up all left space
+        alignItems: 'flex-start', // Aligns leftView to the left
+      },
+      rightContainer: {
+        flex: 1, // Takes up all right space
+        alignItems: 'flex-end', // Aligns rightView to the right
+      }
+    });
+  }
+
+  return StyleSheet.create(headerContainerStyles);
 };

package/src/components/Text/index.js

@@ -8,16 +8,34 @@ import { AppTheme } from '../../utils/context';
 
 export const Text = (props) => {
   const { theme } = useContext(AppTheme);
-  const { FONT_FAMILY, COLORS, CAN_COPY_TEXT } = theme;
+  const {
+    FONT_FAMILY, COLORS, CAN_COPY_TEXT, lineHeightMultiplier,
+  } = theme;
+
+  // Flatten the style first
+  const flattenedStyle = StyleSheet.flatten([props.style]) || {};
+
+  // Use fontSize from style or fallback, and lineHeight from style or calculate
+  const { fontSize } = flattenedStyle;
+  let lineHeight;
+  if (flattenedStyle.lineHeight != null) {
+    lineHeight = flattenedStyle.lineHeight;
+  } else if (fontSize != null) {
+    lineHeight = fontSize * (lineHeightMultiplier ?? 1.5);
+  }
 
   const RNStyle = {
     fontFamily: props.primary ? FONT_FAMILY.primary : FONT_FAMILY.secondary,
     writingDirection: I18nManager.isRTL ? 'rtl' : 'ltr',
+    ...(fontSize != null ? { fontSize } : {}),
+    ...(lineHeight != null ? { lineHeight } : {}),
   };
-  const flattenedStyle = StyleSheet.flatten([RNStyle, props.style]);
 
-  const { ellipsizeMode, numberOfLines, allowFontScaling, testID } = props;
+  const mergedStyle = StyleSheet.flatten([RNStyle, props.style]);
 
+  const {
+    ellipsizeMode, numberOfLines, allowFontScaling, testID,
+  } = props;
   const textData = I18nManager.isRTL ? `\u200F${props.children}` : props.children;
 
   return (
@@ -29,7 +47,7 @@ export const Text = (props) => {
       ellipsizeMode={ellipsizeMode}
       numberOfLines={numberOfLines}
       testID={testID}
-      style={flattenedStyle}
+      style={mergedStyle}
       fontFamily={RNStyle.fontFamily}
       allowFontScaling={allowFontScaling}
     >