Merge pull request #17899 from hungvu193/fix-16931

Fix screen shaking when editing between 2 tabs

Author: aldo-expensify

src/pages/home/report/ReportActionItemMessageEdit.js

@@ -5,7 +5,6 @@ import {InteractionManager, Keyboard, View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import {withOnyx} from 'react-native-onyx';
 import reportActionPropTypes from './reportActionPropTypes';
 import styles from '../../../styles/styles';
 import Composer from '../../../components/Composer';
@@ -26,7 +25,6 @@ import CONST from '../../../CONST';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import withKeyboardState, {keyboardStatePropTypes} from '../../../components/withKeyboardState';
-import ONYXKEYS from '../../../ONYXKEYS';
 import * as ComposerUtils from '../../../libs/ComposerUtils';
 
 const propTypes = {
@@ -36,9 +34,6 @@ const propTypes = {
     /** Draft message */
     draftMessage: PropTypes.string.isRequired,
 
-    /** Number of lines for the draft message */
-    numberOfLines: PropTypes.number,
-
     /** ReportID that holds the comment we're editing */
     reportID: PropTypes.string.isRequired,
 
@@ -67,7 +62,6 @@ const defaultProps = {
     forwardedRef: () => {},
     report: {},
     shouldDisableEmojiPicker: false,
-    numberOfLines: undefined,
     preferredSkinTone: CONST.EMOJI_DEFAULT_SKIN_TONE,
 };
 
@@ -82,7 +76,6 @@ class ReportActionItemMessageEdit extends React.Component {
         this.onSelectionChange = this.onSelectionChange.bind(this);
         this.addEmojiToTextBox = this.addEmojiToTextBox.bind(this);
         this.setExceededMaxCommentLength = this.setExceededMaxCommentLength.bind(this);
-        this.updateNumberOfLines = this.updateNumberOfLines.bind(this);
         this.saveButtonID = 'saveButton';
         this.cancelButtonID = 'cancelButton';
         this.emojiButtonID = 'emojiButton';
@@ -160,14 +153,6 @@ class ReportActionItemMessageEdit extends React.Component {
         }
     }
 
-    /**
-     * Update the number of lines for a draft in Onyx
-     * @param {Number} numberOfLines
-     */
-    updateNumberOfLines(numberOfLines) {
-        Report.saveReportActionDraftNumberOfLines(this.props.reportID, this.props.action.reportActionID, numberOfLines);
-    }
-
     /**
      * Delete the draft of the comment being edited. This will take the comment out of "edit mode" with the old content.
      */
@@ -303,8 +288,6 @@ class ReportActionItemMessageEdit extends React.Component {
                         }}
                         selection={this.state.selection}
                         onSelectionChange={this.onSelectionChange}
-                        numberOfLines={this.props.numberOfLines}
-                        onNumberOfLinesChange={this.updateNumberOfLines}
                     />
                     <View style={styles.editChatItemEmojiWrapper}>
                         <EmojiPickerButton
@@ -346,12 +329,6 @@ export default compose(
     withLocalize,
     withWindowDimensions,
     withKeyboardState,
-    withOnyx({
-        numberOfLines: {
-            key: ({reportID, action}) => `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT_NUMBER_OF_LINES}${reportID}_${action.reportActionID}`,
-            initWithStoredValues: false,
-        },
-    }),
 )(React.forwardRef((props, ref) => (
     /* eslint-disable-next-line react/jsx-props-no-spreading */
     <ReportActionItemMessageEdit {...props} forwardedRef={ref} />