@momo-kits/foundation 0.169.7-beta.5 → 0.169.7-beta.6

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';
@@ -9,6 +9,13 @@ 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 and status bar row keep their right header width
+const DUO_TOOLKIT_WIDTH = 73;
 
 /**
  * Header search bar whose fill turns from surface to default once scrolled, with
@@ -29,14 +36,25 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
     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 backWidth = buttonSize;
+    if (layout.statusBarClearance) {
+      backWidth = DuoMetrics.controlSize;
+    }
+    let defaultRightWidth = TOOLKIT_WIDTH;
+    let searchSize: InputSearchProps['size'] = 'header';
+    if (layout.sideBar || layout.statusBarClearance) {
+      defaultRightWidth = DUO_TOOLKIT_WIDTH;
+      searchSize = 'default';
+    }
 
     const sharedValue = useNormalizedSharedValue(animatedValue);
-    const leftPosition = props?.leftPosition ?? BACK_WIDTH + 20;
-    const headerRightWidth = props?.headerRightWidth ?? 73;
+    const defaultLeft = backWidth + 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 +123,7 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
             <InputSearch
               ref={ref}
               {...props}
+              size={searchSize}
               backgroundColor={'transparent'}
               showButtonText={false}
             />

package/Application/StackScreen.tsx

@@ -8,6 +8,7 @@ import { SwipeBackHaptic } from './Components/SwipeBackHaptic';
 import { useAppState } from './hooks';
 import { createScreenTracking } from './StackScreen.tracking';
 import { TooltipPortalHost, TooltipPortalProvider } from './TooltipPortal';
+import { useHeaderFrameOptions } from './headerLayout';
 
 const runAfterInteractions = InteractionManager.runAfterInteractions;
 
@@ -51,6 +52,7 @@ const StackScreen: React.FC<any> = props => {
   const navigation = useRef(new Navigation(props.navigation, context)).current;
   const heightHeader = useHeaderHeight();
   const { isBackgroundToForeground } = useAppState();
+  const headerFrameOptions = useHeaderFrameOptions(options?.contentLayout);
 
   const data = {
     ...initialParams,
@@ -69,6 +71,13 @@ const StackScreen: React.FC<any> = props => {
     }
   }, [navigation, options]);
 
+  // re-applied on fold, unfold and rotation, apart from the other options
+  useLayoutEffect(() => {
+    if (headerFrameOptions) {
+      navigation.instance.setOptions(headerFrameOptions);
+    }
+  }, [navigation, headerFrameOptions]);
+
   useEffect(() => {
     let focusScreen: any;
     let onFocusApp: any;

package/Application/headerLayout.ts

@@ -0,0 +1,158 @@
+import { useMemo } from 'react';
+import { useWindowDimensions, type ViewStyle } from 'react-native';
+import type { StackNavigationOptions } from '@react-navigation/stack';
+import { Spacing } from '../Consts';
+import { getHeaderMargin } from '../Layout/utils';
+import { FOLDABLE_MIN_WIDTH } from './modalLayout';
+import { isIPhoneDuo } from './utils';
+
+// Top navigation spec, shared with the Compose / SwiftUI kits
+const HEADER_FRAME_MAX_WIDTH = 600;
+
+/**
+ * Top navigation geometry on every device
+ * - buttonSize / iconSize: round back and shortcut buttons, icons inside them and the pill
+ * - pillWidth / pillHeight: help center | home capsule
+ * - clusterWidth: shortcut, gap and pill on the right of the bar
+ * - searchHeight: search field inside the header
+ * - titleGap: space between back and the title, and the title and the right cluster
+ * - sidePadding: bar edge to back and to the right cluster
+ * - gradientHeight: header gradient, kept at the phone height on wide windows
+ * - bannerWidth: animated banner image, kept at the phone width on wide windows
+ */
+const HeaderBarMetrics = {
+  buttonSize: 32,
+  iconSize: 20,
+  pillWidth: 72,
+  pillHeight: 32,
+  clusterWidth: 112,
+  searchHeight: 32,
+  titleGap: Spacing.S,
+  sidePadding: Spacing.M,
+  gradientHeight: 154,
+  bannerWidth: 375,
+};
+
+/**
+ * `grid` keeps the header row at the bar edges, `stretch` centers it in a 600pt
+ * frame on wide windows. Background and status bar always span the window.
+ */
+type HeaderContentLayout = 'grid' | 'stretch';
+
+type HeaderLayout = typeof HeaderBarMetrics & {
+  /**
+   * Window whose short side is at least 600 (Galaxy Z Fold / Pixel Fold inner
+   * display, tablets), iPhone Duo excluded. Phones, landscape included, are not.
+   */
+  isWide: boolean;
+  /**
+   * Window edge to back and to the right cluster: `sidePadding`, or centering the
+   * row in the 600pt frame with `stretch` on a wide window.
+   */
+  frameInset: number;
+  /**
+   * Header row width between the two `frameInset`s.
+   */
+  frameWidth: number;
+};
+
+type HeaderLayoutInput = {
+  width: number;
+  height: number;
+  isDuo: boolean;
+  contentLayout?: HeaderContentLayout;
+};
+
+/**
+ * Header geometry for a window, pure so it can be tested without a device.
+ */
+const getHeaderLayout = ({
+  width,
+  height,
+  isDuo,
+  contentLayout = 'grid',
+}: HeaderLayoutInput): HeaderLayout => {
+  const { sidePadding } = HeaderBarMetrics;
+  const isWide = !isDuo && Math.min(width, height) >= FOLDABLE_MIN_WIDTH;
+  let frameInset = sidePadding;
+  if (isWide && contentLayout === 'stretch') {
+    const centered = (width - HEADER_FRAME_MAX_WIDTH) / 2;
+    frameInset = Math.max(sidePadding, centered);
+  }
+  return {
+    ...HeaderBarMetrics,
+    isWide,
+    frameInset,
+    frameWidth: width - frameInset * 2,
+  };
+};
+
+/**
+ * Widest a title can be between back and the right cluster of the header row.
+ */
+const getTitleBudget = (layout: HeaderLayout) => {
+  const { buttonSize, titleGap, clusterWidth } = layout;
+  return layout.frameWidth - buttonSize - titleGap * 2 - clusterWidth;
+};
+
+/**
+ * Header geometry for the current window; follows fold, unfold and rotation.
+ */
+const useHeaderLayout = (contentLayout?: HeaderContentLayout): HeaderLayout => {
+  const { width, height } = useWindowDimensions();
+  const isDuo = isIPhoneDuo();
+  return useMemo(() => {
+    return getHeaderLayout({ width, height, isDuo, contentLayout });
+  }, [width, height, isDuo, contentLayout]);
+};
+
+const TITLE_CONTAINER_RESET: ViewStyle = {
+  marginLeft: 0,
+  marginEnd: 0,
+  marginStart: 0,
+  marginHorizontal: 0,
+  marginVertical: 0,
+  margin: 0,
+};
+
+/**
+ * React Navigation container styles that keep back, title and the right cluster
+ * in the `stretch` frame. `undefined` for `grid`, and on iPhone Duo, which keeps
+ * its own header row.
+ */
+const useHeaderFrameOptions = (
+  contentLayout?: HeaderContentLayout,
+): StackNavigationOptions | undefined => {
+  const layout = useHeaderLayout(contentLayout);
+  const { width } = useWindowDimensions();
+  const isDuo = isIPhoneDuo();
+  return useMemo(() => {
+    if (contentLayout !== 'stretch' || isDuo) {
+      return undefined;
+    }
+    // the header content row already sits this far in on large iOS windows
+    const shift = layout.frameInset - layout.sidePadding;
+    const containerShift = Math.max(0, shift - getHeaderMargin(width));
+    return {
+      headerLeftContainerStyle: { paddingLeft: containerShift },
+      headerRightContainerStyle: { paddingRight: containerShift },
+      headerTitleContainerStyle: {
+        ...TITLE_CONTAINER_RESET,
+        left: layout.titleGap,
+        maxWidth: getTitleBudget(layout),
+      },
+    };
+  }, [contentLayout, isDuo, layout, width]);
+};
+
+export type { HeaderContentLayout, HeaderLayout };
+
+export {
+  HeaderBarMetrics,
+  HEADER_FRAME_MAX_WIDTH,
+  TITLE_CONTAINER_RESET,
+  getHeaderLayout,
+  getTitleBudget,
+  useHeaderLayout,
+  useHeaderFrameOptions,
+};

