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

package/Application/BottomTab/CurvedContainer.tsx

@@ -3,7 +3,7 @@ import { StyleSheet } from 'react-native';
 import Svg, { Defs, FeGaussianBlur, Filter, Path } from 'react-native-svg';
 import { Colors } from '../../Consts';
 import { ApplicationContext } from '../../Context';
-import { NOTCH_CURVES, NOTCH_HALF_WIDTH, TabBarMetrics } from './metrics';
+import { NOTCH_CURVES, NOTCH_HALF_WIDTH } from './metrics';
 
 type Props = {
   width: number;
@@ -15,18 +15,16 @@ type Props = {
 
 // room for the floating shadow around the shape: the key shadow reaches 12 + 3 × 16 below it
 const SHADOW_PADDING = 64;
-/**
- * Figma Shadow/floating: 12% blur 24, plus 4% blur 32 spread -16 offset 12. SVG blur takes
- * half the CSS blur radius; the spread shrinks the shape the key shadow is cast from.
- */
+// Figma Shadow/floating: 12% blur 24, plus 4% blur 32 spread -16 offset 12; svg blur takes
+// half the CSS blur radius, the spread shrinks the shape the key shadow is cast from
 const AMBIENT_BLUR = 12;
 const KEY_BLUR = 16;
 const KEY_SPREAD = 16;
 const KEY_OFFSET_Y = 12;
 
 /**
- * SVG path of the rounded container placed at (`x`, `y`) on the canvas, with the notch
- * dipped into the top edge around `notchCenterX`.
+ * rounded container path placed at (`x`, `y`) on the canvas, with the notch dipped into the
+ * top edge around `notchCenterX`
  */
 const getContainerPath = (
   width: number,
@@ -45,10 +43,11 @@ const getContainerPath = (
   if (notchCenterX !== undefined) {
     const cx = x + notchCenterX;
     const point = ([dx, dy]: [number, number]) => `${cx + dx} ${top + dy}`;
-    const curves = NOTCH_CURVES.map(([c1, c2, end]) => {
-      return ` C ${point(c1)} ${point(c2)} ${point(end)}`;
-    });
-    notch = ` L ${cx - NOTCH_HALF_WIDTH} ${top}${curves.join('')}`;
+    notch =
+      ` L ${cx - NOTCH_HALF_WIDTH} ${top}` +
+      NOTCH_CURVES.map(
+        ([c1, c2, end]) => ` C ${point(c1)} ${point(c2)} ${point(end)}`,
+      ).join('');
   }
   return (
     `M ${left + r} ${top}` +
@@ -65,8 +64,8 @@ const getContainerPath = (
 };
 
 /**
- * Navigation bar container: surface fill with the floating shadow, drawn as an SVG shape
- * so the shadow follows the notch.
+ * navigation bar container: surface fill with the floating shadow, drawn as a shape so
+ * the shadow follows the notch
  */
 const CurvedContainer: React.FC<Props> = ({
   width,
@@ -88,7 +87,6 @@ const CurvedContainer: React.FC<Props> = ({
     SHADOW_PADDING,
     notchCenterX,
   );
-  const hasKeyShadow = width > 2 * KEY_SPREAD && height > 2 * KEY_SPREAD;
 
   return (
     <Svg
@@ -125,7 +123,7 @@ const CurvedContainer: React.FC<Props> = ({
         fillOpacity={0.12}
         filter={'url(#ambientShadow)'}
       />
-      {hasKeyShadow && (
+      {width > 2 * KEY_SPREAD && height > 2 * KEY_SPREAD && (
         <Path
           d={getContainerPath(
             width - 2 * KEY_SPREAD,
@@ -139,13 +137,7 @@ const CurvedContainer: React.FC<Props> = ({
           filter={'url(#keyShadow)'}
         />
       )}
-      <Path
-        d={path}
-        fill={theme.colors.background.surface}
-        fillOpacity={TabBarMetrics.backgroundOpacity}
-        stroke={theme.colors.border.default}
-        strokeWidth={1}
-      />
+      <Path d={path} fill={theme.colors.background.surface} />
     </Svg>
   );
 };

package/Application/BottomTab/CustomBottomTabItem.tsx

@@ -10,10 +10,10 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated';
-import { TabBarIcon } from './TabBarIcon';
+import { FixedScaleText, TabBarIcon } from './TabBarIcon';
 import { Text } from '../../Text';
 import { MiniAppContext } from '../../Context';
-import { Colors } from '../../Consts';
+import { Colors, Spacing } from '../../Consts';
 import { TabBarMetrics, TabBarMotion } from './metrics';
 
 type IconRenderer = (props: {
@@ -31,12 +31,14 @@ 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, the label in a fixed slot under it so a
- * scaled label grows down. The bar slides one shared active indicator behind the icon slots.
+ * 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,
@@ -46,6 +48,7 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
   icon,
   badge,
   vertical,
+  fixedFontScale,
   hideLabel,
 }) => {
   const progress = useSharedValue(focused ? 1 : 0);
@@ -69,9 +72,9 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
     </Text>
   );
 
-  // Active label fades in over the inactive one; a scaled label overflows down.
-  const labelNode = (
-    <View style={vertical ? styles.railLabelSlot : styles.labelSlot}>
+  // the active label fades in over the inactive one
+  const text = (
+    <View style={!vertical && styles.labelBox}>
       {renderText(inactiveTintColor)}
       <Animated.View
         pointerEvents={'none'}
@@ -94,7 +97,8 @@ const TabItemContent: React.FC<TabItemContentProps> = ({
           renderIcon={icon}
         />
       </View>
-      {!hideLabel && labelNode}
+      {!hideLabel &&
+        (fixedFontScale ? <FixedScaleText>{text}</FixedScaleText> : text)}
     </>
   );
 };
@@ -108,7 +112,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,
@@ -143,7 +147,7 @@ const styles = StyleSheet.create({
     minWidth: 1,
     alignItems: 'center',
     justifyContent: 'center',
-    gap: TabBarMetrics.itemIconLabelGap,
+    gap: Spacing.XXS,
   },
   slot: {
     height: TabBarMetrics.indicatorHeight,
@@ -160,13 +164,9 @@ const styles = StyleSheet.create({
     paddingVertical: TabBarMetrics.railIndicatorPaddingVertical,
     paddingHorizontal: TabBarMetrics.indicatorPaddingHorizontal,
   },
-  labelSlot: {
-    height: TabBarMetrics.labelHeight,
+  labelBox: {
     alignSelf: 'stretch',
   },
-  railLabelSlot: {
-    height: TabBarMetrics.railLabelHeight,
-  },
   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,6 +13,7 @@ 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 {
@@ -23,7 +24,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 +40,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[];
@@ -75,6 +76,7 @@ const Rail: React.FC<{
       >
         <TabItemContent
           vertical
+          fixedFontScale
           label={item.label}
           focused={item.focused}
           icon={item.icon}
@@ -88,7 +90,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,
@@ -114,13 +116,15 @@ 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>
+        <FixedScaleText>
+          <Text
+            numberOfLines={1}
+            typography={'label_xs_medium'}
+            color={theme.colors.text.secondary}
+          >
+            {floatingButton.label}
+          </Text>
+        </FixedScaleText>
         {floatingButton.labelContent && (
           <View pointerEvents={'none'} style={styles.railCtaLabelOverlay}>
             {floatingButton.labelContent}
@@ -132,14 +136,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);
@@ -149,7 +153,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,
     {
@@ -159,10 +164,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,11 +3,7 @@ import React from 'react';
 import { useWindowDimensions, View } from 'react-native';
 import { useScreenLayout } from '../../Layout/utils';
 import { FloatingButtonProps } from '../types';
-import {
-  getSystemIndicatorHeight,
-  hasCenterAction,
-  HorizontalTabBar,
-} from './BottomTabBar';
+import { getSystemIndicatorHeight, HorizontalTabBar } from './BottomTabBar';
 import { getHorizontalBarWidth, TabBarMetrics } from './metrics';
 import { getTabItems } from './tabItems';
 import { DuoRailTabBar } from './DuoRailTabBar';
@@ -20,8 +16,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,13 +28,12 @@ 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
@@ -49,15 +44,9 @@ const DuoFloatingTabBar: React.FC<DuoTabBarProps> = props => {
       ]}
     >
       <HorizontalTabBar
-        items={tabItems}
-        width={getHorizontalBarWidth(
-          width,
-          height,
-          insets.left,
-          insets.right,
-          tabItems.length,
-          hasCenterAction(floatingButton, tabItems.length),
-        )}
+        fixedFontScale
+        items={getTabItems(props)}
+        width={getHorizontalBarWidth(width, height, insets.left, insets.right)}
         floatingButton={floatingButton}
         activeTintColor={activeTintColor}
         inactiveTintColor={inactiveTintColor}
@@ -67,14 +56,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

@@ -7,10 +7,9 @@ import Animated, {
 } from 'react-native-reanimated';
 
 import { Colors, Spacing } from '../../Consts';
-import { ApplicationContext } from '../../Context';
+import { ApplicationContext, MiniAppContext } from '../../Context';
 import { BadgeDot } from '../../Badge';
 import { Text } from '../../Text';
-import ScaleSizeProvider from '../ScaleSizeProvider';
 import { TabBarMetrics, TabBarMotion } from './metrics';
 
 type Props = {
@@ -29,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,
@@ -54,8 +52,27 @@ export const getTabBadge = (
 };
 
 /**
- * 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.
+ * 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)
  */
 const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
   label,
@@ -63,21 +80,19 @@ 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,
         },
       ]}
     >
-      <ScaleSizeProvider scaleSizeMaxRate={1}>
+      <FixedScaleText>
         <Text
           numberOfLines={1}
           typography={'action_xxs_bold'}
@@ -85,7 +100,7 @@ const TabBadge: React.FC<{ label: string; vertical?: boolean }> = ({
         >
           {label}
         </Text>
-      </ScaleSizeProvider>
+      </FixedScaleText>
     </View>
   );
   if (vertical) {
@@ -95,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`,