From dae40941ee5a519af56eea35da3d75d5e227c842 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:14:51 +0100
Subject: [PATCH] Merge pull request #20638 from
 overleaf/dk-review-subview-mini

Always use current file sub view when review panel is collapsed

GitOrigin-RevId: 536476a11a9e54c79c2fe930d74639c6e676870e
---
 .../review-panel-new/components/review-panel.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
index c928356363..e905954fba 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
@@ -1,4 +1,4 @@
-import { FC, memo, useState } from 'react'
+import { FC, memo, useMemo, useState } from 'react'
 import ReviewPanelTabs from './review-panel-tabs'
 import ReviewPanelHeader from './review-panel-header'
 import ReviewPanelCurrentFile from './review-panel-current-file'
@@ -9,13 +9,17 @@ import { useReviewPanelStyles } from '@/features/review-panel-new/hooks/use-revi
 export type SubView = 'cur_file' | 'overview'
 
 const ReviewPanel: FC<{ mini?: boolean }> = ({ mini = false }) => {
-  const [subView, setSubView] = useState<SubView>('cur_file')
+  const [choosenSubView, setSubView] = useState<SubView>('cur_file')
+  const activeSubView = useMemo(
+    () => (mini ? 'cur_file' : choosenSubView),
+    [choosenSubView, mini]
+  )
 
   const style = useReviewPanelStyles(mini)
 
   const className = classnames('review-panel-new', 'review-panel-container', {
     'review-panel-mini': mini,
-    'review-panel-subview-overview': subView === 'overview',
+    'review-panel-subview-overview': activeSubView === 'overview',
   })
 
   return (
@@ -23,11 +27,11 @@ const ReviewPanel: FC<{ mini?: boolean }> = ({ mini = false }) => {
       <div className="review-panel-inner">
         {!mini && <ReviewPanelHeader />}
 
-        {subView === 'cur_file' && <ReviewPanelCurrentFile />}
-        {subView === 'overview' && <ReviewPanelOverview />}
+        {activeSubView === 'cur_file' && <ReviewPanelCurrentFile />}
+        {activeSubView === 'overview' && <ReviewPanelOverview />}
 
         <div className="review-panel-footer">
-          <ReviewPanelTabs subView={subView} setSubView={setSubView} />
+          <ReviewPanelTabs subView={activeSubView} setSubView={setSubView} />
         </div>
       </div>
     </div>