@momo-kits/foundation 0.169.9 → 0.169.10-beta.1

package/Application/Components/HeaderExtendHeader.tsx

@@ -17,11 +17,16 @@ import BackgroundImageView from './BackgroundImageView';
 import { type AnimatedCompatValue } from '../utils';
 import { useNormalizedSharedValue } from '../hooks';
 import { useScreenLayout } from '../../Layout';
-import { DuoMetrics, HeaderMetrics } from '../../Layout/utils';
+import { HeaderMetrics } from '../../Layout/utils';
+import {
+  HeaderBarMetrics,
+  type HeaderContentLayout,
+  useHeaderLayout,
+} from '../headerLayout';
 
-const SCREEN_PADDING = 12;
-const BACK_WIDTH = 28;
-const TOOLKIT_WIDTH = 73;
+const { buttonSize, pillWidth, sidePadding, titleGap } = HeaderBarMetrics;
+const SCREEN_PADDING = sidePadding;
+const TOOLKIT_WIDTH = pillWidth + sidePadding;
 
 /**
  * Extended header background: a gradient that collapses on scroll and, with
@@ -38,6 +43,7 @@ const HeaderExtendHeader: React.FC<{
   useShadowHeader?: boolean;
   gradientColor?: string;
   headerBackground?: string;
+  contentLayout?: HeaderContentLayout;
 }> = ({
   headerType = 'default',
   animatedValue,
@@ -48,6 +54,7 @@ const HeaderExtendHeader: React.FC<{
   useShadowHeader: useShadowHeaderProp = true,
   gradientColor: customGradientColor,
   headerBackground: customBackground,
+  contentLayout,
 }) => {
   const { theme } = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
@@ -55,29 +62,32 @@ const HeaderExtendHeader: React.FC<{
   const gradientColor = customGradientColor ?? theme.colors.gradient;
   const headerBackground = customBackground ?? theme.assets?.headerBackground;
   const layout = useScreenLayout();
+  const headerLayout = useHeaderLayout(contentLayout);
+  // the stretch frame pulls the search in from both bar edges
+  const frameShift = headerLayout.frameInset - sidePadding;
 
-  // the iPhone Duo status bar row keeps side bar sized back and toolkit
-  const isStatusBarRow = !!layout.statusBarClearance;
-  const duoToolkitWidth = DuoMetrics.itemPitch * 2 + SCREEN_PADDING;
-  const backWidth = isStatusBarRow ? DuoMetrics.controlSize : BACK_WIDTH;
-  const toolkitWidth = isStatusBarRow ? duoToolkitWidth : TOOLKIT_WIDTH;
-  const defaultLeft = layout.sideBar ? SCREEN_PADDING : backWidth + 20;
+  const backLeft = buttonSize + sidePadding + titleGap;
+  const defaultLeft = layout.sideBar ? SCREEN_PADDING : backLeft;
   const leftPosition = inputSearchProps?.leftPosition || defaultLeft;
-  const defaultRightWidth = layout.sideBar ? 0 : toolkitWidth;
+  const defaultRightWidth = layout.sideBar ? 0 : TOOLKIT_WIDTH;
   const headerRightWidth = customHeaderRightWidth ?? defaultRightWidth;
-  const contentLeft = layout.insetLeft + SCREEN_PADDING;
-  const contentRight = layout.insetLeft + layout.contentWidth;
+  const contentLeft = layout.insetLeft + SCREEN_PADDING + frameShift;
+  const contentRight = layout.insetLeft + layout.contentWidth - frameShift;
   // collapsed on the status bar row, the search stays between its clusters
   const clearanceLeft = layout.statusBarClearance?.left ?? 0;
   const clearanceRight = layout.statusBarClearance?.right ?? 0;
-  const collapsedLeft = layout.insetLeft + leftPosition + clearanceLeft;
+  const searchLeft = leftPosition + clearanceLeft + frameShift;
+  const collapsedLeft = layout.insetLeft + searchLeft;
   const collapsedRight = contentRight - clearanceRight - headerRightWidth;
-  const searchWidth = layout.contentWidth - SCREEN_PADDING * 2;
+  const searchWidth = contentRight - contentLeft - SCREEN_PADDING;
   const collapsedSearchWidth = collapsedRight - collapsedLeft - SCREEN_PADDING;
   // a row taller than barHeight (iPhone Duo) centers the collapsed search on the title
   const titleRowHeight = layout.headerHeight - layout.headerStatusBarHeight;
   const collapsedRaise = (titleRowHeight - HeaderMetrics.barHeight) / 2;
 
+  // the iPhone Duo side bar keeps the content search size
+  const searchSize = layout.sideBar ? 'default' : 'header';
+
   let useShadowHeader = useShadowHeaderProp;
   if (inputSearchProps && Platform.OS === 'android') {
     useShadowHeader = false;
@@ -169,6 +179,7 @@ const HeaderExtendHeader: React.FC<{
             <Animated.View
               style={[
                 styles.extendedHeader,
+                headerLayout.isWide && styles.phoneHeight,
                 // fade out within the header box, as DuoScrollGradient does
                 !!layout.sideBar && styles.fillHeaderBox,
                 gradientOpacityStyle,
@@ -180,7 +191,10 @@ const HeaderExtendHeader: React.FC<{
               >
                 {!!theme.assets?.headerBackground && (
                   <Image
-                    style={styles.headerBackground}
+                    style={[
+                      styles.headerBackground,
+                      headerLayout.isWide && styles.phoneHeight,
+                    ]}
                     source={{ uri: theme.assets?.headerBackground }}
                     loading={false}
                   />
@@ -189,9 +203,7 @@ const HeaderExtendHeader: React.FC<{
             </Animated.View>
           )}
         </Animated.View>
-        <Animated.View
-          style={[styles.searchContainer, heightStyle]}
-        >
+        <Animated.View style={[styles.searchContainer, heightStyle]}>
           <Animated.View
             style={[{ marginVertical: Spacing.S }, searchTranslateStyle]}
           >
@@ -201,6 +213,7 @@ const HeaderExtendHeader: React.FC<{
               <InputSearch
                 {...inputSearchProps}
                 ref={inputSearchRef}
+                size={searchSize}
                 backgroundColor={'transparent'}
                 showButtonText={false}
               />
@@ -236,7 +249,10 @@ const HeaderExtendHeader: React.FC<{
             >
               {!!headerBackground && (
                 <Image
-                  style={styles.headerBackground}
+                  style={[
+                    styles.headerBackground,
+                    headerLayout.isWide && styles.phoneHeight,
+                  ]}
                   source={{ uri: headerBackground }}
                   loading={false}
                 />
@@ -264,6 +280,11 @@ const styles = StyleSheet.create({
     position: 'absolute',
     width: '100%',
   },
+  // wide windows keep the phone gradient height instead of scaling with the width
+  phoneHeight: {
+    aspectRatio: undefined,
+    height: HeaderBarMetrics.gradientHeight,
+  },
   fillHeaderBox: {
     aspectRatio: undefined,
     height: '100%',
@@ -273,14 +294,6 @@ const styles = StyleSheet.create({
     position: 'absolute',
     overflow: 'hidden',
   },
-  verifiedDot: {
-    width: 4,
-    height: 4,
-    borderRadius: 2,
-    backgroundColor: Colors.green_03,
-    position: 'absolute',
-    alignSelf: 'center',
-  },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
   container: {
     zIndex: 0,

package/Application/Components/HeaderLeft.tsx

@@ -6,12 +6,13 @@ import { PopupNotify } from '../../Popup';
 import { NavigationButton } from './NavigationButton';
 import { SideBarButton } from './SideBarButton';
 import Animated from 'react-native-reanimated';
-import { useScreenLayout, useSideBarItemStyle } from '../../Layout/utils';
+import { useSideBarItemStyle } from '../../Layout/utils';
 import { useSideBarCounterStyle } from './DuoQuickReturnHeader';
+import { HeaderBarMetrics } from '../headerLayout';
 
 /**
  * Header back button, also bound to the Android hardware back. `preventBack`
- * confirms in a popup first; the iPhone Duo layouts use the 48pt side bar button.
+ * confirms in a popup first; the iPhone Duo side bar uses the 48pt side bar button.
  */
 const HeaderLeft: React.FC<HeaderBackProps> = ({
   tintColor,
@@ -24,7 +25,6 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   const { navigator } = useContext(ApplicationContext);
   const sideBarStyle = useSideBarItemStyle('left', 0);
   const counterStyle = useSideBarCounterStyle();
-  const { statusBarClearance } = useScreenLayout();
 
   const goBack = useCallback(() => {
     const canGoBack = navigator?.ref?.current?.canGoBack?.();
@@ -97,20 +97,6 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     );
   }
 
-  // on the status bar row the controls keep the side bar size
-  if (statusBarClearance) {
-    return (
-      <View style={styles.headerLeft}>
-        <SideBarButton
-          accessibilityLabel="btn_navigation_back"
-          icon="arrow-back"
-          tintColor={tintColor}
-          onPress={goBackSafe}
-        />
-      </View>
-    );
-  }
-
   return (
     <View style={styles.headerLeft}>
       <NavigationButton
@@ -125,7 +111,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
 
 const styles = StyleSheet.create({
   headerLeft: {
-    marginLeft: 12,
+    marginLeft: HeaderBarMetrics.sidePadding,
   },
 });
 

package/Application/Components/HeaderRight.styles.ts

@@ -1,11 +1,14 @@
 import { Platform, StyleSheet } from 'react-native';
 import { Colors, Spacing } from '../../Consts';
+import { HeaderBarMetrics } from '../headerLayout';
+
+const { buttonSize, pillWidth, pillHeight, sidePadding } = HeaderBarMetrics;
 
 export const styles = StyleSheet.create({
   navigationButton: {
-    height: 28,
-    width: 28,
-    borderRadius: 14,
+    height: buttonSize,
+    width: buttonSize,
+    borderRadius: buttonSize / 2,
     justifyContent: 'center',
     alignItems: 'center',
     backgroundColor: Colors.black_01 + '99',
@@ -45,11 +48,11 @@ export const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
-    paddingRight: Spacing.M,
+    paddingRight: sidePadding,
   },
   toolkitContainer: {
-    height: 28,
-    borderRadius: 14,
+    height: pillHeight,
+    borderRadius: pillHeight / 2,
     justifyContent: 'center',
     alignItems: 'center',
     flexDirection: 'row',
@@ -59,7 +62,10 @@ export const styles = StyleSheet.create({
     marginLeft: Spacing.S,
   },
   toolkitButton: {
-    padding: 4,
+    flex: 1,
+    height: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
   },
   divider: {
     width: 0.5,
@@ -68,10 +74,6 @@ export const styles = StyleSheet.create({
   sideBarColumn: {
     gap: Spacing.M,
   },
-  sideBarRow: {
-    flexDirection: 'row',
-    gap: Spacing.M,
-  },
   headerLeft: {
     marginLeft: 12,
   },
@@ -136,9 +138,9 @@ export const styles = StyleSheet.create({
     marginRight: Spacing.M,
   },
   toolkitWide: {
-    width: 65,
+    width: pillWidth,
   },
   toolkitNarrow: {
-    width: 28,
+    width: buttonSize,
   },
 });

package/Application/Components/HeaderTitle.shared.ts

@@ -3,6 +3,9 @@ import { MiniAppContext } from '../../Context';
 import { Spacing } from '../../Consts';
 import { isWhiteListDesignSystem } from '../utils';
 import { useScreenLayout } from '../../Layout';
+import { HeaderBarMetrics } from '../headerLayout';
+
+const { sidePadding, buttonSize, titleGap, clusterWidth } = HeaderBarMetrics;
 
 /**
  * Header title font: MoMoTrustDisplay for design-system whitelisted mini apps,
@@ -14,32 +17,28 @@ const useHeaderFontFamily = (): string => {
 };
 
 /**
- * back button and toolkit sharing the navigation bar with the title
- */
-const HEADER_ACTIONS_WIDTH = 172;
-
-/**
- * extra width the 48pt back and toolkit take on the iPhone Duo status bar row
+ * side paddings, back button, title gaps and right cluster sharing the
+ * navigation bar with the title
  */
-const STATUS_BAR_ROW_ACTIONS_EXTRA = 55;
+const HEADER_ACTIONS_WIDTH =
+  sidePadding * 2 + buttonSize + titleGap * 2 + clusterWidth;
 
 /**
  * Max header title width. The iPhone Duo side bar takes back and toolkit out of
- * the bar, so the title gets the content width; otherwise it shares the bar with them.
+ * the bar, so the title gets the content width; otherwise it shares the bar with
+ * them, minus the status bar clusters on the iPhone Duo inner portrait row.
  */
 const useTitleMaxWidth = () => {
   const layout = useScreenLayout();
   const { width, contentWidth, sideBar, statusBarClearance } = layout;
   let clearance = 0;
-  let rowActionsExtra = 0;
   if (statusBarClearance) {
     clearance = statusBarClearance.left + statusBarClearance.right;
-    rowActionsExtra = STATUS_BAR_ROW_ACTIONS_EXTRA;
   }
   if (sideBar) {
     return contentWidth - Spacing.M * 2 - clearance;
   }
-  return width - HEADER_ACTIONS_WIDTH - rowActionsExtra - clearance;
+  return width - HEADER_ACTIONS_WIDTH - clearance;
 };
 
 export { useHeaderFontFamily, HEADER_ACTIONS_WIDTH, useTitleMaxWidth };

package/Application/Components/HeaderToolkitAction.tsx

@@ -4,18 +4,15 @@ import { NavigationButton } from './NavigationButton';
 import { MiniAppContext } from '../../Context';
 import { Colors, Spacing, Styles } from '../../Consts';
 import { Icon } from '../../Icon';
-import { DuoMetrics, useScreenLayout } from '../../Layout/utils';
+import { DuoMetrics } from '../../Layout/utils';
 import { SideBarButton, SideBarGroup, SideBarGroupItem } from './SideBarButton';
 import { useDuoBarCompression } from '../BottomTab/DuoBarCompression';
 import { styles } from './HeaderRight.styles';
 import { useToolkitActions } from './useToolkitActions';
+import { HeaderBarMetrics } from '../headerLayout';
 
 const CLOSE_ICON = '16_navigation_close_circle';
 const HOME_ICON = '16_basic_home';
-const TOOLKIT_ICON_SIZE = 20;
-// the capsule's two buttons extend their touch area outward only
-const HELP_CENTER_HIT_SLOP = { top: 7, bottom: 7, left: 7, right: 0 };
-const CLOSE_HIT_SLOP = { top: 7, bottom: 7, left: 0, right: 7 };
 
 /**
  * Header toolkit: optional shortcut plus the help center / close capsule. When
@@ -35,14 +32,13 @@ const HeaderToolkitAction: React.FC<any> = ({
   const compression = useDuoBarCompression();
   const { toolbarCompressed, toolbarHidden } = compression;
   const { expandToolbar, setToolbarHeight } = compression;
-  const { statusBarClearance } = useScreenLayout();
   const {
     isLoading,
     iconShortcut,
     shortcutOnPress,
     showBadge,
-    handlePressHelpCenter,
-    handleClose,
+    onPressHelpCenter,
+    onClose,
   } = useToolkitActions({
     preventClose,
     useSystemTools,
@@ -60,14 +56,14 @@ const HeaderToolkitAction: React.FC<any> = ({
     };
   }
 
-  const hasHelpCenter = context.appId !== 'vn.momo.helpcenter';
+  const useHelpCenter = context.appId !== 'vn.momo.helpcenter';
   const closeIcon = useCloseIcon ? CLOSE_ICON : HOME_ICON;
   let toolkitWidthStyle: ViewStyle = styles.toolkitNarrow;
-  if (hasHelpCenter) {
+  if (useHelpCenter) {
     toolkitWidthStyle = styles.toolkitWide;
   }
 
-  const groupCount = hasHelpCenter ? 2 : 1;
+  const groupCount = useHelpCenter ? 2 : 1;
   let capsuleHeight = DuoMetrics.controlSize;
   if (groupCount > 1) {
     capsuleHeight = groupCount * DuoMetrics.itemPitch;
@@ -116,52 +112,19 @@ const HeaderToolkitAction: React.FC<any> = ({
           />
         )}
         <SideBarGroup tintColor={tintColor}>
-          {hasHelpCenter && (
+          {useHelpCenter && (
             <SideBarGroupItem
               accessibilityLabel={'btn_navigation_help_center'}
               icon={'help_center'}
               tintColor={tintColor}
-              onPress={handlePressHelpCenter}
+              onPress={onPressHelpCenter}
             />
           )}
           <SideBarGroupItem
             accessibilityLabel={'btn_navigation_close'}
             icon={closeIcon}
             tintColor={tintColor}
-            onPress={handleClose}
-          />
-        </SideBarGroup>
-      </View>
-    );
-  }
-
-  // on the status bar row the controls keep the side bar size
-  if (statusBarClearance) {
-    return (
-      <View style={styles.sideBarRow}>
-        {useShortcut && (
-          <SideBarButton
-            disabled={isLoading}
-            icon={iconShortcut}
-            onPress={shortcutOnPress}
-            tintColor={tintColor}
-            showBadge={showBadge}
-          />
-        )}
-        <SideBarGroup tintColor={tintColor} horizontal>
-          {hasHelpCenter && (
-            <SideBarGroupItem
-              accessibilityLabel={'btn_navigation_help_center'}
-              icon={'help_center'}
-              tintColor={tintColor}
-              onPress={handlePressHelpCenter}
-            />
-          )}
-          <SideBarGroupItem
-            accessibilityLabel={'btn_navigation_close'}
-            icon={closeIcon}
-            tintColor={tintColor}
-            onPress={handleClose}
+            onPress={onClose}
           />
         </SideBarGroup>
       </View>
@@ -180,18 +143,18 @@ const HeaderToolkitAction: React.FC<any> = ({
         />
       )}
       <View style={[styles.toolkitContainer, buttonStyle, toolkitWidthStyle]}>
-        {hasHelpCenter && (
+        {useHelpCenter && (
           <>
             <TouchableOpacity
               accessibilityLabel={'btn_navigation_help_center'}
               style={styles.toolkitButton}
-              onPress={handlePressHelpCenter}
-              hitSlop={HELP_CENTER_HIT_SLOP}
+              onPress={onPressHelpCenter}
+              hitSlop={{ top: 7, bottom: 7, left: 7, right: 0 }}
             >
               <Icon
                 color={tintColor}
                 source={'help_center'}
-                size={TOOLKIT_ICON_SIZE}
+                size={HeaderBarMetrics.iconSize}
               />
             </TouchableOpacity>
             <View style={[styles.divider, { backgroundColor: tintColor }]} />
@@ -199,11 +162,15 @@ const HeaderToolkitAction: React.FC<any> = ({
         )}
         <TouchableOpacity
           accessibilityLabel={'btn_navigation_close'}
-          onPress={handleClose}
+          onPress={onClose}
           style={styles.toolkitButton}
-          hitSlop={CLOSE_HIT_SLOP}
+          hitSlop={{ top: 7, bottom: 7, left: 0, right: 7 }}
         >
-          <Icon color={tintColor} source={closeIcon} size={TOOLKIT_ICON_SIZE} />
+          <Icon
+            color={tintColor}
+            source={closeIcon}
+            size={HeaderBarMetrics.iconSize}
+          />
         </TouchableOpacity>
       </View>
     </View>

package/Application/Components/NavigationButton.tsx

@@ -5,9 +5,12 @@ import { StyleSheet, TouchableOpacity, View, ViewStyle } from 'react-native';
 import { Colors, Spacing } from '../../Consts';
 import { Icon } from '../../Icon';
 import { BadgeDot } from '../../Badge';
+import { HeaderBarMetrics } from '../headerLayout';
+
+const { buttonSize, iconSize } = HeaderBarMetrics;
 
 /**
- * Round 28pt icon button of the header (back, shortcut) with an optional badge
+ * Round 32pt icon button of the header (back, shortcut) with an optional badge
  * dot; switches to a dark fill under a white tint so the icon stays readable.
  */
 const NavigationButton: React.FC<NavigationButtonProps> = ({
@@ -35,7 +38,7 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
         <Icon
           source={icon}
           color={tintColor ?? theme.colors.text.default}
-          size={20}
+          size={iconSize}
         />
       </TouchableOpacity>
       {showBadge && <BadgeDot size={'small'} style={styles.badgeDot} />}
@@ -45,12 +48,12 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    width: 28,
+    width: buttonSize,
   },
   navigationButton: {
-    height: 28,
-    width: 28,
-    borderRadius: 14,
+    height: buttonSize,
+    width: buttonSize,
+    borderRadius: buttonSize / 2,
     justifyContent: 'center',
     alignItems: 'center',
     backgroundColor: Colors.black_01 + '99',

package/Application/Components/SearchHeader.tsx

@@ -1,5 +1,5 @@
 import { Colors, Radius, Spacing, Styles } from '../../Consts';
-import { InputRef, InputSearch } from '../../Input';
+import { InputRef, InputSearch, type InputSearchProps } from '../../Input';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import Animated, { useAnimatedStyle } from 'react-native-reanimated';
 import React, { useContext } from 'react';
@@ -8,7 +8,13 @@ import { ApplicationContext, MiniAppContext } from '../../Context';
 import { Text } from '../../Text';
 import { useNormalizedSharedValue } from '../hooks';
 import { useScreenLayout } from '../../Layout';
-import { DuoMetrics } from '../../Layout/utils';
+import { HeaderBarMetrics } from '../headerLayout';
+
+const { buttonSize, pillWidth, sidePadding, titleGap } = HeaderBarMetrics;
+// help center | home pill and the bar padding right of it
+const TOOLKIT_WIDTH = pillWidth + sidePadding;
+// the iPhone Duo side bar keeps its right header width
+const DUO_TOOLKIT_WIDTH = 73;
 
 /**
  * Header search bar whose fill turns from surface to default once scrolled, with
@@ -28,15 +34,21 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
     const { theme, navigator } = useContext(ApplicationContext);
     const context = useContext<any>(MiniAppContext);
     const layout = useScreenLayout();
-    // the iPhone Duo status bar row keeps a side bar sized back button
-    const BACK_WIDTH = layout.statusBarClearance ? DuoMetrics.controlSize : 28;
+    let defaultRightWidth = TOOLKIT_WIDTH;
+    let searchSize: InputSearchProps['size'] = 'header';
+    if (layout.sideBar) {
+      defaultRightWidth = DUO_TOOLKIT_WIDTH;
+      searchSize = 'default';
+    }
 
     const sharedValue = useNormalizedSharedValue(animatedValue);
-    const leftPosition = props?.leftPosition ?? BACK_WIDTH + 20;
-    const headerRightWidth = props?.headerRightWidth ?? 73;
+    const defaultLeft = buttonSize + sidePadding + titleGap;
+    const leftPosition = props?.leftPosition ?? defaultLeft;
+    const headerRightWidth = props?.headerRightWidth ?? defaultRightWidth;
 
     // iPhone Duo side bar holds back: the search shares the content width with the buttons only
-    let searchMaxWidth = layout.width - leftPosition - 12 - headerRightWidth;
+    const rowWidth = layout.width - leftPosition - sidePadding;
+    let searchMaxWidth = rowWidth - headerRightWidth;
     if (layout.sideBar) {
       searchMaxWidth = layout.contentWidth - Spacing.M * 2 - headerRightWidth;
     }
@@ -105,6 +117,7 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
             <InputSearch
               ref={ref}
               {...props}
+              size={searchSize}
               backgroundColor={'transparent'}
               showButtonText={false}
             />