From b04bc4798e5624a92b1268e2708e4af3b05c06c0 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Tue, 21 Jun 2022 13:15:35 +0100
Subject: [PATCH] Merge pull request #8473 from
 overleaf/ii-cm6-missing-keyboard-shortcuts-2

[cm6] Add missing keyboard shortcuts 2

GitOrigin-RevId: 29f68cd2eb9d0ad931fff463f76ddb91b5275516
---
 services/web/frontend/js/ide.js                   | 14 ++++++++------
 .../controllers/ReviewPanelController.js          | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/services/web/frontend/js/ide.js b/services/web/frontend/js/ide.js
index e2672c3fac..44455234af 100644
--- a/services/web/frontend/js/ide.js
+++ b/services/web/frontend/js/ide.js
@@ -133,12 +133,14 @@ App.controller(
     $scope.chat = {}
 
     ide.toggleReviewPanel = $scope.toggleReviewPanel = function () {
-      if (!$scope.project.features.trackChangesVisible) {
-        return
-      }
-      $scope.ui.reviewPanelOpen = !$scope.ui.reviewPanelOpen
-      eventTracking.sendMB('rp-toggle-panel', {
-        value: $scope.ui.reviewPanelOpen,
+      $scope.$applyAsync(() => {
+        if (!$scope.project.features.trackChangesVisible) {
+          return
+        }
+        $scope.ui.reviewPanelOpen = !$scope.ui.reviewPanelOpen
+        eventTracking.sendMB('rp-toggle-panel', {
+          value: $scope.ui.reviewPanelOpen,
+        })
       })
     }
 
diff --git a/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js b/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
index 37145cbab8..3b4cf5e315 100644
--- a/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
+++ b/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
@@ -1301,6 +1301,21 @@ export default App.controller(
           $scope.$broadcast('editor:focus:changed', from, to, !empty)
           break
         }
+
+        case 'add-new-comment': {
+          $scope.addNewCommentFromKbdShortcut()
+          break
+        }
+
+        case 'toggle-track-changes': {
+          $scope.toggleTrackChangesFromKbdShortcut()
+          break
+        }
+
+        case 'toggle-review-panel': {
+          ide.toggleReviewPanel()
+          break
+        }
       }
     })
   }