@cube-dev/ui-kit 0.0.0-canary-cb8163d → 0.0.0-canary-002ef34

package/dist/components/layout/Board/grid-core/group-move.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { collides, getFirstCollision } from "./collision.js";
 import { sortLayoutItemsByColRow, sortLayoutItemsByRowCol } from "./sort.js";
 import { bottom, cloneLayout, cloneLayoutItem, getStatics } from "./layout.js";

package/dist/components/layout/Board/grid-core/layout.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { getAllCollisions, getFirstCollision } from "./collision.js";
 import { sortLayoutItems } from "./sort.js";
 

package/dist/components/layout/Board/grid-core/placement.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { collides } from "./collision.js";
 
 //#region src/components/layout/Board/grid-core/placement.ts

package/dist/components/layout/Board/grid-core/sort.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 //#region src/components/layout/Board/grid-core/sort.ts
 /**
 * Sort layout items based on the compaction type.

package/dist/components/layout/Board/index.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { distributeEvenly, placeInFreeSlot } from "./grid-core/placement.js";
 import { getCompactor, horizontalCompactor, noCompactor, verticalCompactor } from "./grid-core/compactors.js";
 import { aspectRatio, boundedX, boundedY, containerBounds, gridBounds, maxSize, minMaxSize, minSize, snapToGrid } from "./grid-core/constraints.js";

package/dist/components/layout/Board/responsive-utils.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { cloneLayout, correctBounds } from "./grid-core/layout.js";
 
 //#region src/components/layout/Board/responsive-utils.ts

package/dist/components/layout/Board/use-board-layout.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { useEvent } from "../../../_internal/hooks/use-event.js";
 import { cloneLayout } from "./grid-core/layout.js";
 import { useCallback, useEffect, useRef, useState } from "react";

package/dist/components/layout/Board/use-board-registry.js

@@ -1,4 +1,4 @@
-/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-cb8163d | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.0.0-canary-002ef34 | Cube Dev Team */
 import { useEvent } from "../../../_internal/hooks/use-event.js";
 import { BoardWidgetStore } from "./board-store.js";
 import { collides } from "./grid-core/collision.js";
