Skip to content

Commit 0fdf28f

Browse files
committed
Prettier
1 parent c7e3edc commit 0fdf28f

File tree

2 files changed

+66
-52
lines changed

2 files changed

+66
-52
lines changed

src/app/components/validation-message/validation-message.tsx

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,32 @@ export type ElementWithValidationMessage = HTMLElement & {
55
};
66

77
function matchesOrContainsValidationMessage(el: ElementWithValidationMessage) {
8-
return el?.validationMessage
9-
|| el?.querySelector<ElementWithValidationMessage>(':invalid')?.validationMessage
10-
|| 'invalid input';
8+
return (
9+
el?.validationMessage ||
10+
el?.querySelector<ElementWithValidationMessage>(':invalid')
11+
?.validationMessage ||
12+
'invalid input'
13+
);
1114
}
1215

1316
// watchValue changes trigger updates
1417
// elementRef will be queryied for invalid elements
15-
export default function ValidationMessage({watchValue, elementRef}: {
18+
export default function ValidationMessage({
19+
watchValue,
20+
elementRef
21+
}: {
1622
watchValue?: object;
17-
elementRef: React.MutableRefObject<ElementWithValidationMessage>
23+
elementRef: React.MutableRefObject<ElementWithValidationMessage>;
1824
}) {
1925
const [validationMessage, setValidationMessage] = React.useState('');
2026

2127
React.useEffect(
22-
() => setValidationMessage(
23-
matchesOrContainsValidationMessage(elementRef.current)
24-
),
28+
() =>
29+
setValidationMessage(
30+
matchesOrContainsValidationMessage(elementRef.current)
31+
),
2532
[watchValue, elementRef, setValidationMessage]
2633
);
2734

28-
return (
29-
<div className="invalid-message">{validationMessage}</div>
30-
);
35+
return <div className="invalid-message">{validationMessage}</div>;
3136
}

src/app/components/vertical-list/vertical-list.tsx

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,78 +3,87 @@ import useVListContext, {VListContextProvider} from './vlist-context';
33

44
type LabeledItem = {
55
label: string;
6-
}
6+
};
77

88
export type RenderItemProps<Item> = {
99
item: Item;
1010
current: boolean;
1111
onMouseEnter: React.MouseEventHandler;
1212
onClick: React.MouseEventHandler;
13-
}
13+
};
1414

1515
type VerticalListProps<Item> = {
1616
items: Item[];
1717
RenderItem: (props: RenderItemProps<Item>) => React.JSX.Element;
1818
vListRef: React.RefObject<HTMLDivElement>;
1919
onSelect: (i: Item) => void;
2020
onCancel: () => void;
21-
}
21+
};
2222

23-
function RenderInContext<T extends LabeledItem>(
24-
{items, RenderItem, vListRef, onSelect, onCancel}: VerticalListProps<T>
25-
) {
23+
function RenderInContext<T extends LabeledItem>({
24+
items,
25+
RenderItem,
26+
vListRef,
27+
onSelect,
28+
onCancel
29+
}: VerticalListProps<T>) {
2630
const {count, setCount, index, setIndex} = useVListContext();
2731

2832
React.useEffect(() => setCount(items.length), [items, setCount]);
2933

3034
const onKeyDown = (event: React.KeyboardEvent) => {
3135
switch (event.key) {
32-
case 'ArrowDown':
33-
setIndex(Math.min(index+1, count-1));
34-
event.preventDefault();
35-
event.stopPropagation();
36-
break;
37-
case 'ArrowUp':
38-
setIndex(Math.max(index-1, -1));
39-
event.preventDefault();
40-
event.stopPropagation();
41-
break;
42-
case ' ':
43-
case 'Enter':
44-
onSelect(items[index]);
45-
event.preventDefault();
46-
event.stopPropagation();
47-
break;
48-
case 'Escape':
49-
onCancel();
50-
event.preventDefault();
51-
event.stopPropagation();
52-
break;
53-
default: break;
36+
case 'ArrowDown':
37+
setIndex(Math.min(index + 1, count - 1));
38+
event.preventDefault();
39+
event.stopPropagation();
40+
break;
41+
case 'ArrowUp':
42+
setIndex(Math.max(index - 1, -1));
43+
event.preventDefault();
44+
event.stopPropagation();
45+
break;
46+
case ' ':
47+
case 'Enter':
48+
onSelect(items[index]);
49+
event.preventDefault();
50+
event.stopPropagation();
51+
break;
52+
case 'Escape':
53+
onCancel();
54+
event.preventDefault();
55+
event.stopPropagation();
56+
break;
57+
default:
58+
break;
5459
}
5560
};
5661

5762
return (
5863
<div
59-
className="vertical-list" tabIndex={0} ref={vListRef}
60-
onBlur={onCancel} onKeyDown={onKeyDown}
64+
className="vertical-list"
65+
tabIndex={0}
66+
ref={vListRef}
67+
onBlur={onCancel}
68+
onKeyDown={onKeyDown}
6169
role="listbox"
6270
>
63-
{
64-
items.map((item, i) =>
65-
<RenderItem
66-
key={item.label}
67-
item={item}
68-
current={index === i}
69-
onMouseEnter={() => setIndex(i)}
70-
onClick={() => onSelect(item)}
71-
/>)
72-
}
71+
{items.map((item, i) => (
72+
<RenderItem
73+
key={item.label}
74+
item={item}
75+
current={index === i}
76+
onMouseEnter={() => setIndex(i)}
77+
onClick={() => onSelect(item)}
78+
/>
79+
))}
7380
</div>
7481
);
7582
}
7683

77-
export default function VerticalList<T extends LabeledItem>(props: VerticalListProps<T>) {
84+
export default function VerticalList<T extends LabeledItem>(
85+
props: VerticalListProps<T>
86+
) {
7887
return (
7988
<VListContextProvider>
8089
<RenderInContext {...props} />

0 commit comments

Comments
 (0)