Skip to content

A local-first personal finance app

Fix mobile transaction page amount input (#2166)

Joel Jeremy Marquezd999e466b792
diff --git a/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx b/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx
index 207912155f..0e89d2e98e 100644
--- a/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx
+++ b/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx
@@ -6,6 +6,7 @@ import {
getNumberFormat,
} from 'loot-core/src/shared/util';
+import { useMergedRefs } from '../../hooks/useMergedRefs';
import { theme } from '../../style';
import Button from '../common/Button';
import Text from '../common/Text';
@@ -21,6 +22,7 @@ const AmountInput = memo(function AmountInput({
const [text, setText] = useState('');
const [value, setValue] = useState(0);
const inputRef = useRef();
+ const mergedInputRef = useMergedRefs(props.inputRef, inputRef);
const getInitialValue = () => Math.abs(props.value);
@@ -30,10 +32,6 @@ const AmountInput = memo(function AmountInput({
}
}, []);
- useEffect(() => {
- setEditing(text !== '');
- }, [text]);
-
useEffect(() => {
if (focused) {
focus();
@@ -72,12 +70,18 @@ const AmountInput = memo(function AmountInput({
return newValue;
};
- const onBlur = () => {
+ const onFocus = e => {
+ props.onFocus?.(e);
+ };
+
+ const onBlur = e => {
const value = applyText();
props.onUpdate?.(value);
+ props.onBlur?.(e);
};
const onChangeText = text => {
+ setEditing(true);
setText(text);
props.onChange?.(text);
};
@@ -85,11 +89,12 @@ const AmountInput = memo(function AmountInput({
const input = (
<input
type="text"
- ref={inputRef}
+ ref={mergedInputRef}
value={text}
inputMode="decimal"
autoCapitalize="none"
onChange={e => onChangeText(e.target.value)}
+ onFocus={onFocus}
onBlur={onBlur}
onKeyUp={onKeyPress}
data-testid="amount-input"
@@ -131,6 +136,7 @@ export const FocusableAmountInput = memo(function FocusableAmountInput({
focusedStyle,
buttonProps,
onFocus,
+ onBlur,
...props
}) {
const [isNegative, setIsNegative] = useState(true);
@@ -166,6 +172,8 @@ export const FocusableAmountInput = memo(function FocusableAmountInput({
<AmountInput
{...props}
value={value}
+ onFocus={onFocus}
+ onBlur={onBlur}
onChange={onChange}
onUpdate={onUpdate}
focused={focused}
diff --git a/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx b/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx
index 662c3c3fcb..5dabcf9dc8 100644
--- a/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx
+++ b/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx
@@ -4,12 +4,8 @@ import React, {
useContext,
useState,
useRef,
- useEffect,
} from 'react';
-import usePrevious from './usePrevious';
-import useStableCallback from './useStableCallback';
-
type ActiveEditCleanup = () => void;
type ActiveEditAction = () => void | ActiveEditCleanup;
@@ -19,7 +15,9 @@ type SingleActiveEditFormContextValue = {
onRequestActiveEdit: (
field: string,
action?: ActiveEditAction,
- clearActiveEditDelayMs?: number,
+ options?: {
+ clearActiveEditDelayMs?: number;
+ },
) => void;
onClearActiveEdit: (delayMs?: number) => void;
};
@@ -38,22 +36,8 @@ export function SingleActiveEditFormProvider({
children,
}: SingleActiveEditFormProviderProps) {
const [editingField, setEditingField] = useState(null);
- const prevEditingField = usePrevious(editingField);
- const actionRef = useRef<ActiveEditAction>(null);
const cleanupRef = useRef<ActiveEditCleanup | void>(null);
- useEffect(() => {
- if (prevEditingField != null && prevEditingField !== editingField) {
- runCleanup();
- } else if (prevEditingField == null && editingField !== null) {
- runAction();
- }
- }, [editingField]);
-
- const runAction = () => {
- cleanupRef.current = actionRef.current?.();
- };
-
const runCleanup = () => {
const editCleanup = cleanupRef.current;
if (typeof editCleanup === 'function') {
@@ -62,31 +46,40 @@ export function SingleActiveEditFormProvider({
cleanupRef.current = null;
};
+ const runAction = (action: ActiveEditAction) => {
+ cleanupRef.current = action?.();
+ };
+
const onClearActiveEdit = (delayMs?: number) => {
- setTimeout(() => setEditingField(null), delayMs);
+ setTimeout(() => {
+ runCleanup();
+ setEditingField(null);
+ }, delayMs);
+ };
+
+ const onActiveEdit = (field: string, action: ActiveEditAction) => {
+ runAction(action);
+ setEditingField(field);
};
- const onRequestActiveEdit = useStableCallback(
- (
- field: string,
- action: ActiveEditAction,
- options: {
- clearActiveEditDelayMs?: number;
- },
- ) => {
- if (editingField === field) {
- // Already active.
- return;
- }
-
- if (editingField) {
- onClearActiveEdit(options?.clearActiveEditDelayMs);
- } else {
- actionRef.current = action;
- setEditingField(field);
- }
+ const onRequestActiveEdit = (
+ field: string,
+ action: ActiveEditAction,
+ options: {
+ clearActiveEditDelayMs?: number;
},
- );
+ ) => {
+ if (editingField === field) {
+ // Already active.
+ return;
+ }
+
+ if (editingField) {
+ onClearActiveEdit(options?.clearActiveEditDelayMs);
+ } else {
+ onActiveEdit(field, action);
+ }
+ };
return (
<SingleActiveEditFormContext.Provider
diff --git a/upcoming-release-notes/2166.md b/upcoming-release-notes/2166.md
new file mode 100644
index 0000000000..07194832e5
--- /dev/null
+++ b/upcoming-release-notes/2166.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+Fix mobile transaction page amount input bug on iOS.