toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix emoji picker section goes blank when User chooses Skin tone (#9436)

Browse source 
* Fix emoji picker section goes blank when User chooses Skin tone

* Removed the platform check
This commit is contained in:
Rajat Dabade 2026-01-23 10:40:43 +05:30 committed by GitHub
parent 6fb109faf1
commit a3dc1a1bdc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/components/post_draft/custom_emoji_picker/emoji_picker_header/emoji_picker_header.tsx
View file

@ -229,13 +229,11 @@ const EmojiPickerHeader: React.FC<Props> = ({
showSoftInputOnFocus={Platform.OS !== 'android' || showKeyboard}
/>
</View>
{Platform.OS !== 'android' &&
<SkinToneSelector
skinTone={skinTone}
containerWidth={containerWidth}
isSearching={isSearching}
/>
}
<SkinToneSelector
skinTone={skinTone}
containerWidth={containerWidth}
isSearching={isSearching}
/>
</View>
);
};

7
app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx
View file

@ -129,6 +129,9 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
setTooltipVisible(true);
}
});
// tutorialWatched is not a dependency because it is not used in the effect
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
return (
@ -145,7 +148,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
>
<Animated.View
style={widthAnimatedStyle}
exiting={Platform.OS === 'android' ? undefined : FadeOut /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */}
exiting={Platform.select({ios: FadeOut})} /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */
entering={FadeIn}
>
<Animated.View style={[styles.container, opacityStyle]}>
@ -162,7 +165,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
<Animated.View
style={styles.expanded}
entering={entering}
exiting={exiting}
exiting={Platform.select({ios: exiting})} /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */
>
{!isTablet && <CloseButton collapse={collapse}/>}
<SkinSelector