@momo-kits/foundation 0.169.7-beta.8 → 0.169.7-beta.9

package/Application/Components/HeaderTitle.shared.ts

@@ -3,9 +3,6 @@ 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,
@@ -17,28 +14,32 @@ const useHeaderFontFamily = (): string => {
 };
 
 /**
- * side paddings, back button, title gaps and right cluster sharing the
- * navigation bar with the title
+ * 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
  */
-const HEADER_ACTIONS_WIDTH =
-  sidePadding * 2 + buttonSize + titleGap * 2 + clusterWidth;
+const STATUS_BAR_ROW_ACTIONS_EXTRA = 55;
 
 /**
  * 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, minus the status bar clusters on the iPhone Duo inner portrait row.
+ * the bar, so the title gets the content width; otherwise it shares the bar with them.
  */
 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 - clearance;
+  return width - HEADER_ACTIONS_WIDTH - rowActionsExtra - clearance;
 };
 
 export { useHeaderFontFamily, HEADER_ACTIONS_WIDTH, useTitleMaxWidth };

package/Application/Components/HeaderToolkitAction.tsx

@@ -4,12 +4,11 @@ import { NavigationButton } from './NavigationButton';
 import { MiniAppContext } from '../../Context';
 import { Colors, Spacing, Styles } from '../../Consts';
 import { Icon } from '../../Icon';
-import { DuoMetrics } from '../../Layout/utils';
+import { DuoMetrics, useScreenLayout } 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';
@@ -32,6 +31,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   const compression = useDuoBarCompression();
   const { toolbarCompressed, toolbarHidden } = compression;
   const { expandToolbar, setToolbarHeight } = compression;
