Skip to content

Commit a3dc1a1

Browse files
authored
Fix emoji picker section goes blank when User chooses Skin tone (#9436)
* Fix emoji picker section goes blank when User chooses Skin tone * Removed the platform check
1 parent 6fb109f commit a3dc1a1

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

app/components/post_draft/custom_emoji_picker/emoji_picker_header/emoji_picker_header.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,11 @@ const EmojiPickerHeader: React.FC<Props> = ({
229229
showSoftInputOnFocus={Platform.OS !== 'android' || showKeyboard}
230230
/>
231231
</View>
232-
{Platform.OS !== 'android' &&
233-
<SkinToneSelector
234-
skinTone={skinTone}
235-
containerWidth={containerWidth}
236-
isSearching={isSearching}
237-
/>
238-
}
232+
<SkinToneSelector
233+
skinTone={skinTone}
234+
containerWidth={containerWidth}
235+
isSearching={isSearching}
236+
/>
239237
</View>
240238
);
241239
};

app/screens/emoji_picker/picker/header/skintone_selector/skintone_selector.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
129129
setTooltipVisible(true);
130130
}
131131
});
132+
133+
// tutorialWatched is not a dependency because it is not used in the effect
134+
// eslint-disable-next-line react-hooks/exhaustive-deps
132135
}, []);
133136

134137
return (
@@ -145,7 +148,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
145148
>
146149
<Animated.View
147150
style={widthAnimatedStyle}
148-
exiting={Platform.OS === 'android' ? undefined : FadeOut /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */}
151+
exiting={Platform.select({ios: FadeOut})} /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */
149152
entering={FadeIn}
150153
>
151154
<Animated.View style={[styles.container, opacityStyle]}>
@@ -162,7 +165,7 @@ const SkinToneSelector = ({skinTone = 'default', containerWidth, isSearching, tu
162165
<Animated.View
163166
style={styles.expanded}
164167
entering={entering}
165-
exiting={exiting}
168+
exiting={Platform.select({ios: exiting})} /* https://mattermost.atlassian.net/browse/MM-63814?focusedCommentId=178584 */
166169
>
167170
{!isTablet && <CloseButton collapse={collapse}/>}
168171
<SkinSelector

0 commit comments

Comments
 (0)