Replaced markdown preview display iframe with div

No longer need to use the iframe sandboxing techniques, since we now have
CSP rules in-place. Means that embed tags can load without CSP
complications.

Causes slight change to contents of `editor-markdown::setup` editor
event data, since we're changing the `displayEl` property.

Updates markdown editor component to make better use of the component
system.

diff --git a/resources/js/components/markdown-editor.js b/resources/js/components/markdown-editor.js
index 8d117870c180edfc81cf81e43bd43902d128db07..3f9dbeb6979dca6209c6f7450ec9c12627b90fc5 100644 (file)
--- a/resources/js/components/markdown-editor.js
+++ b/resources/js/components/markdown-editor.js
@@ -18,10 +18,8 @@ class MarkdownEditor {
         this.markdown = new MarkdownIt({html: true});
         this.markdown.use(mdTasksLists, {label: true});
 
         this.markdown = new MarkdownIt({html: true});
         this.markdown.use(mdTasksLists, {label: true});
 

-        this.display = this.elem.querySelector('.markdown-display');
-
-        this.displayStylesLoaded = false;
-        this.input = this.elem.querySelector('textarea');
+        this.display = this.$refs.display;
+        this.input = this.$refs.input;

 
         this.cm = null;
         this.Code = null;
 
         this.cm = null;
         this.Code = null;


@@ -32,23 +30,13 @@ class MarkdownEditor {
         });
 
         this.onMarkdownScroll = this.onMarkdownScroll.bind(this);
         });
 
         this.onMarkdownScroll = this.onMarkdownScroll.bind(this);

-
-        const displayLoad = () => {
-            this.displayDoc = this.display.contentDocument;
-            this.init(cmLoadPromise);
-        };
-
-        if (this.display.contentDocument.readyState === 'complete') {
-            displayLoad();
-        } else {
-            this.display.addEventListener('load', displayLoad.bind(this));
-        }
-

         window.$events.emitPublic(this.elem, 'editor-markdown::setup', {
             markdownIt: this.markdown,
             displayEl: this.display,
             codeMirrorInstance: this.cm,
         });
         window.$events.emitPublic(this.elem, 'editor-markdown::setup', {
             markdownIt: this.markdown,
             displayEl: this.display,
             codeMirrorInstance: this.cm,
         });

