Skip to content

Commit fe3cef2

Browse files
covert data summary to use dl tag (#240)
1 parent c47dee9 commit fe3cef2

File tree

1 file changed

+29
-24
lines changed

1 file changed

+29
-24
lines changed

frontend/app/routes/estimator/results.tsx

+29-24
Original file line numberDiff line numberDiff line change
@@ -245,31 +245,34 @@ function DataSummary(formattedResults: FormattedCDBEstimator) {
245245
return (
246246
<div className="my-8 rounded bg-stone-100 p-5 md:mt-0 md:max-w-[360px]">
247247
<h3 className="font-lato text-xl font-bold">{t('estimator:results.form-data-summary.title')}</h3>
248-
<div>
248+
<dl>
249249
<DataSummaryItem
250-
className=""
250+
classNameDt="pt-4"
251+
classNameDd="pb-4"
251252
title={t('estimator:results.form-data-summary.field-labels.marital-status')}
252253
editAriaLabel={t('estimator:results.form-data-summary.edit-aria-labels.marital-status')}
253254
editRoute={'routes/estimator/step-marital-status.tsx'}
254255
value={formattedResults.maritalStatus}
255-
showBorder={false}
256+
showBorder={true}
256257
showEditButton={true}
257258
data-gc-analytics-customclick={adobeAnalytics.getCustomClick('Results:Edit marital status button')}
258259
/>
259260
<DataSummaryItem
260-
className="pb-2"
261+
classNameDt="pt-4"
262+
classNameDd={formattedResults.income.kind === 'married' ? 'pb-2' : 'pb-4'}
261263
title={t('estimator:results.form-data-summary.field-labels.total-income')}
262264
editAriaLabel={t('estimator:results.form-data-summary.edit-aria-labels.income')}
263265
editRoute={'routes/estimator/step-income.tsx'}
264266
value={formattedResults.income.individualIncome.totalIncome}
265-
showBorder={true}
267+
showBorder={false}
266268
showEditButton={formattedResults.income.kind !== 'married'}
267269
data-gc-analytics-customclick={adobeAnalytics.getCustomClick('Results:Edit income button')}
268270
/>
269271

270272
{formattedResults.income.kind === 'married' && (
271273
<DataSummaryItem
272-
className="pt-0"
274+
classNameDt={undefined}
275+
classNameDd={undefined}
273276
title={t('estimator:results.form-data-summary.field-labels.partner-total-income')}
274277
editAriaLabel={t('estimator:results.form-data-summary.edit-aria-labels.income')}
275278
editRoute={'routes/estimator/step-income.tsx'}
@@ -279,7 +282,7 @@ function DataSummary(formattedResults: FormattedCDBEstimator) {
279282
data-gc-analytics-customclick={adobeAnalytics.getCustomClick('Results:Edit income button')}
280283
/>
281284
)}
282-
</div>
285+
</dl>
283286
</div>
284287
);
285288
}
@@ -290,7 +293,8 @@ interface DataSummaryItemProps {
290293
value: string;
291294
showEditButton: boolean;
292295
showBorder: boolean;
293-
className: string;
296+
classNameDt: string | undefined;
297+
classNameDd: string | undefined;
294298
}
295299
function DataSummaryItem({
296300
title,
@@ -299,27 +303,28 @@ function DataSummaryItem({
299303
value,
300304
showBorder,
301305
showEditButton,
302-
className,
306+
classNameDt,
307+
classNameDd,
303308
...rest
304309
}: DataSummaryItemProps) {
305310
const { t } = useTranslation(handle.i18nNamespace);
306311

307312
return (
308-
<div className={cn('py-4', className, showBorder ? 'border-t border-stone-600' : '')}>
309-
<div>{title}</div>
310-
<div className="grid grid-cols-3 gap-0">
311-
<div className="col-span-2">
312-
<strong>{value}</strong>
313-
</div>
313+
<>
314+
<dt className={cn(classNameDt)}>{title}</dt>
315+
<dd className={cn(classNameDd, showBorder ? 'border-b border-stone-600' : '')}>
316+
<div className="flex justify-end">
317+
<strong className="mr-auto">{value}</strong>
314318

315-
{showEditButton && (
316-
<div className="self-end justify-self-end">
317-
<InlineLink {...rest} file={editRoute} aria-label={editAriaLabel}>
318-
{t('common:edit')}
319-
</InlineLink>
320-
</div>
321-
)}
322-
</div>
323-
</div>
319+
{showEditButton && (
320+
<div className="mt-auto ml-auto">
321+
<InlineLink {...rest} file={editRoute} aria-label={editAriaLabel}>
322+
{t('common:edit')}
323+
</InlineLink>
324+
</div>
325+
)}
326+
</div>
327+
</dd>
328+
</>
324329
);
325330
}

0 commit comments

Comments
 (0)