Desktop, Mobile: Resolves laurent22#5593: Enable safe mode for Markdo…

…wn editor too
adarsh-sgh · Oct 30, 2021 · 0b01b5b · 0b01b5b
1 parent aa3cbbd
commit 0b01b5b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
@@ -812,6 +812,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 					onChange={codeMirror_change}
 					onScroll={editor_scroll}
 					onEditorPaste={onEditorPaste}
+					isSafeMode={props.isSafeMode}
 				/>
 			</div>
 		);

diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
@@ -92,6 +92,7 @@ export interface EditorProps {
 	onChange: any;
 	onScroll: any;
 	onEditorPaste: any;
+	isSafeMode: boolean;
 }
 
 function Editor(props: EditorProps, ref: any) {
@@ -149,11 +150,13 @@ function Editor(props: EditorProps, ref: any) {
 	useEffect(() => {
 		if (!editorParent.current) return () => {};
 
-		// const userOptions = eventManager.filterEmit('codeMirrorOptions', {});
 		const userOptions = {};
 
-		const cmOptions = Object.assign({}, {
+		const safeOptions: Record<string, any> = {
 			value: props.value,
+		};
+
+		const unsafeOptions: Record<string, any> = {
 			screenReaderLabel: props.value,
 			theme: props.codeMirrorTheme,
 			mode: props.mode,
@@ -167,7 +170,17 @@ function Editor(props: EditorProps, ref: any) {
 			spellcheck: true,
 			allowDropFileTypes: [''], // disable codemirror drop handling
 			keyMap: props.keyMap ? props.keyMap : 'default',
-		}, userOptions);
+		};
+
+		let cmOptions: Record<string, any> = { ...safeOptions };
+
+		if (!props.isSafeMode) {
+			cmOptions = {
+				...cmOptions,
+				...unsafeOptions,
+				...userOptions,
+			};
+		}
 
 		const cm = CodeMirror(editorParent.current, cmOptions);
 		setEditor(cm);

diff --git a/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx b/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx
@@ -409,6 +409,7 @@ function NoteEditor(props: NoteEditorProps) {
 		plugins: props.plugins,
 		fontSize: Setting.value('style.editor.fontSize'),
 		contentMaxWidth: props.contentMaxWidth,
+		isSafeMode: props.isSafeMode,
 	};
 
 	let editor = null;
@@ -611,6 +612,7 @@ const mapStateToProps = (state: AppState) => {
 			'setTags',
 		], whenClauseContext)[0],
 		contentMaxWidth: state.settings['style.editor.contentMaxWidth'],
+		isSafeMode: state.settings.isSafeMode,
 	};
 };
 

diff --git a/packages/app-desktop/gui/NoteEditor/utils/types.ts b/packages/app-desktop/gui/NoteEditor/utils/types.ts
@@ -43,6 +43,7 @@ export interface NoteEditorProps {
 	setTagsToolbarButtonInfo: ToolbarButtonInfo;
 	richTextBannerDismissed: boolean;
 	contentMaxWidth: number;
+	isSafeMode: boolean;
 }
 
 export interface NoteBodyEditorProps {
@@ -74,6 +75,7 @@ export interface NoteBodyEditorProps {
 	plugins: PluginStates;
 	fontSize: number;
 	contentMaxWidth: number;
+	isSafeMode: boolean;
 }
 
 export interface FormNote {