Merge pull request #1702 from adumesny/master

collision: more 2 grids with maxRow

Author: adumesny

src/gridstack-dd.ts

@@ -130,7 +130,7 @@ GridStack.prototype._setupAcceptWidget = function(): GridStack {
         }
         // finally check to make sure we actually have space left #1571
         if (canAccept && node && this.opts.maxRow) {
-          let n = {w: node.w, h: node.h, minW: node.minW, minH: node.minH}; // only width/height matters
+          let n = {w: node.w, h: node.h, minW: node.minW, minH: node.minH}; // only width/height matters and autoPosition
           canAccept = this.engine.willItFit(n);
         }
         return canAccept;

src/gridstack-engine.ts

@@ -560,7 +560,9 @@ export class GridStackEngine {
       float: this.float,
       nodes: this.nodes.map(n => {return {...n}})
     });
-    let n = Utils.copyPos({}, node, true); // clone node so we don't mod any settings on it! #1687
+    let n = {...node}; // clone node so we don't mod any settings on it but have full autoPosition and min/max as well! #1687
+    this.cleanupNode(n);
+    delete n.el; delete n._id; delete n.content; delete n.grid;
     clone.addNode(n);
     return clone.getRow() <= this.maxRow;
   }