+
+        this.init(cmLoadPromise);

     }
 
     init(cmLoadPromise) {
     }
 
     init(cmLoadPromise) {


@@ -56,17 +44,17 @@ class MarkdownEditor {
         let lastClick = 0;
 
         // Prevent markdown display link click redirect
         let lastClick = 0;
 
         // Prevent markdown display link click redirect

-        this.displayDoc.addEventListener('click', event => {
-            let isDblClick = Date.now() - lastClick < 300;
+        this.display.addEventListener('click', event => {
+            const isDblClick = Date.now() - lastClick < 300;

 
 

-            let link = event.target.closest('a');
+            const link = event.target.closest('a');

             if (link !== null) {
                 event.preventDefault();
                 window.open(link.getAttribute('href'));
                 return;
             }
 
             if (link !== null) {
                 event.preventDefault();
                 window.open(link.getAttribute('href'));
                 return;
             }
 

-            let drawing = event.target.closest('[drawio-diagram]');
+            const drawing = event.target.closest('[drawio-diagram]');

             if (drawing !== null && isDblClick) {
                 this.actionEditDrawing(drawing);
                 return;
             if (drawing !== null && isDblClick) {
                 this.actionEditDrawing(drawing);
                 return;


@@ -77,10 +65,10 @@ class MarkdownEditor {
 
         // Button actions
         this.elem.addEventListener('click', event => {
 
         // Button actions
         this.elem.addEventListener('click', event => {

-            let button = event.target.closest('button[data-action]');
+            const button = event.target.closest('button[data-action]');

             if (button === null) return;
 
             if (button === null) return;
 

-            let action = button.getAttribute('data-action');
+            const action = button.getAttribute('data-action');

             if (action === 'insertImage') this.actionInsertImage();
             if (action === 'insertLink') this.actionShowLinkSelector();
             if (action === 'insertDrawing' && (event.ctrlKey || event.metaKey)) {
             if (action === 'insertImage') this.actionInsertImage();
             if (action === 'insertLink') this.actionShowLinkSelector();
             if (action === 'insertDrawing' && (event.ctrlKey || event.metaKey)) {


@@ -132,35 +120,11 @@ class MarkdownEditor {
         window.$events.emit('editor-markdown-change', content);
 
         // Set body content
         window.$events.emit('editor-markdown-change', content);
 
         // Set body content

-        this.displayDoc.body.className = 'page-content';
-        this.displayDoc.body.innerHTML = html;
-
-        // Copy styles from page head and set custom styles for editor
-        this.loadStylesIntoDisplay();
-    }
-
-    loadStylesIntoDisplay() {
-        if (this.displayStylesLoaded) return;
-        this.displayDoc.documentElement.classList.add('markdown-editor-display');
-        // Set display to be dark mode if parent is
-
-        if (document.documentElement.classList.contains('dark-mode')) {
-            this.displayDoc.documentElement.style.backgroundColor = '#222';
-            this.displayDoc.documentElement.classList.add('dark-mode');
-        }
-
-        this.displayDoc.head.innerHTML = '';
-        const styles = document.head.querySelectorAll('style,link[rel=stylesheet]');
-        for (let style of styles) {
-            const copy = style.cloneNode(true);
-            this.displayDoc.head.appendChild(copy);
-        }
-
-        this.displayStylesLoaded = true;
+        this.display.innerHTML = html;

     }
 
     onMarkdownScroll(lineCount) {
     }
 
     onMarkdownScroll(lineCount) {

-        const elems = this.displayDoc.body.children;
+        const elems = this.display.children;

         if (elems.length <= lineCount) return;
 
         const topElem = (lineCount === -1) ? elems[elems.length-1] : elems[lineCount];
         if (elems.length <= lineCount) return;
 
         const topElem = (lineCount === -1) ? elems[elems.length-1] : elems[lineCount];


@@ -317,7 +281,7 @@ class MarkdownEditor {
             let cursor = cm.getCursor();
             let lineContent = cm.getLine(cursor.line);
             let lineLen = lineContent.length;
             let cursor = cm.getCursor();
             let lineContent = cm.getLine(cursor.line);
             let lineLen = lineContent.length;

-            let newLineContent = lineContent;
+            let newLineContent;

 
             if (lineContent.indexOf(start) === 0 && lineContent.slice(-end.length) === end) {
                 newLineContent = lineContent.slice(start.length, lineContent.length - end.length);
 
             if (lineContent.indexOf(start) === 0 && lineContent.slice(-end.length) === end) {
                 newLineContent = lineContent.slice(start.length, lineContent.length - end.length);


@@ -333,9 +297,9 @@ class MarkdownEditor {
             let selection = cm.getSelection();
             if (selection === '') return wrapLine(start, end);
 
             let selection = cm.getSelection();
             if (selection === '') return wrapLine(start, end);
 

-            let newSelection = selection;
+            let newSelection;

             let frontDiff = 0;
             let frontDiff = 0;

-            let endDiff = 0;
+            let endDiff;

 
             if (selection.indexOf(start) === 0 && selection.slice(-end.length) === end) {
                 newSelection = selection.slice(start.length, selection.length - end.length);
 
             if (selection.indexOf(start) === 0 && selection.slice(-end.length) === end) {
                 newSelection = selection.slice(start.length, selection.length - end.length);

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 665b1213be8ba5a4401b3449c801f0c627d5c207..40b4da89cd077a6e98419b02773081fb3c182d1f 100644 (file)
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -114,26 +114,20 @@
 
 .markdown-display {
   margin-inline-start: -1px;
 
 .markdown-display {
   margin-inline-start: -1px;

-}
-
-.markdown-editor-display {
+  display: block;

   background-color: #fff;
   background-color: #fff;

-  body {
-    display: block;
-    background-color: #fff;
-    padding-inline-start: 16px;
-    padding-inline-end: 16px;
-  }
+  padding: $-m;
+  overflow-y: scroll;

   [drawio-diagram]:hover {
     outline: 2px solid var(--color-primary);
   }
   [drawio-diagram]:hover {
     outline: 2px solid var(--color-primary);
   }

+  [drawio-diagram] embed {
+    pointer-events: none;
+  }

 }
 
 }
 

-html.markdown-editor-display.dark-mode {
+.dark-mode .markdown-display {

   background-color: #222;
   background-color: #222;

-  body {
-    background-color: #222;
-  }

 }
 
 .editor-toolbar {
 }
 
 .editor-toolbar {

diff --git a/resources/views/pages/parts/markdown-editor.blade.php b/resources/views/pages/parts/markdown-editor.blade.php
index 39d628e17d0ce6ec503d6f8ea76051fa7d1238a2..0df17d986ab2c4948b24e80bac97eccd16d712ee 100644 (file)
--- a/resources/views/pages/parts/markdown-editor.blade.php
+++ b/resources/views/pages/parts/markdown-editor.blade.php
@@ -23,6 +23,7 @@
 
         <div markdown-input class="flex flex-fill">
             <textarea id="markdown-editor-input"
 
         <div markdown-input class="flex flex-fill">
             <textarea id="markdown-editor-input"

+                      refs="markdown-editor@input"

                       @if($errors->has('markdown')) class="text-neg" @endif
                       name="markdown"
                       rows="5">@if(isset($model) || old('markdown')){{ old('markdown') ?? ($model->markdown === '' ? $model->html : $model->markdown) }}@endif</textarea>
                       @if($errors->has('markdown')) class="text-neg" @endif
                       name="markdown"
                       rows="5">@if(isset($model) || old('markdown')){{ old('markdown') ?? ($model->markdown === '' ? $model->html : $model->markdown) }}@endif</textarea>


@@ -34,7 +35,10 @@
         <div class="editor-toolbar">
             <div class="editor-toolbar-label">{{ trans('entities.pages_md_preview') }}</div>
         </div>
         <div class="editor-toolbar">
             <div class="editor-toolbar-label">{{ trans('entities.pages_md_preview') }}</div>
         </div>

-        <iframe src="about:blank" class="markdown-display" sandbox="allow-same-origin"></iframe>
+        <div class="markdown-display">
+            <div refs="markdown-editor@display"
+                 class="page-content"></div>
+        </div>

     </div>
 </div>
 
     </div>
 </div>