@vielzeug/dnd 1.2.3 → 2.0.1

package/dist/sortable.d.ts

@@ -1,17 +1,23 @@
-import { type Disposable } from './types';
+import { type TouchInputOptions } from './_touch';
+import type { Disposable } from './types';
 declare const SCOPE_BRAND: unique symbol;
 export interface SortableScope extends Disposable {
     /** `true` while any sortable in this scope is actively dragging. */
     readonly isDragging: boolean;
+    /**
+     * Calls the revert function registered for the most recent cross-container move.
+     * A no-op when no move registered a revert function.
+     */
+    revert(): void;
     readonly [SCOPE_BRAND]: true;
 }
 export interface AutoScrollOptions {
+    /** Scroll the sortable container while dragging near its edges. @default true */
+    container?: boolean;
     /** Distance in pixels from an edge that triggers auto-scroll. @default 32 */
     edgeThreshold?: number;
     /** Pixels scrolled per dragover frame while near an edge. @default 18 */
     speed?: number;
-    /** Scroll the sortable container while dragging near its edges. @default true */
-    container?: boolean;
     /** Scroll the viewport while dragging near the window edges. @default false */
     viewport?: boolean;
 }
@@ -37,21 +43,57 @@ export interface ReorderEvent {
      */
     setRevert(fn: () => void): void;
 }
