diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 0f4c07c63f64..9e475b7169cf 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -46,10 +46,9 @@ const PressableWithFeedback = forwardRef((props, ref) => { setDisabled(props.disabled); return; } - onPress - .finally(() => { - setDisabled(props.disabled); - }); + onPress.finally(() => { + setDisabled(props.disabled); + }); }); }} > diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js index b3ec4dabc0b8..4a1ded41acc3 100644 --- a/src/pages/home/report/ReportActionCompose.js +++ b/src/pages/home/report/ReportActionCompose.js @@ -1039,7 +1039,10 @@ class ReportActionCompose extends React.Component { placeholderTextColor={themeColors.placeholderText} onChangeText={(comment) => this.updateComment(comment, true)} onKeyPress={this.triggerHotkeyActions} - style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4]} + style={[ + this.props.numberOfLines > 1 ? styles.textInputComposeMultiLines : styles.textInputCompose, + this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4, + ]} maxLines={this.state.maxLines} onFocus={() => this.setIsFocused(true)} onBlur={() => { diff --git a/src/styles/styles.js b/src/styles/styles.js index 8763ecc765dd..e4bb7cf1ad28 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1547,8 +1547,27 @@ const styles = { // paddingVertical: 0, alignSelf: 'center', and textAlignVertical: 'center' paddingHorizontal: variables.avatarChatSpacing, - paddingTop: 0, - paddingBottom: 0, + paddingTop: 9, + paddingBottom: 9, + alignSelf: 'center', + textAlignVertical: 'center', + }, + 0, + ), + textInputComposeMultiLines: addOutlineWidth( + { + backgroundColor: themeColors.componentBG, + borderColor: themeColors.border, + color: themeColors.text, + fontFamily: fontFamily.EMOJI_TEXT_FONT, + fontSize: variables.fontSizeNormal, + borderWidth: 0, + height: 'auto', + lineHeight: variables.lineHeightXLarge, + ...overflowXHidden, + paddingHorizontal: variables.avatarChatSpacing, + paddingTop: 5, + paddingBottom: 5, alignSelf: 'center', textAlignVertical: 'center', }, @@ -1569,7 +1588,7 @@ const styles = { // composer padding should not be modified unless thoroughly tested against the cases in this PR: #12669 textInputComposeSpacing: { - paddingVertical: 5, + paddingVertical: 0, ...flex.flexRow, flex: 1, }, diff --git a/web/index.html b/web/index.html index aa7735079384..a2e691af06d8 100644 --- a/web/index.html +++ b/web/index.html @@ -40,7 +40,7 @@ #no-drag-area { -webkit-app-region: no-drag; } - input::placeholder { + input::placeholder, textarea::placeholder { user-select: none; -webkit-user-select: none }