Comments: Added HTML filter on load, tinymce elem filtering

[bookstack] / resources / js / wysiwyg / plugin-codeeditor.js

diff --git a/resources/js/wysiwyg/plugin-codeeditor.js b/resources/js/wysiwyg/plugin-codeeditor.js
index 82052a40d82bf167dda0f8577234c2145395c47d..2fe2ac26a6bc6ecba4c786ff7e6ee2198c41152f 100644 (file)
--- a/resources/js/wysiwyg/plugin-codeeditor.js
+++ b/resources/js/wysiwyg/plugin-codeeditor.js
@@ -9,9 +9,16 @@ function elemIsCodeBlock(elem) {
  * @param {function(string, string)} callback (Receives (code: string,language: string)
  */
 function showPopup(editor, code, language, callback) {
  * @param {function(string, string)} callback (Receives (code: string,language: string)
  */
 function showPopup(editor, code, language, callback) {

-    window.components.first('code-editor').open(code, language, (newCode, newLang) => {
-        callback(newCode, newLang)
-        editor.focus()
+    /** @var {CodeEditor} codeEditor * */
+    const codeEditor = window.$components.first('code-editor');
+    const bookMark = editor.selection.getBookmark();
+    codeEditor.open(code, language, (newCode, newLang) => {
+        callback(newCode, newLang);
+        editor.focus();
+        editor.selection.moveToBookmark(bookMark);
+    }, () => {
+        editor.focus();
+        editor.selection.moveToBookmark(bookMark);

     });
 }
 
     });
 }
 


@@ -36,23 +43,30 @@ function defineCodeBlockCustomElement(editor) {
     const win = doc.defaultView;
 
     class CodeBlockElement extends win.HTMLElement {
     const win = doc.defaultView;
 
     class CodeBlockElement extends win.HTMLElement {

+
+        /**
+         * @type {?SimpleEditorInterface}
+         */
+        editor = null;
+

         constructor() {
             super();
             this.attachShadow({mode: 'open'});
         constructor() {
             super();
             this.attachShadow({mode: 'open'});

-            const linkElem = document.createElement('link');
-            linkElem.setAttribute('rel', 'stylesheet');
-            linkElem.setAttribute('href', window.baseUrl('/dist/styles.css'));
+
+            const stylesToCopy = document.head.querySelectorAll('link[rel="stylesheet"]:not([media="print"]),style');
+            const copiedStyles = Array.from(stylesToCopy).map(styleEl => styleEl.cloneNode(true));

 
             const cmContainer = document.createElement('div');
             cmContainer.style.pointerEvents = 'none';
             cmContainer.contentEditable = 'false';
             cmContainer.classList.add('CodeMirrorContainer');
 
             const cmContainer = document.createElement('div');
             cmContainer.style.pointerEvents = 'none';
             cmContainer.contentEditable = 'false';
             cmContainer.classList.add('CodeMirrorContainer');

+            cmContainer.classList.toggle('dark-mode', document.documentElement.classList.contains('dark-mode'));

 
 

-            this.shadowRoot.append(linkElem, cmContainer);
+            this.shadowRoot.append(...copiedStyles, cmContainer);

         }
 
         getLanguage() {
         }
 
         getLanguage() {

-            const getLanguageFromClassList = (classes) => {
+            const getLanguageFromClassList = classes => {

                 const langClasses = classes.split(' ').filter(cssClass => cssClass.startsWith('language-'));
                 return (langClasses[0] || '').replace('language-', '');
             };
                 const langClasses = classes.split(' ').filter(cssClass => cssClass.startsWith('language-'));
                 return (langClasses[0] || '').replace('language-', '');
             };


@@ -63,11 +77,9 @@ function defineCodeBlockCustomElement(editor) {
         }
 
         setContent(content, language) {
         }
 
         setContent(content, language) {

-            if (this.cm) {
-                importVersioned('code').then(Code => {
-                    Code.setContent(this.cm, content);
-                    Code.setMode(this.cm, language, content);
-                });
+            if (this.editor) {
+                this.editor.setContent(content);
+                this.editor.setMode(language, content);

             }
 
             let pre = this.querySelector('pre');
             }
 
             let pre = this.querySelector('pre');


@@ -98,7 +110,7 @@ function defineCodeBlockCustomElement(editor) {
 
         connectedCallback() {
             const connectedTime = Date.now();
 
         connectedCallback() {
             const connectedTime = Date.now();

-            if (this.cm) {
+            if (this.editor) {

                 return;
             }
 
                 return;
             }
 


@@ -109,17 +121,16 @@ function defineCodeBlockCustomElement(editor) {
             this.style.height = `${height}px`;
 
             const container = this.shadowRoot.querySelector('.CodeMirrorContainer');
             this.style.height = `${height}px`;
 
             const container = this.shadowRoot.querySelector('.CodeMirrorContainer');

-            const renderCodeMirror = (Code) => {
-                this.cm = Code.wysiwygView(container, content, this.getLanguage());
-                Code.updateLayout(this.cm);
+            const renderEditor = Code => {
+                this.editor = Code.wysiwygView(container, this.shadowRoot, content, this.getLanguage());

                 setTimeout(() => {
                     this.style.height = null;
                 setTimeout(() => {
                     this.style.height = null;

-                }, 1);
+                }, 12);

             };
 
             };
 

-            window.importVersioned('code').then((Code) => {
+            window.importVersioned('code').then(Code => {

                 const timeout = (Date.now() - connectedTime < 20) ? 20 : 0;
                 const timeout = (Date.now() - connectedTime < 20) ? 20 : 0;

-                setTimeout(() => renderCodeMirror(Code), timeout);
+                setTimeout(() => renderEditor(Code), timeout);

             });
         }
 
             });
         }
 


@@ -133,26 +144,32 @@ function defineCodeBlockCustomElement(editor) {
                 }
             }
         }
                 }
             }
         }

+

     }
 
     win.customElements.define('code-block', CodeBlockElement);
 }
 
     }
 
     win.customElements.define('code-block', CodeBlockElement);
 }
 

-

 /**
  * @param {Editor} editor
 /**
  * @param {Editor} editor

- * @param {String} url

  */
  */

-function register(editor, url) {
-
-    editor.ui.registry.addIcon('codeblock', '<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V4c0-.6.4-1 1-1Zm1 2v14h14V5Z"/><path d="M11.103 15.423c.277.277.277.738 0 .922a.692.692 0 0 1-1.106 0l-4.057-3.78a.738.738 0 0 1 0-1.107l4.057-3.872c.276-.277.83-.277 1.106 0a.724.724 0 0 1 0 1.014L7.6 12.012ZM12.897 8.577c-.245-.312-.2-.675.08-.955.28-.281.727-.27 1.027.033l4.057 3.78a.738.738 0 0 1 0 1.107l-4.057 3.872c-.277.277-.83.277-1.107 0a.724.724 0 0 1 0-1.014l3.504-3.412z"/></svg>')
+function register(editor) {
+    editor.ui.registry.addIcon('codeblock', '<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V4c0-.6.4-1 1-1Zm1 2v14h14V5Z"/><path d="M11.103 15.423c.277.277.277.738 0 .922a.692.692 0 0 1-1.106 0l-4.057-3.78a.738.738 0 0 1 0-1.107l4.057-3.872c.276-.277.83-.277 1.106 0a.724.724 0 0 1 0 1.014L7.6 12.012ZM12.897 8.577c-.245-.312-.2-.675.08-.955.28-.281.727-.27 1.027.033l4.057 3.78a.738.738 0 0 1 0 1.107l-4.057 3.872c-.277.277-.83.277-1.107 0a.724.724 0 0 1 0-1.014l3.504-3.412z"/></svg>');

 
     editor.ui.registry.addButton('codeeditor', {
         tooltip: 'Insert code block',
         icon: 'codeblock',
         onAction() {
             editor.execCommand('codeeditor');
 
     editor.ui.registry.addButton('codeeditor', {
         tooltip: 'Insert code block',
         icon: 'codeblock',
         onAction() {
             editor.execCommand('codeeditor');

-        }
+        },
+    });
+
+    editor.ui.registry.addButton('editcodeeditor', {
+        tooltip: 'Edit code block',
+        icon: 'edit-block',
+        onAction() {
+            editor.execCommand('codeeditor');
+        },

     });
 
     editor.addCommand('codeeditor', () => {
     });
 
     editor.addCommand('codeeditor', () => {


@@ -174,17 +191,17 @@ function register(editor, url) {
         }
     });
 
         }
     });
 

-    editor.on('dblclick', event => {
-        let selectedNode = editor.selection.getNode();
+    editor.on('dblclick', () => {
+        const selectedNode = editor.selection.getNode();

         if (elemIsCodeBlock(selectedNode)) {
             showPopupForCodeBlock(editor, selectedNode);
         }
     });
 
     editor.on('PreInit', () => {
         if (elemIsCodeBlock(selectedNode)) {
             showPopupForCodeBlock(editor, selectedNode);
         }
     });
 
     editor.on('PreInit', () => {

-        editor.parser.addNodeFilter('pre', function(elms) {
+        editor.parser.addNodeFilter('pre', elms => {

             for (const el of elms) {
             for (const el of elms) {

-                const wrapper = tinymce.html.Node.create('code-block', {
+                const wrapper = window.tinymce.html.Node.create('code-block', {

                     contenteditable: 'false',
                 });
 
                     contenteditable: 'false',
                 });
 


@@ -197,28 +214,36 @@ function register(editor, url) {
             }
         });
 
             }
         });
 

-        editor.parser.addNodeFilter('code-block', function(elms) {
+        editor.parser.addNodeFilter('code-block', elms => {

             for (const el of elms) {
                 el.attr('contenteditable', 'false');
             }
         });
 
             for (const el of elms) {
                 el.attr('contenteditable', 'false');
             }
         });
 

-        editor.serializer.addNodeFilter('code-block', function(elms) {
+        editor.serializer.addNodeFilter('code-block', elms => {

             for (const el of elms) {
                 el.unwrap();
             }
         });
     });
 
             for (const el of elms) {
                 el.unwrap();
             }
         });
     });
 

+    editor.ui.registry.addContextToolbar('codeeditor', {
+        predicate(node) {
+            return node.nodeName.toLowerCase() === 'code-block';
+        },
+        items: 'editcodeeditor',
+        position: 'node',
+        scope: 'node',
+    });
+

     editor.on('PreInit', () => {
         defineCodeBlockCustomElement(editor);
     });
 }
 
 /**
     editor.on('PreInit', () => {
         defineCodeBlockCustomElement(editor);
     });
 }
 
 /**

- * @param {WysiwygConfigOptions} options

  * @return {register}
  */
  * @return {register}
  */

-export function getPlugin(options) {
+export function getPlugin() {

     return register;
     return register;

-}
\ No newline at end of file
+}