Skip to content
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

Jump to bottom

Fix bug where search was performed on undefined string causing crash #4403

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Fix bug where search was performed on undefined string causing crash #4403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/components/Reactions/ReactionPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ const searchEmojis = (

const ReactionPicker = ({ emojis, contentTarget }: Props) => {
const [activeCategory, setActiveCategory] = useState<string>();
const [searchString, setSearchString] = useState<string>();
const [searchString, setSearchString] = useState<string>('');
const categories = useMemo(() => {
if (!emojis) {
return {};
Expand All @@ -160,16 +160,18 @@ const ReactionPicker = ({ emojis, contentTarget }: Props) => {
}, [emojis]);

const searchResults = useMemo(() => {
if (searchString === null || searchString === '') {
if (searchString === '') {
return null;
}

return searchEmojis(emojis, searchString);
}, [searchString, emojis]);

const onCategoryClick = useCallback((category) => {
setActiveCategory(category);
setSearchString(undefined);
setSearchString('');
}, []);

const onSearch = useCallback(
(searchString) => setSearchString(searchString.trim().toLowerCase()),
[]
Expand All @@ -183,7 +185,7 @@ const ReactionPicker = ({ emojis, contentTarget }: Props) => {
activeCategory={activeCategory}
categories={Object.keys(categories)}
onCategoryClick={onCategoryClick}
isSearching={searchString !== null && searchString !== ''}
isSearching={searchString !== ''}
/>
{isLoading ? (
<div className={styles.emojiLoading}>
Expand Down