Improve search result click performance

Huh, dunno when I regressed this! Or maybe I never did it for search results, just the main items page? But we're needlessly re-rendering the entire search results list when you wear/unwear something, because `onRemove` always changes, and that breaks the `React.useMemo` on `Item`.

Now, we cache the `onRemove` callback with `React.useCallback`, so perf is much happier!
This commit is contained in:
Emi Matchu 2021-04-26 07:14:29 -07:00
parent 571b064fb5
commit 6517087568

View file

@ -98,20 +98,10 @@ function SearchResults({
// Background we want to restore the previous one! // Background we want to restore the previous one!
const [itemIdsToReconsider] = React.useState(outfitState.wornItemIds); const [itemIdsToReconsider] = React.useState(outfitState.wornItemIds);
// When the checkbox changes, we should wear/unwear the item!
const onChange = (e) => {
const itemId = e.target.value;
const willBeWorn = e.target.checked;
if (willBeWorn) {
dispatchToOutfit({ type: "wearItem", itemId, itemIdsToReconsider });
} else {
dispatchToOutfit({ type: "unwearItem", itemId, itemIdsToReconsider });
}
};
// You can use UpArrow/DownArrow to navigate between items, and even back up // You can use UpArrow/DownArrow to navigate between items, and even back up
// to the search field! // to the search field!
const goToPrevItem = (e) => { const goToPrevItem = React.useCallback(
(e) => {
const prevLabel = e.target.closest("label").previousSibling; const prevLabel = e.target.closest("label").previousSibling;
if (prevLabel) { if (prevLabel) {
prevLabel.querySelector("input[type=checkbox]").focus(); prevLabel.querySelector("input[type=checkbox]").focus();
@ -121,15 +111,17 @@ function SearchResults({
// If we're at the top of the list, move back up to the search box! // If we're at the top of the list, move back up to the search box!
onMoveFocusUpToQuery(e); onMoveFocusUpToQuery(e);
} }
}; },
const goToNextItem = (e) => { [onMoveFocusUpToQuery]
);
const goToNextItem = React.useCallback((e) => {
const nextLabel = e.target.closest("label").nextSibling; const nextLabel = e.target.closest("label").nextSibling;
if (nextLabel) { if (nextLabel) {
nextLabel.querySelector("input[type=checkbox]").focus(); nextLabel.querySelector("input[type=checkbox]").focus();
nextLabel.scrollIntoView({ block: "center" }); nextLabel.scrollIntoView({ block: "center" });
e.preventDefault(); e.preventDefault();
} }
}; }, []);
// If the results aren't ready, we have some special case UI! // If the results aren't ready, we have some special case UI!
if (loading) { if (loading) {
@ -167,15 +159,68 @@ function SearchResults({
<> <>
<ItemListContainer> <ItemListContainer>
{items.map((item, index) => ( {items.map((item, index) => (
<label key={item.id}> <SearchResultItem
key={item.id}
item={item}
itemIdsToReconsider={itemIdsToReconsider}
isWorn={outfitState.wornItemIds.includes(item.id)}
isInOutfit={outfitState.allItemIds.includes(item.id)}
dispatchToOutfit={dispatchToOutfit}
checkboxRef={index === 0 ? firstSearchResultRef : null}
goToPrevItem={goToPrevItem}
goToNextItem={goToNextItem}
/>
))}
</ItemListContainer>
{loadingMore && <ItemListSkeleton count={8} />}
</>
);
}
function SearchResultItem({
item,
itemIdsToReconsider,
isWorn,
isInOutfit,
dispatchToOutfit,
checkboxRef,
goToPrevItem,
goToNextItem,
}) {
// It's important to use `useCallback` for `onRemove`, to avoid re-rendering
// the whole list of <Item>s!
const onRemove = React.useCallback(
() =>
dispatchToOutfit({
type: "removeItem",
itemId: item.id,
itemIdsToReconsider,
}),
[item.id, itemIdsToReconsider, dispatchToOutfit]
);
return (
<label>
<VisuallyHidden <VisuallyHidden
as="input" as="input"
type="checkbox" type="checkbox"
aria-label={`Wear "${item.name}"`} aria-label={`Wear "${item.name}"`}
value={item.id} value={item.id}
checked={outfitState.wornItemIds.includes(item.id)} checked={isWorn}
ref={index === 0 ? firstSearchResultRef : null} ref={checkboxRef}
onChange={onChange} onChange={(e) => {
const itemId = e.target.value;
const willBeWorn = e.target.checked;
if (willBeWorn) {
dispatchToOutfit({ type: "wearItem", itemId, itemIdsToReconsider });
} else {
dispatchToOutfit({
type: "unwearItem",
itemId,
itemIdsToReconsider,
});
}
}}
onKeyDown={(e) => { onKeyDown={(e) => {
if (e.key === "Enter") { if (e.key === "Enter") {
e.target.click(); e.target.click();
@ -188,21 +233,11 @@ function SearchResults({
/> />
<Item <Item
item={item} item={item}
isWorn={outfitState.wornItemIds.includes(item.id)} isWorn={isWorn}
isInOutfit={outfitState.allItemIds.includes(item.id)} isInOutfit={isInOutfit}
onRemove={() => onRemove={onRemove}
dispatchToOutfit({
type: "removeItem",
itemId: item.id,
itemIdsToReconsider,
})
}
/> />
</label> </label>
))}
</ItemListContainer>
{loadingMore && <ItemListSkeleton count={8} />}
</>
); );
} }