Skip to content

Commit

Permalink
Merge pull request #19402 from Expensify/revert-19096-fix/18110
Browse files Browse the repository at this point in the history
Revert "fix: double click compose box and select placeholder"

(cherry picked from commit 839c1c6)
  • Loading branch information
mountiny authored and OSBotify committed May 22, 2023
1 parent 36309b4 commit 0ba5e57
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 27 deletions.
5 changes: 1 addition & 4 deletions src/pages/home/report/ReportActionCompose.js
Original file line number Diff line number Diff line change
Expand Up @@ -1022,10 +1022,7 @@ class ReportActionCompose extends React.Component {
placeholderTextColor={themeColors.placeholderText}
onChangeText={(comment) => this.updateComment(comment, true)}
onKeyPress={this.triggerHotkeyActions}
style={[
this.props.numberOfLines > 1 ? styles.textInputComposeMultiLines : styles.textInputCompose,
this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4,
]}
style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4]}
maxLines={this.state.maxLines}
onFocus={() => this.setIsFocused(true)}
onBlur={() => {
Expand Down
25 changes: 3 additions & 22 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1547,27 +1547,8 @@ const styles = {
// paddingVertical: 0, alignSelf: 'center', and textAlignVertical: 'center'

paddingHorizontal: variables.avatarChatSpacing,
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,
paddingTop: 0,
paddingBottom: 0,
alignSelf: 'center',
textAlignVertical: 'center',
},
Expand All @@ -1588,7 +1569,7 @@ const styles = {

// composer padding should not be modified unless thoroughly tested against the cases in this PR: #12669
textInputComposeSpacing: {
paddingVertical: 0,
paddingVertical: 5,
...flex.flexRow,
flex: 1,
},
Expand Down
2 changes: 1 addition & 1 deletion web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#no-drag-area {
-webkit-app-region: no-drag;
}
input::placeholder, textarea::placeholder {
input::placeholder {
user-select: none;
-webkit-user-select: none
}
Expand Down

0 comments on commit 0ba5e57

Please sign in to comment.