@innovastudio/contentbox 1.6.86 → 1.6.88

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@innovastudio/contentbox",
   "type": "module",
-  "version": "1.6.86",
+  "version": "1.6.88",
   "description": "",
   "main": "public/contentbox/contentbox.esm.js",
   "types": "index.d.ts",
@@ -54,7 +54,7 @@
     "ws": "^8.13.0"
   },
   "dependencies": {
-    "@innovastudio/contentbuilder": "^1.5.71",
+    "@innovastudio/contentbuilder": "^1.5.74",
     "js-beautify": "^1.14.0",
     "sortablejs": "^1.15.2"
   }

package/public/contentbox/contentbox.esm.js

@@ -31693,7 +31693,7 @@ class Util$1 {
       this.builder.uo.saveForUndo();
       let element = elm;
       let newelement;
-      if (!element.nextElementSibling) {
+      if (!element.nextElementSibling && !element.closest('[data-subblock]')) {
         // active element is div.display > p.
         let activeCol = this.builder.activeCol;
         let current;
@@ -119873,11 +119873,12 @@ Add an image for each feature.`, 'Create a new content showcasing a photo galler
 
         if (!this.dom.getSelected()) {
           let inputFocused = document.activeElement.tagName.toLowerCase() === 'input';
+          let insideEditable = this.doc.activeElement && this.doc.activeElement.closest('[contenteditable]');
 
           // if(!document.querySelector('.is-modal.active')) { // Additional (to prevent lost focus)
           let openedModal = document.querySelector('.is-modal.active:not(.is-modal-content)');
           if (target.closest('#glightbox-body')) openedModal = true;
-          if (!openedModal && !inputFocused) {
+          if (!openedModal && !inputFocused && !insideEditable) {
             // Additional (to prevent lost focus)
 
             util.clearActiveCell();
@@ -119933,17 +119934,14 @@ Add an image for each feature.`, 'Create a new content showcasing a photo galler
       */
     };
 
-    // document.addEventListener('click', this.doDocumentClick);
-    document.addEventListener('mousedown', this.doDocumentClick);
-    document.addEventListener('touchstart', this.doDocumentClick, {
-      passive: false
-    });
+    document.addEventListener('click', this.doDocumentClick);
+    // document.addEventListener('mousedown', this.doDocumentClick);
+    // document.addEventListener('touchstart', this.doDocumentClick, { passive: false });
+
     if (this.iframe) {
-      // this.doc.addEventListener('click', this.doDocumentClick);
-      this.doc.addEventListener('mousedown', this.doDocumentClick);
-      this.doc.addEventListener('touchstart', this.doDocumentClick, {
-        passive: false
-      });
+      this.doc.addEventListener('click', this.doDocumentClick);
+      // this.doc.addEventListener('mousedown', this.doDocumentClick);
+      // this.doc.addEventListener('touchstart', this.doDocumentClick, { passive: false });
     }
 
     // Drag row will hide content tools
@@ -121473,18 +121471,19 @@ Add an image for each feature.`, 'Create a new content showcasing a photo galler
     if (snippetData) snippetData.remove();
     if (this.eb) this.eb.destroy();
     this.doc.body.classList.remove('data-editor');
+    document.removeEventListener('click', this.doDocumentClick, false);
+    // document.removeEventListener('mousedown', this.doDocumentClick);
+    // document.removeEventListener('touchstart', this.doDocumentClick);
 
-    // document.removeEventListener('click', this.doDocumentClick, false);
-    document.removeEventListener('mousedown', this.doDocumentClick);
-    document.removeEventListener('touchstart', this.doDocumentClick);
     document.removeEventListener('keydown', this.doDocumentKeydown, false);
     document.removeEventListener('mousedown', this.doDocumentMousedown, false);
     document.removeEventListener('click', this.doRteClick, false);
     this.doc.removeEventListener('click', this.doHideSnippetHandler, false);
     if (this.iframe) {
-      // this.doc.removeEventListener('click', this.doDocumentClick, false);
-      this.doc.removeEventListener('mousedown', this.doDocumentClick);
-      this.doc.removeEventListener('touchstart', this.doDocumentClick);
+      this.doc.removeEventListener('click', this.doDocumentClick, false);
+      // this.doc.removeEventListener('mousedown', this.doDocumentClick);
+      // this.doc.removeEventListener('touchstart', this.doDocumentClick);
+
       this.doc.removeEventListener('keydown', this.doDocumentKeydown, false);
       this.doc.removeEventListener('mousedown', this.doDocumentMousedown, false);
       this.doc.removeEventListener('click', this.doRteClick, false);
@@ -159815,7 +159814,9 @@ Add an image for each feature.`, 'Create a new block showcasing a photo gallery
       if (!target.closest('#_cbhtml') && !target.closest('.is-box-tool') && !target.closest('.is-box-info') && !target.closest('.is-section-tool') && !target.closest('.is-side') && !target.closest('.keep-selection') && !target.closest('.is-modal') && !target.closest('.is-sidebar')) {
         if (target.closest('.is-wrapper') && !target.classList.contains('is-wrapper')) {
           // Inside Wrapper
-          if (target.closest('.is-container') || target.closest('.is-block')) {
+          let insideEditable = this.doc.activeElement && this.doc.activeElement.closest('[contenteditable]');
+
+          if (target.closest('.is-container') || insideEditable || target.closest('.is-block')) {
             // freeform
             // Inside Container
             const box = target.closest('.is-box');
@@ -160010,13 +160011,10 @@ Add an image for each feature.`, 'Create a new block showcasing a photo gallery
       if (!(a || b)) {
         this.sidebar.closeSidebar();
       }
-    }; // this.doc.addEventListener('click', this.doDocumentClick);
-
+    };
 
-    this.doc.addEventListener('mousedown', this.doDocumentClick);
-    this.doc.addEventListener('touchstart', this.doDocumentClick, {
-      passive: false
-    });
+    this.doc.addEventListener('click', this.doDocumentClick); // this.doc.addEventListener('mousedown', this.doDocumentClick);
+    // this.doc.addEventListener('touchstart', this.doDocumentClick, { passive: false });
 
     if (this.iframe) {
       this.doIframeDocumentClick = e => {
@@ -162095,10 +162093,10 @@ Add an image for each feature.`, 'Create a new block showcasing a photo gallery
     if (this.editor) this.editor.destroy();
     const panel = document.querySelector('#_newbox');
     if (panel) panel.parentNode.removeChild(panel);
-    document.body.classList.remove('controlpanel'); // if(this.doc) this.doc.removeEventListener('click', this.doDocumentClick, false);
+    document.body.classList.remove('controlpanel');
+    if (this.doc) this.doc.removeEventListener('click', this.doDocumentClick, false); // if(this.doc) this.doc.removeEventListener('mousedown', this.doDocumentClick);
+    // if(this.doc) this.doc.removeEventListener('touchstart', this.doDocumentClick);
 
-    if (this.doc) this.doc.removeEventListener('mousedown', this.doDocumentClick);
-    if (this.doc) this.doc.removeEventListener('touchstart', this.doDocumentClick);
     if (this.iframe) document.removeEventListener('click', this.doIframeDocumentClick, false);
     if (this.doc) this.doc.removeEventListener('click', this.doDocumentKeydown, false);
     if (this.iframe) document.removeEventListener('click', this.doDocumentKeydown, false);