@innovastudio/contentbox 1.3.2-rc11 → 1.3.2-rc12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innovastudio/contentbox",
-  "version": "1.3.2-rc11",
+  "version": "1.3.2-rc12",
   "type": "module",
   "description": "",
   "main": "public/contentbox/contentbox.esm.js",
@@ -46,7 +46,7 @@
     "webpack-dev-server": "^4.0.0"
   },
   "dependencies": {
-    "@innovastudio/contentbuilder": "^1.2.4-rc12",
+    "@innovastudio/contentbuilder": "^1.2.4-rc13",
     "js-beautify": "^1.14.0"
   }
 }

package/public/contentbox/contentbox.esm.js

@@ -26351,11 +26351,11 @@ class UndoRedo {
   }
 
   readHtml() {
-    const htmlutil = new HtmlUtil(this.builder);
-
+    // const htmlutil = new HtmlUtil(this.builder); 
     if (this.builder.opts.page !== '' && !this.builder.opts.undoContainerOnly) {
-      let wrapper = document.querySelector(this.builder.opts.page);
-      return htmlutil.readHtml(wrapper, false);
+      let wrapper = document.querySelector(this.builder.opts.page); // return htmlutil.readHtml(wrapper, false);
+
+      return wrapper.innerHTML;
     } else {
       const builders = document.querySelectorAll(this.builder.opts.container);
       let html = '';
@@ -26365,7 +26365,8 @@ class UndoRedo {
         // } else {
         //     html+= '####|####' + htmlutil.readHtml(builder, false);
         // }
-        html += htmlutil.readHtml(builder, false) + '####|####'; //new
+        // html += htmlutil.readHtml(builder, false) + '####|####'; //new
+        html += builder.innerHTML + '####|####'; //new
       });
       html = html.substr(0, html.length - 9); //new
 
@@ -26373,6 +26374,23 @@ class UndoRedo {
     }
   }
 
+  cleaning(tmp) {
+    // See html.js readHtml's cleaning
+    let builders = tmp.querySelectorAll('.is-builder');
+    Array.prototype.forEach.call(builders, builder => {
+      builder.removeAttribute('data-sort');
+    });
+    let elms = tmp.querySelectorAll('[data-click]');
+    dom$I.removeAttributes(elms, 'data-click');
+    dom$I.removeElements(tmp.querySelectorAll('.is-row-tool'));
+    dom$I.removeElements(tmp.querySelectorAll('.is-rowadd-tool'));
+    dom$I.removeElements(tmp.querySelectorAll('.ovl'));
+    dom$I.removeElements(tmp.querySelectorAll('.row-add-initial')); //ContentBox
+
+    elms = tmp.querySelectorAll('.is-section-tool');
+    dom$I.removeElements(elms);
+  }
+
   writeHtml(html) {
     if (this.builder.opts.page !== '' && !this.builder.opts.undoContainerOnly) {
       let wrapper = document.querySelector(this.builder.opts.page); // wrapper.innerHTML = html;
@@ -26381,7 +26399,9 @@ class UndoRedo {
 
       var range = document.createRange();
       wrapper.innerHTML = '';
-      wrapper.appendChild(range.createContextualFragment(html));
+      wrapper.appendChild(range.createContextualFragment(html)); // applyBehavior (in ContentBox, unUndo will call pageSetup/applyBehavior)
+
+      this.cleaning(wrapper);
     } else {
       const builders = document.querySelectorAll(this.builder.opts.container);
       let n = 0;
@@ -26391,10 +26411,15 @@ class UndoRedo {
         // https://ghinda.net/article/script-tags/
         var range = document.createRange();
         builder.innerHTML = '';
-        builder.appendChild(range.createContextualFragment(html.split('####|####')[n]));
+        builder.appendChild(range.createContextualFragment(html.split('####|####')[n])); // applyBehavior
+
+        this.cleaning(builder);
+        this.builder.applyBehaviorOn(builder);
         n++;
       });
     }
+
+    this.builder.opts.onRender();
   }
 
   saveForUndo(checkLater) {