From e121e47af428a98b7032abccd34840bbcd76892e Mon Sep 17 00:00:00 2001
From: Alain Dumesny <alaind831+github@gmail.com>
Date: Sun, 15 Mar 2020 09:46:43 -0700
Subject: [PATCH] TS: added `getGridItems()`

---
 doc/CHANGES.md   |  1 +
 src/gridstack.ts | 47 ++++++++++++++++++++++-------------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 3ffd8beb2..698778586 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -37,6 +37,7 @@ Change log
 - fix [1187](https://github.com/gridstack/gridstack.js/issues/1187) IE support for `CustomEvent` polyfill - thanks [@phil-blais](https://github.com/phil-blais)
 - fix [1204](https://github.com/gridstack/gridstack.js/issues/1204) destroy drag&drop when removing node(s) instead of just disabling it.
 - include SASS source files to npm package again [1193](https://github.com/gridstack/gridstack.js/pull/1193)	- include SASS source files to npm package again [1193](https://github.com/gridstack/gridstack.js/pull/1193)
+- add `getGridItems()` to return list of HTML grid items
 
 ## 1.1.0 (2020-02-29)
 
diff --git a/src/gridstack.ts b/src/gridstack.ts
index 0c2da771a..26ebbceea 100644
--- a/src/gridstack.ts
+++ b/src/gridstack.ts
@@ -277,18 +277,17 @@ export class GridStack {
     this.opts.maxRow);
 
     if (this.opts.auto) {
-      let elements = [];
-      this.$el.children('.' + this.opts.itemClass + ':not(.' + this.opts.placeholderClass + ')')
-        .each((index, el) => {
-          let x = parseInt(el.getAttribute('data-gs-x'));
-          let y = parseInt(el.getAttribute('data-gs-y'));
-          elements.push({
-            el: el,
-            // if x,y are missing (autoPosition) add them to end of list - but keep their respective DOM order
-            i: (Number.isNaN(x) ? 1000 : x) + (Number.isNaN(y) ? 1000 : y) * this.opts.column
-          });
+      let elements: {el: HTMLElement; i: number}[] = [];
+      this.getGridItems().forEach(el => {
+        let x = parseInt(el.getAttribute('data-gs-x'));
+        let y = parseInt(el.getAttribute('data-gs-y'));
+        elements.push({
+          el,
+          // if x,y are missing (autoPosition) add them to end of list - but keep their respective DOM order
+          i: (Number.isNaN(x) ? 1000 : x) + (Number.isNaN(y) ? 1000 : y) * this.opts.column
         });
-      elements.sort(x => x.i).forEach( item => { this._prepareElement(item.el) });
+      });
+      elements.sort(e => e.i).forEach(item => { this._prepareElement(item.el) });
     }
     this.engine.saveInitial(); // initial start of items
 
@@ -494,15 +493,12 @@ export class GridStack {
     if (doNotPropagate === true) { return; }
 
     // update the items now - see if the dom order nodes should be passed instead (else default to current list)
-    let domNodes: GridStackNode[];
+    let domNodes: GridStackNode[] = undefined; // explicitly leave not defined
     if (column === 1 && this.opts.oneColumnModeDomSort) {
       domNodes = [];
-      Array.from(this.el.children)
-        .filter((el: HTMLElement) => el.matches('.' + this.opts.itemClass))
-        .forEach((el: GridItemHTMLElement) => {
-          let node = el.gridstackNode;
-          if (node) { domNodes.push(node); }
-        });
+      this.getGridItems().forEach(el => {
+        if (el.gridstackNode) { domNodes.push(el.gridstackNode); }
+      });
       if (!domNodes.length) { domNodes = undefined; }
     }
     this.engine.updateNodeWidths(oldColumn, column, domNodes);
@@ -518,6 +514,12 @@ export class GridStack {
     return this.opts.column;
   }
 
+  /** returns an array of grid HTML elements (no placeholder) - used internally to iterate through our children */
+  public getGridItems(): GridItemHTMLElement[] {
+    return Array.from(this.el.children)
+      .filter(el => el.matches('.' + this.opts.itemClass) && !el.matches('.' + this.opts.placeholderClass)) as GridItemHTMLElement[];
+  }
+
   /**
    * Destroys a grid instance.
    * @param detachGrid if false nodes and grid will not be removed from the DOM (Optional. Default true).
@@ -570,10 +572,7 @@ export class GridStack {
    * doEnable`s value by changing the disableDrag grid option (default: true).
    */
   public enableMove(doEnable: boolean, includeNewWidgets = true) {
-    Array.from(this.el.children)
-      .filter((el: HTMLElement) => el.matches('.' + this.opts.itemClass))
-      .forEach((el: HTMLElement) => this.movable(el, doEnable));
-
+    this.getGridItems().forEach(el => this.movable(el, doEnable));
     if (includeNewWidgets) {
       this.opts.disableDrag = !doEnable;
     }
@@ -586,9 +585,7 @@ export class GridStack {
    * doEnable`s value by changing the disableResize grid option (default: true).
    */
   public enableResize(doEnable: boolean, includeNewWidgets = true) {
-    Array.from(this.el.children)
-      .filter((el: HTMLElement) => el.matches('.' + this.opts.itemClass))
-      .forEach((el: HTMLElement) => this.resizable(el, doEnable));
+    this.getGridItems().forEach(el => this.resizable(el, doEnable));
     if (includeNewWidgets) {
       this.opts.disableResize = !doEnable;
     }