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

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/utils.ts

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

package/Popup/PopupNotify.tsx

@@ -8,7 +8,7 @@ import { Image } from '../Image';
 import { Text, useScaleSize } from '../Text';
 import { PopupNotifyProps } from './types';
 import { scheduleOnRN } from 'react-native-worklets';
-import { usePopupMaxHeight, usePopupWidth } from './utils';
+import { getPopupRadius, usePopupMaxHeight, usePopupWidth } from './utils';
 
 const PopupNotify: React.FC<PopupNotifyProps> = ({
   image,
@@ -26,6 +26,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   const [scrollContent, setScrollContent] = useState(false);
   const popupWidth = usePopupWidth();
   const maxHeight = usePopupMaxHeight();
+  const radius = getPopupRadius();
   const scaledMaxHeight = useScaleSize(172);
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
@@ -170,7 +171,15 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
 
   const body = (
     <>
-      {!!image && <Image source={{ uri: image }} style={styles.image} />}
+      {!!image && (
+        <Image
+          source={{ uri: image }}
+          style={[
+            styles.image,
+            { borderTopLeftRadius: radius, borderTopRightRadius: radius },
+          ]}
+        />
+      )}
       <View style={styles.content}>
         <Text
           typography={'header_default_bold'}
@@ -218,9 +227,9 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
     <View
       accessibilityLabel={'popup_notify'}
       style={[
-        styles.container,
         {
           backgroundColor: theme.colors.background.surface,
+          borderRadius: radius,
           width: popupWidth,
           maxHeight,
         },
@@ -231,7 +240,13 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         body
       ) : (
         // scrolls when iPhone Duo landscape is too short; actions stay visible
-        <ScrollView style={styles.body} bounces={false}>
+        <ScrollView
+          style={[
+            styles.body,
+            { borderTopLeftRadius: radius, borderTopRightRadius: radius },
+          ]}
+          bounces={false}
+        >
           {body}
         </ScrollView>
       )}
@@ -242,17 +257,12 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
 };
 
 const styles = StyleSheet.create({
-  container: {
-    borderRadius: Radius.L,
-  },
   debugBaseLine: { borderWidth: 1, borderColor: Colors.green_06 },
   image: {
-    borderTopLeftRadius: Radius.L,
-    borderTopRightRadius: Radius.L,
     aspectRatio: 1.7777,
     overflow: 'hidden',
   },
-  body: { flexShrink: 1 },
+  body: { flexShrink: 1, overflow: 'hidden' },
   content: { padding: Spacing.XL },
   description: {
     marginTop: Spacing.S,

package/Popup/utils.ts

@@ -1,32 +1,26 @@
 import { Dimensions, useWindowDimensions } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { Spacing } from '../Consts';
-import { getDuoTopInset, isIPhoneDuo } from '../Application/device';
-
-// width of a system alert on the iPhone Duo inner display, in both orientations
-const DUO_POPUP_MAX_WIDTH = 440;
+import { Radius, Spacing } from '../Consts';
+import { getDuoModalBounds, isIPhoneDuo } from '../Application/device';
 
 const usePopupWidth = () => {
-  const windowSize = useWindowDimensions();
+  const insets = useSafeAreaInsets();
+  const { width, height } = useWindowDimensions();
   if (!isIPhoneDuo()) {
     return Dimensions.get('window').width - Spacing.XL * 2;
   }
-  return Math.min(windowSize.width - Spacing.XL * 2, DUO_POPUP_MAX_WIDTH);
+  return getDuoModalBounds(insets, width, height).maxWidth;
 };
 
-// room left for a popup on iPhone Duo, where landscape is too short for it
 const usePopupMaxHeight = () => {
   const insets = useSafeAreaInsets();
   const { width, height } = useWindowDimensions();
   if (!isIPhoneDuo()) {
     return undefined;
   }
-  return (
-    height -
-    getDuoTopInset(insets, width, height) -
-    insets.bottom -
-    Spacing.XL * 2
-  );
+  return getDuoModalBounds(insets, width, height).maxHeight;
 };
 
-export { usePopupWidth, usePopupMaxHeight };
+const getPopupRadius = () => (isIPhoneDuo() ? Radius.XL : Radius.L);
+
+export { usePopupWidth, usePopupMaxHeight, getPopupRadius };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.168.1-beta.2",
+    "version": "0.168.1-beta.20",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},