Skip to content

Refactor TransactionForm layout for better input organization #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OrF8 merged 2 commits into from
Apr 9, 2026
Merged

Refactor TransactionForm layout for better input organization #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6395e0b
refactor: reorganize input fields in TransactionForm for improved layout
OrF8 Apr 9, 2026
2e503bb
fix: enhance accessibility and layout in TransactionForm input fields
OrF8 Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 37 additions & 34 deletions src/components/TransactionForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ export function TransactionForm({ initial, defaultName, defaultPaymentMethod, on

return (
<form onSubmit={handleSubmit} className="flex flex-col gap-4" noValidate>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div className={form.type !== 'credit_card' ? 'sm:col-span-2' : ''}>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
<div>
<Input
label="שם"
name="name"
Expand All @@ -193,40 +193,43 @@ export function TransactionForm({ initial, defaultName, defaultPaymentMethod, on
error={errors.name}
/>
</div>
{form.type === 'credit_card' && (
<Input
label="4 ספרות אחרונות של הכרטיס"
name="cardLast4"
value={form.cardLast4}
onChange={handleChange}
placeholder="1234"
maxLength={4}
inputMode="numeric"
error={errors.cardLast4}
/>
)}
<div className="flex flex-col gap-1">
<label htmlFor="transaction-type" className="text-sm font-medium text-gray-700 dark:text-gray-300">
סוג עסקה
</label>
<select
id="transaction-type"
name="type"
value={form.type}
onChange={handleChange}
aria-invalid={errors.type ? 'true' : undefined}
aria-describedby={errors.type ? 'transaction-type-error' : undefined}
className="block w-full rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-900 focus:border-indigo-400 focus:outline-none focus:ring-2 focus:ring-indigo-200 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100 dark:focus:border-indigo-500 dark:focus:ring-indigo-900"
>
<option value="">בחר סוג עסקה</option>
{Object.entries(TRANSACTION_TYPE_LABELS).map(([value, label]) => (
<option key={value} value={value}>
{label}
</option>
))}
</select>
{errors.type && (
<p id="transaction-type-error" className="text-xs text-red-500 mt-0.5" role="alert">{errors.type}</p>
)}
</div>
</div>
<div className="flex flex-col gap-1">
<label className="text-sm font-medium text-gray-700 dark:text-gray-300">
סוג עסקה
</label>
<select
name="type"
value={form.type}
onChange={handleChange}
className="block w-full rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-900 focus:border-indigo-400 focus:outline-none focus:ring-2 focus:ring-indigo-200 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100 dark:focus:border-indigo-500 dark:focus:ring-indigo-900"
>
<option value="">בחר סוג עסקה</option>
{Object.entries(TRANSACTION_TYPE_LABELS).map(([value, label]) => (
<option key={value} value={value}>
{label}
</option>
))}
</select>
{errors.type && (
<p className="text-xs text-red-500 mt-0.5" role="alert">{errors.type}</p>
{form.type === 'credit_card' && (
<Input
label="4 ספרות אחרונות של הכרטיס"
name="cardLast4"
value={form.cardLast4}
onChange={handleChange}
placeholder="1234"
maxLength={4}
inputMode="numeric"
error={errors.cardLast4}
/>
)}
</div>
<Input
label="שם העסק"
name="essence"
Expand Down
Loading