package/Application/index.ts

@@ -26,6 +26,13 @@ import {
   type ModalLayout,
   type ModalRect,
 } from './modalLayout';
+import {
+  HeaderBarMetrics,
+  getHeaderLayout,
+  useHeaderLayout,
+  type HeaderContentLayout,
+  type HeaderLayout,
+} from './headerLayout';
 
 export {
   NavigationContainer,
@@ -41,6 +48,9 @@ export {
   useTooltipPortal,
   getModalLayout,
   useModalLayout,
+  HeaderBarMetrics,
+  getHeaderLayout,
+  useHeaderLayout,
 };
 
-export type { ModalLayout, ModalRect };
+export type { ModalLayout, ModalRect, HeaderContentLayout, HeaderLayout };

package/Application/navigationOptions.tsx

@@ -8,11 +8,12 @@ import {
   TransitionPresets,
 } from '@react-navigation/stack';
 import type { SharedValue } from 'react-native-reanimated';
-import { Colors, Spacing } from '../Consts';
+import { Colors } from '../Consts';
 import { HeaderBackground } from './Components/HeaderBackground';
 import { HeaderLeft } from './Components/HeaderLeft';
 import { HeaderRight } from './Components/HeaderRight';
 import { HeaderTitle, TitleCustom } from './Components/HeaderTitle';
+import { HeaderBarMetrics, TITLE_CONTAINER_RESET } from './headerLayout';
 import type { HeaderTitleProps, NavigationOptions } from './types';
 
 const CARD_SHADOW_OPACITY = 0.3;
@@ -55,13 +56,8 @@ const getStackOptions = (): StackNavigationOptions => {
     headerTitleAlign: 'left',
     headerTitle: props => <HeaderTitle {...props} />,
     headerTitleContainerStyle: {
-      marginLeft: 0,
-      marginEnd: 0,
-      marginStart: 0,
-      marginHorizontal: 0,
-      marginVertical: 0,
-      margin: 0,
-      left: Spacing.S,
+      ...TITLE_CONTAINER_RESET,
+      left: HeaderBarMetrics.titleGap,
     },
     headerBackground: (props: any) => <HeaderBackground {...props} />,
     headerLeft: (props: any) => <HeaderLeft {...props} floating />,
@@ -172,13 +168,8 @@ const getOptions = (
     if (params.hiddenBack) {
       headerLeft = null;
       options.headerTitleContainerStyle = {
-        marginLeft: 0,
-        marginEnd: 0,
-        marginStart: 0,
-        marginHorizontal: 0,
-        marginVertical: 0,
-        margin: 0,
-        left: Spacing.M,
+        ...TITLE_CONTAINER_RESET,
+        left: HeaderBarMetrics.sidePadding,
       };
     }
     options = {

package/Application/types.header.ts

@@ -98,6 +98,11 @@ export interface HeaderAnimatedProps extends ViewProps {
   image: string;
   useScale?: boolean;
   aspectRatio?: '16/9' | '3/2' | '1/1';
+  /**
+   * Optional. On wide windows the image keeps its phone width, centered; this
+   * color fills the sides and fades to transparent downward. No fill when unset.
+   */
+  bannerBackgroundColor?: string;
 }
 
 export type AnimatedHeader = {
@@ -109,8 +114,8 @@ export type AnimatedHeader = {
 export interface SearchHeaderProps extends InputSearchProps {
   ref?: React.RefObject<InputRef>;
   animatedValue?: Animated.Value | SharedValue<number>;
-  headerRightWidth?: 0 | 74 | 110 | number;
-  leftPosition?: 12 | 48 | number;
+  headerRightWidth?: 0 | 84 | 124 | number;
+  leftPosition?: 12 | 52 | number;
   renderButtons?: () => ReactNode;
   hiddenBack?: boolean;
 }

package/Application/types.tabs.ts

@@ -36,6 +36,7 @@ export type BottomTabProps = {
 };
 
 export type FloatingButtonProps = {
+  container?: React.ReactNode;
   icon: string | React.ReactNode;
   label: string;
   onPress: () => void;

package/Application/types.ts

@@ -9,6 +9,7 @@ import type {
   OnBoarding,
 } from './types.header';
 import type { LocalizeProps, Theme } from './types.theme';
+import type { HeaderContentLayout } from './headerLayout';
 
 export * from './types.theme';
 export * from './types.header';
@@ -128,4 +129,10 @@ export interface NavigationOptions
   hiddenBack?: boolean;
   headerTitle?: HeaderTitleProps | string;
   headerRight?: OnBoarding | HeaderRightToolkit | any;
+  /**
+   * Optional. `stretch` centers back, title and the right cluster in a 600pt
+   * frame on wide windows (foldable inner display, tablet); the background stays
+   * full width. Defaults to `grid`, the header row at the window edges.
+   */
+  contentLayout?: HeaderContentLayout;
 }

package/Input/InputSearch.tsx

@@ -13,6 +13,7 @@ import {
   View,
 } from 'react-native';
 import { useComponentId } from '../Application';
+import { HeaderBarMetrics } from '../Application/headerLayout';
 import {
   ApplicationContext,
   ComponentContext,
@@ -26,6 +27,8 @@ import styles from './styles';
 import { Styles } from '../Consts';
 import SystemTextInput from './SystemTextInput';
 
+const SEARCH_ICON_SIZE = 24;
+
 /**
  * Search field with search icon, clear icon, optional trailing icon and a
  * cancel button; with `typingData` it shows an animated placeholder instead.
@@ -49,6 +52,7 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
     backgroundColor,
     onPress,
     typingData,
+    size = 'default',
     ...props
   },
   ref,
@@ -59,6 +63,13 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
   const searchFontFamily = exportFontFamily('regular');
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
+  const isHeaderSize = size === 'header';
+  const inputHeightStyle = isHeaderSize && {
+    height: HeaderBarMetrics.searchHeight,
+  };
+  const searchIconSize = isHeaderSize
+    ? HeaderBarMetrics.iconSize
+    : SEARCH_ICON_SIZE;
 
   const [focused, setFocused] = useState(false);
   const [internalText, setInternalText] = useState(defaultValue || '');
@@ -114,7 +125,11 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
     if (typingData && typingData?.length > 0) {
       return (
         <TouchableOpacity
-          style={[styles.searchInput, styles.searchInputTyping]}
+          style={[
+            styles.searchInput,
+            styles.searchInputTyping,
+            inputHeightStyle,
+          ]}
           onPress={onPress}
           activeOpacity={onPress ? 0.6 : 1}
         >
@@ -132,6 +147,7 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
         ref={inputRef}
         style={[
           styles.searchInput,
+          inputHeightStyle,
           {
             fontSize: scaledFontSize,
             color: theme.colors.text.default,
@@ -225,7 +241,7 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
         >
           <Icon
             source={'navigation_search'}
-            size={24}
+            size={searchIconSize}
             color={theme.colors.text.hint}
           />
           {renderInputView()}

package/Input/index.tsx

@@ -194,6 +194,12 @@ export interface InputSearchProps extends TextInputProps {
    */
   typingData?: string[];
 
+  /**
+   * Optional. `header` is the 32pt field with a 20pt search icon that sits in the
+   * navigation header. Defaults to `default`, the 36pt field for content.
+   */
+  size?: 'default' | 'header';
+
   /**
    * Optional. Called when the field is pressed while showing `typingData`.
    */
@@ -367,4 +373,4 @@ export {
   InputPhoneNumber,
 };
 
-export {checkValidPhoneNumber};
+export { checkValidPhoneNumber };

package/Layout/Screen.tsx

@@ -67,6 +67,7 @@ const Screen = forwardRef(
       headerBackground,
       gradientColor,
       trackingParams,
+      contentLayout,
     }: ScreenProps,
     ref: any,
   ) => {
@@ -144,6 +145,7 @@ const Screen = forwardRef(
       gradientColor,
       headerBackground,
       layoutOffset,
+      contentLayout,
     });
 
     // mutates the content node so callers keep its methods plus the header setters
@@ -223,6 +225,7 @@ const Screen = forwardRef(
           useShadowHeader={useShadowHeader}
           gradientColor={gradientColor}
           headerBackground={headerBackground}
+          contentLayout={contentLayout}
         />
       );
     };