#2339: Use child containing rect for ghostIsLast & ghostIsFirst

SortableJS · Jan 13, 2024 · 38e4d87 · 38e4d87
1 parent 1b7575f
commit 38e4d87
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 18 deletions.
diff --git a/src/Sortable.js b/src/Sortable.js
@@ -35,7 +35,7 @@ import {
 	scrollBy,
 	clone,
 	expando,
-	getContentRect
+	getChildContainingRectFromElement
 } from './utils.js';
 
 
@@ -1790,22 +1790,22 @@ function _unsilent() {
 
 function _ghostIsFirst(evt, vertical, sortable) {
 	let firstElRect = getRect(getChild(sortable.el, 0, sortable.options, true));
-	const sortableContentRect = getContentRect(sortable.el);
+	const childContainingRect = getChildContainingRectFromElement(sortable.el, sortable.options, ghostEl);
 	const spacer = 10;
 
 	return vertical ?
-		(evt.clientX < sortableContentRect.left - spacer || evt.clientY < firstElRect.top && evt.clientX < firstElRect.right) :
-		(evt.clientY < sortableContentRect.top - spacer || evt.clientY < firstElRect.bottom && evt.clientX < firstElRect.left)
+		(evt.clientX < childContainingRect.left - spacer || evt.clientY < firstElRect.top && evt.clientX < firstElRect.right) :
+		(evt.clientY < childContainingRect.top - spacer || evt.clientY < firstElRect.bottom && evt.clientX < firstElRect.left)
 }
 
 function _ghostIsLast(evt, vertical, sortable) {
 	const lastElRect = getRect(lastChild(sortable.el, sortable.options.draggable));
-	const sortableContentRect = getContentRect(sortable.el);
+	const childContainingRect = getChildContainingRectFromElement(sortable.el, sortable.options, ghostEl);
 	const spacer = 10;
 
 	return vertical ?
-		(evt.clientX > sortableContentRect.right + spacer || evt.clientY > lastElRect.bottom && evt.clientX > lastElRect.left) :
-		(evt.clientY > sortableContentRect.bottom + spacer || evt.clientX > lastElRect.right && evt.clientY > lastElRect.top);
+		(evt.clientX > childContainingRect.right + spacer || evt.clientY > lastElRect.bottom && evt.clientX > lastElRect.left) :
+		(evt.clientY > childContainingRect.bottom + spacer || evt.clientX > lastElRect.right && evt.clientY > lastElRect.top);
 }
 
 function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, invertedSwapThreshold, invertSwap, isLastTarget) {
@@ -1944,23 +1944,23 @@ if (documentExists) {
 
 // Export utils
 Sortable.utils = {
-	on: on,
-	off: off,
-	css: css,
-	find: find,
+	on,
+	off,
+	css,
+	find,
 	is: function (el, selector) {
 		return !!closest(el, selector, el, false);
 	},
-	extend: extend,
-	throttle: throttle,
-	closest: closest,
-	toggleClass: toggleClass,
-	clone: clone,
-	index: index,
+	extend,
+	throttle,
+	closest,
+	toggleClass,
+	clone,
+	index,
 	nextTick: _nextTick,
 	cancelNextTick: _cancelNextTick,
 	detectDirection: _detectDirection,
-	getChild: getChild
+	getChild
 };
 
 

diff --git a/src/utils.js b/src/utils.js
@@ -541,6 +541,23 @@ function unsetRect(el) {
 	css(el, 'height', '');
 }
 
+function getChildContainingRectFromElement(container, options, ghostEl) {
+    const rect = {};
+
+	Array.from(container.children).forEach(child => {
+		if (!closest(child, options.draggable, container, false) || child.animated || child === ghostEl) return;
+		const childRect = getRect(child);
+		rect.left = Math.min(rect.left ?? Infinity, childRect.left);
+		rect.top = Math.min(rect.top ?? Infinity, childRect.top);
+		rect.right = Math.max(rect.right ?? -Infinity, childRect.right);
+		rect.bottom = Math.max(rect.bottom ?? -Infinity, childRect.bottom);
+	});
+	rect.width = rect.right - rect.left;
+	rect.height = rect.bottom - rect.top;
+	rect.x = rect.left;
+	rect.y = rect.top;
+    return rect;
+}
 
 const expando = 'Sortable' + (new Date).getTime();
 
@@ -573,5 +590,6 @@ export {
 	setRect,
 	unsetRect,
 	getContentRect,
+	getChildContainingRectFromElement,
 	expando
 };