@innovastudio/contentbox 1.4.66 → 1.4.67

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@innovastudio/contentbox",
   "type": "module",
-  "version": "1.4.66",
+  "version": "1.4.67",
   "description": "",
   "main": "public/contentbox/contentbox.esm.js",
   "files": [
@@ -46,7 +46,7 @@
     "webpack-dev-server": "^4.0.0"
   },
   "dependencies": {
-    "@innovastudio/contentbuilder": "^1.3.75",
+    "@innovastudio/contentbuilder": "^1.3.78",
     "js-beautify": "^1.14.0"
   }
 }

package/public/contentbox/contentbox.esm.js

@@ -19059,15 +19059,18 @@ class Util {
       dom.removeClass(elm, 'elm-inspected');
     }); // RTE
 
-    let rtetool = builderStuff.querySelector('.is-rte-tool');
-    if (rtetool) rtetool.style.display = 'none';
-    let elementRtetool = builderStuff.querySelector('.is-elementrte-tool');
-    if (elementRtetool) elementRtetool.style.display = 'none'; // Click ok on code view should hide these as well
+    if (this.builder.toolbarDisplay === 'auto') {
+      let rtetool = builderStuff.querySelector('.is-rte-tool');
+      if (rtetool) rtetool.style.display = 'none';
+      let elementRtetool = builderStuff.querySelector('.is-elementrte-tool');
+      if (elementRtetool) elementRtetool.style.display = 'none'; // Click ok on code view should hide these as well
+
+      let rtetoolmore = builderStuff.querySelector('.rte-more-options');
+      if (rtetoolmore) rtetoolmore.style.display = '';
+      let elementRtetoolmore = builderStuff.querySelector('.elementrte-more-options');
+      if (elementRtetoolmore) elementRtetoolmore.style.display = '';
+    } // Element
 