+  const { statusBarClearance } = useScreenLayout();
   const {
     isLoading,
     iconShortcut,
@@ -131,6 +131,39 @@ const HeaderToolkitAction: React.FC<any> = ({
     );
   }
 
+  // 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>
+          {useHelpCenter && (
+            <SideBarGroupItem
+              accessibilityLabel={'btn_navigation_help_center'}
+              icon={'help_center'}
+              tintColor={tintColor}
+              onPress={onPressHelpCenter}
+            />
+          )}
+          <SideBarGroupItem
+            accessibilityLabel={'btn_navigation_close'}
+            icon={closeIcon}
+            tintColor={tintColor}
+            onPress={onClose}
+          />
+        </SideBarGroup>
+      </View>
+    );
+  }
+
   return (
     <View style={Styles.row}>
       {useShortcut && (
@@ -151,11 +184,7 @@ const HeaderToolkitAction: React.FC<any> = ({
               onPress={onPressHelpCenter}
               hitSlop={{ top: 7, bottom: 7, left: 7, right: 0 }}
             >
-              <Icon
-                color={tintColor}
-                source={'help_center'}
-                size={HeaderBarMetrics.iconSize}
-              />
+              <Icon color={tintColor} source={'help_center'} size={20} />
             </TouchableOpacity>
             <View style={[styles.divider, { backgroundColor: tintColor }]} />
           </>
@@ -166,11 +195,7 @@ const HeaderToolkitAction: React.FC<any> = ({
           style={styles.toolkitButton}
           hitSlop={{ top: 7, bottom: 7, left: 0, right: 7 }}
         >
-          <Icon
-            color={tintColor}
-            source={closeIcon}
-            size={HeaderBarMetrics.iconSize}
-          />
+          <Icon color={tintColor} source={closeIcon} size={20} />
         </TouchableOpacity>
       </View>
     </View>

package/Application/Components/NavigationButton.tsx

@@ -5,12 +5,9 @@ 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 32pt icon button of the header (back, shortcut) with an optional badge
+ * Round 28pt 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> = ({
@@ -38,7 +35,7 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
         <Icon
           source={icon}
           color={tintColor ?? theme.colors.text.default}
-          size={iconSize}
+          size={20}
         />
       </TouchableOpacity>
       {showBadge && <BadgeDot size={'small'} style={styles.badgeDot} />}
@@ -48,12 +45,12 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    width: buttonSize,
+    width: 28,
   },
   navigationButton: {
-    height: buttonSize,
-    width: buttonSize,
-    borderRadius: buttonSize / 2,
+    height: 28,
+    width: 28,
+    borderRadius: 14,
     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, type InputSearchProps } from '../../Input';
+import { InputRef, InputSearch } from '../../Input';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import Animated, { useAnimatedStyle } from 'react-native-reanimated';
 import React, { useContext } from 'react';
@@ -8,13 +8,7 @@ import { ApplicationContext, MiniAppContext } from '../../Context';
 import { Text } from '../../Text';
 import { useNormalizedSharedValue } from '../hooks';
 import { useScreenLayout } from '../../Layout';
-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;
+import { DuoMetrics } from '../../Layout/utils';
 
 /**
  * Header search bar whose fill turns from surface to default once scrolled, with
@@ -34,21 +28,15 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
     const { theme, navigator } = useContext(ApplicationContext);
     const context = useContext<any>(MiniAppContext);
     const layout = useScreenLayout();
-    let defaultRightWidth = TOOLKIT_WIDTH;
-    let searchSize: InputSearchProps['size'] = 'header';
-    if (layout.sideBar) {
-      defaultRightWidth = DUO_TOOLKIT_WIDTH;
-      searchSize = 'default';
-    }
+    // the iPhone Duo status bar row keeps a side bar sized back button
+    const BACK_WIDTH = layout.statusBarClearance ? DuoMetrics.controlSize : 28;
 
     const sharedValue = useNormalizedSharedValue(animatedValue);
-    const defaultLeft = buttonSize + sidePadding + titleGap;
-    const leftPosition = props?.leftPosition ?? defaultLeft;
-    const headerRightWidth = props?.headerRightWidth ?? defaultRightWidth;
+    const leftPosition = props?.leftPosition ?? BACK_WIDTH + 20;
+    const headerRightWidth = props?.headerRightWidth ?? 73;
 
     // iPhone Duo side bar holds back: the search shares the content width with the buttons only
-    const rowWidth = layout.width - leftPosition - sidePadding;
-    let searchMaxWidth = rowWidth - headerRightWidth;
+    let searchMaxWidth = layout.width - leftPosition - 12 - headerRightWidth;
     if (layout.sideBar) {
       searchMaxWidth = layout.contentWidth - Spacing.M * 2 - headerRightWidth;
     }
@@ -117,7 +105,6 @@ const SearchHeader = React.forwardRef<InputRef, SearchHeaderProps>(
             <InputSearch
               ref={ref}
               {...props}
-              size={searchSize}
               backgroundColor={'transparent'}
               showButtonText={false}
             />

package/Application/StackScreen.tsx

@@ -8,7 +8,6 @@ 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;
 
@@ -52,7 +51,6 @@ 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,
@@ -71,13 +69,6 @@ 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/index.ts

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

package/Application/navigationOptions.tsx

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

package/Application/types.header.ts

@@ -98,11 +98,6 @@ 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 = {
@@ -114,8 +109,8 @@ export type AnimatedHeader = {
 export interface SearchHeaderProps extends InputSearchProps {
   ref?: React.RefObject<InputRef>;
   animatedValue?: Animated.Value | SharedValue<number>;
-  headerRightWidth?: 0 | 84 | 124 | number;
-  leftPosition?: 12 | 52 | number;
+  headerRightWidth?: 0 | 74 | 110 | number;
+  leftPosition?: 12 | 48 | 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,7 +9,6 @@ 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';
@@ -129,10 +128,4 @@ 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,7 +13,6 @@ import {
   View,
 } from 'react-native';
 import { useComponentId } from '../Application';
-import { HeaderBarMetrics } from '../Application/headerLayout';
 import {
   ApplicationContext,
   ComponentContext,
@@ -27,8 +26,6 @@ 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.
@@ -52,7 +49,6 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
     backgroundColor,
     onPress,
     typingData,
-    size = 'default',
     ...props
   },
   ref,
@@ -63,13 +59,6 @@ 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 || '');
@@ -125,11 +114,7 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
     if (typingData && typingData?.length > 0) {
       return (
         <TouchableOpacity
-          style={[
-            styles.searchInput,
-            styles.searchInputTyping,
-            inputHeightStyle,
-          ]}
+          style={[styles.searchInput, styles.searchInputTyping]}
           onPress={onPress}
           activeOpacity={onPress ? 0.6 : 1}
         >
@@ -147,7 +132,6 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
         ref={inputRef}
         style={[
           styles.searchInput,
-          inputHeightStyle,
           {
             fontSize: scaledFontSize,
             color: theme.colors.text.default,
@@ -241,7 +225,7 @@ const InputSearch: ForwardRefRenderFunction<InputRef, InputSearchProps> = (
         >
           <Icon
             source={'navigation_search'}
-            size={searchIconSize}
+            size={24}
             color={theme.colors.text.hint}
           />
           {renderInputView()}

package/Input/index.tsx

@@ -194,12 +194,6 @@ 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`.
    */
@@ -373,4 +367,4 @@ export {
   InputPhoneNumber,
 };
 
-export { checkValidPhoneNumber };
+export {checkValidPhoneNumber};

package/Layout/Card.tsx

@@ -1,12 +1,13 @@
 import React, { useContext } from 'react';
 import { View, ViewProps } from 'react-native';
-import { useGridSystem, useScreenLayout } from './utils';
+import { GRID_GUTTER, GRID_MARGIN } from './constants';
+import { useGridSystem } from './useGridSystem';
 import { GridContextProps } from './types';
 import { GridContext } from './index';
 import { Image } from '../Image';
 import { ApplicationContext } from '../Context';
 import styles from './styles';
-import { Radius, Shadow, Spacing } from '../Consts';
+import { Radius, Shadow } from '../Consts';
 
 export interface CardProps extends ViewProps {
   /**
@@ -21,7 +22,7 @@ export interface CardProps extends ViewProps {
 }
 
 /**
- * Surface card across the content width minus 12pt margins, with its own grid for child
+ * Surface card across the grid width minus 12pt margins, with its own grid for child
  * Items; optional background image and light shadow.
  */
 const Card: React.FC<CardProps> = ({
@@ -32,19 +33,18 @@ const Card: React.FC<CardProps> = ({
   ...props
 }) => {
   const { theme } = useContext(ApplicationContext);
-  const { numberOfColumns } = useGridSystem();
-  const { contentWidth } = useScreenLayout();
+  const { numberOfColumns, gridWidth, gridOffset } = useGridSystem();
 
-  const gutterSize = 8;
-  const margin = 12;
-  const widthSection = contentWidth - margin * 2;
+  const gutterSize = GRID_GUTTER;
+  const margin = GRID_MARGIN;
+  const widthSection = gridWidth - margin * 2;
   const innerWidth = widthSection - margin * 2;
   const columnsWidth = innerWidth - gutterSize * (numberOfColumns - 1);
   const sizePerSpan = columnsWidth / numberOfColumns - 1 / numberOfColumns;
 
   const gridContext: GridContextProps = {
     numberOfColumns,
-    gutterSize: Spacing.S,
+    gutterSize: GRID_GUTTER,
     sizePerSpan,
     getSizeSpan: span => {
       return sizePerSpan * span + gutterSize * (span - 1);
@@ -63,7 +63,7 @@ const Card: React.FC<CardProps> = ({
           styles.card,
           {
             width: widthSection,
-            marginHorizontal: margin,
+            marginHorizontal: gridOffset + margin,
             gap: gutterSize,
           },
           !!backgroundImage && { backgroundColor: undefined },

package/Layout/Item.tsx

@@ -7,12 +7,12 @@ import { SpanNumber } from './types';
 
 export interface ItemProps extends ViewProps {
   /**
-   * Width in grid columns (1-12). Defaults to the full row.
+   * Width in grid columns (1-36, out of the grid's 12, 24 or 36). Defaults to the full row.
    */
   widthSpan?: SpanNumber;
 
   /**
-   * Optional. Height in grid spans (1-12). Unset keeps the content height.
+   * Optional. Height in grid spans (1-36, out of the grid's 12, 24 or 36). Unset keeps the content height.
    */
   heightSpan?: SpanNumber;
 }

package/Layout/Screen.tsx

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

package/Layout/Section.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { View, ViewProps } from 'react-native';
-import { useGridSystem, useScreenLayout } from './utils';
+import { GRID_GUTTER, GRID_MARGIN } from './constants';
+import { useGridSystem } from './useGridSystem';
 import { GridContextProps } from './types';
 import { GridContext } from './index';
 import styles from './styles';
 import { Image } from '../Image';
-import { Spacing } from '../Consts';
 
 export interface SectionProps extends ViewProps {
   /**
@@ -37,22 +37,21 @@ const Section: React.FC<SectionProps> = ({
   style,
   ...props
 }) => {
-  const { numberOfColumns } = useGridSystem();
-  const { contentWidth } = useScreenLayout();
+  const { numberOfColumns, gridWidth, gridOffset } = useGridSystem();
 
-  const gutterSize = 12;
+  const gutterSize = GRID_GUTTER;
   let margin = 0;
   if (useMargin) {
-    margin = 12;
+    margin = GRID_MARGIN;
   }
-  const widthSection = contentWidth - margin * 2;
+  const widthSection = gridWidth - margin * 2;
 
   const columnsWidth = widthSection - gutterSize * (numberOfColumns - 1);
   const sizePerSpan = columnsWidth / numberOfColumns - 1 / numberOfColumns;
 
   const gridContext: GridContextProps = {
     numberOfColumns,
-    gutterSize: Spacing.M,
+    gutterSize: GRID_GUTTER,
     sizePerSpan,
     getSizeSpan: span => {
       return span * sizePerSpan + gutterSize * (span - 1);
@@ -70,7 +69,7 @@ const Section: React.FC<SectionProps> = ({
           styles.rowWrap,
           {
             width: widthSection,
-            marginHorizontal: margin,
+            marginHorizontal: gridOffset + margin,
             gap: gutterSize,
           },
         ]}

package/Layout/constants.ts

@@ -0,0 +1,19 @@
+const GRID_MARGIN = 12;
+const GRID_GUTTER = 12;
+const GRID_PHONE_MAX_WIDTH = 600;
+const GRID_TABLET_MIN_WIDTH = 800;
+const GRID_DESKTOP_MIN_WIDTH = 1100;
+const GRID_PHONE_COLUMNS = 12;
+const GRID_TABLET_COLUMNS = 24;
+const GRID_DESKTOP_COLUMNS = 36;
+
+export {
+  GRID_DESKTOP_COLUMNS,
+  GRID_DESKTOP_MIN_WIDTH,
+  GRID_GUTTER,
+  GRID_MARGIN,
+  GRID_PHONE_COLUMNS,
+  GRID_PHONE_MAX_WIDTH,
+  GRID_TABLET_COLUMNS,
+  GRID_TABLET_MIN_WIDTH,
+};