Merge pull request gridstack#2721 from adumesny/master

adumesny · web-flow · commit 76a319e11523 · 2024-06-26T23:48:55.000+01:00
more load() now creates in order fixes
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -113,7 +113,7 @@ Change log
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 ## 10.2.1-dev (TBD)
-* fix: [#2717](https://github.com/gridstack/gridstack.js/pull/2717) load() now creates in order
+* fix: [#2720](https://github.com/gridstack/gridstack.js/pull/2720) load() now creates in order
 
 ## 10.2.1 (2024-06-23)
 * fix: [#2683](https://github.com/gridstack/gridstack.js/issues/2683) check for fixed grid maxRow during resize
diff --git a/src/gridstack.ts b/src/gridstack.ts
@@ -413,7 +413,9 @@ export class GridStack {
 
     if (opts.auto) {
       this.batchUpdate(); // prevent in between re-layout #1535 TODO: this only set float=true, need to prevent collision check...
+      this.engine._loading = true; // loading collision check
       this.getGridItems().forEach(el => this._prepareElement(el));
+      delete this.engine._loading;
       this.batchUpdate(false);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,9 @@ export class GridStack {`
`413`	`413`
`414`	`414`	`if (opts.auto) {`
`415`	`415`	`this.batchUpdate(); // prevent in between re-layout #1535 TODO: this only set float=true, need to prevent collision check...`
	`416`	`+ this.engine._loading = true; // loading collision check`
`416`	`417`	`this.getGridItems().forEach(el => this._prepareElement(el));`
	`418`	`+ delete this.engine._loading;`
`417`	`419`	`this.batchUpdate(false);`
`418`	`420`	`}`
`419`	`421`