feat(cards): refine controls and modal transitions

This commit is contained in:
2026-09-12 22:34:27 +03:00
parent cf21a5bd17
commit aba4cf1ce8
16 changed files with 245 additions and 107 deletions
@@ -39,6 +39,12 @@ function setup(value: BankCard) {
return close;
}
describe("BankCardForm", () => {
it("waits for the exit transition before notifying the parent", async () => {
const close = setup(card);
fireEvent.click(screen.getByRole("button", { name: "Отмена" }));
expect(close).not.toHaveBeenCalled();
await waitFor(() => expect(close).toHaveBeenCalledTimes(1));
});
it("clears optional metadata on archive while omitting protected financial fields", async () => {
const close = setup({ ...card, archivedAt: "2026-09-01" });
expect(screen.getByLabelText(/Начальный остаток/)).toHaveAttribute(
+9 -5
View File
@@ -20,6 +20,7 @@ import { useBankFormFocus } from "./useBankFormFocus";
type BankCardFormProps = { card?: BankCard; onClose: () => void };
const BankCardForm: FC<BankCardFormProps> = (props) => {
useBankFormFocus();
const [opened, setOpened] = useState(true);
const { t } = useTranslation();
const [intent] = useState(() => crypto.randomUUID());
const [version, setVersion] = useState(props.card?.version ?? 1);
@@ -39,11 +40,14 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
},
});
const pending =
methods.formState.isSubmitting || (fresh.isFetching && Boolean(error));
!opened ||
methods.formState.isSubmitting ||
(fresh.isFetching && Boolean(error));
return (
<Modal
opened
onClose={() => !pending && props.onClose()}
opened={opened}
onExitTransitionEnd={props.onClose}
onClose={() => !pending && setOpened(false)}
title={t(props.card ? "bank.editCard" : "bank.addCard")}
closeButtonProps={{ "aria-label": t("bank.close"), disabled: pending }}
closeOnClickOutside={!pending}
@@ -82,7 +86,7 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
...metadata,
...financial,
});
props.onClose();
setOpened(false);
} catch (failure) {
setError(failure);
}
@@ -132,7 +136,7 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
<Button type="submit" loading={pending}>
{t("bank.save")}
</Button>
<Button variant="default" onClick={props.onClose}>
<Button variant="default" onClick={() => setOpened(false)}>
{t("bank.cancel")}
</Button>
</Group>
@@ -0,0 +1,38 @@
import { DatePickerInput } from "@mantine/dates";
import { type FC, useState } from "react";
import { useTranslation } from "react-i18next";
type BankPeriodPickerProps = {
period: { from: string; to: string };
onChange: (value: [string | null, string | null]) => void;
};
const BankPeriodPicker: FC<BankPeriodPickerProps> = (props) => {
const { period, onChange } = props;
const { t } = useTranslation();
const scope = `${period.from}-${period.to}`;
const [draft, setDraft] = useState<{
scope: string;
value: [string | null, string | null];
}>();
const value: [string | null, string | null] =
draft?.scope === scope ? draft.value : [period.from, period.to];
return (
<DatePickerInput
type="range"
allowSingleDateInRange
label={t("bank.period")}
valueFormat="DD.MM.YYYY"
value={value}
onChange={(next) => {
setDraft({ scope, value: next });
onChange(next);
}}
popoverProps={{
returnFocus: true,
middlewares: { shift: { crossAxis: true } },
}}
/>
);
};
export { BankPeriodPicker };
@@ -53,6 +53,7 @@ const CategoryFields: FC = () => {
};
const CategoryManager: FC<CategoryManagerProps> = (props) => {
useBankFormFocus();
const [opened, setOpened] = useState(true);
const { t } = useTranslation();
const categories = useBankCategories();
const mutation = useBankMutations();
@@ -83,11 +84,12 @@ const CategoryManager: FC<CategoryManagerProps> = (props) => {
),
defaultValues: { name: "" },
});
const pending = methods.formState.isSubmitting;
const pending = !opened || methods.formState.isSubmitting;
return (
<Modal
opened
onClose={() => !pending && props.onClose()}
opened={opened}
onExitTransitionEnd={props.onClose}
onClose={() => !pending && setOpened(false)}
title={t("bank.categories")}
closeOnClickOutside={!pending}
closeOnEscape={!pending}
@@ -205,7 +207,7 @@ const CategoryManager: FC<CategoryManagerProps> = (props) => {
{t("bank.cancel")}
</Button>
)}
<Button variant="default" onClick={props.onClose}>
<Button variant="default" onClick={() => setOpened(false)}>
{t("bank.close")}
</Button>
</Group>