@@ -70,6 +70,39 @@ function hasNewOverlap(before, after) {
 	return false;
 }
 /**
+* Where a cross-board arrival ends up when the destination refuses the very first
+* cell it was offered.
+*
+* `moveElement` answers a refused placement by restoring the item to where it
+* came from. Every frame after the first has a real cell to go back to - the one
+* the previous frame settled on - so the preview simply holds there, which is
+* what keeps the placeholder from jumping about as the pointer sweeps across an
+* occupied widget. The *first* frame on a board has no such cell: its origin is
+* the synthetic seed one row above (or column left of) the anchor, which sits off
+* the board entirely whenever the anchor is in row 0 or column 0. Holding that
+* would preview - and commit - a widget outside the grid.
+*
+* So only that first frame relocates, to the nearest cell that can hold the
+* widget. The destination's own widgets are the fixed `others`: an arrival is
+* placed around them and never displaces one.
+*
+* Returns `layout` untouched when the requested cell was honoured, which covers
+* both a clean landing and a resolver that downscaled the item into it.
+*/
+function landIncoming(layout, others, itemId, x, y, cols, maxRows) {
+	const placed = getLayoutItem(layout, itemId);
+	if (!placed || placed.x === x && placed.y === y) return layout;
+	const landed = placeInFreeSlot(others, {
+		...placed,
+		x,
+		y
+	}, cols, maxRows);
+	return layout.map((l) => l.i === itemId ? {
+		...l,
+		...landed
+	} : l);
+}
+/**
 * Whether any item in `after` has a different size than it had in `before`.
 */
 function resizesAnything(before, after) {
@@ -89,7 +122,6 @@ function useBoardRegistry(options) {
 	const sourceSnapshotRef = useRef([]);
 	const targetSnapshotsRef = useRef(/* @__PURE__ */ new Map());
 	const previewRef = useRef(null);
-	const targetLandingRef = useRef(null);
 	const frozenRectsRef = useRef(/* @__PURE__ */ new Map());
 	const nestedInDraggedRef = useRef(/* @__PURE__ */ new Set());
 	const lastLandingRef = useRef(null);
@@ -204,7 +236,6 @@ function useBoardRegistry(options) {
 		affectedRef.current = new Set([boardId]);
 		sourceSnapshotRef.current = cloneLayout(entry.getLayout());
 		previewRef.current = null;
-		targetLandingRef.current = null;
 		lastLandingRef.current = {
 			x: item.x,
 			y: item.y
@@ -436,7 +467,6 @@ function useBoardRegistry(options) {
 	const previewOnTarget = useCallback((target, item, x, y) => {
 		const pp = target.getPositionParams();
 		const compactor = target.getCompactor();
-		const strictIncomingSwap = compactor.preventCollision === true && !compactor.allowOverlap && target.getCollisionMode() === "swap";
 		const carried = previewRef.current?.boardId === target.id ? previewRef.current.working : null;
 		const base = cloneLayout(carried ?? targetSnapshotsRef.current.get(target.id) ?? target.getLayout()).filter((l) => l.i !== item.i);
 		const prevItem = carried ? getLayoutItem(carried, item.i) : void 0;
@@ -462,40 +492,13 @@ function useBoardRegistry(options) {
 			},
 			allowExchange: false
 		}) : void 0 });
-		const compacted = strictIncomingSwap ? cloneLayout(moved) : [...compactor.compact(moved, pp.cols)];
+		const compacted = [...compactor.compact(prevItem ? moved : landIncoming(moved, base, item.i, x, y, pp.cols, target.getMaxRows()), pp.cols)];
 		const landed = getLayoutItem(compacted, item.i);
-		if (!compactor.allowOverlap && hasNewOverlap(overlappingPairs(base), compacted)) {
-			if (strictIncomingSwap) {
-				const snapshot = targetSnapshotsRef.current.get(target.id);
-				if (snapshot) target.applyLayout(cloneLayout(snapshot), false);
-				target.setPlaceholders([]);
-				previewRef.current = null;
-				targetLandingRef.current = {
-					boardId: target.id,
-					valid: false
-				};
-			}
-			return;
-		}
-		if (strictIncomingSwap && (!landed || landed.x !== x || landed.y !== y)) {
-			const snapshot = targetSnapshotsRef.current.get(target.id);
-			if (snapshot) target.applyLayout(cloneLayout(snapshot), false);
-			target.setPlaceholders([]);
-			previewRef.current = null;
-			targetLandingRef.current = {
-				boardId: target.id,
-				valid: false
-			};
-			return;
-		}
+		if (!compactor.allowOverlap && hasNewOverlap(overlappingPairs(base), compacted)) return;
 		previewRef.current = {
 			boardId: target.id,
 			working: compacted
 		};
-		targetLandingRef.current = {
-			boardId: target.id,
-			valid: true
-		};
 		const previewItem = landed ?? {
 			...item,
 			x,
@@ -547,7 +550,6 @@ function useBoardRegistry(options) {
 				if (snap) prev?.applyLayout(cloneLayout(snap), false);
 				prev?.setPlaceholders([]);
 				previewRef.current = null;
-				targetLandingRef.current = null;
 			}
 			if (isGroup) moveGroupWithinBoard(target, ds, x - ds.item.x, y - ds.item.y);
 			else moveWithinBoard(target, ds.item, x, y);
@@ -567,7 +569,6 @@ function useBoardRegistry(options) {
 			}
 			prev?.setPlaceholders([]);
 			previewRef.current = null;
-			targetLandingRef.current = null;
 			if (!targetSnapshotsRef.current.has(target.id)) targetSnapshotsRef.current.set(target.id, cloneLayout(target.getLayout()));
 		}
 		previewOnTarget(target, ds.item, x, y);
@@ -598,61 +599,54 @@ function useBoardRegistry(options) {
 			};
 			const tp = target.getPositionParams();
 			const tc = target.getCompactor();
-			const strictIncomingSwap = tc.preventCollision === true && !tc.allowOverlap && target.getCollisionMode() === "swap";
 			const carried = previewRef.current?.boardId === target.id && getLayoutItem(previewRef.current.working, ds.itemId) ? previewRef.current.working : null;
-			const hasValidStrictLanding = targetLandingRef.current?.boardId === target.id && targetLandingRef.current.valid && carried != null;
-			if (strictIncomingSwap && !hasValidStrictLanding) {
-				if (source) source.applyLayout(cloneLayout(sourceSnapshotRef.current), false);
-				const targetSnapshot = targetSnapshotsRef.current.get(target.id);
-				if (targetSnapshot) target.applyLayout(cloneLayout(targetSnapshot), false);
-			} else {
-				if (source) {
-					const sp = source.getPositionParams();
-					const sc = source.getCompactor();
-					const remaining = source.getLayout().filter((l) => l.i !== ds.itemId);
-					source.applyLayout([...sc.compact(remaining, sp.cols)], true, "transfer");
-				}
-				let finalLayout;
-				if (carried) finalLayout = strictIncomingSwap ? cloneLayout(carried) : [...tc.compact(cloneLayout(carried), tp.cols)];
-				else {
-					const newItem = tc.type === "horizontal" ? {
-						...ds.item,
-						x: Math.max(0, landing.x) - 1,
-						y: landing.y
-					} : {
-						...ds.item,
-						x: landing.x,
-						y: Math.max(0, landing.y) - 1
-					};
-					const moved = moveElement([...cloneLayout((targetSnapshotsRef.current.get(target.id) ?? target.getLayout()).filter((l) => l.i !== ds.itemId)), newItem], newItem, landing.x, landing.y, true, tc.preventCollision, tc.type, tp.cols, tc.allowOverlap, { resolveCollision: createCollisionResolver(target.getCollisionMode(), {
-						cols: tp.cols,
-						maxRows: tp.maxRows,
-						desired: {
-							w: ds.item.w,
-							h: ds.item.h
-						},
-						allowExchange: false
-					}) });
-					finalLayout = [...tc.compact(moved, tp.cols)];
-				}
-				const targetOthers = cloneLayout((targetSnapshotsRef.current.get(target.id) ?? target.getLayout()).filter((l) => l.i !== ds.itemId));
-				if (!tc.allowOverlap && hasNewOverlap(overlappingPairs(targetOthers), finalLayout)) finalLayout = [...targetOthers, placeInFreeSlot(targetOthers, {
+			if (source) {
+				const sp = source.getPositionParams();
+				const sc = source.getCompactor();
+				const remaining = source.getLayout().filter((l) => l.i !== ds.itemId);
+				source.applyLayout([...sc.compact(remaining, sp.cols)], true, "transfer");
+			}
+			let finalLayout;
+			if (carried) finalLayout = [...tc.compact(cloneLayout(carried), tp.cols)];
+			else {
+				const newItem = tc.type === "horizontal" ? {
 					...ds.item,
-					x: landing.x,
+					x: Math.max(0, landing.x) - 1,
 					y: landing.y
-				}, tp.cols, tp.maxRows)];
-				target.applyLayout(finalLayout, true, "transfer");
-				onTransferRef.current?.({
-					widgetId: ds.itemId,
-					fromBoardId: ds.sourceBoardId,
-					toBoardId: target.id,
-					item: getLayoutItem(finalLayout, ds.itemId) ?? {
-						...ds.item,
-						x: landing.x,
-						y: landing.y
-					}
-				});
+				} : {
+					...ds.item,
+					x: landing.x,
+					y: Math.max(0, landing.y) - 1
+				};
+				const base = [...cloneLayout((targetSnapshotsRef.current.get(target.id) ?? target.getLayout()).filter((l) => l.i !== ds.itemId)), newItem];
+				const moved = moveElement(base, newItem, landing.x, landing.y, true, tc.preventCollision, tc.type, tp.cols, tc.allowOverlap, { resolveCollision: createCollisionResolver(target.getCollisionMode(), {
+					cols: tp.cols,
+					maxRows: tp.maxRows,
+					desired: {
+						w: ds.item.w,
+						h: ds.item.h
+					},
+					allowExchange: false
+				}) });
+				finalLayout = [...tc.compact(landIncoming(moved, base.filter((l) => l.i !== ds.itemId), ds.itemId, landing.x, landing.y, tp.cols, tp.maxRows), tp.cols)];
 			}
+			const targetOthers = cloneLayout((targetSnapshotsRef.current.get(target.id) ?? target.getLayout()).filter((l) => l.i !== ds.itemId));
+			if (!tc.allowOverlap && hasNewOverlap(overlappingPairs(targetOthers), finalLayout)) finalLayout = [...targetOthers, placeInFreeSlot(targetOthers, {
+				...ds.item,
+				x: landing.x,
+				y: landing.y
+			}, tp.cols, tp.maxRows)];
+			target.applyLayout(finalLayout, true, "transfer");
+			onTransferRef.current?.({
+				widgetId: ds.itemId,
+				fromBoardId: ds.sourceBoardId,
+				toBoardId: target.id,
+				item: getLayoutItem(finalLayout, ds.itemId) ?? {
+					...ds.item,
+					x: landing.x,
+					y: landing.y
+				}
+			});
 		}
 		const ids = new Set(affectedRef.current);
 		ids.add(ds.sourceBoardId);
@@ -664,7 +658,6 @@ function useBoardRegistry(options) {
 		frozenRectsRef.current.clear();
 		nestedInDraggedRef.current = /* @__PURE__ */ new Set();
 		previewRef.current = null;
-		targetLandingRef.current = null;
 		lastLandingRef.current = null;
 		setDragState(null);
 	});