From 5e1f1b5c3b2e239b4df53c1e049c7b4408b653c7 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Tue, 7 Mar 2023 15:19:16 -0700 Subject: [PATCH 1/4] Add bottom padding to skin tone picker --- src/CONST.js | 21 ++++++++--- .../EmojiPicker/EmojiPickerMenu/index.js | 2 +- src/styles/styles.js | 35 +++++++++++++++++-- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index b8c26f163376..c2d2a7333857 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -352,10 +352,8 @@ const CONST = { ALWAYS: 'always', }, VISIBILITY: { - PUBLIC: 'public', - PUBLIC_ANNOUNCE: 'public_announce', - PRIVATE: 'private', RESTRICTED: 'restricted', + PRIVATE: 'private', }, RESERVED_ROOM_NAMES: ['#admins', '#announce'], MAX_PREVIEW_AVATARS: 4, @@ -559,11 +557,19 @@ const CONST = { ADD_PAYMENT_MENU_POSITION_X: 356, EMOJI_PICKER_SIZE: { WIDTH: 320, - HEIGHT: 392, + HEIGHT: 396, }, NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT: 256, EMOJI_PICKER_ITEM_HEIGHT: 32, EMOJI_PICKER_HEADER_HEIGHT: 32, + RECIPIENT_LOCAL_TIME_HEIGHT: 25, + EMOJI_SUGGESTER: { + SUGGESTER_PADDING: 6, + ITEM_HEIGHT: 36, + SMALL_CONTAINER_HEIGHT_FACTOR: 2.5, + MIN_AMOUNT_OF_ITEMS: 3, + MAX_AMOUNT_OF_ITEMS: 5, + }, COMPOSER_MAX_HEIGHT: 125, CHAT_FOOTER_MIN_HEIGHT: 65, CHAT_SKELETON_VIEW: { @@ -829,6 +835,11 @@ const CONST = { AFTER_FIRST_LINE_BREAK: /\n.*/g, CODE_2FA: /^\d{6}$/, ATTACHMENT_ID: /chat-attachments\/(\d+)/, + HAS_COLON_ONLY_AT_THE_BEGINNING: /^:[^:]+$/, + NEW_LINE_OR_WHITE_SPACE: /[\n\s]/g, + + // Define the regular expression pattern to match a string starting with a colon and ending with a space or newline character + EMOJI_REPLACER: /^:[^\n\r]+?(?=$|\s)/, MERGED_ACCOUNT_PREFIX: /^(MERGED_\d+@)/, }, @@ -1228,6 +1239,8 @@ const CONST = { 'Zambia', 'Zimbabwe', ], + SPACE_LENGTH: 1, + SPACE: 1, // Values for checking if polyfill is required on a platform POLYFILL_TEST: { diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js index c8dd15a4d373..a536d5ba5a86 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js @@ -472,7 +472,7 @@ class EmojiPickerMenu extends Component { const isFiltered = this.emojis.length !== this.state.filteredEmojis.length; return ( {!this.props.isSmallScreenWidth && ( diff --git a/src/styles/styles.js b/src/styles/styles.js index f95ad25f7b50..d38b4c5e99cd 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -165,6 +165,33 @@ const styles = { flexBasis: '48%', }, + emojiSuggestionsContainer: { + backgroundColor: themeColors.appBG, + borderRadius: 8, + borderWidth: 1, + borderColor: themeColors.border, + justifyContent: 'center', + boxShadow: variables.popoverMenuShadow, + position: 'absolute', + left: 0, + right: 0, + }, + emojiSuggestionContainer: { + flexDirection: 'row', + alignItems: 'center', + }, + + emojiSuggestionsEmoji: { + fontFamily: fontFamily.EMOJI_TEXT_FONT, + fontSize: variables.fontSizeMedium, + width: 51, + textAlign: 'center', + }, + emojiSuggestionsText: { + fontFamily: fontFamily.EMOJI_TEXT_FONT, + fontSize: variables.fontSizeMedium, + }, + unitCol: { margin: 0, padding: 0, @@ -1381,7 +1408,6 @@ const styles = { chatItemFullComposeBox: { ...flex.flex1, - ...spacing.mt4, ...sizing.h100, }, @@ -1394,8 +1420,6 @@ const styles = { chatFooterFullCompose: { flex: 1, - flexShrink: 1, - flexBasis: '100%', }, // Be extremely careful when editing the compose styles, as it is easy to introduce regressions. @@ -1454,6 +1478,11 @@ const styles = { backgroundColor: themeColors.componentBG, }, + emojiPickerContainerWeb: { + backgroundColor: themeColors.componentBG, + paddingBottom: 4, + }, + emojiPickerList: { height: 288, width: '100%', From d54dca42d32ad6e42364e28d7ef0446dca3234c9 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Wed, 8 Mar 2023 13:04:32 -0700 Subject: [PATCH 2/4] Fix bad merge --- src/CONST.js | 553 ++++++++++++++++++++++++++------------------------- 1 file changed, 286 insertions(+), 267 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index c2d2a7333857..55cf82f4a7ab 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -352,8 +352,10 @@ const CONST = { ALWAYS: 'always', }, VISIBILITY: { - RESTRICTED: 'restricted', + PUBLIC: 'public', + PUBLIC_ANNOUNCE: 'public_announce', PRIVATE: 'private', + RESTRICTED: 'restricted', }, RESERVED_ROOM_NAMES: ['#admins', '#announce'], MAX_PREVIEW_AVATARS: 4, @@ -562,14 +564,6 @@ const CONST = { NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT: 256, EMOJI_PICKER_ITEM_HEIGHT: 32, EMOJI_PICKER_HEADER_HEIGHT: 32, - RECIPIENT_LOCAL_TIME_HEIGHT: 25, - EMOJI_SUGGESTER: { - SUGGESTER_PADDING: 6, - ITEM_HEIGHT: 36, - SMALL_CONTAINER_HEIGHT_FACTOR: 2.5, - MIN_AMOUNT_OF_ITEMS: 3, - MAX_AMOUNT_OF_ITEMS: 5, - }, COMPOSER_MAX_HEIGHT: 125, CHAT_FOOTER_MIN_HEIGHT: 65, CHAT_SKELETON_VIEW: { @@ -835,11 +829,6 @@ const CONST = { AFTER_FIRST_LINE_BREAK: /\n.*/g, CODE_2FA: /^\d{6}$/, ATTACHMENT_ID: /chat-attachments\/(\d+)/, - HAS_COLON_ONLY_AT_THE_BEGINNING: /^:[^:]+$/, - NEW_LINE_OR_WHITE_SPACE: /[\n\s]/g, - - // Define the regular expression pattern to match a string starting with a colon and ending with a space or newline character - EMOJI_REPLACER: /^:[^\n\r]+?(?=$|\s)/, MERGED_ACCOUNT_PREFIX: /^(MERGED_\d+@)/, }, @@ -984,263 +973,293 @@ const CONST = { MAKE_REQUEST_WITH_SIDE_EFFECTS: 'makeRequestWithSideEffects', }, + QUICK_REACTIONS: [ + { + name: '+1', + code: '👍', + types: [ + '👍🏿', + '👍🏾', + '👍🏽', + '👍🏼', + '👍🏻', + ], + }, + { + name: 'heart', + code: '❤️', + }, + { + name: 'joy', + code: '😂', + }, + { + name: 'fire', + code: '🔥', + }, + ], + TFA_CODE_LENGTH: 6, CHAT_ATTACHMENT_TOKEN_KEY: 'X-Chat-Attachment-Token', USA_COUNTRY_NAME, - ALL_COUNTRIES: [ - 'Afghanistan', - 'Aland Islands', - 'Albania', - 'Algeria', - 'American Samoa', - 'Andorra', - 'Angola', - 'Anguilla', - 'Antarctica', - 'Antigua and Barbuda', - 'Argentina', - 'Armenia', - 'Aruba', - 'Australia', - 'Austria', - 'Azerbaijan', - 'Bahamas', - 'Bahrain', - 'Bangladesh', - 'Barbados', - 'Belarus', - 'Belgium', - 'Belize', - 'Benin', - 'Bermuda', - 'Bhutan', - 'Bolivia', - 'Bonaire, Saint Eustatius and Saba ', - 'Bosnia and Herzegovina', - 'Botswana', - 'Bouvet Island', - 'Brazil', - 'British Indian Ocean Territory', - 'British Virgin Islands', - 'Brunei', - 'Bulgaria', - 'Burkina Faso', - 'Burundi', - 'Cambodia', - 'Cameroon', - 'Canada', - 'Cape Verde', - 'Cayman Islands', - 'Central African Republic', - 'Chad', - 'Chile', - 'China', - 'Christmas Island', - 'Cocos Islands', - 'Colombia', - 'Comoros', - 'Cook Islands', - 'Costa Rica', - 'Croatia', - 'Cuba', - 'Curacao', - 'Cyprus', - 'Czech Republic', - 'Democratic Republic of the Congo', - 'Denmark', - 'Djibouti', - 'Dominica', - 'Dominican Republic', - 'East Timor', - 'Ecuador', - 'Egypt', - 'El Salvador', - 'Equatorial Guinea', - 'Eritrea', - 'Estonia', - 'Ethiopia', - 'Falkland Islands', - 'Faroe Islands', - 'Fiji', - 'Finland', - 'France', - 'French Guiana', - 'French Polynesia', - 'French Southern Territories', - 'Gabon', - 'Gambia', - 'Georgia', - 'Germany', - 'Ghana', - 'Gibraltar', - 'Greece', - 'Greenland', - 'Grenada', - 'Guadeloupe', - 'Guam', - 'Guatemala', - 'Guernsey', - 'Guinea', - 'Guinea-Bissau', - 'Guyana', - 'Haiti', - 'Heard Island and McDonald Islands', - 'Honduras', - 'Hong Kong', - 'Hungary', - 'Iceland', - 'India', - 'Indonesia', - 'Iran', - 'Iraq', - 'Ireland', - 'Isle of Man', - 'Israel', - 'Italy', - 'Ivory Coast', - 'Jamaica', - 'Japan', - 'Jersey', - 'Jordan', - 'Kazakhstan', - 'Kenya', - 'Kiribati', - 'Kosovo', - 'Kuwait', - 'Kyrgyzstan', - 'Laos', - 'Latvia', - 'Lebanon', - 'Lesotho', - 'Liberia', - 'Libya', - 'Liechtenstein', - 'Lithuania', - 'Luxembourg', - 'Macao', - 'Macedonia', - 'Madagascar', - 'Malawi', - 'Malaysia', - 'Maldives', - 'Mali', - 'Malta', - 'Marshall Islands', - 'Martinique', - 'Mauritania', - 'Mauritius', - 'Mayotte', - 'Mexico', - 'Micronesia', - 'Moldova', - 'Monaco', - 'Mongolia', - 'Montenegro', - 'Montserrat', - 'Morocco', - 'Mozambique', - 'Myanmar', - 'Namibia', - 'Nauru', - 'Nepal', - 'Netherlands', - 'New Caledonia', - 'New Zealand', - 'Nicaragua', - 'Niger', - 'Nigeria', - 'Niue', - 'Norfolk Island', - 'North Korea', - 'Northern Mariana Islands', - 'Norway', - 'Oman', - 'Pakistan', - 'Palau', - 'Palestinian Territory', - 'Panama', - 'Papua New Guinea', - 'Paraguay', - 'Peru', - 'Philippines', - 'Pitcairn', - 'Poland', - 'Portugal', - 'Puerto Rico', - 'Qatar', - 'Republic of the Congo', - 'Reunion', - 'Romania', - 'Russia', - 'Rwanda', - 'Saint Barthelemy', - 'Saint Helena', - 'Saint Kitts and Nevis', - 'Saint Lucia', - 'Saint Martin', - 'Saint Pierre and Miquelon', - 'Saint Vincent and the Grenadines', - 'Samoa', - 'San Marino', - 'Sao Tome and Principe', - 'Saudi Arabia', - 'Senegal', - 'Serbia', - 'Seychelles', - 'Sierra Leone', - 'Singapore', - 'Sint Maarten', - 'Slovakia', - 'Slovenia', - 'Solomon Islands', - 'Somalia', - 'South Africa', - 'South Georgia and the South Sandwich Islands', - 'South Korea', - 'South Sudan', - 'Spain', - 'Sri Lanka', - 'Sudan', - 'Suriname', - 'Svalbard and Jan Mayen', - 'Swaziland', - 'Sweden', - 'Switzerland', - 'Syria', - 'Taiwan', - 'Tajikistan', - 'Tanzania', - 'Thailand', - 'Togo', - 'Tokelau', - 'Tonga', - 'Trinidad and Tobago', - 'Tunisia', - 'Turkey', - 'Turkmenistan', - 'Turks and Caicos Islands', - 'Tuvalu', - 'U.S. Virgin Islands', - 'Uganda', - 'Ukraine', - 'United Arab Emirates', - 'United Kingdom', - USA_COUNTRY_NAME, - 'Uruguay', - 'Uzbekistan', - 'Vanuatu', - 'Vatican', - 'Venezuela', - 'Vietnam', - 'Wallis and Futuna', - 'Western Sahara', - 'Yemen', - 'Zambia', - 'Zimbabwe', - ], - SPACE_LENGTH: 1, - SPACE: 1, + ALL_COUNTRIES: { + AC: 'Ascension Island', + AD: 'Andorra', + AE: 'United Arab Emirates', + AF: 'Afghanistan', + AG: 'Antigua & Barbuda', + AI: 'Anguilla', + AL: 'Albania', + AM: 'Armenia', + AO: 'Angola', + AQ: 'Antarctica', + AR: 'Argentina', + AS: 'American Samoa', + AT: 'Austria', + AU: 'Australia', + AW: 'Aruba', + AX: 'Åland Islands', + AZ: 'Azerbaijan', + BA: 'Bosnia & Herzegovina', + BB: 'Barbados', + BD: 'Bangladesh', + BE: 'Belgium', + BF: 'Burkina Faso', + BG: 'Bulgaria', + BH: 'Bahrain', + BI: 'Burundi', + BJ: 'Benin', + BL: 'St. Barthélemy', + BM: 'Bermuda', + BN: 'Brunei', + BO: 'Bolivia', + BQ: 'Caribbean Netherlands', + BR: 'Brazil', + BS: 'Bahamas', + BT: 'Bhutan', + BW: 'Botswana', + BY: 'Belarus', + BZ: 'Belize', + CA: 'Canada', + CC: 'Cocos (Keeling) Islands', + CD: 'Congo - Kinshasa', + CF: 'Central African Republic', + CG: 'Congo - Brazzaville', + CH: 'Switzerland', + CI: 'Côte d’Ivoire', + CK: 'Cook Islands', + CL: 'Chile', + CM: 'Cameroon', + CN: 'China', + CO: 'Colombia', + CR: 'Costa Rica', + CU: 'Cuba', + CV: 'Cape Verde', + CW: 'Curaçao', + CX: 'Christmas Island', + CY: 'Cyprus', + CZ: 'Czechia', + DE: 'Germany', + DG: 'Diego Garcia', + DJ: 'Djibouti', + DK: 'Denmark', + DM: 'Dominica', + DO: 'Dominican Republic', + DZ: 'Algeria', + EA: 'Ceuta & Melilla', + EC: 'Ecuador', + EE: 'Estonia', + EG: 'Egypt', + EH: 'Western Sahara', + ER: 'Eritrea', + ES: 'Spain', + ET: 'Ethiopia', + EZ: 'Eurozone', + FI: 'Finland', + FJ: 'Fiji', + FK: 'Falkland Islands', + FM: 'Micronesia', + FO: 'Faroe Islands', + FR: 'France', + GA: 'Gabon', + GB: 'United Kingdom', + GD: 'Grenada', + GE: 'Georgia', + GF: 'French Guiana', + GG: 'Guernsey', + GH: 'Ghana', + GI: 'Gibraltar', + GL: 'Greenland', + GM: 'Gambia', + GN: 'Guinea', + GP: 'Guadeloupe', + GQ: 'Equatorial Guinea', + GR: 'Greece', + GS: 'South Georgia & South Sandwich Islands', + GT: 'Guatemala', + GU: 'Guam', + GW: 'Guinea-Bissau', + GY: 'Guyana', + HK: 'Hong Kong', + HN: 'Honduras', + HR: 'Croatia', + HT: 'Haiti', + HU: 'Hungary', + IC: 'Canary Islands', + ID: 'Indonesia', + IE: 'Ireland', + IL: 'Israel', + IM: 'Isle of Man', + IN: 'India', + IO: 'British Indian Ocean Territory', + IQ: 'Iraq', + IR: 'Iran', + IS: 'Iceland', + IT: 'Italy', + JE: 'Jersey', + JM: 'Jamaica', + JO: 'Jordan', + JP: 'Japan', + KE: 'Kenya', + KG: 'Kyrgyzstan', + KH: 'Cambodia', + KI: 'Kiribati', + KM: 'Comoros', + KN: 'St. Kitts & Nevis', + KP: 'North Korea', + KR: 'South Korea', + KW: 'Kuwait', + KY: 'Cayman Islands', + KZ: 'Kazakhstan', + LA: 'Laos', + LB: 'Lebanon', + LC: 'St. Lucia', + LI: 'Liechtenstein', + LK: 'Sri Lanka', + LR: 'Liberia', + LS: 'Lesotho', + LT: 'Lithuania', + LU: 'Luxembourg', + LV: 'Latvia', + LY: 'Libya', + MA: 'Morocco', + MC: 'Monaco', + MD: 'Moldova', + ME: 'Montenegro', + MF: 'St. Martin', + MG: 'Madagascar', + MH: 'Marshall Islands', + MK: 'Macedonia', + ML: 'Mali', + MM: 'Myanmar (Burma)', + MN: 'Mongolia', + MO: 'Macau', + MP: 'Northern Mariana Islands', + MQ: 'Martinique', + MR: 'Mauritania', + MS: 'Montserrat', + MT: 'Malta', + MU: 'Mauritius', + MV: 'Maldives', + MW: 'Malawi', + MX: 'Mexico', + MY: 'Malaysia', + MZ: 'Mozambique', + NA: 'Namibia', + NC: 'New Caledonia', + NE: 'Niger', + NF: 'Norfolk Island', + NG: 'Nigeria', + NI: 'Nicaragua', + NL: 'Netherlands', + NO: 'Norway', + NP: 'Nepal', + NR: 'Nauru', + NU: 'Niue', + NZ: 'New Zealand', + OM: 'Oman', + PA: 'Panama', + PE: 'Peru', + PF: 'French Polynesia', + PG: 'Papua New Guinea', + PH: 'Philippines', + PK: 'Pakistan', + PL: 'Poland', + PM: 'St. Pierre & Miquelon', + PN: 'Pitcairn Islands', + PR: 'Puerto Rico', + PS: 'Palestinian Territories', + PT: 'Portugal', + PW: 'Palau', + PY: 'Paraguay', + QA: 'Qatar', + RE: 'Réunion', + RO: 'Romania', + RS: 'Serbia', + RU: 'Russia', + RW: 'Rwanda', + SA: 'Saudi Arabia', + SB: 'Solomon Islands', + SC: 'Seychelles', + SD: 'Sudan', + SE: 'Sweden', + SG: 'Singapore', + SH: 'St. Helena', + SI: 'Slovenia', + SJ: 'Svalbard & Jan Mayen', + SK: 'Slovakia', + SL: 'Sierra Leone', + SM: 'San Marino', + SN: 'Senegal', + SO: 'Somalia', + SR: 'Suriname', + SS: 'South Sudan', + ST: 'São Tomé & Príncipe', + SV: 'El Salvador', + SX: 'Sint Maarten', + SY: 'Syria', + SZ: 'Swaziland', + TA: 'Tristan da Cunha', + TC: 'Turks & Caicos Islands', + TD: 'Chad', + TF: 'French Southern Territories', + TG: 'Togo', + TH: 'Thailand', + TJ: 'Tajikistan', + TK: 'Tokelau', + TL: 'Timor-Leste', + TM: 'Turkmenistan', + TN: 'Tunisia', + TO: 'Tonga', + TR: 'Turkey', + TT: 'Trinidad & Tobago', + TV: 'Tuvalu', + TW: 'Taiwan', + TZ: 'Tanzania', + UA: 'Ukraine', + UG: 'Uganda', + UM: 'U.S. Outlying Islands', + UN: 'United Nations', + US: 'United States', + UY: 'Uruguay', + UZ: 'Uzbekistan', + VA: 'Vatican City', + VC: 'St. Vincent & Grenadines', + VE: 'Venezuela', + VG: 'British Virgin Islands', + VI: 'U.S. Virgin Islands', + VN: 'Vietnam', + VU: 'Vanuatu', + WF: 'Wallis & Futuna', + WS: 'Samoa', + XK: 'Kosovo', + YE: 'Yemen', + YT: 'Mayotte', + ZA: 'South Africa', + ZM: 'Zambia', + ZW: 'Zimbabwe', + }, // Values for checking if polyfill is required on a platform POLYFILL_TEST: { From 920f9b969ae743a92b8a73cf7c389de54a9bdce9 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Wed, 8 Mar 2023 13:49:50 -0700 Subject: [PATCH 3/4] Add padding directly to the component and fix overall height --- src/CONST.js | 2 +- src/components/EmojiPicker/EmojiPickerMenu/index.js | 2 +- src/components/EmojiPicker/EmojiSkinToneList.js | 2 +- src/styles/styles.js | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index b9a9c01684f0..0f80671876e5 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -559,7 +559,7 @@ const CONST = { ADD_PAYMENT_MENU_POSITION_X: 356, EMOJI_PICKER_SIZE: { WIDTH: 320, - HEIGHT: 396, + HEIGHT: 416, }, NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT: 256, EMOJI_PICKER_ITEM_HEIGHT: 32, diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js index d47085a9ac91..ff24bf692627 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js @@ -472,7 +472,7 @@ class EmojiPickerMenu extends Component { const isFiltered = this.emojis.length !== this.state.filteredEmojis.length; return ( {!this.props.isSmallScreenWidth && ( diff --git a/src/components/EmojiPicker/EmojiSkinToneList.js b/src/components/EmojiPicker/EmojiSkinToneList.js index b06e6bdc005d..220a1ac5e119 100644 --- a/src/components/EmojiPicker/EmojiSkinToneList.js +++ b/src/components/EmojiPicker/EmojiSkinToneList.js @@ -51,7 +51,7 @@ class EmojiSkinToneList extends Component { render() { const selectedEmoji = getSkinToneEmojiFromIndex(this.props.preferredSkinTone); return ( - + { !this.state.isSkinToneListVisible && ( Date: Thu, 9 Mar 2023 09:42:58 -0700 Subject: [PATCH 4/4] Fix bad git changes --- src/styles/styles.js | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index c08621bc458d..fe71c5274eff 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -165,33 +165,6 @@ const styles = { flexBasis: '48%', }, - emojiSuggestionsContainer: { - backgroundColor: themeColors.appBG, - borderRadius: 8, - borderWidth: 1, - borderColor: themeColors.border, - justifyContent: 'center', - boxShadow: variables.popoverMenuShadow, - position: 'absolute', - left: 0, - right: 0, - }, - emojiSuggestionContainer: { - flexDirection: 'row', - alignItems: 'center', - }, - - emojiSuggestionsEmoji: { - fontFamily: fontFamily.EMOJI_TEXT_FONT, - fontSize: variables.fontSizeMedium, - width: 51, - textAlign: 'center', - }, - emojiSuggestionsText: { - fontFamily: fontFamily.EMOJI_TEXT_FONT, - fontSize: variables.fontSizeMedium, - }, - unitCol: { margin: 0, padding: 0, @@ -1408,6 +1381,7 @@ const styles = { chatItemFullComposeBox: { ...flex.flex1, + ...spacing.mt4, ...sizing.h100, }, @@ -1420,6 +1394,8 @@ const styles = { chatFooterFullCompose: { flex: 1, + flexShrink: 1, + flexBasis: '100%', }, // Be extremely careful when editing the compose styles, as it is easy to introduce regressions.