Adjusted audit log row spacing a tad

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

diff --git a/resources/js/wysiwyg/plugin-codeeditor.js b/resources/js/wysiwyg/plugin-codeeditor.js
index 12b2c25fb2d70922b1a98c9a128adf68bfce145f..66441c87e9ee8387bf32653fa6ca3bd41b468218 100644 (file)
--- a/resources/js/wysiwyg/plugin-codeeditor.js
+++ b/resources/js/wysiwyg/plugin-codeeditor.js
@@ -39,16 +39,16 @@ function defineCodeBlockCustomElement(editor) {
         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.querySelectorAll('link[rel="stylesheet"]:not([media="print"])');
+            const copiedStyles = Array.from(stylesToCopy).map(styleEl => styleEl.cloneNode(false));

 
             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');
 

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

         }
 
         getLanguage() {
         }
 
         getLanguage() {


@@ -86,20 +86,51 @@ function defineCodeBlockCustomElement(editor) {
         getContent() {
             const code = this.querySelector('code') || this.querySelector('pre');
             const tempEl = document.createElement('pre');
         getContent() {
             const code = this.querySelector('code') || this.querySelector('pre');
             const tempEl = document.createElement('pre');

-            tempEl.innerHTML = code.innerHTML.replace().replace(/<br\s*[\/]?>/gi ,'\n').replace(/\ufeff/g, '');
+            tempEl.innerHTML = code.innerHTML.replace(/\ufeff/g, '');
+
+            const brs = tempEl.querySelectorAll('br');
+            for (const br of brs) {
+                br.replaceWith('\n');
+            }
+

             return tempEl.textContent;
         }
 
         connectedCallback() {
             return tempEl.textContent;
         }
 
         connectedCallback() {

+            const connectedTime = Date.now();

             if (this.cm) {
                 return;
             }
 
             if (this.cm) {
                 return;
             }
 

+            this.cleanChildContent();
+            const content = this.getContent();
+            const lines = content.split('\n').length;
+            const height = (lines * 19.2) + 18 + 24;
+            this.style.height = `${height}px`;
+

             const container = this.shadowRoot.querySelector('.CodeMirrorContainer');
             const container = this.shadowRoot.querySelector('.CodeMirrorContainer');

-            importVersioned('code').then(Code => {
-                this.cm = Code.wysiwygView(container, this.getContent(), this.getLanguage());
+            const renderCodeMirror = (Code) => {
+                this.cm = Code.wysiwygView(container, content, this.getLanguage());
+                setTimeout(() => Code.updateLayout(this.cm), 10);
+                setTimeout(() => this.style.height = null, 12);
+            };
+
+            window.importVersioned('code').then((Code) => {
+                const timeout = (Date.now() - connectedTime < 20) ? 20 : 0;
+                setTimeout(() => renderCodeMirror(Code), timeout);

             });
         }
             });
         }

+
+        cleanChildContent() {
+            const pre = this.querySelector('pre');
+            if (!pre) return;
+
+            for (const preChild of pre.childNodes) {
+                if (preChild.nodeName === '#text' && preChild.textContent === '') {
+                    preChild.remove();
+                }
+            }
+        }

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


@@ -122,6 +153,14 @@ function register(editor, url) {
         }
     });
 
         }
     });
 

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

     editor.addCommand('codeeditor', () => {
         const selectedNode = editor.selection.getNode();
         const doc = selectedNode.ownerDocument;
     editor.addCommand('codeeditor', () => {
         const selectedNode = editor.selection.getNode();
         const doc = selectedNode.ownerDocument;


@@ -130,15 +169,13 @@ function register(editor, url) {
         } else {
             const textContent = editor.selection.getContent({format: 'text'});
             showPopup(editor, textContent, '', (newCode, newLang) => {
         } else {
             const textContent = editor.selection.getContent({format: 'text'});
             showPopup(editor, textContent, '', (newCode, newLang) => {

-                const wrap = doc.createElement('code-block');

                 const pre = doc.createElement('pre');
                 const code = doc.createElement('code');
                 code.classList.add(`language-${newLang}`);
                 code.innerText = newCode;
                 pre.append(code);
                 const pre = doc.createElement('pre');
                 const code = doc.createElement('code');
                 code.classList.add(`language-${newLang}`);
                 code.innerText = newCode;
                 pre.append(code);

-                wrap.append(pre);

 
 

-                editor.insertContent(wrap.outerHTML);
+                editor.insertContent(pre.outerHTML);

             });
         }
     });
             });
         }
     });


@@ -153,7 +190,7 @@ function register(editor, url) {
     editor.on('PreInit', () => {
         editor.parser.addNodeFilter('pre', function(elms) {
             for (const el of elms) {
     editor.on('PreInit', () => {
         editor.parser.addNodeFilter('pre', function(elms) {
             for (const el of elms) {

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

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


@@ -168,7 +205,7 @@ function register(editor, url) {
 
         editor.parser.addNodeFilter('code-block', function(elms) {
             for (const el of elms) {
 
         editor.parser.addNodeFilter('code-block', function(elms) {
             for (const el of elms) {

-                el.attr('content-editable', 'false');
+                el.attr('contenteditable', 'false');

             }
         });
 
             }
         });
 


@@ -179,6 +216,15 @@ function register(editor, url) {
         });
     });
 
         });
     });
 

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

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