@innovastudio/contentbuilder 1.5.165 → 1.5.167

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@innovastudio/contentbuilder",
   "type": "module",
-  "version": "1.5.165",
+  "version": "1.5.167",
   "description": "",
   "main": "public/contentbuilder/contentbuilder.esm.js",
   "types": "index.d.ts",
@@ -52,7 +52,7 @@
     "sass": "^1.42.1",
     "sass-loader": "^12.1.0",
     "serve-static": "^1.14.1",
-    "sharp": "^0.30.3",
+    "sharp": "^0.34.4",
     "style-loader": "^3.3.0",
     "webpack": "^5.53.0",
     "webpack-cli": "^4.8.0",

package/public/contentbuilder/contentbuilder.esm.js

@@ -5135,6 +5135,7 @@ class Util {
   }
 
   hideModal(modal) {
+    if (!modal) return;
     this.builder.doc.activeElement.blur();
     document.activeElement.blur();
     // this.builder.doc.body.focus(); 
@@ -5543,13 +5544,24 @@ class Util {
         element.click();
       }
     }
+    let editingInsidePlugin = false;
+    let elm = this.builder.activeElement;
+    const plugin = elm.closest('[data-cb-type]');
+    const subblock = elm.closest('.is-subblock');
+    if (plugin && subblock) {
+      editingInsidePlugin = true;
+    }
     if (mode === 'elm') {
       let elm = this.builder.activeElement; // See elementtool.js line 195-196. // document.querySelector('.elm-active');
       if (!elm) return;
       this.builder.uo.saveForUndo();
       let element = elm;
       let newelement;
-      if (!element.nextElementSibling && !element.closest('[data-subblock]')) {
+      const plugin = element.closest('[data-cb-type]');
+      if (plugin) {
+        element.insertAdjacentHTML('afterend', html);
+        newelement = element.nextElementSibling;
+      } else if (!element.nextElementSibling && !element.closest('[data-subblock]')) {
         // active element is div.display > p.
         let activeCol = this.builder.activeCol;
         let current;
@@ -5603,7 +5615,7 @@ class Util {
     this.builder.opts.onRender();
 
     // Reinit after drag drop block
-    if (this.builder.win.builderRuntime) this.builder.win.builderRuntime.reinitialize();
+    if (this.builder.win.builderRuntime && !editingInsidePlugin) this.builder.win.builderRuntime.reinitialize();
     setTimeout(() => {
       this.builder.makeSortable(this.builder.doc);
     }, 400);
@@ -15098,11 +15110,18 @@ class HtmlUtil {
           elm.removeAttribute('data-item-id');
         });
       }
-      const elms = element.querySelectorAll('[data-scroll], [data-scroll-once]');
+      let elms = element.querySelectorAll('[data-scroll], [data-scroll-once]');
       elms.forEach(elm => {
         elm.removeAttribute('data-scroll');
         elm.removeAttribute('data-scroll-once');
       });
+      elms = element.querySelectorAll('.elm-active, .icon-active');
+      elms.forEach(elm => {
+        elm.classList.remove('elm-active');
+        elm.classList.remove('icon-active');
+      });
+      const oldEditables = element.querySelectorAll('[contenteditable="true"]');
+      oldEditables.forEach(el => el.removeAttribute('contenteditable'));
     });
     html = '';
     if (multiple) {
@@ -53589,8 +53608,10 @@ class Element$1 {
         subblock = true;
       }
     }
-    if (elm.closest('[data-cb-type]')) {
+    const plugin = elm.closest('[data-cb-type]');
+    if (plugin) {
       customcode = true;
+      subblock = elm.closest('.is-subblock');
     }
     if (!customcode && !noedit && !_protected || subblock) {
       //previously this is commented: && !noedit && !_protected
@@ -62738,7 +62759,15 @@ class ElementTool {
           if (elm.closest('.is-subblock')) {
             subblock = true;
           }
-
+          const plugin = elm.closest('[data-cb-type]');
+          if (plugin && subblock) {
+            elm.remove();
+            this.elementTool.style.display = 'none';
+            //Trigger Change event
+            this.builder.opts.onChange();
+            if (this.builder.onSelectChange) this.builder.onSelectChange();
+            return;
+          }
           /*
           if(dom.hasClass(elm.parentNode, 'cell-active') || elm.parentNode.hasAttribute('data-subblock')) {
               // Level 1
@@ -63097,7 +63126,7 @@ class ElementTool {
       subblock = true;
     }
     const plugin = elm.closest('[data-cb-type]');
-    if ((customcode || noedit || _protected) && !subblock) ; else if (plugin) {
+    if ((customcode || noedit || _protected) && !subblock) ; else if (plugin && !subblock) {
       activeElement = plugin;
     } else {
       const tagName = elm.tagName.toLowerCase();