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: Line doesn't update on adding emoji #11700

Merged
merged 2 commits into from
Oct 13, 2022
Merged

Fix: Line doesn't update on adding emoji #11700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bb5e26
call updateNumberOfLines when value changes
Puneet-here Oct 11, 2022
69070ac
call updateNumberOfLines at onChange when value is notavailable
Puneet-here Oct 11, 2022
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
21 changes: 17 additions & 4 deletions src/components/Composer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class Composer extends React.Component {
this.handlePaste = this.handlePaste.bind(this);
this.handlePastedHTML = this.handlePastedHTML.bind(this);
this.handleWheel = this.handleWheel.bind(this);
this.shouldCallUpdateNumberOfLines = this.shouldCallUpdateNumberOfLines.bind(this);
}

componentDidMount() {
Expand Down Expand Up @@ -169,7 +170,9 @@ class Composer extends React.Component {
this.setState({numberOfLines: 1});
this.props.onClear();
}
if (prevProps.defaultValue !== this.props.defaultValue

if (prevProps.value !== this.props.value
|| prevProps.defaultValue !== this.props.defaultValue
|| prevProps.isComposerFullSize !== this.props.isComposerFullSize) {
this.updateNumberOfLines();
}
Expand Down Expand Up @@ -339,6 +342,18 @@ class Composer extends React.Component {
event.stopPropagation();
}

/**
* We want to call updateNumberOfLines only when the parent doesn't provide value in props
* as updateNumberOfLines is already being called when value changes in componentDidUpdate
*/
shouldCallUpdateNumberOfLines() {
if (!_.isEmpty(this.props.value)) {
return;
}

this.updateNumberOfLines();
}

/**
* Check the current scrollHeight of the textarea (minus any padding) and
* divide by line height to get the total number of rows for the textarea.
Expand Down Expand Up @@ -373,9 +388,7 @@ class Composer extends React.Component {
placeholderTextColor={themeColors.placeholderText}
ref={el => this.textInput = el}
selection={this.state.selection}
onChange={() => {
this.updateNumberOfLines();
}}
onChange={this.shouldCallUpdateNumberOfLines}
onSelectionChange={this.onSelectionChange}
numberOfLines={this.state.numberOfLines}
style={propStyles}
Expand Down