@innovastudio/contentbox 1.3.18 → 1.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innovastudio/contentbox",
-  "version": "1.3.18",
+  "version": "1.3.21",
   "type": "module",
   "description": "",
   "main": "public/contentbox/contentbox.esm.js",
@@ -46,7 +46,7 @@
     "webpack-dev-server": "^4.0.0"
   },
   "dependencies": {
-    "@innovastudio/contentbuilder": "^1.2.15",
+    "@innovastudio/contentbuilder": "^1.2.18",
     "js-beautify": "^1.14.0"
   }
 }

package/public/contentbox/contentbox.esm.js

@@ -10114,8 +10114,9 @@ class EditBox {
     });
     const btnModuleOk = modalEditModule.querySelector('.input-ok');
     btnModuleOk.addEventListener('click', () => {
-      let activeBox = this.builder.activeBox;
-      let activeModule = activeBox.querySelector('.is-overlay-content[data-module]');
+      // let activeBox = this.builder.activeBox;
+      // let activeModule = activeBox.querySelector('.is-overlay-content[data-module]');
+      let activeModule = document.querySelector('[data-module-active="1"]');
       this.builder.editor.saveForUndo();
       let modalIframe = modalEditModule.querySelector('iframe');
       if (modalIframe.contentWindow.construct) modalIframe.contentWindow.construct();
@@ -10667,9 +10668,10 @@ class EditBox {
 
   refreshModule() {
     const modalEditModule = document.querySelector('.is-modal.editmodule');
-    const builderStuff = this.builderStuff;
-    let activeBox = this.builder.activeBox;
-    let activeModule = activeBox.querySelector('.is-overlay-content[data-module]');
+    const builderStuff = this.builderStuff; // let activeBox = this.builder.activeBox;
+    // let activeModule = activeBox.querySelector('.is-overlay-content[data-module]'); 
+
+    let activeModule = document.querySelector('[data-module-active="1"]');
     let modalIframe = modalEditModule.querySelector('iframe');
     if (modalIframe.contentWindow.construct) modalIframe.contentWindow.construct();
     const hidModuleCode = builderStuff.querySelector('#hidModuleCode');
@@ -15429,7 +15431,7 @@ class Util {
     let html = '';
     html = `<div class="is-modal is-confirm" tabindex="-1" role="dialog" aria-modal="true" aria-hidden="true">
             <div class="is-modal-content" style="padding-bottom:20px;">
-                <p>${message}</p>
+                <div style="margin: 20px 0 30px;font-size: 14px;">${message}</div>
                 <button title="${this.out('Delete')}" class="input-ok classic focus-warning">${this.out('Delete')}</button>
             </div>
         </div>`;
@@ -15437,7 +15439,7 @@ class Util {
     if (yesno) {
       html = `<div class="is-modal is-confirm" tabindex="-1" role="dialog" aria-modal="true" aria-hidden="true">
                 <div class="is-modal-content" style="padding-bottom:20px;">
-                    <p>${message}</p>
+                    <div style="margin: 20px 0 30px;font-size: 14px;">${message}</div>
                     <button title="${this.out('Cancel')}" class="input-cancel classic-secondary">${this.out('Cancel')}</button>
                     <button title="${yestext}" class="input-ok classic-primary">${yestext}</button>
                 </div>
@@ -15517,8 +15519,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);
@@ -15527,37 +15540,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) {
@@ -18165,6 +18181,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);
   }
@@ -32896,12 +32923,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',
@@ -32910,6 +32937,18 @@ 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);
@@ -64209,7 +64248,7 @@ class Modal {
   confirm(message, callback, animated) {
     let html = `<div class="is-modal is-confirm" tabindex="-1" role="dialog" aria-modal="true" aria-hidden="true">
             <div class="is-modal-content" style="padding-bottom:20px;">
-                <p>${message}</p>
+                <div style="margin: 20px 0 30px;font-size: 14px;">${message}</div>
                 <button title="${this.out('Delete')}" class="input-ok classic">${this.out('Delete')}</button>
             </div>
         </div>`;
@@ -80921,8 +80960,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
 
@@ -81460,12 +81514,40 @@ 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
+          let scale;
+
+          if (this.opts.page !== '') {
+            const wrapper = this.doc.querySelector(this.opts.page);
+            scale = dom$L.getScale(wrapper);
+          } else {
+            const area = this.doc.querySelector('.is-builder'); // get one of the builder area
+
+            scale = dom$L.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 
 
@@ -83787,6 +83869,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 pace = {exports: {}};