Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions src/components/Composer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import updateIsFullComposerAvailable from '../../libs/ComposerUtils/updateIsFull
import getNumberOfLines from '../../libs/ComposerUtils/index';
import * as Browser from '../../libs/Browser';
import Clipboard from '../../libs/Clipboard';
import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
import compose from '../../libs/compose';

const propTypes = {
/** Maximum number of lines in the text input */
Expand Down Expand Up @@ -65,6 +67,8 @@ const propTypes = {
isComposerFullSize: PropTypes.bool,

...withLocalizePropTypes,

...windowDimensionsPropTypes,
};

const defaultProps = {
Expand Down Expand Up @@ -156,7 +160,8 @@ class Composer extends React.Component {

if (prevProps.value !== this.props.value
|| prevProps.defaultValue !== this.props.defaultValue
|| prevProps.isComposerFullSize !== this.props.isComposerFullSize) {
|| prevProps.isComposerFullSize !== this.props.isComposerFullSize
|| prevProps.windowWidth !== this.props.windowWidth) {
this.updateNumberOfLines();
}

Expand Down Expand Up @@ -366,7 +371,10 @@ class Composer extends React.Component {
Composer.propTypes = propTypes;
Composer.defaultProps = defaultProps;

export default withLocalize(React.forwardRef((props, ref) => (
export default compose(
withLocalize,
withWindowDimensions,
)(React.forwardRef((props, ref) => (
/* eslint-disable-next-line react/jsx-props-no-spreading */
<Composer {...props} forwardedRef={ref} />
)));