@innovastudio/contentbuilder 1.2.15 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innovastudio/contentbuilder",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "type": "module",
   "description": "",
   "main": "public/contentbuilder/contentbuilder.esm.js",

package/public/contentbuilder/contentbuilder.css

@@ -121,29 +121,40 @@ button:focus {
     display: flex;
   }
 }
+/*
 .sortable-drag {
-  background: transparent;
-  outline: none !important;
-}
-.sortable-drag * {
-  opacity: 0;
-}
-.sortable-drag .is-row-tool {
-  opacity: 0;
+    background: transparent; // background:rgba(0,0,0,0.04);
+    outline:none !important;
+    * {
+        opacity:0;
+    }
+    .is-row-tool {
+        opacity:0;
+    }
 }
 
 .sortable-ghost {
-  background: rgba(204, 204, 204, 0.15);
-  width: 100%;
-  outline: none !important;
-}
-.sortable-ghost * {
-  outline: none !important;
-}
-.sortable-ghost .is-row-tool {
-  display: none !important;
+    background: $ui-sortable-ghost-color;
+    width: 100%;
+    outline: none !important;
+    * {
+        outline: none !important;
+    }
+    .is-row-tool {
+        display:none !important;
+    }
 }
 
+.sortable-drag::before {
+    content: ' ';
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0; left:0;
+    background: rgba(0, 0, 0 , 0.03);
+    transform-origin: top left;
+}
+*/
 #_cbhtml .snippet-item {
   cursor: move !important;
 }

package/public/contentbuilder/contentbuilder.esm.js

@@ -4196,8 +4196,19 @@ class Util {
     dom.addClass(pop, 'deactive');
   }
 
+  clearAllEventListener(pop) {
+    for (let i = 0; i < 10; i++) {
+      pop.removeEventListener('keydown', this.handlePopKeyDown);
+      document.removeEventListener('click', this.handlePopClickOut);
+    }
+  }
+
   showPop(pop, cancelCallback, btn) {
     const dom = this.dom;
+    if (pop.style.display === 'flex') return; // important
+
+    this.clearAllEventListener(pop); // for safety of uncleared events as a result of closing without hidePop()
+
     pop.style.display = 'flex';
     dom.addClass(pop, 'active');
     pop.setAttribute('aria-hidden', false);
@@ -4206,37 +4217,40 @@ class Util {
       preventScroll: true
     });
 
