From 872645c276342312772f7c73029e7faa95fd533f Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 18 Oct 2023 11:55:47 +0800 Subject: [PATCH 1/2] update number of lines when window width changes --- src/components/Composer/index.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js index ad7a84cc1828..14974f217aab 100755 --- a/src/components/Composer/index.js +++ b/src/components/Composer/index.js @@ -11,7 +11,6 @@ import updateIsFullComposerAvailable from '../../libs/ComposerUtils/updateIsFull import * as ComposerUtils from '../../libs/ComposerUtils'; import * as Browser from '../../libs/Browser'; import * as StyleUtils from '../../styles/StyleUtils'; -import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions'; import compose from '../../libs/compose'; import styles from '../../styles/styles'; import Text from '../Text'; @@ -19,6 +18,7 @@ import isEnterWhileComposition from '../../libs/KeyboardShortcut/isEnterWhileCom import CONST from '../../CONST'; import withNavigation from '../withNavigation'; import ReportActionComposeFocusManager from '../../libs/ReportActionComposeFocusManager'; +import useWindowDimensions from '../../hooks/useWindowDimensions'; const propTypes = { /** Maximum number of lines in the text input */ @@ -87,8 +87,6 @@ const propTypes = { isComposerFullSize: PropTypes.bool, ...withLocalizePropTypes, - - ...windowDimensionsPropTypes, }; const defaultProps = { @@ -168,6 +166,7 @@ function Composer({ isComposerFullSize, ...props }) { + const {windowWidth} = useWindowDimensions(); const textRef = useRef(null); const textInput = useRef(null); const initialValue = defaultValue ? `${defaultValue}` : `${value || ''}`; @@ -366,7 +365,7 @@ function Composer({ setNumberOfLines(generalNumberOfLines); textInput.current.style.height = 'auto'; // eslint-disable-next-line react-hooks/exhaustive-deps - }, [value, maxLines, numberOfLinesProp, onNumberOfLinesChange, isFullComposerAvailable, setIsFullComposerAvailable]); + }, [value, maxLines, numberOfLinesProp, onNumberOfLinesChange, isFullComposerAvailable, setIsFullComposerAvailable, windowWidth]); useEffect(() => { updateNumberOfLines(); @@ -491,7 +490,6 @@ Composer.defaultProps = defaultProps; export default compose( withLocalize, - withWindowDimensions, withNavigation, )( React.forwardRef((props, ref) => ( From 48aa3dc4fae45ab38c9d7fa8b69940de027152a4 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 31 Oct 2023 12:45:54 +0800 Subject: [PATCH 2/2] add missing import --- src/components/Composer/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js index a148ea5f7f60..f8045eb87f9f 100755 --- a/src/components/Composer/index.js +++ b/src/components/Composer/index.js @@ -8,6 +8,7 @@ import RNTextInput from '@components/RNTextInput'; import Text from '@components/Text'; import withLocalize, {withLocalizePropTypes} from '@components/withLocalize'; import withNavigation from '@components/withNavigation'; +import useWindowDimensions from '@hooks/useWindowDimensions'; import * as Browser from '@libs/Browser'; import compose from '@libs/compose'; import * as ComposerUtils from '@libs/ComposerUtils';