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

package/Input/InputMoney.tsx

@@ -1,16 +1,16 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import React, {
   forwardRef,
   useContext,
   useEffect,
   useImperativeHandle,
-  useLayoutEffect,
   useRef,
   useState,
 } from 'react';
 import {
+  Platform,
   TextInput,
   TextInputFocusEvent,
-  TextInputSelectionChangeEvent,
   TouchableOpacity,
   View,
 } from 'react-native';
@@ -32,97 +32,9 @@ import {
 } from './common';
 import { InputMoneyProps } from './index';
 import styles from './styles';
+import { formatNumberToMoney } from './utils';
 import SystemTextInput from './SystemTextInput';
 
-type Selection = { start: number; end: number };
-type Edit = { start: number; end: number; inserted: string };
-
-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;
-  }
-  let suffix = 0;
-  while (
-    suffix < Math.min(old.length, next.length) - prefix &&
-    old[old.length - 1 - suffix] === next[next.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 InputMoney = forwardRef(
   (
     {
@@ -160,14 +72,10 @@ 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 componentName = 'InputMoney';
 
     const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
@@ -177,94 +85,114 @@ 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]);
+    // Android moves the caret proportionally when the text is replaced, so it
+    // lands before the typed digit once a separator is added. Put it back after
+    // the same digit.
+    useEffect(() => {
+      setLastDisplayValue(displayValue);
+      const digitsAfter = caretDigitsAfter.current;
+      caretDigitsAfter.current = undefined;
+      if (Platform.OS !== 'android' || digitsAfter === undefined) return;
+      let before = parseInputText(displayValue).length - digitsAfter;
+      let caret = 0;
+      while (before > 0 && caret < displayValue.length) {
+        if (/\d/.test(displayValue[caret])) before -= 1;
+        caret += 1;
+      }
+      inputRef.current?.setSelection(caret, caret);
+    }, [displayValue]);
+
+    const updateDisplayValue = (numeric: string) => {
+      if (!numeric) {
+        setDisplayValue('');
+        return;
+      }
+      const formatted = formatNumberToMoney(Number(numeric));
+      setDisplayValue(formatted ? `${formatted}${currency}` : '');
+    };
+
+    const parseInputText = (text: string): string => {
+      if (!text) return '';
+      const currencyRegex = new RegExp(` ?${currency}$`, 'g');
+      const textWithoutCurrency = text.replace(currencyRegex, '').trim();
+      return textWithoutCurrency.replace(/[^\d]/g, '');
+    };
 
-    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;
+    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) {
+        setDisplayValue('');
+        setNumericValue('');
+        onChangeText?.('');
+        return;
       }
-      if (commit(digits, caretDigit)) {
-        onChangeText?.(digits);
+      const old = lastDisplayValue;
+      let start = 0;
+      while (start < text.length && old[start] === text[start]) {
+        start += 1;
       }
-    };
-
-    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);
+      let suffix = 0;
+      while (
+        suffix < Math.min(text.length, old.length) - start &&
+        old[old.length - 1 - suffix] === text[text.length - 1 - suffix]
+      ) {
+        suffix += 1;
+      }
+      caretDigitsAfter.current = text
+        .slice(text.length - suffix)
+        .replace(/\D/g, '').length;
+      if (text.length < old.length) {
+        const removed = old.slice(start, old.length - suffix);
+        if (!/\d/.test(removed)) {
+          const index = removed.includes('.')
+            ? parseInputText(old.slice(0, start)).length - 1
+            : numericValue.length - 1;
+          if (index >= 0) {
+            updateNumericValue(
+              numericValue.slice(0, index) + numericValue.slice(index + 1),
+            );
+          }
+          return;
         }
-      });
+      }
+      const newNumericValue = parseInputText(text);
+      updateNumericValue(newNumericValue);
     };
 
     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 +202,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, () => {
@@ -326,7 +256,6 @@ const InputMoney = forwardRef(
               accessibilityLabel={`${componentId}`}
               textAlignVertical="center"
               ref={inputRef}
-              editable={props.editable !== false && !disabled}
               accessibilityState={{
                 disabled: disabled,
                 ...props.accessibilityState,
@@ -348,7 +277,6 @@ const InputMoney = forwardRef(
               textBreakStrategy="highQuality"
               value={displayValue}
               onChangeText={_onChangeText}
-              onSelectionChange={_onSelectionChange}
               onFocus={_onFocus}
               onBlur={_onBlur}
               placeholder={placeholder}

package/package.json

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