feat: bump gridstack to 7.2.2 (#109)

* feat: bump gridstack to 7.2.2
* refactor: cleanup removeWidget method
* docs: update changelog

---------

Co-authored-by: Artyom Melichow <[email protected]>
Co-authored-by: Kevin Hinterlong <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,6 +1,42 @@
 # Changelog
 
-## 3.0.0
+## [3.2.0](https://github.com/yahoo/ember-gridstack/compare/v3.1.1...v3.2.0) (2023-02-06)
+
+### Features
+
+- update to gridstack v7
+
+## [3.1.1](https://github.com/yahoo/ember-gridstack/compare/v3.1.0...v3.1.1) (2022-05-25)
+
+### Bug Fixes
+
+- don't trigger events due to teardown ([#98](https://github.com/yahoo/ember-gridstack/issues/98)) ([7743acf](https://github.com/yahoo/ember-gridstack/commit/7743acf900e433f2f74507e527aa41b46b8692c7))
+
+# [3.1.0](https://github.com/yahoo/ember-gridstack/compare/v3.0.2...v3.1.0) (2021-12-22)
+
+### Bug Fixes
+
+- **grid-stack:** allow custom class attribute ([f00309e](https://github.com/yahoo/ember-gridstack/commit/f00309ef9e016fe0e90e024b78c48b2dc1dd6e79))
+
+### Features
+
+- update ember-modifier render-modifiers deps ([7a1c6b4](https://github.com/yahoo/ember-gridstack/commit/7a1c6b40120b8c99af1aa1769b985232b83af3e6))
+
+## [3.0.2](https://github.com/yahoo/ember-gridstack/compare/v3.0.1...v3.0.2) (2021-10-21)
+
+### Bug Fixes
+
+- embroider-safe and embroider-optimized builds ([#88](https://github.com/yahoo/ember-gridstack/issues/88)) ([26e77a8](https://github.com/yahoo/ember-gridstack/commit/26e77a867a146eeaf949b4c89697593d3872865c))
+
+## [3.0.1](https://github.com/yahoo/ember-gridstack/compare/v3.0.0...v3.0.1) (2021-10-19)
+
+### Bug Fixes
+
+- bump path-parse from 1.0.6 to 1.0.7 ([#83](https://github.com/yahoo/ember-gridstack/issues/83)) ([47503ed](https://github.com/yahoo/ember-gridstack/commit/47503edc97fc8ab280a619fc6370cfa0ee1d0956))
+- bump tmpl from 1.0.4 to 1.0.5 ([#84](https://github.com/yahoo/ember-gridstack/issues/84)) ([382c7f9](https://github.com/yahoo/ember-gridstack/commit/382c7f91ec5a49abee9be52bb230b271bdf17e7d))
+- bump ws from 7.4.5 to 7.4.6 ([#80](https://github.com/yahoo/ember-gridstack/issues/80)) ([4b36d95](https://github.com/yahoo/ember-gridstack/commit/4b36d95637f84c282af730d651588a1f41c1ba55))
+
+## [3.0.0](https://github.com/yahoo/ember-gridstack/compare/v2.1.0...v3.0.0) (2021-10-19)
 
 ✨ Huge shoutout to [@adumesny](https://github.com/adumesny) for his work on gridstack ✨
 

addon/components/grid-stack.js

@@ -26,8 +26,7 @@ import { inject as service } from '@ember/service';
 import { scheduleOnce } from '@ember/runloop';
 import { capitalize } from '@ember/string';
 import { guidFor } from '@ember/object/internals';
-import { GridStackDDI } from 'gridstack';
-import GridStack from 'gridstack-h5';
+import { GridStack } from 'gridstack';
 
 export const GRID_STACK_EVENTS = [
   'added',
@@ -130,39 +129,9 @@ export default class GridStackComponent extends Component {
     this.gridStack?.makeWidget(element);
   }
 
-  /**
-   * Custom removeWidget function that skips check to see if widget is in current grid
-   * @see https://github.com/gridstack/gridstack.js/blob/v4.2.5/src/gridstack.ts#L893
-   */
   @action
   removeWidget(element, removeDOM = false, triggerEvent = true) {
-    GridStack.getElements(element).forEach((el) => {
-      // The following line was causing issues because this hook is called correctly from
-      // child widgets, but after they are already removed from the dom
-      // --- SKIP ---
-      // if (el.parentElement !== this.el) return; // not our child!
-      // --- SKIP ---
-      let node = el.gridstackNode;
-      // For Meteor support: https://github.com/gridstack/gridstack.js/pull/272
-      if (!node) {
-        node = this.gridStack?.engine.nodes.find((n) => el === n.el);
-      }
-      if (!node) return;
-
-      // remove our DOM data (circular link) and drag&drop permanently
-      delete el.gridstackNode;
-      GridStackDDI.get().remove(el);
-
-      this.gridStack?.engine.removeNode(node, removeDOM, triggerEvent);
-
-      if (removeDOM && el.parentElement) {
-        el.remove(); // in batch mode engine.removeNode doesn't call back to remove DOM
-      }
-    });
-    if (triggerEvent && !this.isDestroying && !this.isDestroyed) {
-      this.gridStack?._triggerRemoveEvent();
-      this.gridStack?._triggerChangeEvent();
-    }
-    return this;
+    triggerEvent = triggerEvent && !this.isDestroying && !this.isDestroyed;
+    this.gridStack?.removeWidget(element, removeDOM, triggerEvent);
   }
 }

index.js

@@ -8,10 +8,6 @@ module.exports = {
   included(app) {
     this._super.included.apply(this, arguments);
 
-    app.import(`${GRIDSTACK_DIR}/gridstack-h5.js`, {
-      using: [{ transformation: 'amd', as: 'gridstack-h5' }],
-    });
-
     app.import(`${GRIDSTACK_DIR}/gridstack.css`);
     app.import(`${GRIDSTACK_DIR}/gridstack-extra.css`);
   },

package.json

@@ -38,7 +38,7 @@
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-modifier": "^3.0.0",
-    "gridstack": "^4.2.7"
+    "gridstack": "^7.2.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",

yarn.lock

@@ -7762,10 +7762,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3
   resolved "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
-gridstack@^4.2.7:
-  version "4.3.1"
-  resolved "https://registry.npmjs.org/gridstack/-/gridstack-4.3.1.tgz#dd9709fc5ba0a1e4ff64d8ed3319a95d88f2e21b"
-  integrity sha512-E4smuSe7ZZBrqPWm4THxDSYCQG4xcoQg8k0eeHjqkKiKuh3W4JFbyhA86DVarWruuZuUl2pwgO3oDhL6DFKFYw==
+gridstack@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-7.2.2.tgz#1a5be730923722c88685641809f36c9681d329bd"
+  integrity sha512-9swEjbisKhtZlbmNiTCxOarp/9NWit5mLg6Z73sUhd4LKur5ZptMH16CUJu7HjMHxgI86FbQI5ZfMM/2TuMqdw==
 
 growly@^1.3.0:
   version "1.3.0"