@momo-kits/foundation 0.168.1-beta.2 → 0.168.1-beta.21

package/Input/InputMoney.tsx

@@ -1,16 +1,18 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import React, {
   forwardRef,
   useContext,
   useEffect,
   useImperativeHandle,
-  useLayoutEffect,
   useRef,
   useState,
 } from 'react';
 import {
+  Platform,
+  Pressable,
+  Text,
   TextInput,
   TextInputFocusEvent,
-  TextInputSelectionChangeEvent,
   TouchableOpacity,
   View,
 } from 'react-native';
@@ -22,7 +24,6 @@ import {
 } from '../Context';
 import { Icon } from '../Icon';
 import { useScaleSize, exportFontFamily } from '../Text';
-import { Spacing } from '../Consts';
 import {
   ErrorView,
   FloatingView,
@@ -34,93 +35,22 @@ import { InputMoneyProps } from './index';
 import styles from './styles';
 import SystemTextInput from './SystemTextInput';
 
-type Selection = { start: number; end: number };
-type Edit = { start: number; end: number; inserted: string };
+const moneyFormatter = new Intl.NumberFormat('vi-VN');
 
-const countDigits = (text: string) => text.replace(/\D/g, '').length;
-
-const groupDigits = (digits: string) =>
-  digits.replace(/\B(?=(\d{3})+(?!\d))/g, '.');
-
-const caretFromDigitIndex = (display: string, digitIndex: number) => {
-  let count = 0;
-  for (let i = 0; i < display.length && count < digitIndex; i++) {
-    if (/\d/.test(display[i])) {
-      count += 1;
-      if (count === digitIndex) return i + 1;
-    }
-  }
-  return 0;
-};
-
-const detectEdit = (old: string, next: string, selection: Selection): Edit => {
-  const { start, end } = selection;
-  const removed = old.length - next.length;
-  const candidates: Edit[] = [
-    {
-      start,
-      end,
-      inserted: next.slice(start, next.length - (old.length - end)),
-    },
-    { start: start - removed, end: start, inserted: '' },
-    { start, end: start + removed, inserted: '' },
-  ];
-  const match = candidates.find(
-    e =>
-      e.start >= 0 &&
-      e.end >= e.start &&
-      e.end <= old.length &&
-      old.slice(0, e.start) + e.inserted + old.slice(e.end) === next,
-  );
-  if (match) return match;
-
-  let prefix = 0;
-  while (
-    prefix < Math.min(old.length, next.length) &&
-    old[prefix] === next[prefix]
-  ) {
-    prefix += 1;
+const findEdit = (old: string, text: string) => {
+  let start = 0;
+  while (start < text.length && old[start] === text[start]) {
+    start += 1;
   }
   let suffix = 0;
   while (
-    suffix < Math.min(old.length, next.length) - prefix &&
-    old[old.length - 1 - suffix] === next[next.length - 1 - suffix]
+    suffix < Math.min(text.length, old.length) - start &&
+    old[old.length - 1 - suffix] === text[text.length - 1 - suffix]
   ) {
     suffix += 1;
   }
-  return {
-    start: prefix,
-    end: old.length - suffix,
-    inserted: next.slice(prefix, next.length - suffix),
-  };
-};
-
-const applyEdit = (display: string, edit: Edit, digitLimit: number) => {
-  const digits = display.replace(/\D/g, '');
-  let left = countDigits(display.slice(0, edit.start));
-  let removed = countDigits(display.slice(edit.start, edit.end));
-  const inserted = edit.inserted.replace(/\D/g, '');
-  if (
-    !removed &&
-    !inserted &&
-    left > 0 &&
-    display.slice(edit.start, edit.end).includes('.')
-  ) {
-    left -= 1;
-    removed = 1;
-  }
-  const next = digits.slice(0, left) + inserted + digits.slice(left + removed);
-  const trimmed = next.replace(/^0+(?=\d)/, '');
-  if ((!removed && !inserted) || trimmed.length > digitLimit) {
-    return { digits, caretDigit: left };
-  }
-  return {
-    digits: trimmed,
-    caretDigit: Math.max(
-      0,
-      left + inserted.length - (next.length - trimmed.length),
-    ),
-  };
+  const size = old.length + text.length - 2 * (start + suffix);
+  return { old, start, suffix, size };
 };
 
 const InputMoney = forwardRef(
@@ -160,14 +90,15 @@ const InputMoney = forwardRef(
     const inputFontFamily = exportFontFamily('bold');
     const [focused, setFocused] = useState(false);
     const [displayValue, setDisplayValue] = useState('');
-    const [commitCount, setCommitCount] = useState(0);
-    const displayRef = useRef('');
-    const digitsRef = useRef('');
-    const selectionRef = useRef<Selection>({ start: 0, end: 0 });
-    const pendingCaretRef = useRef<number | null>(null);
-    const pendingSelectionRef = useRef<Selection | null>(null);
-    const editingRef = useRef(false);
+    const [numericValue, setNumericValue] = useState('');
+    const [lastDisplayValue, setLastDisplayValue] = useState('');
     const inputRef = useRef<TextInput>(null);
+    const caretDigitsAfter = useRef<number | undefined>(undefined);
+    const lastRawText = useRef('');
+    const [caretSelection, setCaretSelection] = useState<{
+      start: number;
+      end: number;
+    }>();
     const componentName = 'InputMoney';
 
     const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
@@ -177,94 +108,103 @@ const InputMoney = forwardRef(
       props.accessibilityLabel,
     );
 
-    const digitLimit = props.maxLength ?? Number.POSITIVE_INFINITY;
+    const maxLength = (props as any)?.maxLength;
+    const hasMaxLength = typeof maxLength === 'number';
+    const digitLimit = hasMaxLength ? maxLength : Number.POSITIVE_INFINITY;
 
     useEffect(() => {
       if (value !== undefined && typeof value === 'string') {
         const cleanValue = value.replace(/\D/g, '').replace(/^0+(?=\d)/, '');
-        if (cleanValue !== digitsRef.current) {
-          commit(cleanValue, cleanValue.length);
+        if (cleanValue !== numericValue) {
+          caretDigitsAfter.current = undefined;
+          setNumericValue(cleanValue);
+          updateDisplayValue(cleanValue);
         }
       }
-      // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value]);
 
-    useLayoutEffect(() => {
-      const caret = pendingCaretRef.current;
-      if (caret === null || !inputRef.current?.isFocused()) return;
-      pendingCaretRef.current = null;
-      inputRef.current.setSelection(caret, caret);
-    }, [commitCount]);
+    useEffect(() => {
+      setLastDisplayValue(displayValue);
+    }, [displayValue]);
 
-    const commit = (digits: string, caretDigit: number) => {
-      const display = digits ? `${groupDigits(digits)}${currency}` : '';
-      const caret = caretFromDigitIndex(display, caretDigit);
-      const changed = digits !== digitsRef.current;
-      displayRef.current = display;
-      digitsRef.current = digits;
-      selectionRef.current = { start: caret, end: caret };
-      pendingCaretRef.current = caret;
-      setCommitCount(count => count + 1);
-      setDisplayValue(display);
-      return changed;
+    useEffect(() => {
+      if (!caretSelection) return;
+      setCaretSelection(current =>
+        current === caretSelection ? undefined : current,
+      );
+    }, [caretSelection]);
+
+    const updateDisplayValue = (numeric: string) => {
+      const next = numeric ? moneyFormatter.format(Number(numeric)) : '';
+      setDisplayValue(next);
+
+      const digitsAfter = caretDigitsAfter.current;
+      caretDigitsAfter.current = undefined;
+      if (Platform.OS !== 'android' || digitsAfter === undefined) return;
+      let before = parseInputText(next).length - digitsAfter;
+      let caret = 0;
+      while (before > 0 && caret < next.length) {
+        if (/\d/.test(next[caret])) before -= 1;
+        caret += 1;
+      }
+      setCaretSelection({ start: caret, end: caret });
+    };
+
+    const parseInputText = (text: string): string => text.replace(/\D/g, '');
+
+    const updateNumericValue = (val: string) => {
+      let next = val.replace(/[^\d]/g, '').replace(/^0+(?=\d)/, '');
+      if (next.length > digitLimit) next = next.slice(0, digitLimit);
+      if (/^\d*$/.test(next)) {
+        setNumericValue(next);
+        updateDisplayValue(next);
+        onChangeText?.(next);
+      }
     };
 
     const onClearText = () => {
-      commit('', 0);
+      inputRef?.current?.clear();
+      inputRef.current?.setNativeProps({ text: '' });
+      setDisplayValue('');
+      setNumericValue('');
       onChangeText?.('');
     };
 
     const _onChangeText = (text: string) => {
-      let digits = '';
-      let caretDigit = 0;
-      pendingSelectionRef.current = null;
-      editingRef.current = true;
-      setTimeout(() => {
-        editingRef.current = false;
-      });
-      if (text) {
-        const edit = detectEdit(displayRef.current, text, selectionRef.current);
-        ({ digits, caretDigit } = applyEdit(
-          displayRef.current,
-          edit,
-          digitLimit,
-        ));
+      if (!text) {
+        lastRawText.current = '';
+        setDisplayValue('');
+        setNumericValue('');
+        onChangeText?.('');
+        return;
       }
-      if (commit(digits, caretDigit)) {
-        onChangeText?.(digits);
+      const digits = parseInputText(text);
+      const raw = lastRawText.current;
+      lastRawText.current = text;
+      const formattedEdit = findEdit(lastDisplayValue, text);
+      const rawEdit = findEdit(raw, text);
+      const { old, start, suffix } =
+        raw && rawEdit.size < formattedEdit.size ? rawEdit : formattedEdit;
+      caretDigitsAfter.current = parseInputText(
+        text.slice(text.length - suffix),
+      ).length;
+      if (text.length < old.length && digits === numericValue) {
+        const index = parseInputText(text.slice(0, start)).length - 1;
+        if (index >= 0) {
+          updateNumericValue(digits.slice(0, index) + digits.slice(index + 1));
+          return;
+        }
       }
+      updateNumericValue(digits);
     };
 
-    const _onSelectionChange = (e: TextInputSelectionChangeEvent) => {
-      props.onSelectionChange?.(e);
-      if (editingRef.current) return;
-      const selection = e.nativeEvent.selection;
-      pendingSelectionRef.current = selection;
-      setTimeout(() => {
-        if (pendingSelectionRef.current !== selection) return;
-        pendingSelectionRef.current = null;
-        const { start, end } = selection;
-        const display = displayRef.current;
-        const max = display ? display.length - currency.length : 0;
-        const clamped = {
-          start: Math.min(start, max),
-          end: Math.min(end, max),
-        };
-        selectionRef.current = clamped;
-        if (clamped.start !== start || clamped.end !== end) {
-          inputRef.current?.setSelection(clamped.start, clamped.end);
-        }
-      });
+    const focusAtEnd = () => {
+      inputRef.current?.focus();
+      inputRef.current?.setSelection(displayValue.length, displayValue.length);
     };
 
     const _onFocus = (e: TextInputFocusEvent) => {
       setFocused(true);
-      const caret = pendingCaretRef.current;
-      pendingCaretRef.current = null;
-      if (caret !== null && !props.selectTextOnFocus) {
-        selectionRef.current = { start: caret, end: caret };
-        inputRef.current?.setSelection(caret, caret);
-      }
       onFocus?.(e);
     };
 
@@ -274,13 +214,15 @@ const InputMoney = forwardRef(
     };
 
     const _setText = (text: string) => {
-      const digits = text
-        .replace(/\D/g, '')
-        .replace(/^0+(?=\d)/, '')
-        .slice(0, digitLimit);
-      if (commit(digits, digits.length)) {
-        onChangeText?.(digits);
+      caretDigitsAfter.current = undefined;
+      if (!text) {
+        setDisplayValue('');
+        setNumericValue('');
+        onChangeText?.('');
+        return;
       }
+      const newNumericValue = parseInputText(text);
+      updateNumericValue(newNumericValue);
     };
 
     useImperativeHandle(ref, () => {
@@ -302,6 +244,14 @@ const InputMoney = forwardRef(
         placeholderColor = disabledColor;
         iconTintColor = disabledColor;
       }
+      const textStyle = {
+        fontSize: scaledFontSize,
+        fontFamily: inputFontFamily,
+      };
+      const placeholderHasCurrency = placeholder.endsWith(currency);
+      const inputPlaceholder = placeholderHasCurrency
+        ? placeholder.slice(0, -currency.length)
+        : placeholder;
       return (
         <View
           style={[
@@ -320,44 +270,46 @@ const InputMoney = forwardRef(
             onPress={onPressFloatingIcon}
             componentId={componentId}
           />
-          <View style={styles.inputView}>
+          <Pressable
+            style={[styles.inputView, styles.moneyInputView]}
+            onPress={focusAtEnd}
+            disabled={disabled}
+          >
             <SystemTextInput
               {...props}
               accessibilityLabel={`${componentId}`}
               textAlignVertical="center"
               ref={inputRef}
-              editable={props.editable !== false && !disabled}
               accessibilityState={{
                 disabled: disabled,
                 ...props.accessibilityState,
               }}
-              style={[
-                {
-                  width: '100%',
-                  paddingLeft: Spacing.M,
-                  height: '100%',
-                  fontSize: scaledFontSize,
-                  paddingVertical: Spacing.S,
-                  fontFamily: inputFontFamily,
-                },
-                {
-                  color: textColor,
-                },
-              ]}
+              style={[textStyle, styles.moneyTextInput, { color: textColor }]}
               allowFontScaling={false}
               textBreakStrategy="highQuality"
               value={displayValue}
+              selection={caretSelection ?? props.selection}
               onChangeText={_onChangeText}
-              onSelectionChange={_onSelectionChange}
               onFocus={_onFocus}
               onBlur={_onBlur}
-              placeholder={placeholder}
+              placeholder={inputPlaceholder}
               selectionColor={theme.colors.primary}
               placeholderTextColor={placeholderColor}
               keyboardType={'numeric'}
               maxLength={undefined}
             />
-          </View>
+            {displayValue || placeholderHasCurrency ? (
+              <Text
+                style={[
+                  textStyle,
+                  { color: displayValue ? textColor : placeholderColor },
+                ]}
+                allowFontScaling={false}
+              >
+                {currency}
+              </Text>
+            ) : null}
+          </Pressable>
           <View style={styles.iconView}>
             {showClearIcon && focused && displayValue ? (
               <TouchableOpacity

package/Input/styles.ts

@@ -218,4 +218,13 @@ export default StyleSheet.create({
     marginLeft: Spacing.M,
   },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
+  moneyInputView: {
+    paddingLeft: Spacing.M,
+  },
+  moneyTextInput: {
+    flexShrink: 1,
+    paddingLeft: 0,
+    paddingRight: Spacing.XXS,
+    paddingVertical: 0,
+  },
 });

package/Layout/Screen.tsx

@@ -64,6 +64,8 @@ import {
 import { DuoQuickReturnHeader } from '../Application/Components/DuoQuickReturnHeader';
 import { useDuoTabBarInset } from '../Application/BottomTab/DuoTabBar';
 
+const ANIMATED_BANNER_HEIGHT = 210;
+
 export interface ScreenProps extends ViewProps {
   /**
    * ReactNode representing the content of the screen.
@@ -222,19 +224,6 @@ const Screen = forwardRef(
     const frame = useSafeAreaFrame();
     const heightHeader = useHeaderHeight();
 
-    /**
-     * Dual animation source:
-     * - `animatedValue` is a react-native `Animated.Value` driven natively by the
-     *   scroll event. It is what legacy consumers receive (`animatedValue`).
-     * - `sharedValue` is a reanimated `SharedValue` consumed by every internal
-     *   foundation component (and offered to modern consumers). It is kept in
-     *   sync from the scroll `listener` (see below), which fires on the JS
-     *   thread even when the scroll uses the native driver.
-     *   If a legacy value is driven outside of Screen, its listener also
-     *   mirrors JS-driven updates into the shared value.
-     * Consumers pass only `Animated.Value`; the reanimated shared value stays
-     * an internal implementation detail.
-     */
     const animatedValue = useRef<Animated.Value>(
       customAnimatedValue ?? new Animated.Value(0),
     );
@@ -258,7 +247,6 @@ const Screen = forwardRef(
     const currentTint = useRef<string | undefined>(undefined);
 
     const isTab = !!screen?.bottomTab;
-    // Duo floating tab bar overlays the tab content instead of taking layout space
     const duoTabInset = useDuoTabBarInset();
 
     let handleScroll;
@@ -267,14 +255,12 @@ const Screen = forwardRef(
     const isIOS = Platform.OS === 'ios';
     const bottomInset = isIOS ? Math.min(insets.bottom, 21) : insets.bottom;
     const hasSideBar = !!layout.sideBar;
-    // iPhone Duo: content scrolls under a glass header instead of starting below it
     const useDuoGlass =
       hasSideBar &&
       (headerType === 'default' || headerType === 'extended') &&
       !animatedHeader &&
       !inputSearchProps;
 
-    // iPhone Duo: the header leaves with the content and returns on a reverse scroll
     const useQuickReturn =
       hasSideBar && scrollable && (useDuoGlass || !!animatedHeader);
     const headerHide = useSharedValue(0);
@@ -324,12 +310,14 @@ const Screen = forwardRef(
      */
     screen?.onSetParams?.(trackingParams);
 
+    const appliedHeaderMode = useRef<string | undefined>(undefined);
+
     /**
      * export options for screen
      * @param headerType
      */
     const setHeaderType = useCallback(
-      (headerType: HeaderType) => {
+      (headerType: HeaderType, keepTitle = false) => {
         let options: StackNavigationOptions;
         switch (headerType) {
           case 'none':
@@ -418,6 +406,10 @@ const Screen = forwardRef(
             }
         }
 
+        if (keepTitle) {
+          delete options.headerTitle;
+        }
+
         navigation?.instance?.setOptions({ header: undefined, ...options });
       },
       [
@@ -449,10 +441,9 @@ const Screen = forwardRef(
           headerTransparent: true,
           headerBackground: (props: any) =>
             hasSideBar ? (
-              // glass shows once the banner has scrolled under the header
               <DuoGlassBackground
                 animatedValue={sharedValue}
-                fadeStart={Math.max(210 + layoutOffset - heightHeader, 0)}
+                bannerBottom={ANIMATED_BANNER_HEIGHT + layoutOffset}
               />
             ) : (
               <HeaderBackground
@@ -486,7 +477,6 @@ const Screen = forwardRef(
         useShadowHeader,
         hasSideBar,
         layoutOffset,
-        heightHeader,
         quickReturnOptions,
       ],
     );
@@ -521,7 +511,6 @@ const Screen = forwardRef(
       let searchWidth = layout.width - 24;
       let searchLeft = Spacing.M;
       if (layout.sideBar) {
-        // back floats in the side bar: the search spans the content width
         searchWidth = layout.contentWidth - Spacing.M * 2;
         searchLeft = Spacing.M - getHeaderMargin(layout.width);
       }
@@ -563,10 +552,13 @@ const Screen = forwardRef(
 
       if (animatedHeader) {
         setAnimatedHeader(animatedHeader);
+        appliedHeaderMode.current = 'animated';
       } else if (inputSearchProps) {
         setAnimatedSearch();
+        appliedHeaderMode.current = 'search';
       } else {
-        setHeaderType(headerType);
+        setHeaderType(headerType, appliedHeaderMode.current === headerType);
+        appliedHeaderMode.current = headerType;
       }
 
       return () => {
@@ -613,7 +605,6 @@ const Screen = forwardRef(
           useNativeDriver: true,
           listener: (e: NativeSyntheticEvent<NativeScrollEvent>) => {
             const offsetY = e.nativeEvent.contentOffset.y;
-            // keep the reanimated source in sync for the internal components.
             sharedValue.value = offsetY;
             scrollViewProps?.onScroll?.(e);
             if (animatedHeader) {
@@ -648,7 +639,6 @@ const Screen = forwardRef(
      */
     const snapQuickReturnHeader = (offsetY: number) => {
       const hide = headerHide.value;
-      // above heightHeader the header still sits on the content
       if (
         !useQuickReturn ||
         offsetY < heightHeader ||
@@ -692,11 +682,12 @@ const Screen = forwardRef(
       if (typeof animatedHeader?.component === 'function') {
         return (
           <View
-            style={[styles.screenBanner, { maxHeight: 210 + layoutOffset }]}
+            style={[
+              styles.screenBanner,
+              { maxHeight: ANIMATED_BANNER_HEIGHT + layoutOffset },
+            ]}
           >
             {animatedHeader?.component({
-              // legacy consumers read `animatedValue` (Animated.Value),
-              // modern consumers read `sharedValue` (SharedValue).
               animatedValue: animatedValue.current,
               sharedValue: sharedValue,
             })}
@@ -756,11 +747,6 @@ const Screen = forwardRef(
       }
     };
 
-    // Cap the screen container height so a scrollable body with a sticky footer
-    // can't push the footer past the visible frame (web previews measure the
-    // safe-area frame from the seeded SafeAreaProvider metrics). Subtract the
-    // bottom tab bar when present and the header unless it's an animated/extended
-    // header (those overlay rather than offset the body).
     const getHeight = () => {
       let newHeight = frame.height;
       if (isTab) {
@@ -772,8 +758,6 @@ const Screen = forwardRef(
       return newHeight;
     };
 
-    // without the grid, the content container keeps clear of the horizontal insets.
-    // Only set when there are insets, so a caller's paddingHorizontal is never overridden.
     const hasContentInset = layout.insetLeft > 0 || layout.insetRight > 0;
     const needsContentInset = !useGridLayout && hasContentInset;
     const contentInsetStyle = needsContentInset && {
@@ -796,8 +780,6 @@ const Screen = forwardRef(
           Styles.flex,
           {
             backgroundColor: backgroundColor ?? theme.colors.background.default,
-            // Web-only cap so a scrollable body with a sticky footer can't push
-            // the footer past the frame. Native handles this without a cap.
             maxHeight: Platform.OS === 'web' ? getHeight() : undefined,
           },
         ]}
@@ -882,7 +864,6 @@ const Screen = forwardRef(
           )}
 
           {Footer && (
-            // with side insets, the clip keeps the shadow off the side bar, only the top one shows
             <View
               pointerEvents={'box-none'}
               style={[
@@ -904,8 +885,6 @@ const Screen = forwardRef(
                   },
                 ]}
               >
-                {/* The footer inset is a caller decision, not a platform one — a footer
-                    that carries its own horizontal padding passes `marginFooter={false}`. */}
                 <Section useMargin={marginFooter}>{Footer}</Section>
               </View>
             </View>

package/Layout/utils.ts

@@ -510,6 +510,7 @@ const useGridSystem = () => {
 export {
   DuoMetrics,
   HeaderMetrics,
+  InnerEdgeStyles,
   getHeaderMargin,
   getHeaderRowOptions,
   useGridSystem,