Adjusted code manager changes for dark mode

[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..82ab7d3c8eebad8327a842ef208c575e6451ded0 100644 (file)
--- a/resources/js/wysiwyg/plugin-codeeditor.js
+++ b/resources/js/wysiwyg/plugin-codeeditor.js
@@ -91,15 +91,42 @@ function defineCodeBlockCustomElement(editor) {
         }
 
         connectedCallback() {
         }
 
         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());
+                Code.updateLayout(this.cm);
+                setTimeout(() => {
+                    this.style.height = null;
+                }, 1);
+            };
+
+            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);


@@ -130,15 +157,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);

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


@@ -168,7 +193,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');

             }
         });
 
             }
         });