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

package/Application/BottomTab/CustomBottomTabItem.tsx

@@ -10,10 +10,10 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated';
-import { FixedScaleText, TabBarIcon } from './TabBarIcon';
+import { TabBarIcon } from './TabBarIcon';
 import { Text } from '../../Text';
 import { MiniAppContext } from '../../Context';
-import { Colors, Spacing } from '../../Consts';
+import { Colors } from '../../Consts';
 import { TabBarMetrics, TabBarMotion } from './metrics';
 
 type IconRenderer = (props: {
@@ -31,14 +31,12 @@ type TabItemContentProps = {
   badge?: string | number;
   // rail item (.Nav/Duo/Item) instead of the horizontal one (.Nav/itemTab)
   vertical?: boolean;
-  // keep the label at its design size, the Duo displays otherwise scale it up
-  fixedFontScale?: boolean;
   hideLabel?: boolean;
 };
 
 /**
- * Tab item body: the icon in its indicator slot with the label under it. The bar slides one
- * shared active indicator behind the slots; icon and label tints cross-fade on focus.
+ * icon in its indicator slot, label under it. The bar slides one shared active indicator
+ * behind the slots; the icon and label tint cross-fade on focus
  */
 const TabItemContent: React.FC<TabItemContentProps> = ({
   label,
@@ -48,7 +46,6 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
   icon,
   badge,
   vertical,
-  fixedFontScale,
   hideLabel,
 }) => {
   const progress = useSharedValue(focused ? 1 : 0);
@@ -72,7 +69,7 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
     </Text>
   );
 
-  // The active label fades in over the inactive one.
+  // the active label fades in over the inactive one
   const text = (
     <View style={!vertical && styles.labelBox}>
       {renderText(inactiveTintColor)}
@@ -85,11 +82,6 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
     </View>
   );
 
-  let labelNode = text;
-  if (fixedFontScale) {
-    labelNode = <FixedScaleText>{text}</FixedScaleText>;
-  }
-
   return (
     <>
       <View style={vertical ? styles.railSlot : styles.slot}>
@@ -102,7 +94,7 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
           renderIcon={icon}
         />
       </View>
-      {!hideLabel && labelNode}
+      {!hideLabel && text}
     </>
   );
 };
@@ -116,7 +108,7 @@ type CustomBottomTabItemProps = TabItemContentProps & {
 };
 
 /**
- * Horizontal navigation item (.Nav/itemTab), filling an even share of the container.
+ * horizontal navigation item (.Nav/itemTab): fills an even share of the container
  */
 const CustomBottomTabItem: React.FC<CustomBottomTabItemProps> = ({
   onPress,
@@ -151,7 +143,7 @@ const styles = StyleSheet.create({
     minWidth: 1,
     alignItems: 'center',
     justifyContent: 'center',
-    gap: Spacing.XXS,
+    gap: TabBarMetrics.itemIconLabelGap,
   },
   slot: {
     height: TabBarMetrics.indicatorHeight,
@@ -170,6 +162,11 @@ const styles = StyleSheet.create({
   },
   labelBox: {
     alignSelf: 'stretch',
+    // fixed to the design line height so a capped-scale label overflows downward and the
+    // icon above it stays put
+    height: TabBarMetrics.labelHeight,
+    justifyContent: 'flex-start',
+    overflow: 'visible',
   },
   label: {
     textAlign: 'center',

package/Application/BottomTab/DuoBarCompression.tsx

@@ -28,9 +28,9 @@ type DuoBarCompression = {
 
 // space kept between the top and the bottom groups (HIG Vertical controls)
 const GROUP_GAP = Spacing.M;
-const BACK_SLOT_HEIGHT = DuoMetrics.controlSize + Spacing.M;
 // Back, then the right toolkit: help + home capsule
-const DEFAULT_TOOLBAR_HEIGHT = BACK_SLOT_HEIGHT + 2 * DuoMetrics.itemPitch;
+const DEFAULT_TOOLBAR_HEIGHT =
+  DuoMetrics.controlSize + Spacing.M + 2 * DuoMetrics.itemPitch;
 // Back, then the single button the toolbar folds into
 const COMPRESSED_TOOLBAR_HEIGHT = 2 * DuoMetrics.controlSize + Spacing.M;
 
@@ -39,12 +39,16 @@ const NO_COMPRESSION: DuoBarCompression = {
   tabBarCompressed: false,
 };
 
-const DuoBarCompressionContext = createContext(NO_COMPRESSION);
+const DuoBarCompressionContext =
+  createContext<DuoBarCompression>(NO_COMPRESSION);
 
 /**
- * Keeps the Duo side bar's toolbar and tab bar clear of each other (HIG Vertical controls):
- * both stay whole if they fit, else one is compressed and tapping it swaps them, else both
- * rest compressed and tapping one opens it until a tab is picked.
+ * keeps the side bar's toolbar and tab bar clear of each other (HIG, Designing for
+ * iPhone Duo: Vertical controls):
+ * - both fit: both stay whole
+ * - one fits whole beside the other compressed: one is compressed, tapping it swaps them
+ * - otherwise both rest compressed; tapping one opens it for a moment (the rail closes
+ *   again once a tab is picked)
  */
 const DuoBarCompressionProvider: React.FC<{
   behavior?: DuoBarCompressionBehavior;
@@ -67,16 +71,18 @@ const DuoBarCompressionProvider: React.FC<{
     }
     const room = height - sideBar.bottom - sideBar.top - GROUP_GAP;
     const tabBar = getRailHeight(tabCount, hasQr);
-    const qrHeight = TabBarMetrics.railCtaGap + TabBarMetrics.railCtaHeight;
-    const compressedTabBar = DuoMetrics.controlSize + (hasQr ? qrHeight : 0);
+    const compressedTabBar =
+      DuoMetrics.controlSize +
+      (hasQr ? TabBarMetrics.railCtaGap + TabBarMetrics.railCtaHeight : 0);
     const fits = (toolbar: number, tabs: number) => toolbar + tabs <= room;
 
     if (fits(toolbarHeight, tabBar)) {
       return { ...NO_COMPRESSION, setToolbarHeight };
     }
-    const canCompressToolbar = fits(COMPRESSED_TOOLBAR_HEIGHT, tabBar);
-    const canCompressTabBar = fits(toolbarHeight, compressedTabBar);
-    if (canCompressToolbar && canCompressTabBar) {
+    const canSwap =
+      fits(COMPRESSED_TOOLBAR_HEIGHT, tabBar) &&
+      fits(toolbarHeight, compressedTabBar);
+    if (canSwap) {
       return {
         toolbarCompressed: expanded === 'tabBar',
         tabBarCompressed: expanded === 'toolbar',
@@ -91,7 +97,8 @@ const DuoBarCompressionProvider: React.FC<{
       expandTabBar: () => setOpened('tabBar'),
       setToolbarHeight,
     };
-    // An opened rail shows even if only the group gap is short; picking a tab closes it.
+    // an opened rail always shows, even when only the gap between the groups is short:
+    // it closes again once a tab is picked
     if (opened === 'tabBar') {
       return {
         ...open,
@@ -115,7 +122,6 @@ const DuoBarCompressionProvider: React.FC<{
   );
 };
 
-/** Compression state of the Duo side bars; no compression outside the provider. */
 const useDuoBarCompression = () => useContext(DuoBarCompressionContext);
 
 export { DuoBarCompressionProvider, useDuoBarCompression };

package/Application/BottomTab/DuoRailTabBar.tsx

@@ -13,7 +13,6 @@ import { TabItemContent } from './CustomBottomTabItem';
 import { CurvedContainer } from './CurvedContainer';
 import { TabBarMetrics } from './metrics';
 import { getTabItems, TabItem } from './tabItems';
-import { FixedScaleText } from './TabBarIcon';
 import { usePressLift } from './usePressLift';
 import { ActiveIndicator } from './ActiveIndicator';
 import {
@@ -24,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') {
@@ -40,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[];
@@ -76,7 +75,6 @@ const Rail: React.FC<{
       >
         <TabItemContent
           vertical
-          fixedFontScale
           label={item.label}
           focused={item.focused}
           icon={item.icon}
@@ -90,7 +88,7 @@ const Rail: React.FC<{
 );
 
 /**
- * Center action of the rail: a round button with its label, under the container.
+ * center action of the rail: round button with its label, under the container
  */
 const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
   floatingButton,
@@ -116,7 +114,6 @@ const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
         <CtaIcon icon={floatingButton.icon} />
       </Animated.View>
       <View style={styles.railCtaLabel}>
-        <FixedScaleText>
           <Text
             numberOfLines={1}
             typography={'label_xs_medium'}
@@ -124,7 +121,6 @@ const RailCenterAction: React.FC<{ floatingButton: FloatingButtonProps }> = ({
           >
             {floatingButton.label}
           </Text>
-        </FixedScaleText>
         {floatingButton.labelContent && (
           <View pointerEvents={'none'} style={styles.railCtaLabelOverlay}>
             {floatingButton.labelContent}
@@ -136,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 compression = useDuoBarCompression();
-  const { tabBarCompressed, expandTabBar, onTabSelected } = compression;
+  const { tabBarCompressed, expandTabBar, onTabSelected } =
+    useDuoBarCompression();
   const compactLift = usePressLift();
   const { state, floatingButton, activeTintColor, inactiveTintColor } = props;
   const items = getTabItems(props);
@@ -153,7 +149,8 @@ const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
     return null;
   }
 
-  // Lines up with the side bar header buttons: a 48 lane kept 12 from the inner edge.
+  // 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
   const columnStyle = [
     styles.railColumn,
     {
@@ -163,10 +160,9 @@ const DuoRailTabBar: React.FC<DuoTabBarProps> = props => {
     },
     sideBar.edge === 'right' ? styles.railColumnRight : styles.railColumnLeft,
   ];
-  let cta: React.ReactNode;
-  if (floatingButton) {
-    cta = <RailCenterAction floatingButton={floatingButton} />;
-  }
+  const cta = floatingButton && (
+    <RailCenterAction floatingButton={floatingButton} />
+  );
 
   if (!tabBarCompressed) {
     return (

package/Application/BottomTab/DuoTabBar.tsx

@@ -3,7 +3,11 @@ import React from 'react';
 import { useWindowDimensions, View } from 'react-native';
 import { useScreenLayout } from '../../Layout/utils';
 import { FloatingButtonProps } from '../types';
-import { getSystemIndicatorHeight, HorizontalTabBar } from './BottomTabBar';
+import {
+  getSystemIndicatorHeight,
+  hasCenterAction,
+  HorizontalTabBar,
+} from './BottomTabBar';
 import { getHorizontalBarWidth, TabBarMetrics } from './metrics';
 import { getTabItems } from './tabItems';
 import { DuoRailTabBar } from './DuoRailTabBar';
@@ -16,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();
@@ -28,12 +32,13 @@ 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();
   const { width, height } = useWindowDimensions();
   const { floatingButton, activeTintColor, inactiveTintColor } = props;
+  const tabItems = getTabItems(props);
 
   return (
     <View
@@ -44,9 +49,15 @@ const DuoFloatingTabBar: React.FC<DuoTabBarProps> = props => {
       ]}
     >
       <HorizontalTabBar
-        fixedFontScale
-        items={getTabItems(props)}
-        width={getHorizontalBarWidth(width, height, insets.left, insets.right)}
+        items={tabItems}
+        width={getHorizontalBarWidth(
+          width,
+          height,
+          insets.left,
+          insets.right,
+          tabItems.length,
+          hasCenterAction(floatingButton, tabItems.length),
+        )}
         floatingButton={floatingButton}
         activeTintColor={activeTintColor}
         inactiveTintColor={inactiveTintColor}
@@ -56,14 +67,15 @@ const DuoFloatingTabBar: React.FC<DuoTabBarProps> = props => {
 };
 
 /**
- * iPhone Duo tab bar: the rail in the side bar, or the horizontal bar when unfolded portrait.
+ * iPhone Duo tab bar: rail in the side bar, or the horizontal bar when unfolded portrait
  */
 const DuoTabBar: React.FC<DuoTabBarProps> = props => {
   const { sideBar } = useScreenLayout();
-  if (sideBar) {
-    return <DuoRailTabBar {...props} />;
-  }
-  return <DuoFloatingTabBar {...props} />;
+  return sideBar ? (
+    <DuoRailTabBar {...props} />
+  ) : (
+    <DuoFloatingTabBar {...props} />
+  );
 };
 
 export type { DuoTabBarProps };

package/Application/BottomTab/TabBarIcon.tsx

@@ -28,8 +28,7 @@ type Props = {
 };
 
 /**
- * Badge value of a tab: undefined hides it, '' is a dot (also 0 when `showDot`), numbers
- * cap at 99+.
+ * badge value shown on a tab: undefined hides it, '' is a dot, numbers cap at 99+
  */
 export const getTabBadge = (
   badgeLabel?: string | number,
@@ -53,8 +52,8 @@ export const getTabBadge = (
 };
 
 /**
- * Keeps 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.
+ * 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,
@@ -73,8 +72,7 @@ export const FixedScaleText: React.FC<{ children: React.ReactNode }> = ({
 };
 
 /**
- * Label badge of a tab: numbers use the error color, text the warning color (Figma Badge
- * round numeric / text).
+ * numbers use the error color, text the warning color (Figma Badge round numeric / text)
  */
 const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
   label,
@@ -82,16 +80,14 @@ 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,
+          backgroundColor: isNumber
+            ? theme.colors.error.primary
+            : theme.colors.warning.primary,
           borderColor: theme.colors.background.surface,
         },
       ]}
@@ -114,8 +110,7 @@ const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
 };
 
 /**
- * Tab icon (24) with its badge; active and inactive icons are stacked and cross-fade on
- * focus.
+ * 24 icon; active and inactive icons are stacked and cross-faded on focus
  */
 export function TabBarIcon({
   focused,

package/Application/BottomTab/TabScreen.tsx

@@ -29,7 +29,8 @@ const TabScreen: React.FC<any> = ({ route, navigation }) => {
 
   const screenName = screen?.name || screen?.type?.name || 'Invalid';
   const { isBackgroundToForeground } = useAppState();
-  // Pad clear of the floating bar unless a Screen inside claims the inset to scroll under it.
+  // 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)
   const { inset: tabBarInset } = useContext(BottomTabInsetContext);
   const [insetClaimed, setInsetClaimed] = useState(false);
   const tabInsetValue = useMemo(
@@ -53,6 +54,9 @@ 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,5 +1,4 @@
 import {
-  BottomTabBarProps,
   BottomTabNavigationOptions,
   createBottomTabNavigator,
 } from '@react-navigation/bottom-tabs';
@@ -24,8 +23,6 @@ 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`
@@ -35,11 +32,12 @@ const TAB_SWITCH_SPEC = {
 };
 
 /**
- * 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.
+ * 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
  */
-const getTabSlide = (width: number): SceneInterpolator => {
-  return ({ current }) => ({
+const getTabSlide =
+  (width: number): BottomTabNavigationOptions['sceneStyleInterpolator'] =>
+  ({ current }) => ({
     sceneStyle: {
       transform: [
         {
@@ -51,7 +49,6 @@ const getTabSlide = (width: number): SceneInterpolator => {
       ],
     },
   });
-};
 
 /**
  * App tab navigator: the floating bar on phones, the rail or floating bar on
@@ -70,11 +67,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.
-  let tabBarInset = barInset;
-  if (barInset && hasCenterAction(floatingButton, tabs.length)) {
-    tabBarInset = barInset + TabBarMetrics.ctaLift;
-  }
+  // 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;
   const initialIndex = tabs.findIndex(i => i.name === initialRouteName);
   const activeIndex = React.useRef(initialIndex > 0 ? initialIndex : 0);
 
@@ -86,15 +83,15 @@ const BottomTab: React.FC<BottomTabProps> = ({
     });
   }, [navigation]);
 
-  // Focus, not mount/onFocus: popping back from a pushed screen only refocuses BottomTab.
+  // Focus, not mount: pushing a screen from a tab leaves BottomTab mounted but blurred, and
+  // onFocus only fires on tab changes.
   useFocusEffect(
     React.useCallback(() => {
       NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(
         activeIndex.current !== 0,
       );
-      return () => {
+      return () =>
         NativeModules?.MiniAppModule?.setShouldUseFloatingArrowBack?.(false);
-      };
     }, []),
   );
 
@@ -131,27 +128,6 @@ const BottomTab: React.FC<BottomTabProps> = ({
     },
   };
 
-  const renderTabBar = (props: BottomTabBarProps) => {
-    if (isIPhoneDuo) {
-      return (
-        <DuoTabBar
-          {...props}
-          floatingButton={floatingButton}
-          inactiveTintColor={theme.colors.text.secondary}
-          activeTintColor={theme.colors.primary}
-        />
-      );
-    }
-    return (
-      <BottomTabBar
-        {...props}
-        floatingButton={floatingButton}
-        inactiveTintColor={theme.colors.text.secondary}
-        activeTintColor={theme.colors.primary}
-      />
-    );
-  };
-
   return (
     <DuoBarCompressionProvider
       behavior={compressionBehavior}
@@ -169,7 +145,23 @@ const BottomTab: React.FC<BottomTabProps> = ({
             transitionSpec: TAB_SWITCH_SPEC,
             sceneStyleInterpolator: getTabSlide(windowWidth),
           }}
-          tabBar={renderTabBar}
+          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}
+              />
+            )
+          }
           initialRouteName={initialRouteName}
         >
           {tabs.map((item, index) => (