address comment issues

vijay14887 · May 16, 2023 · cc216e9 · cc216e9
1 parent 01f20aa
commit cc216e9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/patches/@react-navigation+stack+6.3.16.patch b/patches/@react-navigation+stack+6.3.16.patch
@@ -29,10 +29,10 @@ index 1e9ee0e..d85c7b4 100644
 
    const handleGestureCanceled = () => {
 diff --git a/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx b/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx
-index 6bbce10..5139382 100644
+index 6bbce10..7f2eed3 100644
 --- a/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx
 +++ b/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx
-@@ -375,29 +375,48 @@ export default class StackView extends React.Component<Props, State> {
+@@ -375,29 +375,51 @@ export default class StackView extends React.Component<Props, State> {
 
    private handleTransitionStart = (
      { route }: { route: Route<string> },
@@ -59,6 +59,7 @@ index 6bbce10..5139382 100644
        data: { closing },
        target: route.key,
      });
++    // Patch introduced to pass information about events to screens lower in the stack, so they could be safely frozen
 +    if (state?.index > 1) {
 +      this.props.navigation.emit({
 +        type: 'transitionEnd',
@@ -73,10 +74,12 @@ index 6bbce10..5139382 100644
 +      { route }: { route: Route<string> },
 +      state: StackNavigationState<ParamListBase>
 +    ) => {
++    console.log(state)
      this.props.navigation.emit({
        type: 'gestureStart',
        target: route.key,
      });
++    // Patch introduced to pass information about events to screens lower in the stack, so they could be safely frozen
 +    if (state?.index > 1) {
 +      this.props.navigation.emit({
 +        type: 'gestureStart',

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -138,7 +138,7 @@ class ReportScreen extends React.Component {
             skeletonViewContainerHeight: reportActionsListViewHeight,
             isBannerVisible: true,
             animationFinished: false,
-            screenDisappeared: false,
+            isScreenBlurred: false,
         };
     }
 
@@ -163,11 +163,11 @@ class ReportScreen extends React.Component {
 
         // ReportScreen is nested inside another navigator, so we need to listen to the parent navigator's events
         this.transitionEndListener = this.props.navigation.getParent().addListener('transitionEnd', (e) => {
-            this.setState({screenDisappeared: e.data.closing});
+            this.setState({isScreenBlurred: e.data.closing});
         });
 
         this.gestureStartListener = this.props.navigation.getParent().addListener('gestureStart', () => {
-            this.setState({screenDisappeared: false});
+            this.setState({isScreenBlurred: false});
         });
     }
 
@@ -260,7 +260,7 @@ class ReportScreen extends React.Component {
             (ReportUtils.isUserCreatedPolicyRoom(this.props.report) && !Permissions.canUsePolicyRooms(this.props.betas));
 
         // When the ReportScreen is not open/in the viewport, we want to "freeze" it for performance reasons
-        const isVisible = this.props.isFocused || !this.state.screenDisappeared;
+        const isVisible = this.props.isFocused || !this.state.isScreenBlurred;
         const shouldFreeze = this.props.isSmallScreenWidth && !isVisible;
 
         const isLoading = !reportID || !this.props.isSidebarLoaded || _.isEmpty(this.props.personalDetails) || !this.state.animationFinished;

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
@@ -107,19 +107,20 @@ class SidebarLinks extends React.Component {
         }
 
         this.state = {
-            screenDisappeared: false,
+            isScreenBlurred: false,
         };
     }
 
     componentDidMount() {
         App.setSidebarLoaded();
         this.isSidebarLoaded = true;
+        // SidebarLinks need to have information if the screen is blurred in order to enable freeze
         this.transitionEndListener = this.props.navigation.addListener('transitionEnd', (e) => {
-            this.setState({screenDisappeared: e.data.closing});
+            this.setState({isScreenBlurred: e.data.closing});
         });
 
         this.gestureStartListener = this.props.navigation.addListener('gestureStart', () => {
-            this.setState({screenDisappeared: false});
+            this.setState({isScreenBlurred: false});
         });
     }
 
@@ -161,7 +162,7 @@ class SidebarLinks extends React.Component {
 
     render() {
         const isLoading = _.isEmpty(this.props.personalDetails) || _.isEmpty(this.props.chatReports);
-        const isVisible = this.props.isFocused || !this.state.screenDisappeared;
+        const isVisible = this.props.isFocused || !this.state.isScreenBlurred;
         const shouldFreeze = this.props.isSmallScreenWidth && this.isSidebarLoaded && !isVisible;
         const optionListItems = SidebarUtils.getOrderedReportIDs(this.props.reportIDFromRoute);