From 59b3b9b9336676bd33d67d6fe97c7c87e4857419 Mon Sep 17 00:00:00 2001 From: Mathias Jakobsen Date: Thu, 20 Apr 2023 10:59:09 +0100 Subject: [PATCH] Merge pull request #12631 from overleaf/ae-readonly-focus [cm6] Prevent the editor being focused when read-only GitOrigin-RevId: 7de9f2df2421b57b3315d59d640f7c8b46caf178 --- .../features/source-editor/extensions/editable.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/services/web/frontend/js/features/source-editor/extensions/editable.ts b/services/web/frontend/js/features/source-editor/extensions/editable.ts index 4371810ebb..83b2b6c7f7 100644 --- a/services/web/frontend/js/features/source-editor/extensions/editable.ts +++ b/services/web/frontend/js/features/source-editor/extensions/editable.ts @@ -1,13 +1,24 @@ import { Compartment, EditorState, TransactionSpec } from '@codemirror/state' +import { EditorView } from '@codemirror/view' const readOnlyConf = new Compartment() export const editable = () => { - return [readOnlyConf.of(EditorState.readOnly.of(true))] + return [ + readOnlyConf.of([ + EditorState.readOnly.of(true), + EditorView.editable.of(false), + ]), + ] } export const setEditable = (value = true): TransactionSpec => { return { - effects: [readOnlyConf.reconfigure(EditorState.readOnly.of(!value))], + effects: [ + readOnlyConf.reconfigure([ + EditorState.readOnly.of(!value), + EditorView.editable.of(value), + ]), + ], } }