From 20485b886f53d5fa41501df2b825f8d812fbbdc5 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Wed, 3 Jan 2024 13:14:13 +0200
Subject: [PATCH] Merge pull request #16278 from
 overleaf/ii-ide-page-prototype-review-panel-entry-hover

[web] Remove entry hover from review panel

GitOrigin-RevId: 6bcfb28e20d7a8826301c34499340b6a7d2745db
---
 .../context/review-panel/hooks/use-review-panel-state.ts  | 5 -----
 .../source-editor/components/review-panel/container.tsx   | 7 +++----
 .../components/review-panel/current-file-container.tsx    | 8 +-------
 .../review-panel/hooks/use-angular-review-panel-state.ts  | 5 -----
 .../context/review-panel/types/review-panel-state.ts      | 2 --
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts b/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
index 260ed24d52..6d7a294966 100644
--- a/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
+++ b/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
@@ -1153,7 +1153,6 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
     ]
   )
 
-  const [entryHover, setEntryHover] = useState(false)
   const [isAddingComment, setIsAddingComment] = useState(false)
   const [navHeight, setNavHeight] = useState(0)
   const [toolbarHeight, setToolbarHeight] = useState(0)
@@ -1503,7 +1502,6 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
       collapsed,
       commentThreads,
       entries,
-      entryHover,
       isAddingComment,
       loadingThreads,
       nVisibleSelectedChanges,
@@ -1531,7 +1529,6 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
       collapsed,
       commentThreads,
       entries,
-      entryHover,
       isAddingComment,
       loadingThreads,
       nVisibleSelectedChanges,
@@ -1578,7 +1575,6 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
       toggleTrackChangesForEveryone,
       toggleTrackChangesForUser,
       toggleTrackChangesForGuests,
-      setEntryHover,
       setCollapsed,
       setShouldCollapse,
       setIsAddingComment,
@@ -1607,7 +1603,6 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
       toggleTrackChangesForUser,
       toggleTrackChangesForGuests,
       setCollapsed,
-      setEntryHover,
       setShouldCollapse,
       setIsAddingComment,
       setNavHeight,
diff --git a/services/web/frontend/js/features/source-editor/components/review-panel/container.tsx b/services/web/frontend/js/features/source-editor/components/review-panel/container.tsx
index 21f4dd32ab..d1eab7846d 100644
--- a/services/web/frontend/js/features/source-editor/components/review-panel/container.tsx
+++ b/services/web/frontend/js/features/source-editor/components/review-panel/container.tsx
@@ -4,14 +4,13 @@ const reviewPanelClasses = ['ol-cm-review-panel']
 
 type ContainerProps = {
   children?: React.ReactNode
-  classNames?: Record<string, boolean>
-  style?: React.CSSProperties
+  className?: string
 }
 
-function Container({ children, classNames, ...rest }: ContainerProps) {
+function Container({ children, className, ...rest }: ContainerProps) {
   return (
     <div
-      className={classnames(...reviewPanelClasses, classNames)}
+      className={classnames(...reviewPanelClasses, className)}
       {...rest}
       data-testid="review-panel"
     >
diff --git a/services/web/frontend/js/features/source-editor/components/review-panel/current-file-container.tsx b/services/web/frontend/js/features/source-editor/components/review-panel/current-file-container.tsx
index 45f4c6d0e9..8306e72580 100644
--- a/services/web/frontend/js/features/source-editor/components/review-panel/current-file-container.tsx
+++ b/services/web/frontend/js/features/source-editor/components/review-panel/current-file-container.tsx
@@ -29,7 +29,6 @@ function CurrentFileContainer() {
     permissions,
     loadingThreads,
     users,
-    entryHover,
     nVisibleSelectedChanges: nChanges,
   } = useReviewPanelValueContext()
   const contentHeight = useCodeMirrorContentHeight()
@@ -44,12 +43,7 @@ function CurrentFileContainer() {
   }, [currentDocEntries])
 
   return (
-    <Container
-      classNames={{
-        'rp-collapsed-displaying-entry': entryHover,
-        'rp-current-file-container': true,
-      }}
-    >
+    <Container className="rp-current-file-container">
       <div className="review-panel-tools">
         <Toolbar />
         <Nav />
diff --git a/services/web/frontend/js/features/source-editor/context/review-panel/hooks/use-angular-review-panel-state.ts b/services/web/frontend/js/features/source-editor/context/review-panel/hooks/use-angular-review-panel-state.ts
index 83c9b1c51e..e74c06eb5c 100644
--- a/services/web/frontend/js/features/source-editor/context/review-panel/hooks/use-angular-review-panel-state.ts
+++ b/services/web/frontend/js/features/source-editor/context/review-panel/hooks/use-angular-review-panel-state.ts
@@ -149,7 +149,6 @@ function useAngularReviewPanelState(): ReviewPanelState {
     [submitReplyAngular]
   )
 
-  const [entryHover, setEntryHover] = useState(false)
   const [isAddingComment, setIsAddingComment] = useState(false)
   const [navHeight, setNavHeight] = useState(0)
   const [toolbarHeight, setToolbarHeight] = useState(0)
@@ -161,7 +160,6 @@ function useAngularReviewPanelState(): ReviewPanelState {
       collapsed,
       commentThreads,
       entries,
-      entryHover,
       isAddingComment,
       loadingThreads,
       nVisibleSelectedChanges,
@@ -189,7 +187,6 @@ function useAngularReviewPanelState(): ReviewPanelState {
       collapsed,
       commentThreads,
       entries,
-      entryHover,
       isAddingComment,
       loadingThreads,
       nVisibleSelectedChanges,
@@ -236,7 +233,6 @@ function useAngularReviewPanelState(): ReviewPanelState {
       toggleTrackChangesForEveryone,
       toggleTrackChangesForUser,
       toggleTrackChangesForGuests,
-      setEntryHover,
       setCollapsed,
       setShouldCollapse,
       setIsAddingComment,
@@ -265,7 +261,6 @@ function useAngularReviewPanelState(): ReviewPanelState {
       toggleTrackChangesForUser,
       toggleTrackChangesForGuests,
       setCollapsed,
-      setEntryHover,
       setShouldCollapse,
       setIsAddingComment,
       setNavHeight,
diff --git a/services/web/frontend/js/features/source-editor/context/review-panel/types/review-panel-state.ts b/services/web/frontend/js/features/source-editor/context/review-panel/types/review-panel-state.ts
index c65652fc3d..6531261d53 100644
--- a/services/web/frontend/js/features/source-editor/context/review-panel/types/review-panel-state.ts
+++ b/services/web/frontend/js/features/source-editor/context/review-panel/types/review-panel-state.ts
@@ -18,7 +18,6 @@ export interface ReviewPanelState {
     collapsed: Record<DocId, boolean>
     commentThreads: ReviewPanelCommentThreads
     entries: ReviewPanelEntries
-    entryHover: boolean
     isAddingComment: boolean
     loadingThreads: boolean
     nVisibleSelectedChanges: number
@@ -78,7 +77,6 @@ export interface ReviewPanelState {
       void | ReviewPanelDocEntries[]
     >
     submitNewComment: (content: string) => void
-    setEntryHover: React.Dispatch<React.SetStateAction<Value<'entryHover'>>>
     setIsAddingComment: React.Dispatch<
       React.SetStateAction<Value<'isAddingComment'>>
     >