@momo-kits/foundation 0.169.6-beta.1 → 0.169.7-beta.1

package/Application/BottomTab/DuoRailTabBar.tsx

@@ -23,7 +23,7 @@ import {
 import type { DuoTabBarProps } from './DuoTabBar';
 
 /**
- * Center action icon: an icon name drawn at the CTA size, or a custom node
+ * Center action icon: an icon name drawn at the CTA size, or a custom node.
  */
 const CtaIcon: React.FC<{ icon: FloatingButtonProps['icon'] }> = ({ icon }) => {
   if (typeof icon === 'string') {
@@ -39,7 +39,7 @@ const CtaIcon: React.FC<{ icon: FloatingButtonProps['icon'] }> = ({ icon }) => {
 };
 
 /**
- * vertical container (.Nav/Duo/Item column) with the sliding active indicator
+ * Vertical container (.Nav/Duo/Item column) with the sliding active indicator.
  */
 const Rail: React.FC<{
   items: TabItem[];
@@ -88,7 +88,7 @@ const Rail: React.FC<{
 );
 
 /**
- * center action of the rail: round button with its label, under the container
+ * Center action of the rail: a round button with its label, under the container.
  */
 const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
   floatingButton,
@@ -114,13 +114,13 @@ const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
         <CtaIcon icon={floatingButton.icon} />
       </Animated.View>
       <View style={styles.railCtaLabel}>
-          <Text
-            numberOfLines={1}
-            typography={'label_xs_medium'}
-            color={theme.colors.text.secondary}
-          >
-            {floatingButton.label}
-          </Text>
+        <Text
+          numberOfLines={1}
+          typography={'label_xs_medium'}
+          color={theme.colors.text.secondary}
+        >
+          {floatingButton.label}
+        </Text>
         {floatingButton.labelContent && (
           <View pointerEvents={'none'} style={styles.railCtaLabelOverlay}>
             {floatingButton.labelContent}
@@ -132,14 +132,14 @@ const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
 };
 
 /**
- * vertical bar anchored to the bottom of the Duo side bar, center action below it.
- * When the side bar is short, it can shrink to one button showing the current tab
- * (HIG "Tab bar compressed"); tapping it expands the rail and compresses the toolbar
+ * Vertical bar anchored to the bottom of the Duo side bar, center action below it. When the
+ * side bar is short it can shrink to one button showing the current tab (HIG "Tab bar
+ * compressed"); tapping it expands the rail and compresses the toolbar.
  */
 const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
   const { sideBar } = useScreenLayout();
-  const { tabBarCompressed, expandTabBar, onTabSelected } =
-    useDuoBarCompression();
+  const compression = useDuoBarCompression();
+  const { tabBarCompressed, expandTabBar, onTabSelected } = compression;
   const compactLift = usePressLift();
   const { state, floatingButton, activeTintColor, inactiveTintColor } = props;
   const items = getTabItems(props);
@@ -149,8 +149,7 @@ const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
     return null;
   }
 
-  // the rail lines up with the header buttons in the side bar: centered on a 48 lane kept 12
-  // from the strip's inner edge
+  // Lines up with the side bar header buttons: a 48 lane kept 12 from the inner edge.
   const columnStyle = [
     styles.railColumn,
     {
@@ -160,9 +159,10 @@ const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
     },
     sideBar.edge === 'right' ? styles.railColumnRight : styles.railColumnLeft,
   ];
-  const cta = floatingButton && (
-    <RailCenterAction floatingButton={floatingButton} />
-  );
+  let cta: React.ReactNode;
+  if (floatingButton) {
+    cta = <RailCenterAction floatingButton={floatingButton} />;
+  }
 
   if (!tabBarCompressed) {
     return (

package/Application/BottomTab/DuoTabBar.tsx

@@ -20,8 +20,8 @@ type DuoTabBarProps = BottomTabBarProps & {
 };
 
 /**
- * space tab content leaves under the floating horizontal tab bar (phone and unfolded Duo);
- * 0 when the Duo rail sits in the side bar
+ * Space tab content leaves under the floating horizontal tab bar (phone and unfolded Duo);
+ * 0 when the Duo rail sits in the side bar.
  */
 const useDuoTabBarInset = () => {
   const { isIPhoneDuo, sideBar, insets } = useScreenLayout();
@@ -32,7 +32,7 @@ const useDuoTabBarInset = () => {
 };
 
 /**
- * horizontal navigation bar of the unfolded display: 65% of the short side, centered
+ * Horizontal navigation bar of the unfolded display: 65% of the short side, centered.
  */
 const DuoFloatingTabBar: React.FC<DuoTabBarProps> = props => {
   const { insets } = useScreenLayout();
@@ -67,15 +67,14 @@ const DuoFloatingTabBar: React.FC<DuoTabBarProps> = props => {
 };
 
 /**
- * iPhone Duo tab bar: rail in the side bar, or the horizontal bar when unfolded portrait
+ * iPhone Duo tab bar: the rail in the side bar, or the horizontal bar when unfolded portrait.
  */
 const DuoTabBar: React.FC<DuoTabBarProps> = props => {
   const { sideBar } = useScreenLayout();
-  return sideBar ? (
-    <DuoRailTabBar {...props} />
-  ) : (
-    <DuoFloatingTabBar {...props} />
-  );
+  if (sideBar) {
+    return <DuoRailTabBar {...props} />;
+  }
+  return <DuoFloatingTabBar {...props} />;
 };
 
 export type { DuoTabBarProps };

package/Application/BottomTab/TabBarIcon.tsx

@@ -7,9 +7,10 @@ import Animated, {
 } from 'react-native-reanimated';
 
 import { Colors, Spacing } from '../../Consts';
-import { ApplicationContext, MiniAppContext } from '../../Context';
+import { ApplicationContext } from '../../Context';
 import { BadgeDot } from '../../Badge';
 import { Text } from '../../Text';
+import ScaleSizeProvider from '../ScaleSizeProvider';
 import { TabBarMetrics, TabBarMotion } from './metrics';
 
 type Props = {
@@ -28,7 +29,8 @@ type Props = {
 };
 
 /**
- * badge value shown on a tab: undefined hides it, '' is a dot, numbers cap at 99+
+ * Badge value of a tab: undefined hides it, '' is a dot (also 0 when `showDot`), numbers
+ * cap at 99+.
  */
 export const getTabBadge = (
   badgeLabel?: string | number,
@@ -52,27 +54,8 @@ export const getTabBadge = (
 };
 
 /**
- * text at its design size: like the system tab bar it doesn't grow with the OS font scale or
- * the wide Duo displays, which Text otherwise scales up to 5pt
- */
-export const FixedScaleText: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
-  const context = useContext<any>(MiniAppContext);
-  return (
-    <MiniAppContext.Provider
-      value={{
-        ...context,
-        fontScale: { useOSScaleRate: false, userScaleRate: 1 },
-      }}
-    >
-      {children}
-    </MiniAppContext.Provider>
-  );
-};
-
-/**
- * numbers use the error color, text the warning color (Figma Badge round numeric / text)
+ * Label badge of a tab: numbers use the error color, text the warning color (Figma Badge
+ * round numeric / text). The text keeps its design size to fit the 16 height.
  */
 const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
   label,
@@ -80,19 +63,21 @@ const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
 }) => {
   const { theme } = useContext(ApplicationContext);
   const isNumber = /^\d+\+?$/.test(label);
+  let backgroundColor = theme.colors.warning.primary;
+  if (isNumber) {
+    backgroundColor = theme.colors.error.primary;
+  }
   const badge = (
     <View
       style={[
         styles.badge,
         {
-          backgroundColor: isNumber
-            ? theme.colors.error.primary
-            : theme.colors.warning.primary,
+          backgroundColor,
           borderColor: theme.colors.background.surface,
         },
       ]}
     >
-      <FixedScaleText>
+      <ScaleSizeProvider scaleSizeMaxRate={1}>
         <Text
           numberOfLines={1}
           typography={'action_xxs_bold'}
@@ -100,7 +85,7 @@ const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
         >
           {label}
         </Text>
-      </FixedScaleText>
+      </ScaleSizeProvider>
     </View>
   );
   if (vertical) {
@@ -110,7 +95,8 @@ const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
 };
 
 /**
- * 24 icon; active and inactive icons are stacked and cross-faded on focus
+ * Tab icon (24) with its badge; active and inactive icons are stacked and cross-fade on
+ * focus.
  */
 export function TabBarIcon({
   focused,

package/Application/BottomTab/TabScreen.tsx

@@ -29,8 +29,7 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
 
   const screenName = screen?.name || screen?.type?.name || 'Invalid';
   const { isBackgroundToForeground } = useAppState();
-  // the floating tab bar covers the bottom of the tab: pad the content unless a Screen in it
-  // keeps clear of the bar itself (scroll content running under the bar)
+  // Pad clear of the floating bar unless a Screen inside claims the inset to scroll under it.
   const { inset: tabBarInset } = useContext(BottomTabInsetContext);
   const [insetClaimed, setInsetClaimed] = useState(false);
   const tabInsetValue = useMemo(
@@ -54,9 +53,6 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
         ...data,
       });
 
-      /**
-       * debug toast
-       */
       navigator?.maxApi?.showToastDebug?.({
         appId: context.appId,
         message: `${screenName} screen_navigated`,

package/Application/BottomTab/index.tsx

@@ -1,4 +1,5 @@
 import {
+  BottomTabBarProps,
   BottomTabNavigationOptions,
   createBottomTabNavigator,
 } from '@react-navigation/bottom-tabs';
@@ -13,6 +14,7 @@ import {
 } from 'react-native';
 import { Icon } from '../../Icon';
 import { BottomTabProps } from '../types';
+import ScaleSizeProvider from '../ScaleSizeProvider';
 import BottomTabBar, { hasCenterAction } from './BottomTabBar';
 import { TabBarMetrics } from './metrics';
 import { getTabBadge } from './TabBarIcon';
@@ -23,6 +25,8 @@ import TabScreen from './TabScreen';
 import { ApplicationContext } from '../../Context';
 import { useScreenLayout } from '../../Layout';
 
+type SceneInterpolator = BottomTabNavigationOptions['sceneStyleInterpolator'];
+
 const Tab = createBottomTabNavigator();
 
 // the tab screens slide in index order over 280ms, CSS `ease`
@@ -32,12 +36,11 @@ const TAB_SWITCH_SPEC = {
 };
 
 /**
- * scene progress is -1 for tabs before the active one, 1 for tabs after it: they wait a full
- * width off screen on their side
+ * Tab slide interpolator. Scene progress is -1 for tabs before the active one and 1 for
+ * tabs after it, so they wait a full width off screen on their side.
  */
-const getTabSlide =
-  (width: number): BottomTabNavigationOptions['sceneStyleInterpolator'] =>
-  ({ current }) => ({
+const getTabSlide = (width: number): SceneInterpolator => {
+  return ({ current }) => ({
     sceneStyle: {
       transform: [
         {
@@ -49,6 +52,7 @@ const getTabSlide =
       ],
     },
   });
+};
 
 /**
  * App tab navigator: the floating bar on phones, the rail or floating bar on
@@ -67,11 +71,11 @@ const BottomTab: React.FC<BottomTabProps> = ({
   const { isIPhoneDuo } = useScreenLayout();
   const { width: windowWidth } = useWindowDimensions();
   const barInset = useDuoTabBarInset();
-  // the center action's button rises above the bar, tab content leaves room for it too
-  const tabBarInset =
-    barInset && hasCenterAction(floatingButton, tabs.length)
-      ? barInset + TabBarMetrics.ctaLift
-      : barInset;
+  // The center action's button rises above the bar; tab content leaves room for it too.
+  let tabBarInset = barInset;
+  if (barInset && hasCenterAction(floatingButton, tabs.length)) {
+    tabBarInset = barInset + TabBarMetrics.ctaLift;
+  }
   const initialIndex = tabs.findIndex(i => i.name === initialRouteName);
   const activeIndex = React.useRef(initialIndex > 0 ? initialIndex : 0);
 
@@ -83,15 +87,15 @@ const BottomTab: React.FC<BottomTabProps> = ({
     });
   }, [navigation]);
 
-  // Focus, not mount: pushing a screen from a tab leaves BottomTab mounted but blurred, and
-  // onFocus only fires on tab changes.
+  // Focus, not mount/onFocus: popping back from a pushed screen only refocuses BottomTab.
   useFocusEffect(
     React.useCallback(() => {
       NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(
         activeIndex.current !== 0,
       );
-      return () =>
+      return () => {
         NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(false);
+      };
     }, []),
   );
 
@@ -128,6 +132,21 @@ const BottomTab: React.FC<BottomTabProps> = ({
     },
   };
 
+  // One cap for the whole bar (labels, CTA, custom content) so it fits the fixed bar and notch.
+  const renderTabBar = (props: BottomTabBarProps) => {
+    const TabBar = isIPhoneDuo ? DuoTabBar : BottomTabBar;
+    return (
+      <ScaleSizeProvider scaleSizeMaxRate={TabBarMetrics.labelMaxScale}>
+        <TabBar
+          {...props}
+          floatingButton={floatingButton}
+          inactiveTintColor={theme.colors.text.secondary}
+          activeTintColor={theme.colors.primary}
+        />
+      </ScaleSizeProvider>
+    );
+  };
+
   return (
     <DuoBarCompressionProvider
       behavior={compressionBehavior}
@@ -145,23 +164,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
             transitionSpec: TAB_SWITCH_SPEC,
             sceneStyleInterpolator: getTabSlide(windowWidth),
           }}
-          tabBar={props =>
-            isIPhoneDuo ? (
-              <DuoTabBar
-                {...props}
-                floatingButton={floatingButton}
-                inactiveTintColor={theme.colors.text.secondary}
-                activeTintColor={theme.colors.primary}
-              />
-            ) : (
-              <BottomTabBar
-                {...props}
-                floatingButton={floatingButton}
-                inactiveTintColor={theme.colors.text.secondary}
-                activeTintColor={theme.colors.primary}
-              />
-            )
-          }
+          tabBar={renderTabBar}
           initialRouteName={initialRouteName}
         >
           {tabs.map((item, index) => (

package/Application/BottomTab/metrics.ts

@@ -3,10 +3,9 @@ import { Easing } from 'react-native-reanimated';
 import { Colors, Radius, Spacing } from '../../Consts';
 
 /**
- * Navigation bar measurements (Figma "Specs Navigation", DS-984), kept in sync with
- * momo-native-kits `TabBarMetrics`
- * - horizontal: floating container with items split evenly, center action in a notch
- * - vertical: iPhone Duo rail, center action under the container
+ * Navigation bar measurements (Figma "Specs Navigation", DS-984), in sync with momo-native-kits
+ * `TabBarMetrics`: the horizontal floating bar (center action in a notch) and the vertical
+ * iPhone Duo rail (center action under the container).
  */
 const TabBarMetrics = {
   height: 60,
@@ -27,13 +26,10 @@ const TabBarMetrics = {
   indicatorPaddingHorizontal: Spacing.M,
   indicatorRadius: Radius.XL,
   indicatorHeight: 32,
-  // label_s_medium line height: the label box keeps this height so a scaled label grows
-  // downward instead of pushing the icon up
+  labelMaxScale: 1.2,
   labelHeight: 18,
-  // home indicator / gesture bar area under the container
+  railLabelHeight: 14,
   systemIndicatorHeight: 24,
-  // unfolded foldables (short side from 600, the smallest in the spec) use 65% of the short
-  // side, centered; phones and folded outer displays fill the window
   foldableMinShortSide: 600,
   foldableWidthRatio: 0.65,
   // a 2-tab bar doesn't stretch to the full width: each item is this fixed width and the bar is
@@ -41,9 +37,7 @@ const TabBarMetrics = {
   twoTabItemWidth: 100,
   ctaSlotWidth: 92,
   ctaSize: 48,
-  // the icon sits 10 inside the 48 button (prototype .cta: 28 icon), 12 inside the 52 rail one
   ctaIconSize: 28,
-  // the button rises 22 above the container top edge
   ctaLift: 22,
   ctaLabelGap: Spacing.M,
   ctaLabelHeight: 18,
@@ -64,10 +58,9 @@ const TabBarMetrics = {
 };
 
 /**
- * motion of the navigation bar (MoMo Navigation Prototype):
- * - one active indicator slides to the selected item, overshooting a little
- * - icons cross-fade and the label color follows
- * - the center action shrinks while pressed
+ * Navigation bar motion (MoMo Navigation Prototype): the active indicator slides to the
+ * selected item with a little overshoot, icon and label tints cross-fade, and the center
+ * action shrinks while pressed.
  */
 const TabBarMotion = {
   indicator: { duration: 550, easing: Easing.bezier(0.34, 1.4, 0.5, 1) },
@@ -98,7 +91,7 @@ const CTA_SHADOW: BoxShadowValue[] = [
 ];
 
 /**
- * inner light and tint of the active indicator: white 12% from below, primary 12% from above
+ * Inner light and tint of the active indicator: white 12% from below, primary 12% from above.
  */
 const getIndicatorShadow = (primary: string): BoxShadowValue[] => [
   {
@@ -112,9 +105,9 @@ const getIndicatorShadow = (primary: string): BoxShadowValue[] => [
 ];
 
 /**
- * notch dipped into the container top edge under the center action (Figma "Backgroud" path):
+ * Notch dipped into the container top edge under the center action (Figma "Backgroud" path):
  * starts NOTCH_HALF_WIDTH left of the center, then cubic segments as [control1, control2, end],
- * each point [dx from the center, dy below the top edge]
+ * each point [dx from the center, dy below the top edge].
  */
 const NOTCH_HALF_WIDTH = 50.758;
 const NOTCH_CURVES: [number, number][][] = [
@@ -141,8 +134,8 @@ const NOTCH_CURVES: [number, number][][] = [
 ];
 
 /**
- * width of the horizontal bar: 65% of the short side on an unfolded foldable, otherwise the
- * window minus the side safe areas and margins
+ * Width of the horizontal bar: 65% of the short side on an unfolded foldable, otherwise the
+ * window minus the side safe areas and margins.
  */
 const getHorizontalBarWidth = (
   width: number,
@@ -168,12 +161,16 @@ const getHorizontalBarWidth = (
 };
 
 /**
- * height of the vertical rail container, plus the center action under it
+ * Height of the vertical rail container, plus the center action under it.
  */
-const getRailHeight = (tabCount: number, hasCta: boolean) =>
-  tabCount * TabBarMetrics.railItemHeight +
-  TabBarMetrics.railPaddingBottom +
-  (hasCta ? TabBarMetrics.railCtaGap + TabBarMetrics.railCtaHeight : 0);
+const getRailHeight = (tabCount: number, hasCta: boolean) => {
+  const itemsHeight = tabCount * TabBarMetrics.railItemHeight;
+  let ctaHeight = 0;
+  if (hasCta) {
+    ctaHeight = TabBarMetrics.railCtaGap + TabBarMetrics.railCtaHeight;
+  }
+  return itemsHeight + TabBarMetrics.railPaddingBottom + ctaHeight;
+};
 
 export {
   TabBarMetrics,

package/Application/BottomTab/tabItems.ts

@@ -2,7 +2,7 @@ import { BottomTabBarProps } from '@react-navigation/bottom-tabs';
 import { CommonActions, Route } from '@react-navigation/native';
 
 /**
- * navigation items of the tab bar, with the press handlers of the system tab bar
+ * Navigation items of the tab bar, with the press handlers of the system tab bar.
  */
 const getTabItems = ({ state, descriptors, navigation }: BottomTabBarProps) => {
   return state.routes.map((route: Route<string>, index: number) => {

package/Application/BottomTab/usePressLift.ts

@@ -6,11 +6,11 @@ import {
 } from 'react-native-reanimated';
 
 const SPRING = { damping: 18, stiffness: 220, mass: 0.8 };
-// the button grows by a tenth while held
 const PRESSED_SCALE = 1.1;
 
 /**
- * lift for a single button, e.g. the compressed rail
+ * Press lift for a single button (e.g. the compressed rail): it scales up while held,
+ * unless the OS asks for reduced motion.
  */
 const usePressLift = () => {
   const reduceMotion = useReducedMotion();

package/Application/Components/BackgroundImageView.tsx

@@ -17,6 +17,10 @@ type BackgroundImageViewProps = {
   animatedValue: SharedValue<number>;
 };
 
+/**
+ * Header surface (shadow or divider) and image, fading in over the first 52pt of
+ * scroll. iOS keeps the surface out of the clipped view so its shadow isn't cut.
+ */
 const BackgroundImageView: FC<BackgroundImageViewProps> = ({
   useShadowHeader = true,
   headerBackground = null,

package/Application/Components/DuoGlassBackground.tsx

@@ -30,6 +30,7 @@ const DuoGlassBackground: React.FC<{
   const { headerHeight } = useScreenLayout();
   const sharedValue = useNormalizedSharedValue(animatedValue);
   const fadeStart = Math.max(bannerBottom - headerHeight, 0);
+  const translucentColor = theme.colors.background.surface + TRANSLUCENT_ALPHA;
 
   const fadeStyle = useAnimatedStyle(() => ({
     opacity: interpolate(
@@ -47,8 +48,7 @@ const DuoGlassBackground: React.FC<{
           StyleSheet.absoluteFill,
           styles.translucentBar,
           {
-            backgroundColor:
-              theme.colors.background.surface + TRANSLUCENT_ALPHA,
+            backgroundColor: translucentColor,
             borderBottomColor: theme.colors.border.default,
           },
           fadeStyle,
@@ -59,8 +59,9 @@ const DuoGlassBackground: React.FC<{
 };
 
 /**
- * pink header gradient drawn under the content, fading out on scroll as main's extended
- * header does: header-high for default headers, 52 taller (collapsing) for extended
+ * Header gradient (and theme image) drawn under the content, fading out on scroll:
+ * header-high, or 52pt taller and collapsing when `extended`. `followScroll`
+ * scrolls it away with the content instead of fading it.
  */
 const DuoScrollGradient: React.FC<{
   animatedValue?: AnimatedCompatValue;

package/Application/Components/HeaderAnimated.tsx

@@ -19,6 +19,10 @@ const ASPECT_RATIOS: Record<
   '1/1': 1 / 1,
 };
 
+/**
+ * Parallax header image (or `children`): stretches when pulled down and fades out
+ * as the content scrolls up.
+ */
 const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   animatedValue,
   image,

package/Application/Components/HeaderBackground.tsx

@@ -9,6 +9,10 @@ import { Image } from '../../Image';
 import BackgroundImageView from './BackgroundImageView';
 import { useNormalizedSharedValue } from '../hooks';
 
+/**
+ * Header background: surface and image that fade in on scroll, with an optional
+ * gradient (custom or theme) on top. Outlined when `showBaseLineDebug` is on.
+ */
 const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   animatedValue,
   useGradient = true,

package/Application/Components/HeaderExtendHeader.tsx

@@ -23,6 +23,10 @@ const SCREEN_PADDING = 12;
 const BACK_WIDTH = 28;
 const TOOLKIT_WIDTH = 73;
 
+/**
+ * Extended header background: a gradient that collapses on scroll and, with
+ * `inputSearchProps`, a full-width search that slides into the bar beside back/toolkit.
+ */
 const HeaderExtendHeader: React.FC<{
   headerType?: HeaderType;
   animatedValue: AnimatedCompatValue;
@@ -64,18 +68,15 @@ const HeaderExtendHeader: React.FC<{
   const contentLeft = layout.insetLeft + SCREEN_PADDING;
   const contentRight = layout.insetLeft + layout.contentWidth;
   // collapsed on the status bar row, the search stays between its clusters
-  const collapsedLeft =
-    layout.insetLeft + leftPosition + (layout.statusBarClearance?.left ?? 0);
-  const collapsedRight = contentRight - (layout.statusBarClearance?.right ?? 0);
+  const clearanceLeft = layout.statusBarClearance?.left ?? 0;
+  const clearanceRight = layout.statusBarClearance?.right ?? 0;
+  const collapsedLeft = layout.insetLeft + leftPosition + clearanceLeft;
+  const collapsedRight = contentRight - clearanceRight - headerRightWidth;
   const searchWidth = layout.contentWidth - SCREEN_PADDING * 2;
-  const collapsedSearchWidth =
-    collapsedRight - collapsedLeft - SCREEN_PADDING - headerRightWidth;
+  const collapsedSearchWidth = collapsedRight - collapsedLeft - SCREEN_PADDING;
   // a row taller than barHeight (iPhone Duo) centers the collapsed search on the title
-  const collapsedRaise =
-    (layout.headerHeight -
-      layout.headerStatusBarHeight -
-      HeaderMetrics.barHeight) /
-    2;
+  const titleRowHeight = layout.headerHeight - layout.headerStatusBarHeight;
+  const collapsedRaise = (titleRowHeight - HeaderMetrics.barHeight) / 2;
 
   let useShadowHeader = useShadowHeaderProp;
   if (inputSearchProps && Platform.OS === 'android') {

package/Application/Components/HeaderLeft.tsx

@@ -10,7 +10,8 @@ import { useScreenLayout, useSideBarItemStyle } from '../../Layout/utils';
 import { useSideBarCounterStyle } from './DuoQuickReturnHeader';
 
 /**
- * default header left used for nav
+ * 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.
  */
 const HeaderLeft: React.FC<HeaderBackProps> = ({
   tintColor,

package/Application/Components/HeaderRight.tsx

@@ -9,7 +9,8 @@ import { HeaderToolkitAction } from './HeaderToolkitAction';
 import { styles } from './HeaderRight.styles';
 
 /**
- * main component for header right
+ * Header right slot: a custom `headerRight` render function, the onboarding skip
+ * button, or the toolkit (stacked vertically in the floating iPhone Duo side bar).
  */
 const HeaderRight: React.FC<any> = props => {
   const { translate } = useContext(ApplicationContext);