Merge pull request gridstack#1967 from adumesny/master

adumesny · web-flow · commit f0737564aad4 · 2022-05-21T07:58:09.000-07:00
restore animation when dragging items
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -71,6 +71,7 @@ Change log
 ## 5.0.0-dev (TBD)
 * add `GridStack.registerEngine()` to let user use their own custom layout engine subclass. Thank you [Thomas] for sponsoring it.
 * grid option `minWidth` is now `oneColumnSize` to make it clearer, but old field will still work (JS only) for a while
+* fix [#1966](https://github.com/gridstack/gridstack.js/issues/1966) restore animation when dragging items
 * updated jqueryui to latest v1.13.1
 
 ## 5.0.0 (2022-01-10)
diff --git a/src/h5/dd-draggable.ts b/src/h5/dd-draggable.ts
@@ -53,7 +53,7 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
   protected helperContainment: HTMLElement;
   /** @internal #1541 can't have {passive: true} on Safari as otherwise it reverts animate back to old location on drop */
   protected static dragEventListenerOption = true; // DDUtils.isEventSupportPassiveOption ? { capture: true, passive: true } : true;
-  /** @internal */
+  /** @internal properties we change during dragging, and restore back */
   protected static originStyleProp = ['transition', 'pointerEvents', 'position',
     'left', 'top', 'opacity', 'zIndex', 'width', 'height', 'willChange', 'min-width'];
 
@@ -232,19 +232,15 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
 
   /** @internal */
   protected _removeHelperStyle(): DDDraggable {
+    let node = (this.helper as GridItemHTMLElement)?.gridstackNode;
     // don't bother restoring styles if we're gonna remove anyway...
-    let node = this.helper ? (this.helper as GridItemHTMLElement).gridstackNode : undefined;
     if (this.dragElementOriginStyle && (!node || !node._isAboutToRemove)) {
-      DDDraggable.originStyleProp.forEach(prop => {
-        this.helper.style[prop] = this.dragElementOriginStyle[prop] || null;
-      });
+      let helper = this.helper;
+      DDDraggable.originStyleProp.forEach(prop => helper.style[prop] = this.dragElementOriginStyle[prop] || null);
       // show up instantly otherwise we animate to off the grid when switching back to 'absolute' from 'fixed'
-      this.helper.style.transition = 'none';
-      setTimeout(() => {
-        if (this.helper) {
-          this.helper.style.transition = this.dragElementOriginStyle['transition']; // recover animation
-        }
-      }, 0);
+      helper.style.transition = 'none';
+      let transition = this.dragElementOriginStyle['transition'] || null;
+      setTimeout(() => helper.style.transition = transition, 0); // recover animation from saved vars
     }
     delete this.dragElementOriginStyle;
     return this;
