github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-13 11:12:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[cm6] Hide list indentation shortcuts in button tooltips in Code Editor (#13797)

Browse source 
GitOrigin-RevId: d5184310d81953d9765f6e1ae2343fdeb824ae01
This commit is contained in:
Alf Eaton 2023-07-11 14:30:55 +01:00 committed by Copybot
parent 34fa28c90b
commit 5a786029a3
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
View file

@ -46,6 +46,7 @@ const Toolbar = memo(function Toolbar() {
const overflowedItemsRef = useRef<Set<string>>(new Set()) const overflowedItemsRef = useRef<Set<string>>(new Set())
const languageName = state.facet(language)?.name const languageName = state.facet(language)?.name
const visual = isVisual(view)
const { const {
open: overflowOpen, open: overflowOpen,
@ -100,7 +101,7 @@ const Toolbar = memo(function Toolbar() {
return ( return (
<div className="ol-cm-toolbar toolbar-editor" ref={resizeRef}> <div className="ol-cm-toolbar toolbar-editor" ref={resizeRef}>
{showSourceToolbar && <EditorSwitch />} {showSourceToolbar && <EditorSwitch />}
<ToolbarItems state={state} languageName={languageName} /> <ToolbarItems state={state} languageName={languageName} visual={visual} />
<div <div
className="ol-cm-toolbar-button-group ol-cm-toolbar-stretch" className="ol-cm-toolbar-button-group ol-cm-toolbar-stretch"
ref={overflowBeforeRef} ref={overflowBeforeRef}
@ -116,6 +117,7 @@ const Toolbar = memo(function Toolbar() {
state={state} state={state}
overflowed={overflowedItemsRef.current} overflowed={overflowedItemsRef.current}
languageName={languageName} languageName={languageName}
visual={visual}
/> />
</ToolbarOverflow> </ToolbarOverflow>
<div className="formatting-buttons-wrapper" /> <div className="formatting-buttons-wrapper" />
@ -128,7 +130,7 @@ const Toolbar = memo(function Toolbar() {
active={searchPanelOpen(state)} active={searchPanelOpen(state)}
icon="search" icon="search"
/> />
{languageName === 'latex' && !isVisual(view) && ( {languageName === 'latex' && !visual && (
<SplitTestBadge <SplitTestBadge
splitTestName="source-editor-toolbar" splitTestName="source-editor-toolbar"
displayOnVariants={['enabled']} displayOnVariants={['enabled']}

7
services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
View file

@ -24,7 +24,8 @@ export const ToolbarItems: FC<{
state: EditorState state: EditorState
overflowed?: Set<string> overflowed?: Set<string>
languageName?: string languageName?: string
}> = memo(function ToolbarItems({ state, overflowed, languageName }) { visual: boolean
}> = memo(function ToolbarItems({ state, overflowed, languageName, visual }) {
const { t } = useTranslation() const { t } = useTranslation()
const { toggleSymbolPalette, showSymbolPalette } = useEditorContext() const { toggleSymbolPalette, showSymbolPalette } = useEditorContext()
const isActive = withinFormattingCommand(state) const isActive = withinFormattingCommand(state)
@ -192,7 +193,7 @@ export const ToolbarItems: FC<{
label={t('toolbar_decrease_indent')} label={t('toolbar_decrease_indent')}
command={commands.indentDecrease} command={commands.indentDecrease}
icon="outdent" icon="outdent"
shortcut={isMac ? '⌘[' : 'Ctrl+['} shortcut={visual ? (isMac ? '⌘[' : 'Ctrl+[') : undefined}
disabled={listDepth < 2} disabled={listDepth < 2}
/> />
<ToolbarButton <ToolbarButton
@ -200,7 +201,7 @@ export const ToolbarItems: FC<{
label={t('toolbar_increase_indent')} label={t('toolbar_increase_indent')}
command={commands.indentIncrease} command={commands.indentIncrease}
icon="indent" icon="indent"
shortcut={isMac ? '⌘]' : 'Ctrl+]'} shortcut={visual ? (isMac ? '⌘]' : 'Ctrl+]') : undefined}
disabled={listDepth < 1} disabled={listDepth < 1}
/> />
</div> </div>