+/** A single committed move between two containers in the same sortable scope. */
+export interface SortableMoveEvent {
+    /** Stable identity of the moved item. */
+    readonly itemId: string;
+    /** Registers a rollback for the most recent scope move. */
+    setRevert(fn: () => void): void;
+    /** Source container before the move. */
+    readonly source: HTMLElement;
+    /** Ordered source item IDs after the move. */
+    readonly sourceIds: string[];
+    /** Target container after the move. */
+    readonly target: HTMLElement;
+    /** Ordered target item IDs after the move. */
+    readonly targetIds: string[];
+}
+export interface SortableScopeOptions {
+    /**
+     * Called exactly once for every successful cross-container move.
+     * Local reorders continue to use each sortable's `onReorder` callback.
+     */
+    onMove?: (event: SortableMoveEvent) => void;
+    /**
+     * Enables touch input for sortable items registered to this scope.
+     * The controller ignores unrelated document draggables.
+     */
+    touch?: boolean | TouchInputOptions;
+}
+export type SortableTouchOptions = TouchInputOptions;
 export interface SortableOptions {
-    /** Container element whose direct-child items are sortable. */
-    element: HTMLElement;
-    /** Shared scope for connected sortable containers. Containers only exchange items within the same scope. */
-    scope?: SortableScope;
+    /** Auto-scrolls the container (and viewport) near edges while dragging. @default true */
+    autoScroll?: boolean | AutoScrollOptions;
+    /** Sorting axis used to compute insertion position. @default 'vertical' */
+    axis?: 'vertical' | 'horizontal';
     /**
-     * Selector for the drag handle inside each item.
-     * When omitted the whole item is the handle.
+     * When `true`, drag interactions are ignored.
+     *
+     * Note: if `disabled` transitions to `true` while a drag is in progress the
+     * drag is treated as a cancellation — the item snaps back to its original
+     * position rather than committing the last placeholder location.
      */
-    handle?: string;
+    disabled?: boolean;
+    /** Optional custom drag preview element. */
+    dragImage?: HTMLElement | ((id: string, item: HTMLElement, event: DragEvent) => HTMLElement | null | undefined);
     /**
-     * Enables keyboard-based reordering using arrow keys plus Home/End.
-     * @default true
+     * Hotspot offset `[x, y]` passed to `setDragImage`.
+     * Controls which point of the preview image follows the cursor.
+     * @default [0, 0]
      */
-    keyboard?: boolean;
+    dragImageOffset?: [number, number];
+    /** Container element whose direct-child items are sortable. */
+    element: HTMLElement;
     /**
      * Returns the identity key for a given item element.
      * This separates the "what is this item?" concern (yours) from the "which children
@@ -63,27 +105,16 @@ export interface SortableOptions {
      * ```
      */
     getKey: (element: HTMLElement) => string;
-    /** Sorting axis used to compute insertion position. @default 'vertical' */
-    axis?: 'vertical' | 'horizontal';
-    /** Auto-scrolls the container (and viewport) near edges while dragging. @default true */
-    autoScroll?: boolean | AutoScrollOptions;
-    /** Optional custom drag preview element. */
-    dragImage?: HTMLElement | ((id: string, item: HTMLElement, event: DragEvent) => HTMLElement | null | undefined);
-    /** CSS class applied to the placeholder element. @default 'dnd-placeholder' */
-    placeholderClass?: string;
     /**
-     * Called with a {@link ReorderEvent} after a successful reorder, only when the order changed.
-     *
-     * @example
-     * ```ts
-     * onReorder: ({ ids, setRevert }) => {
-     *   const prev = order;
-     *   setOrder(ids);
-     *   setRevert(() => setOrder(prev));
-     * },
-     * ```
+     * Selector for the drag handle inside each item.
+     * When omitted the whole item is the handle.
      */
-    onReorder?: (event: ReorderEvent) => void;
+    handle?: string;
+    /**
+     * Enables keyboard-based reordering using arrow keys plus Home/End.
+     * @default true
+     */
+    keyboard?: boolean;
     /**
      * Called just before a successful drag commit with the before and after order snapshots.
      * Use this hook to set up FLIP animations — the source items are still in their
@@ -97,24 +128,27 @@ export interface SortableOptions {
      * ```
      */
     onBeforeReorder?: (from: string[], to: string[]) => void;
-    /**
-     * When `true`, drag interactions are ignored.
-     *
-     * Note: if `disabled` transitions to `true` while a drag is in progress the
-     * drag is treated as a cancellation — the item snaps back to its original
-     * position rather than committing the last placeholder location.
-     */
-    disabled?: boolean;
-    /** Called when the user starts dragging an item. */
-    onDragStart?: (id: string, event: DragEvent) => void;
     /** Called when a drag ends (whether dropped or cancelled). */
     onDragEnd?: (id: string, event: DragEvent) => void;
+    /** Called when the user starts dragging an item. */
+    onDragStart?: (id: string, event: DragEvent) => void;
     /**
-     * Hotspot offset `[x, y]` passed to `setDragImage`.
-     * Controls which point of the preview image follows the cursor.
-     * @default [0, 0]
+     * Called with a {@link ReorderEvent} after a successful reorder, only when the order changed.
+     *
+     * @example
+     * ```ts
+     * onReorder: ({ ids, setRevert }) => {
+     *   const prev = order;
+     *   setOrder(ids);
+     *   setRevert(() => setOrder(prev));
+     * },
+     * ```
      */
-    dragImageOffset?: [number, number];
+    onReorder?: (event: ReorderEvent) => void;
+    /** CSS class applied to the placeholder element. @default 'dnd-placeholder' */
+    placeholderClass?: string;
+    /** Shared scope for connected sortable containers. Containers only exchange items within the same scope. */
+    scope?: SortableScope;
 }
 export interface Sortable extends Disposable {
     readonly isDragging: boolean;
@@ -163,7 +197,7 @@ export interface Sortable extends Disposable {
  * scope.dispose();
  * ```
  */
-export declare function createSortableScope(): SortableScope;
+export declare function createSortableScope(options?: SortableScopeOptions): SortableScope;
 /**
  * Makes a list of items sortable via native HTML drag interactions.
  *

package/dist/sortable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sortable.d.ts","sourceRoot":"","sources":["../src/sortable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sortable.d.ts","sourceRoot":"","sources":["../src/sortable.ts"],"names":[],"mappings":"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"}

package/dist/sortable.js

@@ -1,69 +1,86 @@
 import { createDisposable as e, resolveDisabled as t } from "./_shared.js";
 import { DndScopeError as n } from "./errors.js";
 import "./_dev.js";
+import { createScopeTouchController as r } from "./_touch.js";
 //#region src/sortable.ts
-var r = Symbol("SortableScope"), i = "data-dnd-handle", a = "data-dnd-item", o = /* @__PURE__ */ new WeakMap(), s = {
+var i = Symbol("SortableScope"), a = "data-dnd-handle", o = "data-dnd-item", s = /* @__PURE__ */ new WeakMap(), c = {
 	container: !0,
 	edgeThreshold: 32,
 	speed: 18,
 	viewport: !1
 };
-function c(e) {
-	let t = o.get(e);
+function l(e) {
+	let t = s.get(e);
 	if (!t) throw new n();
 	return t;
 }
-function l(e) {
-	return e === !1 ? null : e === !0 || e === void 0 ? s : {
+function u(e) {
+	return e === !1 ? null : e === !0 || e === void 0 ? c : {
 		container: e.container ?? !0,
 		edgeThreshold: e.edgeThreshold ?? 32,
 		speed: e.speed ?? 18,
 		viewport: e.viewport ?? !1
 	};
 }
-function u(e, t) {
+function d(e, t) {
 	return t.length !== e.length || t.some((t, n) => t !== e[n]);
 }
-function d(e) {
-	e.querySelectorAll(`[${i}]`).forEach((e) => {
-		e.removeAttribute(i), e.removeAttribute("draggable"), e.style.touchAction = "";
-	});
-}
 function f(e) {
+	return e.__dndTouch === !0;
+}
+function p(e) {
 	typeof requestAnimationFrame == "function" && (e.hideFrame = requestAnimationFrame(() => {
 		e.hideFrame = null, e.draggedEl.style.display = "none";
 	}));
 }
-function p(e) {
+function m(e) {
 	e.hideFrame !== null && (cancelAnimationFrame(e.hideFrame), e.hideFrame = null);
 }
-function m(e) {
-	p(e), e.draggedEl.style.display = e.originalDisplay, e.draggedEl.removeAttribute("data-dragging");
+function h(e) {
+	m(e), e.draggedEl.style.display = e.originalDisplay, e.draggedEl.removeAttribute("data-dragging");
 }
-function h(e, t) {
+function g(e, t) {
 	e.initialOrders.has(t) || e.initialOrders.set(t, t.getOrderedIds());
 }
-function g(e, t) {
+function _(e, t) {
 	let n = e.active;
-	n && (m(n), n.originalParent.insertBefore(n.draggedEl, n.originalNextSibling), n.placeholder.remove(), e.active = null, n.source.notifyDragEnd(n.draggedId, t));
+	n && (h(n), n.originalParent.insertBefore(n.draggedEl, n.originalNextSibling), n.placeholder.remove(), e.active = null, n.source.notifyDragEnd(n.draggedId, t));
 }
-function _(e, t) {
+function v(e, t) {
 	let n = e.active;
 	if (!n) return;
 	let r = n.target, i = n.placeholder.parentElement;
-	m(n), r && e.handles.has(r) && i ? i.insertBefore(n.draggedEl, n.placeholder) : n.originalParent.insertBefore(n.draggedEl, n.originalNextSibling), n.placeholder.remove(), e.active = null, n.source.notifyDragEnd(n.draggedId, t);
+	h(n), r && e.handles.has(r) && i ? i.insertBefore(n.draggedEl, n.placeholder) : n.originalParent.insertBefore(n.draggedEl, n.originalNextSibling), n.placeholder.remove(), e.active = null, n.source.notifyDragEnd(n.draggedId, t);
+	let a = [];
 	for (let [t, r] of n.initialOrders) {
 		if (!e.handles.has(t)) continue;
 		let n = t.getOrderedIds();
-		u(r, n) && (t.notifyBeforeReorder(r, n), t.commitReorder(n));
+		d(r, n) && a.push({
+			after: n,
+			before: r,
+			handle: t
+		});
 	}
+	for (let { after: e, before: t, handle: n } of a) n.notifyBeforeReorder(t, e);
+	if (r && r !== n.source) {
+		let t = a.find((e) => e.handle === n.source), i = a.find((e) => e.handle === r);
+		t && i && e.commitMove({
+			itemId: n.draggedId,
+			source: n.source.element,
+			sourceIds: t.after,
+			target: r.element,
+			targetIds: i.after
+		});
+		return;
+	}
+	for (let { after: e, handle: t } of a) t.commitReorder(e);
 }
-function v(e, t, n) {
+function y(e, t, n) {
 	if (!e.active) return;
 	let { active: r } = e;
-	n || !t.dataTransfer || t.dataTransfer.dropEffect === "none" || !r.target || !e.handles.has(r.target) || r.source.isDisabled() || r.target.isDisabled() ? g(e, t) : _(e, t);
+	n || !t.dataTransfer || t.dataTransfer.dropEffect === "none" || !r.target || !e.handles.has(r.target) || r.source.isDisabled() || r.target.isDisabled() ? _(e, t) : v(e, t);
 }
-function y(e, t, n, r) {
+function b(e, t, n, r) {
 	if (!r) return;
 	let { container: i, edgeThreshold: a, speed: o, viewport: s } = r, c = t.getBoundingClientRect();
 	if (n === "vertical") {
@@ -84,7 +101,7 @@ function y(e, t, n, r) {
 		top: 0
 	});
 }
-function b(e, t, n, r, i, a) {
+function x(e, t, n, r, i, a) {
 	let o = n(), s = o.indexOf(e);
 	if (s < 0) return null;
 	let c = a === "vertical" ? i === "ArrowDown" : i === "ArrowRight", l = a === "vertical" ? i === "ArrowUp" : i === "ArrowLeft", u;
@@ -97,150 +114,193 @@ function b(e, t, n, r, i, a) {
 	let d = o[u];
 	return d ? (t.insertBefore(e, u > s ? d.nextSibling : d), e.focus(), r()) : null;
 }
-function x() {
-	let t = {
+function S(t = {}) {
+	let n = {
 		active: null,
+		commitMove(e) {
+			t.onMove?.({
+				...e,
+				setRevert(e) {
+					n.lastRevert = e;
+				}
+			});
+		},
 		disposables: /* @__PURE__ */ new Set(),
-		handles: /* @__PURE__ */ new Set()
-	}, n = e(() => {
-		for (let e of t.disposables) e();
-	}), i = {
+		handles: /* @__PURE__ */ new Set(),
+		lastRevert: null,
+		touch: null
+	}, a = e(() => {
+		n.touch?.dispose();
+		for (let e of n.disposables) e();
+	}), o = {
 		get disposalSignal() {
-			return n.disposalSignal;
+			return a.disposalSignal;
 		},
-		dispose: n.dispose,
+		dispose: a.dispose,
 		get disposed() {
-			return n.disposed;
+			return a.disposed;
 		},
 		get isDragging() {
-			return t.active !== null;
+			return n.active !== null;
+		},
+		revert() {
+			n.lastRevert?.(), n.lastRevert = null;
 		},
-		[r]: !0,
-		[Symbol.dispose]: n[Symbol.dispose]
+		[i]: !0,
+		[Symbol.dispose]: a[Symbol.dispose]
 	};
-	return o.set(i, t), i;
+	return s.set(o, n), t.touch && (n.touch = r(t.touch === !0 ? {} : t.touch, (e) => {
+		for (let t of n.handles) {
+			let n = t.resolveTouchTarget(e);
+			if (n) return n;
+		}
+		return null;
+	})), o;
 }
-function S(n) {
-	let { autoScroll: r = !0, axis: o = "vertical", element: s, getKey: u, handle: p, keyboard: m = !0, placeholderClass: g = "dnd-placeholder", scope: _ = x() } = n, S = l(r), C = c(_);
-	p !== void 0 && p.trim();
-	let w = () => Array.from(s.children).filter((e) => e.hasAttribute(a)), T = () => w().map((e) => u(e)), E = () => {
-		d(s), w().forEach((e) => {
-			e.setAttribute("role", "listitem"), e.tabIndex = 0, p ? (e.removeAttribute("draggable"), e.style.touchAction = "", e.querySelectorAll(p).forEach((e) => {
-				e.setAttribute(i, ""), e.setAttribute("draggable", "true"), e.style.touchAction = "none";
-			})) : (e.setAttribute("draggable", "true"), e.style.touchAction = "none");
+function C(n) {
+	let { autoScroll: r = !0, axis: i = "vertical", element: s, getKey: c, handle: d, keyboard: m = !0, placeholderClass: h = "dnd-placeholder", scope: _ = S() } = n, v = u(r), C = l(_);
+	d !== void 0 && d.trim();
+	let w = () => Array.from(s.children).filter((e) => e.hasAttribute(o)), T = () => w().map((e) => c(e)), E = /* @__PURE__ */ new Map(), D = s.getAttribute("role"), O = (e) => {
+		let t = E.get(e);
+		if (t) return t;
+		let n = {
+			dataDndHandle: e.getAttribute(a),
+			dataDndItem: e.getAttribute(o),
+			draggable: e.getAttribute("draggable"),
+			role: e.getAttribute("role"),
+			tabIndex: e.getAttribute("tabindex"),
+			touchAction: e.style.touchAction
+		};
+		return E.set(e, n), n;
+	}, k = (e, t, n) => {
+		n === null ? e.removeAttribute(t) : e.setAttribute(t, n);
+	}, A = () => {
+		w().forEach((e) => {
+			let t = O(e);
+			t.role === null && e.setAttribute("role", "listitem"), t.tabIndex === null && (e.tabIndex = 0), d ? e.querySelectorAll(d).forEach((e) => {
+				O(e), e.setAttribute(a, ""), e.setAttribute("draggable", "true"), e.style.touchAction = "none";
+			}) : (e.setAttribute("draggable", "true"), e.style.touchAction = "none");
 		});
-	}, D = () => {
+	}, j = () => {
 		let e = /* @__PURE__ */ new Set();
 		Array.from(s.children).forEach((t) => {
 			let n = t;
 			try {
-				let t = u(n);
-				t && (e.has(t) ? `${t}` : e.add(t), n.setAttribute(a, ""));
+				let t = c(n);
+				t && (O(n), e.has(t) ? `${t}` : e.add(t), n.setAttribute(o, ""));
 			} catch (e) {
 				`${String(e)}`;
 			}
-		}), E();
-	}, O = () => {
-		d(s), s.querySelectorAll(`[${a}]`).forEach((e) => {
-			e.removeAttribute(a), e.removeAttribute("draggable"), e.removeAttribute("role"), e.removeAttribute("tabindex"), e.style.touchAction = "";
-		});
-	}, k = (e) => {
+		}), A();
+	}, M = () => {
+		for (let [e, t] of E) k(e, a, t.dataDndHandle), k(e, o, t.dataDndItem), k(e, "draggable", t.draggable), k(e, "role", t.role), k(e, "tabindex", t.tabIndex), e.style.touchAction = t.touchAction;
+		E.clear();
+	}, N = (e) => {
 		let t = document.createElement("div");
-		return t.className = g, t.setAttribute("aria-hidden", "true"), o === "horizontal" ? t.style.width = `${e.offsetWidth}px` : t.style.height = `${e.offsetHeight}px`, t;
-	}, A = null, j = {
+		return t.className = h, t.setAttribute("aria-hidden", "true"), i === "horizontal" ? t.style.width = `${e.offsetWidth}px` : t.style.height = `${e.offsetHeight}px`, t;
+	}, P = null, F = {
 		commitReorder: (e) => {
 			if (!n.onReorder) return;
 			let t = {
 				ids: e,
 				setRevert(e) {
-					A = e;
+					P = e;
 				}
 			};
 			n.onReorder(t);
 		},
+		element: s,
 		getOrderedIds: T,
 		isDisabled: () => t(n.disabled),
 		notifyBeforeReorder: (e, t) => n.onBeforeReorder?.(e, t),
 		notifyDragEnd: (e, t) => n.onDragEnd?.(e, t),
-		notifyDragStart: (e, t) => n.onDragStart?.(e, t)
+		notifyDragStart: (e, t) => n.onDragStart?.(e, t),
+		resolveTouchTarget: (e) => {
+			if (t(n.disabled) || !s.contains(e)) return null;
+			let r = e.closest(`[${o}]`);
+			if (!r || !s.contains(r)) return null;
+			if (!d) return r;
+			let i = e.closest(d);
+			return i && r.contains(i) ? i : null;
+		}
 	};
-	C.handles.add(j);
-	let M = (e) => {
-		if (C.active || j.isDisabled()) return;
-		let t = e.target, r = t.closest(`[${a}]`);
-		if (!r || p && !t.closest(p)) return;
+	C.handles.add(F);
+	let I = (e) => {
+		if (C.active || F.isDisabled()) return;
+		let t = e.target, r = t.closest(`[${o}]`);
+		if (!r || d && !t.closest(d)) return;
 		let i = r.parentElement;
 		if (!i) return;
-		let o = k(r), s = r.nextSibling, c = u(r), l = /* @__PURE__ */ new Map();
-		l.set(j, j.getOrderedIds()), r.setAttribute("data-dragging", ""), i.insertBefore(o, s);
-		let d = {
+		let a = N(r), s = r.nextSibling, l = c(r), u = /* @__PURE__ */ new Map();
+		u.set(F, F.getOrderedIds()), r.setAttribute("data-dragging", ""), i.insertBefore(a, s);
+		let m = {
 			draggedEl: r,
-			draggedId: c,
+			draggedId: l,
 			hideFrame: null,
-			initialOrders: l,
+			initialOrders: u,
 			originalDisplay: r.style.display,
 			originalNextSibling: s,
 			originalParent: i,
-			placeholder: o,
-			source: j,
-			target: j
+			placeholder: a,
+			source: F,
+			target: F
 		};
-		if (f(d), C.active = d, e.dataTransfer && (e.dataTransfer.effectAllowed = "move", e.dataTransfer.setData("text/plain", c), n.dragImage)) {
-			let t = typeof n.dragImage == "function" ? n.dragImage(c, r, e) : n.dragImage, [i, a] = n.dragImageOffset ?? [0, 0];
+		if ((!f(e) || e.__dndTouchPreview) && p(m), C.active = m, e.dataTransfer && (e.dataTransfer.effectAllowed = "move", e.dataTransfer.setData("text/plain", l), n.dragImage)) {
+			let t = typeof n.dragImage == "function" ? n.dragImage(l, r, e) : n.dragImage, [i, a] = n.dragImageOffset ?? [0, 0];
 			t && e.dataTransfer.setDragImage(t, i, a);
 		}
-		j.notifyDragStart(d.draggedId, e);
-	}, N = (e) => {
+		F.notifyDragStart(m.draggedId, e);
+	}, L = (e) => {
 		let t = C.active;
-		if (!t || t.source.isDisabled() || j.isDisabled()) return;
-		e.preventDefault(), y(e, s, o, S), h(t, j);
-		let { draggedEl: n, placeholder: r } = t, i = e.target.closest(`[${a}]`);
-		if (!i) {
-			r.parentElement !== s && s.appendChild(r), t.target = j;
+		if (!t || t.source.isDisabled() || F.isDisabled()) return;
+		e.preventDefault(), b(e, s, i, v), g(t, F);
+		let { draggedEl: n, placeholder: r } = t, a = e.target.closest(`[${o}]`);
+		if (!a) {
+			r.parentElement !== s && s.appendChild(r), t.target = F;
 			return;
 		}
-		if (i === n || i === r) return;
-		let c = i.getBoundingClientRect(), l = o === "vertical" ? e.clientY >= c.top + c.height / 2 : e.clientX >= c.left + c.width / 2;
-		s.insertBefore(r, l ? i.nextSibling : i), t.target = j;
-	}, P = (e) => {
+		if (a === n || a === r) return;
+		let c = a.getBoundingClientRect(), l = i === "vertical" ? e.clientY >= c.top + c.height / 2 : e.clientX >= c.left + c.width / 2;
+		s.insertBefore(r, l ? a.nextSibling : a), t.target = F;
+	}, R = (e) => {
 		let t = C.active;
-		t && (t.source.isDisabled() || j.isDisabled() || (e.preventDefault(), t.target = j));
-	}, F = (e) => {
-		C.active?.source === j && v(C, e, !1);
-	}, I = (e) => {
-		if (!m || j.isDisabled()) return;
+		t && (t.source.isDisabled() || F.isDisabled() || (e.preventDefault(), t.target = F));
+	}, z = (e) => {
+		C.active?.source === F && y(C, e, !1);
+	}, B = (e) => {
+		if (!m || F.isDisabled()) return;
 		let t = e.target?.tagName;
 		if (t === "INPUT" || t === "TEXTAREA" || t === "SELECT") return;
-		let n = e.target.closest(`[${a}]`);
+		let n = e.target.closest(`[${o}]`);
 		if (!n || !s.contains(n)) return;
-		let r = T(), i = b(n, s, w, T, e.key, o);
-		i !== null && (e.preventDefault(), j.notifyBeforeReorder(r, i), j.commitReorder(i));
+		let r = T(), a = x(n, s, w, T, e.key, i);
+		a !== null && (e.preventDefault(), F.notifyBeforeReorder(r, a), F.commitReorder(a));
 	};
-	D();
-	let L = e(() => {
-		C.disposables.delete(L.dispose), C.active && (C.active.source === j || C.active.target === j) && v(C, new Event("dragend"), !0), C.handles.delete(j), s.removeAttribute("role"), O();
+	j();
+	let V = e(() => {
+		C.disposables.delete(V.dispose), C.active && (C.active.source === F || C.active.target === F) && y(C, new Event("dragend"), !0), C.handles.delete(F), k(s, "role", D), M();
 	});
-	return s.setAttribute("role", "list"), s.addEventListener("dragstart", M, { signal: L.disposalSignal }), s.addEventListener("dragover", N, { signal: L.disposalSignal }), s.addEventListener("drop", P, { signal: L.disposalSignal }), s.addEventListener("dragend", F, { signal: L.disposalSignal }), s.addEventListener("keydown", I, { signal: L.disposalSignal }), C.disposables.add(L.dispose), {
+	return D === null && s.setAttribute("role", "list"), s.addEventListener("dragstart", I, { signal: V.disposalSignal }), s.addEventListener("dragover", L, { signal: V.disposalSignal }), s.addEventListener("drop", R, { signal: V.disposalSignal }), s.addEventListener("dragend", z, { signal: V.disposalSignal }), s.addEventListener("keydown", B, { signal: V.disposalSignal }), C.disposables.add(V.dispose), {
 		get disposalSignal() {
-			return L.disposalSignal;
+			return V.disposalSignal;
 		},
-		dispose: L.dispose,
+		dispose: V.dispose,
 		get disposed() {
-			return L.disposed;
+			return V.disposed;
 		},
 		get isDragging() {
-			return C.active?.source === j;
+			return C.active?.source === F;
 		},
 		revert: () => {
-			A?.(), A = null;
+			P?.(), P = null;
 		},
-		[Symbol.dispose]: L[Symbol.dispose],
+		[Symbol.dispose]: V[Symbol.dispose],
 		sync: () => {
-			D();
+			j();
 		}
 	};
 }
-function C(e, t, n) {
+function w(e, t, n) {
 	let r = new Map(e.map((e) => [n(e), e])), i = [];
 	for (let e of t) {
 		if (!r.has(e)) continue;
@@ -251,6 +311,6 @@ function C(e, t, n) {
 	return i;
 }
 //#endregion
-export { C as applyReorder, S as createSortable, x as createSortableScope };
+export { w as applyReorder, C as createSortable, S as createSortableScope };
 
 //# sourceMappingURL=sortable.js.map