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.

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

fix empty categories from briefly displaying when search begins #52009

35 changes: 22 additions & 13 deletions src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import type {ListRenderItem} from '@shopify/flash-list';
import lodashDebounce from 'lodash/debounce';
import React, {useCallback} from 'react';
import React, {useCallback, useState} from 'react';
import type {ForwardedRef} from 'react';
import {View} from 'react-native';
import {InteractionManager, View} from 'react-native';
import type {Emoji} from '@assets/emojis/types';
import EmojiPickerMenuItem from '@components/EmojiPicker/EmojiPickerMenuItem';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import Text from '@components/Text';
import TextInput from '@components/TextInput';
import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
Expand All @@ -27,6 +29,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {translate} = useLocalize();
const {singleExecution} = useSingleExecution();
const [isLoading, setIsLoading] = useState(false);
const {
allEmojis,
headerEmojis,
Expand All @@ -43,25 +46,30 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
} = useEmojiPickerMenu();
const StyleUtils = useStyleUtils();

const updateEmojiList = (emojiData: EmojiUtils.EmojiPickerList | Emoji[], headerData: number[] = []) => {
setFilteredEmojis(emojiData);
setHeaderIndices(headerData);

InteractionManager.runAfterInteractions(() => {
requestAnimationFrame(() => {
emojiListRef.current?.scrollToOffset({offset: 0, animated: false});
setIsLoading(false);
});
});
};

/**
* Filter the entire list of emojis to only emojis that have the search term in their keywords
*/
const filterEmojis = lodashDebounce((searchTerm: string) => {
const [normalizedSearchTerm, newFilteredEmojiList] = suggestEmojis(searchTerm);

if (emojiListRef.current) {
emojiListRef.current.scrollToOffset({offset: 0, animated: false});
}
setIsLoading(true);

if (normalizedSearchTerm === '') {
setFilteredEmojis(allEmojis);
setHeaderIndices(headerRowIndices);

return;
updateEmojiList(allEmojis, headerRowIndices);
} else {
updateEmojiList(newFilteredEmojiList ?? [], []);
}

setFilteredEmojis(newFilteredEmojiList ?? []);
setHeaderIndices([]);
}, 300);

const scrollToHeader = (headerIndex: number) => {
Expand Down Expand Up @@ -121,6 +129,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
blurOnSubmit={filteredEmojis.length > 0}
/>
</View>
{isLoading && <FullScreenLoadingIndicator />}
<BaseEmojiPickerMenu
isFiltered={isListFiltered}
headerEmojis={headerEmojis}
Expand Down
Loading