@@ -14,7 +14,8 @@ import useSingleExecution from '@hooks/useSingleExecution';
1414import useStyleUtils from '@hooks/useStyleUtils' ;
1515import useThemeStyles from '@hooks/useThemeStyles' ;
1616import useWindowDimensions from '@hooks/useWindowDimensions' ;
17- import * as EmojiUtils from '@libs/EmojiUtils' ;
17+ import type { EmojiPickerList , EmojiPickerListItem } from '@libs/EmojiUtils' ;
18+ import { getRemovedSkinToneEmoji } from '@libs/EmojiUtils' ;
1819import CONST from '@src/CONST' ;
1920import type { TranslationPaths } from '@src/languages/types' ;
2021import BaseEmojiPickerMenu from './BaseEmojiPickerMenu' ;
@@ -44,7 +45,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
4445 } = useEmojiPickerMenu ( ) ;
4546 const StyleUtils = useStyleUtils ( ) ;
4647
47- const updateEmojiList = ( emojiData : EmojiUtils . EmojiPickerList | Emoji [ ] , headerData : number [ ] = [ ] ) => {
48+ const updateEmojiList = ( emojiData : EmojiPickerList | Emoji [ ] , headerData : number [ ] = [ ] ) => {
4849 setFilteredEmojis ( emojiData ) ;
4950 setHeaderIndices ( headerData ) ;
5051
@@ -81,7 +82,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
8182 * Items with the code "SPACER" return nothing and are used to fill rows up to 8
8283 * so that the sticky headers function properly.
8384 */
84- const renderItem : ListRenderItem < EmojiUtils . EmojiPickerListItem > = useCallback (
85+ const renderItem : ListRenderItem < EmojiPickerListItem > = useCallback (
8586 ( { item, target} ) => {
8687 const code = item . code ;
8788 const types = 'types' in item ? item . types : undefined ;
@@ -99,7 +100,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
99100 }
100101
101102 const emojiCode = typeof preferredSkinTone === 'number' && preferredSkinTone !== - 1 && types ?. at ( preferredSkinTone ) ? types . at ( preferredSkinTone ) : code ;
102- const shouldEmojiBeHighlighted = ! ! activeEmoji && EmojiUtils . getRemovedSkinToneEmoji ( emojiCode ) === EmojiUtils . getRemovedSkinToneEmoji ( activeEmoji ) ;
103+ const shouldEmojiBeHighlighted = ! ! activeEmoji && getRemovedSkinToneEmoji ( emojiCode ) === getRemovedSkinToneEmoji ( activeEmoji ) ;
103104
104105 return (
105106 < EmojiPickerMenuItem
0 commit comments