-    let rtetoolmore = builderStuff.querySelector('.rte-more-options');
-    if (rtetoolmore) rtetoolmore.style.display = '';
-    let elementRtetoolmore = builderStuff.querySelector('.elementrte-more-options');
-    if (elementRtetoolmore) elementRtetoolmore.style.display = ''; // Element
 
     elms = this.builder.doc.querySelectorAll('.elm-active');
     Array.prototype.forEach.call(elms, elm => {
@@ -79118,6 +79121,7 @@ class Preferences {
                             <label style="${this.builder.isTouchSupport ? 'display:none;' : 'display:block;'}margin-top:5px;margin-bottom:5px;">
                                 ${util.out('Toolbar position')}:&nbsp;
                                 <select class="select-editingtoolbar">
+                                    <option value="topfull">${util.out('Top (Full Width)')}</option>
                                     <option value="top">${util.out('Top')}</option>
                                     <option value="left">${util.out('Left')}</option>
                                     <option value="right">${util.out('Right')}</option>
@@ -79250,8 +79254,8 @@ class Preferences {
       // if (localStorage.getItem('_editingtoolbardisplay') !== null) {
       //     this.builder.opts.toolbarDisplay = localStorage.getItem('_editingtoolbardisplay');
       // }
-
-      this.builder.opts.toolbarDisplay = 'auto'; // this.setToolbarDisplay(this.builder.opts.toolbarDisplay);
+      // this.builder.opts.toolbarDisplay = 'auto';
+      // this.setToolbarDisplay(this.builder.opts.toolbarDisplay);
 
       if (localStorage.getItem('_snippetssidebardisplay') !== null) {
         this.builder.opts.snippetsSidebarDisplay = localStorage.getItem('_snippetssidebardisplay');
@@ -79489,7 +79493,14 @@ class Preferences {
     if (this.builder.themes) {
       const n = this.builder.themeIndex;
       if (this.builder.themeIndex) localStorage.setItem('_theme', n);
-    }
+    } // clear/hide rte pops
+
+
+    const builderStuff = this.builder.builderStuff;
+    let rtepops = builderStuff.querySelectorAll('.is-rte-pop');
+    Array.prototype.forEach.call(rtepops, rtepop => {
+      rtepop.style.display = '';
+    });
   }
 
   setToolbar(toolbar) {
@@ -79497,9 +79508,19 @@ class Preferences {
     const builderStuff = this.builder.builderStuff;
     const contentStuff = this.builder.contentStuff;
 
-    if (toolbar === 'top') {
+    if (toolbar === 'topfull') {
+      builderStuff.setAttribute('toolbarfull', '');
+      builderStuff.removeAttribute('toolbarleft', '');
+      builderStuff.removeAttribute('toolbarright', '');
+
+      if (this.builder.iframe) {
+        contentStuff.removeAttribute('toolbarleft', '');
+        contentStuff.removeAttribute('toolbarright', '');
+      }
+    } else if (toolbar === 'top') {
       builderStuff.removeAttribute('toolbarleft', '');
       builderStuff.removeAttribute('toolbarright', '');
+      builderStuff.removeAttribute('toolbarfull', '');
 
       if (this.builder.iframe) {
         contentStuff.removeAttribute('toolbarleft', '');
@@ -79508,6 +79529,7 @@ class Preferences {
     } else if (toolbar === 'left') {
       builderStuff.setAttribute('toolbarleft', '');
       builderStuff.removeAttribute('toolbarright', '');
+      builderStuff.removeAttribute('toolbarfull', '');
 
       if (this.builder.iframe) {
         contentStuff.setAttribute('toolbarleft', '');
@@ -79516,6 +79538,7 @@ class Preferences {
     } else if (toolbar === 'right') {
       builderStuff.setAttribute('toolbarright', '');
       builderStuff.removeAttribute('toolbarleft', '');
+      builderStuff.removeAttribute('toolbarfull', '');
 
       if (this.builder.iframe) {
         contentStuff.setAttribute('toolbarright', '');
@@ -80083,6 +80106,41 @@ class Rte {
     let inpZoomSlider;
 
     if (!rteTool) {
+      if (builder.plugins.length > 0) {
+        let allButtons = ['|', 'addsnippet', 'bold', 'italic', 'underline', 'formatting', 'color', 'removeformat', 'align', 'textsettings', 'createlink', 'tags', 'undo', 'redo', 'zoom', 'icon', 'image', 'list', 'font', 'formatpara', 'gridtool', 'html', 'preferences', 'more', 'left', 'center', 'right', 'full'];
+
+        const filterButtons = myArray => {
+          let newArray = myArray;
+          myArray.forEach(item => {
+            item = item.toLowerCase();
+            let result = allButtons.filter(btnName => {
+              return btnName === item;
+            });
+
+            if (result.length === 0) {
+              // a plugin
+              result = builder.plugins.filter(plugin => {
+                // check if plugin registered.
+                return plugin.name === item;
+              });
+
+              if (result.length === 0) {
+                // plugin not registered
+                newArray = newArray.filter(e => e !== item);
+              }
+            }
+          });
+          return newArray;
+        };
+
+        builder.opts.buttons = filterButtons(builder.opts.buttons);
+        builder.opts.buttonsMore = filterButtons(builder.opts.buttonsMore);
+        builder.opts.elementButtons = filterButtons(builder.opts.elementButtons);
+        builder.opts.elementButtonsMore = filterButtons(builder.opts.elementButtonsMore);
+        builder.opts.iconButtons = filterButtons(builder.opts.iconButtons);
+        builder.opts.iconButtonsMore = filterButtons(builder.opts.iconButtonsMore);
+      }
+
       let customtag_button = '';
       var customTagsHtml = '';
 
@@ -82673,7 +82731,48 @@ class Rte {
           dom.addClass(this.elementRteMoreOptions, 'deactive');
         }
       }
-    });
+    }); // Backward compatible
+
+    this.builderStuff.insertAdjacentHTML('afterbegin', `
+        <style>
+            #_cbhtml[toolbarfull] .is-rte-tool,
+            #_cbhtml[toolbarfull] .is-elementrte-tool {
+                top: 0;
+                left: 0;
+                width: 100vw;
+                align-items: center;
+                box-shadow: rgba(0, 0, 0, 0.07) -1px 1px 0px 0px;
+            }
+            #_cbhtml[toolbarfull] .is-rte-pop {
+                box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 0px 1px;
+            }
+        </style>
+        `);
+    /*
+    if(this.builder.toolbar === 'topfull') {
+        if(window.getComputedStyle(this.rteTool).getPropertyValue('left') !== '0px') {
+            this.builderStuff.insertAdjacentHTML('afterbegin', `
+            <style>
+                #_cbhtml[toolbarfull] .is-rte-tool,
+                #_cbhtml[toolbarfull] .is-elementrte-tool {
+                    top: 0;
+                    left: 0;
+                    width: 100vw;
+                    align-items: center;
+                    box-shadow: rgba(0, 0, 0, 0.07) -1px 1px 0px 0px;
+                }
+                #_cbhtml[toolbarfull] .is-rte-pop {
+                    box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 0px 1px;
+                }
+            </style>
+            `);
+        }
+    }
+    */
+
+    if (this.builder.toolbarDisplay !== 'auto') {
+      this.showDefaultToolbar(); // first time
+    }
   }
 
   zoomStart() {
@@ -82920,10 +83019,12 @@ class Rte {
     let top;
     let left;
     const btnRteMore = this.rteTool.querySelectorAll('button.rte-more');
+    let btnWidth = 0;
     btnRteMore.forEach(btn => {
       if (btn.getBoundingClientRect().top > 0) {
         top = btn.getBoundingClientRect().top;
         left = btn.getBoundingClientRect().left;
+        btnWidth = btn.offsetWidth;
       }
     });
     const pop = this.rteMoreOptions;
@@ -82950,6 +83051,10 @@ class Rte {
       pop.style.left = parseFloat(this.rteTool.style.left) + this.rteTool.offsetWidth - w + adj + 'px'; //(left -(w/2)+23) + 'px';
 
       pop.style.right = 'auto';
+
+      if (this.builderStuff.hasAttribute('toolbarfull')) {
+        pop.style.left = left - w + btnWidth + 'px';
+      }
     }
   } // showElementRteMore() {
   //     const btnElementRteMore = this.elementRteTool.querySelector('button.rte-more'); 
@@ -83025,6 +83130,10 @@ class Rte {
       pop.style.left = parseFloat(this.elementRteTool.style.left) + this.elementRteTool.offsetWidth - w + adj + 'px'; //(left -(w/2)+23) + 'px';
 
       pop.style.right = 'auto';
+
+      if (this.builderStuff.hasAttribute('toolbarfull')) {
+        pop.style.left = left - w + btnElementRteMore.offsetWidth + 'px';
+      }
     }
   }
 
@@ -83172,6 +83281,60 @@ class Rte {
     dom.cleanClassSize(elm, classname); // dom.cleanUnusedSpan(elm); // will remove empty spans that makes selection changes
   }
 
+  hideAlignButtons() {
+    let btns = this.elementRteTool.querySelectorAll('button[data-align]');
+    let separator1;
+    let separator2;
+    Array.prototype.forEach.call(btns, btn => {
+      btn.style.display = 'none';
+
+      if (btn.previousElementSibling) {
+        if (btn.previousElementSibling.classList.contains('rte-separator')) {
+          separator1 = btn.previousElementSibling;
+        }
+      }
+
+      if (btn.nextElementSibling) {
+        if (btn.nextElementSibling.classList.contains('rte-separator')) {
+          separator2 = btn.nextElementSibling;
+        }
+      }
+    });
+
+    if (separator1 && separator2) {
+      separator2.style.display = 'none';
+    }
+
+    btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+
+    Array.prototype.forEach.call(btns, btn => {
+      btn.style.display = 'none';
+    });
+  }
+
+  showAlignButtons() {
+    let separators = this.elementRteTool.querySelectorAll('.rte-separator');
+    Array.prototype.forEach.call(separators, separator => {
+      separator.style.display = '';
+    });
+    let btns = this.elementRteTool.querySelectorAll('button[data-align]');
+    Array.prototype.forEach.call(btns, btn => {
+      btn.style.display = '';
+    });
+    btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+
+    Array.prototype.forEach.call(btns, btn => {
+      btn.style.display = '';
+    });
+  }
+
+  showDefaultToolbar() {
+    this.elementRteTool.style.display = 'flex';
+    this.rteTool.style.display = 'none';
+    this.hideAlignButtons();
+    this.positionToolbar();
+  }
+
   click(col) {
     const dom = this.dom;
     let elm = this.builder.inspectedElement;
@@ -83213,32 +83376,32 @@ class Rte {
       if ((elm.tagName.toLowerCase() === 'img' || dom.hasClass(elm, 'is-social') || dom.hasClass(elm, 'is-rounded-button-medium') || dom.hasClass(elm, 'cell-active')) && !dom.getSelected()) {
         if (this.elementRteTool.style.display === 'none' || this.elementRteTool.style.display === '') {
           this.elementRteTool.style.display = 'flex';
-          this.rteTool.style.display = 'none';
-          let btns = this.elementRteTool.querySelectorAll('button[data-align]');
-          Array.prototype.forEach.call(btns, btn => {
-            btn.style.display = '';
-          });
-          btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+          this.rteTool.style.display = 'none'; // let btns = this.elementRteTool.querySelectorAll('button[data-align]'); 
+          // Array.prototype.forEach.call(btns, (btn) => {
+          //     btn.style.display = '';
+          // });
+          // btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+          // Array.prototype.forEach.call(btns, (btn) => {
+          //     btn.style.display = '';
+          // });
 
-          Array.prototype.forEach.call(btns, btn => {
-            btn.style.display = '';
-          });
+          this.showAlignButtons();
           this.positionToolbar();
         }
       } else if (dom.hasClass(elm, 'spacer') || elm.tagName.toLowerCase() === 'video' || dom.hasClass(elm, 'ovl') || col.getAttribute('data-html')) {
         //|| col===elm
         if (this.elementRteTool.style.display === 'none' || this.elementRteTool.style.display === '') {
           this.elementRteTool.style.display = 'flex';
-          this.rteTool.style.display = 'none';
-          let btns = this.elementRteTool.querySelectorAll('button[data-align]');
-          Array.prototype.forEach.call(btns, btn => {
-            btn.style.display = 'none';
-          });
-          btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+          this.rteTool.style.display = 'none'; // let btns = this.elementRteTool.querySelectorAll('button[data-align]'); 
+          // Array.prototype.forEach.call(btns, (btn) => {
+          //     btn.style.display = 'none';
+          // });
+          // btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+          // Array.prototype.forEach.call(btns, (btn) => {
+          //     btn.style.display = 'none';
+          // });
 
-          Array.prototype.forEach.call(btns, btn => {
-            btn.style.display = 'none';
-          });
+          this.hideAlignButtons();
           this.positionToolbar();
         }
       } else if (dom.hasClass(elm, 'icon')) {
@@ -83261,16 +83424,16 @@ class Rte {
         } else {
           if (this.elementRteTool.style.display === 'none' || this.elementRteTool.style.display === '') {
             this.elementRteTool.style.display = 'flex';
-            this.rteTool.style.display = 'none';
-            let btns = this.elementRteTool.querySelectorAll('button[data-align]');
-            Array.prototype.forEach.call(btns, btn => {
-              btn.style.display = '';
-            });
-            btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+            this.rteTool.style.display = 'none'; // let btns = this.elementRteTool.querySelectorAll('button[data-align]'); 
+            // Array.prototype.forEach.call(btns, (btn) => {
+            //     btn.style.display = '';
+            // });
+            // btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+            // Array.prototype.forEach.call(btns, (btn) => {
+            //     btn.style.display = '';
+            // });
 
-            Array.prototype.forEach.call(btns, btn => {
-              btn.style.display = '';
-            });
+            this.showAlignButtons();
             this.positionToolbar();
           }
         }
@@ -83278,16 +83441,16 @@ class Rte {
     } else {
       if (this.elementRteTool.style.display === 'none' || this.elementRteTool.style.display === '') {
         this.elementRteTool.style.display = 'flex';
-        this.rteTool.style.display = 'none';
-        let btns = this.elementRteTool.querySelectorAll('button[data-align]');
-        Array.prototype.forEach.call(btns, btn => {
-          btn.style.display = 'none';
-        });
-        btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+        this.rteTool.style.display = 'none'; // let btns = this.elementRteTool.querySelectorAll('button[data-align]'); 
+        // Array.prototype.forEach.call(btns, (btn) => {
+        //     btn.style.display = 'none';
+        // });
+        // btns = this.elementRteMoreOptions.querySelectorAll('button[data-align]'); //new
+        // Array.prototype.forEach.call(btns, (btn) => {
+        //     btn.style.display = 'none';
+        // });
 
-        Array.prototype.forEach.call(btns, btn => {
-          btn.style.display = 'none';
-        });
+        this.hideAlignButtons();
         this.positionToolbar();
       }
     }
@@ -89318,6 +89481,10 @@ class ContentBuilder {
             // Additional (to prevent lost focus)
             util.clearActiveCell();
             util.clearControls();
+
+            if (this.toolbarDisplay !== 'auto') {
+              this.rte.showDefaultToolbar();
+            }
           }
         }