-    const handleClickOut = e => {
+    this.handlePopClickOut = e => {
       if (!pop.contains(e.target) && !btn.contains(e.target)) {
         // click outside
         // hide
-        this.hidePop(pop);
-        pop.removeEventListener('keydown', handleKeyDown);
-        document.removeEventListener('click', handleClickOut);
+        this.hidePop(pop); // pop.removeEventListener('keydown', this.handlePopKeyDown);
+        // document.removeEventListener('click', this.handlePopClickOut);
+
         if (cancelCallback) cancelCallback();
       }
     };
 
-    const handleKeyDown = e => {
+    this.handlePopKeyDown = e => {
       if (e.keyCode === 27) {
         // escape key
         // hide
-        this.hidePop(pop);
-        pop.removeEventListener('keydown', handleKeyDown);
-        document.removeEventListener('click', handleClickOut);
+        this.hidePop(pop); // pop.removeEventListener('keydown', this.handlePopKeyDown);
+        // document.removeEventListener('click', this.handlePopClickOut);
+
         if (cancelCallback) cancelCallback();
       }
     };
 
-    pop.addEventListener('keydown', handleKeyDown);
-    document.addEventListener('click', handleClickOut);
+    pop.addEventListener('keydown', this.handlePopKeyDown);
+    document.addEventListener('click', this.handlePopClickOut);
   }
 
   hidePop(pop) {
     const dom = this.dom;
     pop.style.display = '';
     dom.removeClass(pop, 'active');
-    pop.setAttribute('aria-hidden', true);
+    pop.setAttribute('aria-hidden', true); // pop.removeEventListener('keydown', this.handlePopKeyDown);
+    // document.removeEventListener('click', this.handlePopClickOut);
+
+    this.clearAllEventListener(pop);
   }
 
   setupTabKeys(div) {
@@ -6844,6 +6858,17 @@ class Util {
 
 }
 class Dom {
+  getScale(container) {
+    let matrix = window.getComputedStyle(container).transform;
+    let values = matrix.split('(')[1];
+    values = values.split(')')[0];
+    values = values.split(',');
+    let a = values[0];
+    let b = values[1];
+    let scale = Math.sqrt(a * a + b * b);
+    return scale;
+  }
+
   createElement(tag) {
     return document.createElement(tag);
   }
@@ -21575,12 +21600,12 @@ const renderSnippetPanel = builder => {
   let chromeAgent = userAgentString.indexOf('Chrome') > -1; 
   if ((chromeAgent) && (safariAgent)) safariAgent = false;
   */
+  // let safariAgent = false;
 
 
-  let safariAgent = false;
   let activeBuilderArea;
   new Sortable(snippetlist, {
-    forceFallback: safariAgent,
+    // forceFallback: safariAgent,
     group: {
       name: 'shared',
       pull: 'clone',
@@ -21589,6 +21614,19 @@ const renderSnippetPanel = builder => {
     },
     sort: false,
     animation: 150,
+    onChoose: () => {
+      // Make moving draggable item scaled & positioned correctly (due to zoom value)
+      const newCss = `
+            <style id="css-scale">
+                .sortable-drag::before {
+                    transform: scale(1);
+                }
+            </style>
+            `;
+      const oldCss = builder.contentStuff.querySelector('#css-scale');
+      if (oldCss) oldCss.parentNode.removeChild(oldCss);
+      builder.contentStuff.insertAdjacentHTML('afterbegin', newCss);
+    },
     onMove: () => {
       let emptyinfo = document.querySelector('.row-add-initial'); // if there is empty info, remove it during snippet drag drop
       // if(emptyinfo) emptyinfo.parentNode.removeChild(emptyinfo);
@@ -69600,8 +69638,23 @@ class ContentBuilder {
           ['column sixth', 'column two-sixth'], ['column fifth', 'column two-fifth'], ['column fourth', 'column two-fourth'], ['column third', 'column two-third'], ['column half', 'column half'], ['column two-third', 'column third'], ['column two-fourth', 'column fourth'], ['column two-fifth', 'column fifth'], ['column two-sixth', 'column sixth']]];
         }
       }
+    } // Experimental for iframe
+
+
+    let doc;
+    if (this.iframeDocument) doc = this.iframeDocument;else doc = document;
+    this.doc = doc; // Content stuff
+
+    let contentStuff = doc.querySelector('.content-stuff');
+
+    if (!contentStuff) {
+      contentStuff = document.createElement('div');
+      contentStuff.className = 'content-stuff is-ui';
+      doc.body.appendChild(contentStuff);
     }
 
+    this.contentStuff = contentStuff;
+    this.addStuff();
     this.sortableObjects = [];
     const util = new Util(this); // General utilities
 
@@ -70139,12 +70192,32 @@ class ContentBuilder {
         scroll: true,
         // invertSwap: true, /* https://github.com/SortableJS/Sortable/wiki/Swap-Thresholds-and-Direction#swap-threshold */
         group: 'shared',
-        direction: 'dummy',
+        // direction: 'dummy',
         animation: 300,
         handle: '.row-handle',
         // swapThreshold: 0.1, // this cause drag drop snippet sometimes difficult
         // invertedSwapThreshold: 0.1,
         sort: true,
+        //new
+        swapThreshold: 0.5,
+        // & comment the direction setting above
+        onChoose: () => {
+          // Get zoom (scale) value
+          const area = this.doc.querySelector('.is-builder'); // get one of the builder area
+
+          const scale = dom.getScale(area); // Make moving draggable item scaled & positioned correctly (due to zoom value)
+
+          const newCss = `
+                    <style id="css-scale">
+                        .sortable-drag::before {
+                            transform: scale(${scale});
+                        }
+                    </style>
+                    `;
+          const oldCss = this.contentStuff.querySelector('#css-scale');
+          if (oldCss) oldCss.parentNode.removeChild(oldCss);
+          this.contentStuff.insertAdjacentHTML('afterbegin', newCss);
+        },
         onStart: () => {
           this.uo.saveForUndo(); // Even if cancelled, saveForUndo will make sure not to save if there is no change 
 
@@ -72466,6 +72539,45 @@ class ContentBuilder {
     // return currentScript.replace(currentScriptFile, '');
   }
 
+  addStuff() {
+    const css = `
+        <style>
+        /* sortable */
+        .sortable-drag {
+            background: transparent;
+            outline:none !important;
+        }
+        .sortable-drag * {
+                opacity:0;
+        }
+        
+        .sortable-ghost {
+            background: rgba(0, 0, 0 , 0.03);
+            width: 100%;
+            outline: none !important;
+        }
+        .sortable-ghost * {
+                outline: none !important;
+
+        }
+        .sortable-ghost .is-row-tool {
+            display:none !important;
+        }
+        
+        .sortable-drag::before {
+            content: ' ';
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0; left:0;
+            background: rgba(0, 0, 0 , 0.03);
+            transform-origin: top left;
+        }
+        </style>
+        `;
+    this.contentStuff.insertAdjacentHTML('afterbegin', css);
+  }
+
 }
 //     var run = (opts = {}) => {
 //         return new ContentBuilder(opts);