Merge branch 'dev' of https://github.com/artf/grapesjs into dev

package-lock.json

@@ -8517,9 +8517,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "hpack.js": {

src/canvas/index.js

@@ -646,7 +646,7 @@ export default () => {
 
     destroy() {
       canvas.stopListening();
-      CanvasView.remove();
+      CanvasView && CanvasView.remove();
       [c, canvas, CanvasView].forEach(i => (i = {}));
       ['em', 'model', 'droppable'].forEach(i => (this[i] = {}));
     }

src/canvas/view/CanvasView.js

@@ -75,9 +75,9 @@ export default Backbone.View.extend({
   },
 
   remove() {
+    this.frames.remove();
     const frm = this.model.get('frames');
     frm.remove(frm.models);
-    this.frames.remove();
     this.frames = {};
     Backbone.View.prototype.remove.apply(this, arguments);
     this.toggleListeners();

src/commands/view/SelectComponent.js

@@ -84,11 +84,11 @@ export default {
       methods[method](body, 'mouseover', this.onHover);
       methods[method](body, 'mouseleave', this.onOut);
       methods[method](body, 'click touchend', this.onClick);
-      methods[method](win, 'scroll', this.onFrameScroll);
+      methods[method](win, 'scroll', this.onFrameScroll, true);
     };
     methods[method](window, 'resize', this.onFrameUpdated);
     methods[method](listenToEl, 'scroll', this.onContainerChange);
-    em[method]('component:toggled component:remove', this.onSelect, this);
+    em[method]('component:toggled component:update', this.onSelect, this);
     em[method]('change:componentHovered', this.onHovered, this);
     em[method](
       'component:resize component:styleUpdate component:input',
@@ -192,7 +192,7 @@ export default {
     this.elSelected = result;
     this.updateToolsGlobal();
     // This will hide some elements from the select component
-    this.updateToolsLocal(result);
+    this.updateLocalPos(result);
     this.initResize(component);
   }),
 
@@ -203,11 +203,11 @@ export default {
     this.updateToolsGlobal();
   },
 
-  updateLocalPos() {
+  updateLocalPos(data) {
     const sel = this.getElHovered();
     if (!sel.el) return;
     sel.pos = this.getElementPos(sel.el);
-    this.updateToolsLocal();
+    this.updateToolsLocal(data);
   },
 
   getElHovered() {
@@ -576,7 +576,7 @@ export default {
   },
 
   updateTools() {
-    this.updateToolsLocal();
+    this.updateLocalPos();
     this.updateGlobalPos();
   },
 

src/dom_components/config/config.js

@@ -1,28 +1,6 @@
 export default {
   stylePrefix: 'comp-',
 
-  wrapperId: 'wrapper',
-
-  wrapperName: 'Body',
-
-  // Default wrapper configuration
-  wrapper: {
-    removable: false,
-    copyable: false,
-    draggable: false,
-    components: [],
-    traits: [],
-    stylable: [
-      'background',
-      'background-color',
-      'background-image',
-      'background-repeat',
-      'background-attachment',
-      'background-position',
-      'background-size'
-    ]
-  },
-
   // Could be used for default components
   components: [],
 

src/utils/Sorter.js

@@ -1050,7 +1050,7 @@ export default Backbone.View.extend({
       }
     }
 
-    if (this.moved) {
+    if (this.moved && target) {
       const toMove = this.toMove;
       const toMoveArr = isArray(toMove) ? toMove : toMove ? [toMove] : [src];
       toMoveArr.forEach(model => {

src/utils/mixins.js

@@ -78,21 +78,21 @@ const shallowDiff = (objOrig, objNew) => {
   return result;
 };
 
-const on = (el, ev, fn) => {
+const on = (el, ev, fn, opts) => {
   ev = ev.split(/\s+/);
   el = el instanceof Array ? el : [el];
 
   for (let i = 0; i < ev.length; ++i) {
-    el.forEach(elem => elem.addEventListener(ev[i], fn));
+    el.forEach(elem => elem.addEventListener(ev[i], fn, opts));
   }
 };
 
-const off = (el, ev, fn) => {
+const off = (el, ev, fn, opts) => {
   ev = ev.split(/\s+/);
   el = el instanceof Array ? el : [el];
 
   for (let i = 0; i < ev.length; ++i) {
-    el.forEach(elem => elem.removeEventListener(ev[i], fn));
+    el.forEach(elem => elem.removeEventListener(ev[i], fn, opts));
   }
 };