github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-04-30 18:20:24 -05:00
Code Issues 1.5k Packages Projects Releases 54 Wiki Activity

Fix #2932: Schedule reset amount to ten (10) when amount is zero (0) (#3732)

Browse Source 
* Fix #2932

* md

* e2e update

* Update packages/desktop-client/src/components/util/AmountInput.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
lelemm
2024-11-03 13:46:23 -03:00
committed by GitHub
parent 1c05d7e5fe
commit 15b2ef1591
6 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/desktop-client/src/components/util/AmountInput.tsx
View File

@@ -55,7 +55,9 @@ export function AmountInput({
autoDecimals = false,
}: AmountInputProps) {
const format = useFormat();
const negative = (initialValue === 0 && zeroSign === '-') || initialValue < 0;
const [symbol, setSymbol] = useState<'+' | '-'>(
initialValue === 0 ? zeroSign : initialValue > 0 ? '+' : '-',
);
const initialValueAbsolute = format(Math.abs(initialValue || 0), 'financial');
const [value, setValue] = useState(initialValueAbsolute);
@@ -73,12 +75,16 @@ export function AmountInput({
}, [focused]);
function onSwitch() {
fireUpdate(!negative);
const amount = getAmount();
if (amount === 0) {
setSymbol(symbol === '+' ? '-' : '+');
}
fireUpdate(amount * -1);
}
function getAmount(negate) {
const valueOrInitial = Math.abs(amountToInteger(evalArithmetic(value)));
return negate ? valueOrInitial * -1 : valueOrInitial;
function getAmount() {
const signedValued = symbol === '-' ? symbol + value : value;
return amountToInteger(evalArithmetic(signedValued));
}
function onInputTextChange(val) {
@@ -89,13 +95,19 @@ export function AmountInput({
onChangeValue?.(val);
}
function fireUpdate(negate) {
onUpdate?.(getAmount(negate));
function fireUpdate(amount) {
onUpdate?.(amount);
if (amount > 0) {
setSymbol('+');
} else if (amount < 0) {
setSymbol('-');
}
}
function onInputAmountBlur(e) {
if (!ref.current?.contains(e.relatedTarget)) {
fireUpdate(negative);
const amount = getAmount();
fireUpdate(amount);
}
onBlur?.(e);
}
@@ -109,14 +121,15 @@ export function AmountInput({
<Button
variant="bare"
isDisabled={disabled}
aria-label={`Make ${negative ? 'positive' : 'negative'}`}
aria-label={`Make ${symbol === '-' ? 'positive' : 'negative'}`}
style={{ padding: '0 7px' }}
onPress={onSwitch}
ref={buttonRef}
>
{negative ? (
{symbol === '-' && (
<SvgSubtract style={{ width: 8, height: 8, color: 'inherit' }} />
) : (
)}
{symbol === '+' && (
<SvgAdd style={{ width: 8, height: 8, color: 'inherit' }} />
)}
</Button>
@@ -128,7 +141,8 @@ export function AmountInput({
inputStyle={inputStyle}
onKeyUp={e => {
if (e.key === 'Enter') {
fireUpdate(negative);
const amount = getAmount();
fireUpdate(amount);
}
}}
onChangeValue={onInputTextChange}