From 0ab7332bb7e968fe16f24e6d8429d82e22940e6c Mon Sep 17 00:00:00 2001 From: tienifr Date: Tue, 19 Sep 2023 23:45:01 +0700 Subject: [PATCH] revert 27268 --- src/libs/Navigation/NavigationRoot.js | 6 ------ .../PopoverReactionList/BasePopoverReactionList.js | 3 --- .../home/report/ReactionList/PopoverReactionList/index.js | 6 ------ src/pages/home/report/ReportActionsView.js | 7 ------- 4 files changed, 22 deletions(-) diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js index 9e3cad6144dd..d8cb96e2c6b3 100644 --- a/src/libs/Navigation/NavigationRoot.js +++ b/src/libs/Navigation/NavigationRoot.js @@ -11,8 +11,6 @@ import Log from '../Log'; import StatusBar from '../StatusBar'; import useCurrentReportID from '../../hooks/useCurrentReportID'; import useWindowDimensions from '../../hooks/useWindowDimensions'; -import * as ReportActionContextMenu from '../../pages/home/report/ContextMenu/ReportActionContextMenu'; -import * as EmojiPickerAction from '../actions/EmojiPickerAction'; // https://reactnavigation.org/docs/themes const navigationTheme = { @@ -123,10 +121,6 @@ function NavigationRoot(props) { if (!state) { return; } - ReportActionContextMenu.hideContextMenu(); - ReportActionContextMenu.hideDeleteModal(); - EmojiPickerAction.hideEmojiPicker(true); - updateCurrentReportID(state); parseAndLogRoute(state); animateStatusBarBackgroundColor(); diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js index a721ab31b78e..9303d7a5bc39 100644 --- a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js +++ b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js @@ -198,9 +198,6 @@ class BasePopoverReactionList extends React.Component { * Hide the ReactionList modal popover. */ hideReactionList() { - if (!this.state.isPopoverVisible) { - return; - } this.setState({ isPopoverVisible: false, }); diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/index.js b/src/pages/home/report/ReactionList/PopoverReactionList/index.js index 6d8ad425bfcd..327885249843 100644 --- a/src/pages/home/report/ReactionList/PopoverReactionList/index.js +++ b/src/pages/home/report/ReactionList/PopoverReactionList/index.js @@ -26,16 +26,10 @@ function PopoverReactionList(props) { const showReactionList = (event, reactionListAnchor, emojiName, reportActionID) => { setReactionListReportActionID(reportActionID); setReactionListEmojiName(emojiName); - if (!innerReactionListRef.current || !innerReactionListRef.current.hideReactionList) { - return; - } innerReactionListRef.current.showReactionList(event, reactionListAnchor); }; const hideReactionList = () => { - if (!innerReactionListRef.current || !innerReactionListRef.current.hideReactionList) { - return; - } innerReactionListRef.current.hideReactionList(); }; diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js index fb0f10298537..a694c4996438 100755 --- a/src/pages/home/report/ReportActionsView.js +++ b/src/pages/home/report/ReportActionsView.js @@ -132,13 +132,6 @@ function ReportActionsView(props) { } }, [props.report, didSubscribeToReportTypingEvents, reportID]); - useEffect(() => { - if (isFocused || !context.reactionListRef || !context.reactionListRef.current) { - return; - } - context.reactionListRef.current.hideReactionList(); - }, [isFocused, context.reactionListRef]); - /** * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently * displaying.