Skip to content
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

fix: double click compose box and select placeholder #19096

Merged
merged 5 commits into from
May 17, 2023
Merged

fix: double click compose box and select placeholder #19096

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
401d1e9
fix: double click composo box and select placeholder
dukenv0307 May 17, 2023
11e0672
Merge branch main to fix lint
dukenv0307 May 17, 2023
12849ab
fix: width compose input when multiple lines
dukenv0307 May 17, 2023
7dd7d80
fix lint
dukenv0307 May 17, 2023
eb5a67d
remove useless comment
dukenv0307 May 17, 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
7 changes: 3 additions & 4 deletions src/components/Pressable/PressableWithFeedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ const PressableWithFeedback = forwardRef((props, ref) => {
setDisabled(props.disabled);
return;
}
onPress
.finally(() => {
setDisabled(props.disabled);
});
onPress.finally(() => {
setDisabled(props.disabled);
});
});
}}
>
Expand Down
5 changes: 4 additions & 1 deletion src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={() => {
Expand Down
29 changes: 26 additions & 3 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,8 +1547,31 @@ 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,

// On Android, multiline TextInput with height: 'auto' will show extra padding unless they are configured with
// paddingVertical: 0, alignSelf: 'center', and textAlignVertical: 'center'
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure what to make of this. Why is this explanation here, but it doesn't really appear to do anything or be valuable.


paddingHorizontal: variables.avatarChatSpacing,
paddingTop: 5,
Copy link
Collaborator

Choose a reason for hiding this comment

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

@dukenv0307 Your proposal mentioned that if the numberOfLines would be 1, the padding values should be 9. I don't see that change here, can you please explain?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that's covered in the textInputCompose style right above this? The styles will be used conditionally: this.props.numberOfLines > 1 ? styles.textInputComposeMultiLines : styles.textInputCompose,

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just updated

paddingBottom: 5,
alignSelf: 'center',
textAlignVertical: 'center',
},
Expand All @@ -1569,7 +1592,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,
},
Expand Down
2 changes: 1 addition & 1 deletion web/index.html
View file
Open in desktop
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 {
input::placeholder, textarea::placeholder {
user-select: none;
-webkit-user-select: none
}
Expand Down