@wizishop/wizi-block 4.2.31-beta → 4.2.32-beta

package/fesm2015/wizishop-wizi-block.js

@@ -23,6 +23,9 @@ import { NgScrollbarModule } from 'ngx-scrollbar';
 import { __awaiter } from 'tslib';
 import EditorJS from '@editorjs/editorjs';
 import iro from '@jaames/iro';
+import { basicSetup, EditorView } from 'codemirror';
+import { EditorState } from '@codemirror/state';
+import { html } from '@codemirror/lang-html';
 import { MonacoEditorModule } from 'ngx-monaco-editor';
 import { tileLayer, latLng, marker, icon } from 'leaflet';
 import places from 'places.js';
@@ -18728,6 +18731,8 @@ class InlineStyleTool extends EditorJSTool {
                 : anchorNode.parentElement;
             const sameSelection = container && container.innerText === selection.toString();
             yield this.saveInlineSelection(container, true);
+            console.log('here');
+            console.log(this.hasStyle(container));
             try {
                 // Link delete exception
                 if (this.linkDeletion) {
@@ -18738,9 +18743,11 @@ class InlineStyleTool extends EditorJSTool {
                         !this.isContainer(this.textContainers, container) &&
                         this.hasStyle(container) &&
                         selection.toString() === this.hasStyle(container).innerText) {
+                        console.log('update');
                         yield this.updateSelection(selection, this.hasStyle(container), action, this.textContainers);
                     }
                     else {
+                        console.log('replace');
                         yield this.replaceSelection(this.getMostDescendantChild(container), action, selection, this.textContainers);
                     }
                 }
@@ -18804,6 +18811,7 @@ class InlineStyleTool extends EditorJSTool {
                 parentContainer === offsetParentContainer &&
                 ((parentContainer.children.length > 0 && parentContainer.innerText !== parentContainer.children[0].textContent) ||
                     parentContainer.innerText !== selection.toString())) {
+                console.log('if');
                 const range = this.getRangeObject(selection);
                 const currentFragment = range.extractContents();
                 const currentElement = document.createElement('span');
@@ -18826,6 +18834,8 @@ class InlineStyleTool extends EditorJSTool {
                 let currentParentElement = container;
                 if (parentContainer.contains(currentParentElement)) {
                     while (currentParentElement !== parentContainer) {
+                        console.warn('currentParentElement');
+                        console.log(currentParentElement);
                         let tmpElement = document.createElement(currentParentElement.tagName);
                         tmpElement = this.setInlineStyle(currentParentElement, tmpElement);
                         tmpElement.appendChild(currentElementToAppend);
@@ -18845,9 +18855,13 @@ class InlineStyleTool extends EditorJSTool {
                 newElement.appendChild(preFragment);
                 parentContainer.parentElement.insertBefore(currentElementToAppend, parentContainer);
                 parentContainer.parentElement.insertBefore(newElement, currentElementToAppend);
+                if (!parentContainer.textContent || parentContainer.textContent.length === 0) {
+                    parentContainer.parentElement.removeChild(parentContainer);
+                }
                 selection.selectAllChildren(currentElementToAppend);
             }
             else {
+                console.log('else');
                 const range = this.getRangeObject(selection);
                 const fragment = range.extractContents();
                 let fragmentElement = document.createElement('div');
@@ -19025,7 +19039,7 @@ class InlineStyleTool extends EditorJSTool {
         });
     }
     cleanupContainer(selection, container, firstTimeCall) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let parentContainer;
             let parentFound = false;
@@ -19050,10 +19064,6 @@ class InlineStyleTool extends EditorJSTool {
             const children = Array.from(parentContainer.childNodes);
             if ((children === null || children === void 0 ? void 0 : children.length) > 0) {
                 for (var currentNode = children[0]; currentNode; currentNode = currentNode.nextSibling) {
-                    console.log('currentNode');
-                    console.log(currentNode);
-                    console.log(currentNode.textContent);
-                    console.log((_b = currentNode.textContent) === null || _b === void 0 ? void 0 : _b.length);
                     if (!currentNode.textContent || currentNode.textContent.length === 0) {
                         parentContainer.removeChild(currentNode);
                     }
@@ -22256,21 +22266,17 @@ class TextEditionTool extends ParagraphStyleTool {
         modal.appendChild(editorContainer);
         modal.appendChild(buttonContainer);
         container.appendChild(modal);
-        document.querySelector('body').appendChild(container);
-        setTimeout(() => {
-            console.log('monacoeditor init');
-            console.log(modal);
-            var monacoEditor = editor.create(editorContainer, {
-                value: content,
-                language: 'html',
-                ariaContainerElement: modal
-            });
-            saveButton.addEventListener('click', () => {
-                let content = monacoEditor.getValue();
-                saveCodeEditModal(content);
-            }, true);
-            buttonContainer.appendChild(saveButton);
-        }, 200);
+        document.body.appendChild(container);
+        let state = EditorState.create({
+            doc: content,
+            extensions: [basicSetup, html()],
+        });
+        let view = new EditorView({
+            state: state,
+            parent: editorContainer,
+        });
+        saveButton.addEventListener('click', () => saveCodeEditModal(view.state.doc.toString()), true);
+        buttonContainer.appendChild(saveButton);
     }
     getSavedEditorContent(name) {
         return localStorage.getItem(name);