Skip to content

Add padding to skin tone picker #15730

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

Merged
danieldoglas merged 5 commits into from
Mar 9, 2023
Merged

Add padding to skin tone picker #15730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e1f1b5
Add bottom padding to skin tone picker
stitesExpensify Mar 7, 2023
d54dca4
Fix bad merge
stitesExpensify Mar 8, 2023
097211e
Merge branch 'main' of github.com:Expensify/App into stites-skinToneM…
stitesExpensify Mar 8, 2023
920f9b9
Add padding directly to the component and fix overall height
stitesExpensify Mar 8, 2023
7ea32c7
Fix bad git changes
stitesExpensify Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ const CONST = {
ADD_PAYMENT_MENU_POSITION_X: 356,
EMOJI_PICKER_SIZE: {
WIDTH: 320,
HEIGHT: 392,
HEIGHT: 416,

@rushatgabhane rushatgabhane Apr 11, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have increased the height of the emoji component from 392 to 416

And increased skin tone padding from p1 to p3

But we have not updated the height when there are no results. Causing #15868

App/src/components/EmojiPicker/EmojiPickerMenu/index.js

Lines 501 to 511 in 7bf0b0b

{this.state.filteredEmojis.length === 0
? (
<Text
style={[
styles.disabledText,
styles.emojiPickerList,
styles.dFlex,
styles.alignItemsCenter,
styles.justifyContentCenter,
this.isMobileLandscape() && styles.emojiPickerListLandscape,
]}

Adding a flexGrow1 fixed the issue and we won't have to worry about it anymore.

},
NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT: 256,
EMOJI_PICKER_ITEM_HEIGHT: 32,
Expand Down
2 changes: 1 addition & 1 deletion src/components/EmojiPicker/EmojiSkinToneList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class EmojiSkinToneList extends Component {
render() {
const selectedEmoji = getSkinToneEmojiFromIndex(this.props.preferredSkinTone);
return (
<View style={[styles.flexRow, styles.p1, styles.ph4, styles.emojiPickerContainer]}>
<View style={[styles.flexRow, styles.p3, styles.ph4, styles.emojiPickerContainer]}>
Comment thread
stitesExpensify marked this conversation as resolved.
{
!this.state.isSkinToneListVisible && (
<Pressable
Expand Down