From 5a786029a326e5367f5c61823764bd7e103853c2 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Tue, 11 Jul 2023 14:30:55 +0100
Subject: [PATCH] [cm6] Hide list indentation shortcuts in button tooltips in
 Code Editor (#13797)

GitOrigin-RevId: d5184310d81953d9765f6e1ae2343fdeb824ae01
---
 .../source-editor/components/codemirror-toolbar.tsx        | 6 ++++--
 .../source-editor/components/toolbar/toolbar-items.tsx     | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
index 3203687d07..b6090141f2 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
@@ -46,6 +46,7 @@ const Toolbar = memo(function Toolbar() {
   const overflowedItemsRef = useRef<Set<string>>(new Set())
 
   const languageName = state.facet(language)?.name
+  const visual = isVisual(view)
 
   const {
     open: overflowOpen,
@@ -100,7 +101,7 @@ const Toolbar = memo(function Toolbar() {
   return (
     <div className="ol-cm-toolbar toolbar-editor" ref={resizeRef}>
       {showSourceToolbar && <EditorSwitch />}
-      <ToolbarItems state={state} languageName={languageName} />
+      <ToolbarItems state={state} languageName={languageName} visual={visual} />
       <div
         className="ol-cm-toolbar-button-group ol-cm-toolbar-stretch"
         ref={overflowBeforeRef}
@@ -116,6 +117,7 @@ const Toolbar = memo(function Toolbar() {
             state={state}
             overflowed={overflowedItemsRef.current}
             languageName={languageName}
+            visual={visual}
           />
         </ToolbarOverflow>
         <div className="formatting-buttons-wrapper" />
@@ -128,7 +130,7 @@ const Toolbar = memo(function Toolbar() {
           active={searchPanelOpen(state)}
           icon="search"
         />
-        {languageName === 'latex' && !isVisual(view) && (
+        {languageName === 'latex' && !visual && (
           <SplitTestBadge
             splitTestName="source-editor-toolbar"
             displayOnVariants={['enabled']}
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
index c990e61872..c9eb5d164c 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
@@ -24,7 +24,8 @@ export const ToolbarItems: FC<{
   state: EditorState
   overflowed?: Set<string>
   languageName?: string
-}> = memo(function ToolbarItems({ state, overflowed, languageName }) {
+  visual: boolean
+}> = memo(function ToolbarItems({ state, overflowed, languageName, visual }) {
   const { t } = useTranslation()
   const { toggleSymbolPalette, showSymbolPalette } = useEditorContext()
   const isActive = withinFormattingCommand(state)
@@ -192,7 +193,7 @@ export const ToolbarItems: FC<{
                 label={t('toolbar_decrease_indent')}
                 command={commands.indentDecrease}
                 icon="outdent"
-                shortcut={isMac ? '⌘[' : 'Ctrl+['}
+                shortcut={visual ? (isMac ? '⌘[' : 'Ctrl+[') : undefined}
                 disabled={listDepth < 2}
               />
               <ToolbarButton
@@ -200,7 +201,7 @@ export const ToolbarItems: FC<{
                 label={t('toolbar_increase_indent')}
                 command={commands.indentIncrease}
                 icon="indent"
-                shortcut={isMac ? '⌘]' : 'Ctrl+]'}
+                shortcut={visual ? (isMac ? '⌘]' : 'Ctrl+]') : undefined}
                 disabled={listDepth < 1}
               />
             </div>