@wizishop/wizi-block 4.2.26-beta → 4.2.27-beta

package/fesm2015/wizishop-wizi-block.js

@@ -18728,24 +18728,29 @@ class InlineStyleTool extends EditorJSTool {
                 : anchorNode.parentElement;
             const sameSelection = container && container.innerText === selection.toString();
             yield this.saveInlineSelection(container, true);
-            // Link delete exception
-            if (this.linkDeletion) {
-                yield this.replaceLink(selection, this.hasStyle(container));
-            }
-            else {
-                if (sameSelection &&
-                    !this.isContainer(this.textContainers, container) &&
-                    this.hasStyle(container) &&
-                    selection.toString() === this.hasStyle(container).innerText) {
-                    yield this.updateSelection(selection, this.hasStyle(container), action, this.textContainers);
+            try {
+                // Link delete exception
+                if (this.linkDeletion) {
+                    yield this.replaceLink(selection, this.hasStyle(container));
                 }
                 else {
-                    yield this.replaceSelection(container, action, selection, this.textContainers);
+                    if (sameSelection &&
+                        !this.isContainer(this.textContainers, container) &&
+                        this.hasStyle(container) &&
+                        selection.toString() === this.hasStyle(container).innerText) {
+                        yield this.updateSelection(selection, this.hasStyle(container), action, this.textContainers);
+                    }
+                    else {
+                        yield this.replaceSelection(this.getMostDescendantChild(container), action, selection, this.textContainers);
+                    }
+                }
+                yield this.cleanupContainer(selection, container, true);
+                if (this.modifiedContent) {
+                    yield this.resetInlineSelection(container, true);
                 }
             }
-            yield this.cleanupContainer(selection, container, true);
-            if (this.modifiedContent) {
-                yield this.resetInlineSelection(container, true);
+            catch (error) {
+                console.warn('Inline Tool Error : ' + error);
             }
         });
     }
@@ -18753,7 +18758,13 @@ class InlineStyleTool extends EditorJSTool {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.modifies.style) {
                 const css = this.style.property;
-                container.style[css] = yield this.getStyleValue(container, action, containers);
+                let value = yield this.getStyleValue(container, action, containers);
+                if (value !== this.style.default) {
+                    container.style[css] = value;
+                }
+                else {
+                    container.style.removeProperty(this.style.property);
+                }
             }
             else {
                 const range = this.getRangeObject(selection);
@@ -18789,7 +18800,10 @@ class InlineStyleTool extends EditorJSTool {
                 ? focusNode
                 : focusNode.parentElement;
             let offsetParentContainer = this.hasStyle(offsetContainer);
-            if (parentContainer && parentContainer === offsetParentContainer) {
+            if (parentContainer &&
+                parentContainer === offsetParentContainer &&
+                ((parentContainer.children.length > 0 && parentContainer.innerText !== parentContainer.children[0].textContent) ||
+                    parentContainer.innerText !== selection.toString())) {
                 const range = this.getRangeObject(selection);
                 const currentFragment = range.extractContents();
                 const currentElement = document.createElement('span');
@@ -18810,12 +18824,14 @@ class InlineStyleTool extends EditorJSTool {
                 }
                 let currentElementToAppend = currentElement;
                 let currentParentElement = container;
-                while (currentParentElement !== parentContainer) {
-                    let tmpElement = document.createElement(currentParentElement.tagName);
-                    tmpElement = this.setInlineStyle(currentParentElement, tmpElement);
-                    tmpElement.appendChild(currentElementToAppend);
-                    currentElementToAppend = tmpElement;
-                    currentParentElement = currentParentElement.parentElement;
+                if (parentContainer.contains(currentParentElement)) {
+                    while (currentParentElement !== parentContainer) {
+                        let tmpElement = document.createElement(currentParentElement.tagName);
+                        tmpElement = this.setInlineStyle(currentParentElement, tmpElement);
+                        tmpElement.appendChild(currentElementToAppend);
+                        currentElementToAppend = tmpElement;
+                        currentParentElement = currentParentElement.parentElement;
+                    }
                 }
                 const isLTR = this.isAnchorBeforeFocus(selection.anchorNode, selection.anchorOffset, selection.focusNode, selection.focusOffset);
                 let selectionFocusOffset = isLTR ? selection.anchorOffset : selection.focusOffset;
@@ -18866,8 +18882,6 @@ class InlineStyleTool extends EditorJSTool {
     }
     replaceLink(selection, container) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('container');
-            console.log(container);
             let newElement = document.createElement('span');
             newElement.innerHTML = container.innerHTML;
             container.parentElement.replaceChild(newElement, container);
@@ -18887,17 +18901,13 @@ class InlineStyleTool extends EditorJSTool {
         return false;
     }
     hasStyle(element, firstTimeCall = true) {
-        var _a, _b, _c;
+        var _a, _b;
         if (firstTimeCall && element.children) {
-            while (element.children &&
-                element.innerText === ((_a = element.children[0]) === null || _a === void 0 ? void 0 : _a.innerText) &&
-                element.children.length === 1) {
-                element = element.children[0];
-            }
+            element = this.getMostDescendantChild(element);
         }
         // foundElement was added because of a return issue when a class is applied
         let foundElement = null;
-        if (!element || ((_b = element.classList) === null || _b === void 0 ? void 0 : _b.contains('ce-paragraph'))) {
+        if (!element || ((_a = element.classList) === null || _a === void 0 ? void 0 : _a.contains('ce-paragraph'))) {
             return null;
         }
         if (this.modifies.style) {
@@ -18918,7 +18928,7 @@ class InlineStyleTool extends EditorJSTool {
             });
         }
         else if (this.modifies.tag) {
-            if (((_c = element.tagName) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === this.tag.toLowerCase()) {
+            if (((_b = element.tagName) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === this.tag.toLowerCase()) {
                 return element;
             }
         }
@@ -18979,7 +18989,13 @@ class InlineStyleTool extends EditorJSTool {
             let newElement = document.createElement(this.tag);
             if (this.modifies.style) {
                 const property = this.style.property;
-                newElement.style[property] = yield this.getStyleValue(container, action, containers);
+                let value = yield this.getStyleValue(container, action, containers);
+                if (value !== this.style.default) {
+                    newElement.style[property] = value;
+                }
+                else {
+                    newElement.style.removeProperty(property);
+                }
             }
             return newElement;
         });
@@ -19009,7 +19025,7 @@ class InlineStyleTool extends EditorJSTool {
         });
     }
     cleanupContainer(selection, container, firstTimeCall) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let parentContainer;
             let parentFound = false;
@@ -19034,47 +19050,66 @@ 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) {
-                    if (currentNode.childNodes.length > 0) {
-                        yield this.cleanupContainer(selection, currentNode, false);
+                    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);
                     }
-                    let identicalElements = true;
-                    while (identicalElements &&
-                        currentNode.nextSibling &&
-                        currentNode.nodeType === Node.ELEMENT_NODE &&
-                        currentNode.nextSibling.nodeType === Node.ELEMENT_NODE) {
-                        let currentElement = currentNode;
-                        let nextElement = currentNode.nextSibling;
-                        if (this.identicalInlineStyle(currentElement, nextElement) &&
-                            currentElement.tagName.toLowerCase() === nextElement.tagName.toLowerCase() &&
-                            this.identicalClassList(currentElement, nextElement) &&
-                            !currentElement.hasAttributes() &&
-                            !nextElement.hasAttributes()) {
-                            currentElement.innerHTML += nextElement.innerHTML;
-                            nextElement.remove();
-                            this.modifiedContent = true;
+                    else {
+                        if (currentNode.childNodes.length > 0) {
+                            yield this.cleanupContainer(selection, currentNode, false);
                         }
-                        else {
-                            identicalElements = false;
+                        let identicalElements = true;
+                        while (identicalElements &&
+                            currentNode.nextSibling &&
+                            currentNode.nodeType === Node.ELEMENT_NODE &&
+                            currentNode.nextSibling.nodeType === Node.ELEMENT_NODE) {
+                            let currentElement = currentNode;
+                            let nextElement = currentNode.nextSibling;
+                            if (this.identicalInlineStyle(currentElement, nextElement) &&
+                                currentElement.tagName.toLowerCase() === nextElement.tagName.toLowerCase() &&
+                                this.identicalClassList(currentElement, nextElement) &&
+                                !currentElement.hasAttributes() &&
+                                !nextElement.hasAttributes()) {
+                                currentElement.innerHTML += nextElement.innerHTML;
+                                nextElement.remove();
+                                this.modifiedContent = true;
+                            }
+                            else {
+                                identicalElements = false;
+                            }
                         }
-                    }
-                    if (currentNode.nodeType === Node.ELEMENT_NODE &&
-                        currentNode.tagName.toLowerCase() === 'span' &&
-                        Object.keys(this.getInlineStyle(currentNode)).length === 0 &&
-                        (!currentNode.classList || currentNode.classList.length === 0) &&
-                        !currentNode.hasAttributes()) {
-                        let currentNodeFirstChild = currentNode;
-                        while (currentNode.firstChild) {
-                            currentNodeFirstChild.parentElement.insertBefore(currentNode.firstChild, currentNodeFirstChild.nextSibling);
-                            currentNodeFirstChild = currentNodeFirstChild.nextSibling;
+                        if (currentNode.nodeType === Node.ELEMENT_NODE &&
+                            currentNode.tagName.toLowerCase() === 'span' &&
+                            Object.keys(this.getInlineStyle(currentNode)).length === 0 &&
+                            (!currentNode.classList || currentNode.classList.length === 0) &&
+                            this.hasNoAttributes(currentNode)) {
+                            let currentNodeFirstChild = currentNode;
+                            while (currentNode.firstChild) {
+                                currentNodeFirstChild.parentElement.insertBefore(currentNode.firstChild, currentNodeFirstChild.nextSibling);
+                                currentNodeFirstChild = currentNodeFirstChild.nextSibling;
+                            }
+                            currentNode.remove();
+                            this.modifiedContent = true;
                         }
-                        currentNode.remove();
-                        this.modifiedContent = true;
+                        currentNode.normalize();
                     }
-                    currentNode.normalize();
                 }
             }
         });
     }
+    hasNoAttributes(node) {
+        let nodeStyle = Object.keys(this.getInlineStyle(node));
+        let nodeAttributes = Object.keys(node.getAttributeNames().reduce((acc, name) => {
+            return Object.assign(Object.assign({}, acc), { [name]: node.getAttribute(name) });
+        }, {}));
+        if (nodeAttributes.length === 0 || (nodeAttributes.length === 1 && nodeStyle.length === 0)) {
+            return true;
+        }
+        return false;
+    }
     identicalClassList(currentElement, nextElement) {
         return ([...currentElement.classList].every((classList) => nextElement.classList.contains(classList)) &&
             [...nextElement.classList].every((classList) => currentElement.classList.contains(classList)));
@@ -19121,6 +19156,13 @@ class InlineStyleTool extends EditorJSTool {
                 this.foundFocusNode = false;
                 this.foundAnchorOffset = 0;
                 this.foundFocusOffset = 0;
+                if (this.getSelection().toString() === this.parentEditor.querySelector('.ce-paragraph').textContent) {
+                    this.foundAnchorOffset = 0;
+                    this.foundAnchorNode = true;
+                    this.foundFocusOffset = this.getSelection().toString().length;
+                    this.foundFocusNode = true;
+                    return;
+                }
             }
             let nextNode = container.firstChild;
             while (nextNode && (!this.foundAnchorNode || !this.foundFocusNode)) {
@@ -19159,6 +19201,15 @@ class InlineStyleTool extends EditorJSTool {
                 this.foundAnchorNode = false;
                 this.foundFocusNode = false;
                 this.tmpOffset = 0;
+                if (this.foundAnchorOffset === 0 &&
+                    this.parentEditor.querySelector('.ce-paragraph').textContent.length === this.foundFocusOffset) {
+                    this.selectedAnchorNode = this.parentEditor.querySelector('.ce-paragraph').firstElementChild;
+                    this.anchorOffset = 0;
+                    this.selectedFocusNode = this.parentEditor.querySelector('.ce-paragraph').firstElementChild;
+                    this.focusOffset = 1;
+                    this.resetUserSelection();
+                    return;
+                }
             }
             let nextNode = container.firstChild;
             while (nextNode && (!this.foundAnchorNode || !this.foundFocusNode)) {
@@ -19187,6 +19238,13 @@ class InlineStyleTool extends EditorJSTool {
             }
         });
     }
+    getMostDescendantChild(element) {
+        var _a;
+        while (element.children && element.innerText === ((_a = element.children[0]) === null || _a === void 0 ? void 0 : _a.innerText) && element.children.length === 1) {
+            element = element.children[0];
+        }
+        return element;
+    }
 }
 
 // @dynamic
@@ -20492,13 +20550,18 @@ class ParagraphStyleTool extends EditorJSTool {
                 return;
             }
             let parentModifier = this.findParentModifier(anchorNode.parentElement);
-            if (this.tag.toLowerCase() !== 'span') {
-                this.changeContainerTag(parentModifier, selection);
+            try {
+                if (this.tag.toLowerCase() !== 'span') {
+                    this.changeContainerTag(parentModifier, selection);
+                }
+                if ((this.classToApply && this.classToApply.length > 0) || (this.classes && this.classes.length > 0)) {
+                    this.changeCurrentClass(parentModifier);
+                }
+                this.collapseSelection();
             }
-            if ((this.classToApply && this.classToApply.length > 0) || (this.classes && this.classes.length > 0)) {
-                this.changeCurrentClass(parentModifier);
+            catch (error) {
+                console.warn('Paragraph Tool Error : ' + error);
             }
-            this.collapseSelection();
         });
     }
     checkOrderedListValue() {
@@ -20914,6 +20977,7 @@ class TextTypeTool extends ParagraphTextTool {
         let dropdownArrow = document.createElement('span');
         dropdownArrow.classList.add(this.CSS.arrowButtonModifier);
         this.nodes.button.appendChild(dropdownArrow);
+        console.log('rendering paragraph tool');
         return this.nodes.button;
     }
     surround(range, applyStyle = false) {
@@ -20941,6 +21005,7 @@ class TextTypeTool extends ParagraphTextTool {
             this.nodes.button.classList.remove(textType.tag.toLowerCase());
         });
         this.nodes.button.classList.add(classToApply);
+        console.log('checkState method on paragraph tool');
         return true;
     }
     renderActions() {
@@ -22197,7 +22262,6 @@ class TextEditionTool extends ParagraphStyleTool {
             language: 'html',
         });
         saveButton.addEventListener('click', () => {
-            console.log("here");
             let content = monacoEditor.getValue();
             saveCodeEditModal(content);
         }, true);