Skip to content

Esc doesn't restore subgrid (partial) #3163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −3
Open

Esc doesn't restore subgrid (partial) #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dd-draggable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
/** @internal restore back the original style before dragging */
protected _removeHelperStyle(): DDDraggable {
this.helper.classList.remove('ui-draggable-dragging');
this.el.gridstackNode?.grid?.el.classList.remove('grid-stack-dragging');
(this.el._gridstackNodeOrig || this.el.gridstackNode)?.grid?.el.classList.remove('grid-stack-dragging');
const node = (this.helper as GridItemHTMLElement)?.gridstackNode;
// don't bother restoring styles if we're gonna remove anyway...
if (!node?._isAboutToRemove && this.dragElementOriginStyle) {
Expand Down
19 changes: 17 additions & 2 deletions src/gridstack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2374,12 +2374,22 @@ export class GridStack {

/** @internal call when drag (and drop) needs to be cancelled (Esc key) */
public cancelDrag() {
const n = this._placeholder?.gridstackNode;
const el = DDManager.dragElement?.el;
let n = el?.gridstackNode;
if (!n) return;
if (n._isExternal) {
// remove any newly inserted nodes (from outside)
n._isAboutToRemove = true;
this.engine.removeNode(n);
// check if this came from another grid, where it needs to be restored (swap it back)
if (el._gridstackNodeOrig) {
el.gridstackNode = n = el._gridstackNodeOrig;
delete el._gridstackNodeOrig;
delete DDManager.dropElement; // not dropping onto our original grid, will manually add it back
const grid = n.grid;
grid.engine.addNode(n, false);
grid.engine.restoreInitial();
}
} else if (n._isAboutToRemove) {
// restore any temp removed (dragged over trash)
GridStack._itemRemoving(n.el, false);
Expand Down Expand Up @@ -2746,11 +2756,15 @@ export class GridStack {
const onEndMoving = (event: Event) => {
this.placeholder.remove();
delete this.placeholder.gridstackNode;
const widthChanged = node.w !== node._orig.w;
delete node._moving;
delete node._resizing;
delete node._event;
delete node._lastTried;
const widthChanged = node.w !== node._orig.w;
delete node._lastUiPosition;
delete node._prevYPix;
delete node._rect;
delete node._sidebarOrig;

// if the item has moved to another grid, we're done here
const target: GridItemHTMLElement = event.target as GridItemHTMLElement;
Expand Down Expand Up @@ -2913,6 +2927,7 @@ export class GridStack {
if (node.x === p.x && node.y === p.y) return; // skip same
// DON'T skip one we tried as we might have failed because of coverage <50% before
// if (node._lastTried && node._lastTried.x === x && node._lastTried.y === y) return;
console.log('not skip same');
} else if (event.type === 'resize') {
if (p.x < 0) return;
// Scrolling page if needed
Expand Down