@oscarpalmer/toretto 0.31.0 → 0.32.0

package/dist/event/delegation.js

@@ -1,37 +1,39 @@
 import { isEventTarget } from "../internal/is.js";
 function addDelegatedHandler(doc, type, name, passive) {
-	const count = `${name}${COUNT_SUFFIX}`;
-	if (doc[count] != null) {
-		doc[count] += 1;
-		return;
-	}
-	doc[count] = 1;
+	if (DELEGATED.has(name)) return;
+	DELEGATED.add(name);
 	doc.addEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE, { passive });
 }
 function addDelegatedListener(target, type, name, listener, passive) {
 	target[name] ??= /* @__PURE__ */ new Set();
-	target[name]?.add(listener);
+	target[name].add(listener);
 	addDelegatedHandler(document, type, name, passive);
 	return () => {
-		removeDelegatedListener(target, type, name, listener, passive);
+		removeDelegatedListener(target, name, listener);
 	};
 }
 function delegatedEventHandler(event) {
 	const key = `${EVENT_PREFIX}${event.type}${this ? EVENT_SUFFIX_PASSIVE : EVENT_SUFFIX_ACTIVE}`;
 	const items = event.composedPath();
 	const { length } = items;
-	Object.defineProperty(event, "target", {
-		configurable: true,
-		value: items[0]
+	let target = items[0];
+	Object.defineProperties(event, {
+		currentTarget: {
+			configurable: true,
+			get() {
+				return target;
+			}
+		},
+		target: {
+			configurable: true,
+			value: target
+		}
 	});
 	for (let index = 0; index < length; index += 1) {
 		const item = items[index];
 		const listeners = item[key];
 		if (item.disabled || listeners == null) continue;
-		Object.defineProperty(event, "currentTarget", {
-			configurable: true,
-			value: item
-		});
+		target = item;
 		for (const listener of listeners) {
 			listener.call(item, event);
 			if (event.cancelBubble) return;
@@ -41,23 +43,14 @@ function delegatedEventHandler(event) {
 function getDelegatedName(target, type, options) {
 	if (isEventTarget(target) && EVENT_TYPES.has(type) && !options.capture && !options.once && options.signal == null) return `${EVENT_PREFIX}${type}${options.passive ? EVENT_SUFFIX_PASSIVE : EVENT_SUFFIX_ACTIVE}`;
 }
-function removeDelegatedHandler(doc, type, name, passive) {
-	const count = `${name}${COUNT_SUFFIX}`;
-	doc[count] -= 1;
-	if (doc[count] < 1) {
-		doc[count] = void 0;
-		doc.removeEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE);
-	}
-}
-function removeDelegatedListener(target, type, name, listener, passive) {
+function removeDelegatedListener(target, name, listener) {
 	const handlers = target[name];
 	if (handlers == null || !handlers.has(listener)) return false;
 	handlers.delete(listener);
 	if (handlers.size === 0) target[name] = void 0;
-	removeDelegatedHandler(document, type, name, passive);
 	return true;
 }
-var COUNT_SUFFIX = ".count";
+var DELEGATED = /* @__PURE__ */ new Set();
 var EVENT_PREFIX = "@";
 var EVENT_SUFFIX_ACTIVE = ":active";
 var EVENT_SUFFIX_PASSIVE = ":passive";

package/dist/event/index.js

@@ -48,7 +48,7 @@ function off(target, type, listener, options) {
 	if (!isEventTarget(target) || typeof type !== "string" || typeof listener !== "function") return;
 	const extended = createEventOptions(options);
 	const delegated = getDelegatedName(target, type, extended);
-	if (delegated == null || !removeDelegatedListener(target, type, delegated, listener, extended.passive)) target.removeEventListener(type, listener, extended);
+	if (delegated == null || !removeDelegatedListener(target, delegated, listener)) target.removeEventListener(type, listener, extended);
 }
 function on(target, type, listener, options) {
 	if (!isEventTarget(target) || typeof type !== "string" || typeof listener !== "function") return noop;

package/dist/find/index.js

@@ -1,4 +1,4 @@
-import { findAncestor, findRelatives } from "./relative.js";
+import { findAncestor, findRelatives, getDistance } from "./relative.js";
 function findElement(selector, context) {
 	return findElementOrElements(selector, context, true);
 }
@@ -61,4 +61,4 @@ var STYLE_HIDDEN = "hidden";
 var STYLE_NONE = "none";
 var SUFFIX_HOVER = ":hover";
 var TAG_HEAD = "HEAD";
-export { findElement as $, findElement, findElements as $$, findElements, findAncestor, findRelatives, getElementUnderPointer };
+export { findElement as $, findElement, findElements as $$, findElements, findAncestor, findRelatives, getDistance, getElementUnderPointer };

package/dist/find/relative.js

@@ -1,12 +1,3 @@
-function getDistanceBetweenElements(origin, target) {
-	if (origin === target) return 0;
-	if (origin.parentElement === target) return 1;
-	const children = [...origin.parentElement?.children ?? []];
-	if (children.includes(target)) return Math.abs(children.indexOf(origin) - children.indexOf(target));
-	const comparison = origin.compareDocumentPosition(target);
-	const beforeOrInside = Boolean(comparison & 2 || comparison & 8);
-	if (beforeOrInside || Boolean(comparison & 4 || comparison & 16)) return traverse(beforeOrInside ? origin : target, beforeOrInside ? target : origin) ?? -1;
-}
 function findAncestor(origin, selector) {
 	if (!(origin instanceof Element) || selector == null) return null;
 	if (typeof selector === "string") {
@@ -31,8 +22,8 @@ function findRelatives(origin, selector, context) {
 	let minimum;
 	for (let index = 0; index < length; index += 1) {
 		const element = elements[index];
-		const distance = getDistanceBetweenElements(origin, element);
-		if (distance != null && distance > 0) {
+		const distance = getDistance(origin, element);
+		if (distance > 0) {
 			if (minimum == null || distance < minimum) minimum = distance;
 			distances.push({
 				distance,
@@ -40,19 +31,29 @@ function findRelatives(origin, selector, context) {
 			});
 		}
 	}
-	return distances.filter((found) => found.distance === minimum && found.element !== origin).map((found) => found.element);
+	return distances.filter((found) => found.distance === minimum).map((found) => found.element);
+}
+function getDistance(origin, target) {
+	if (origin === target) return 0;
+	if (origin.parentElement === target || target.parentElement === origin) return 1;
+	if (origin.parentElement != null && origin.parentElement === target.parentElement) {
+		const children = [...origin.parentElement.children];
+		return Math.abs(children.indexOf(origin) - children.indexOf(target));
+	}
+	const comparison = origin.compareDocumentPosition(target);
+	if (comparison & Node.DOCUMENT_POSITION_DISCONNECTED) return -1;
+	const preceding = comparison & Node.DOCUMENT_POSITION_PRECEDING;
+	return traverse(preceding ? origin : target, preceding ? target : origin) ?? -1;
 }
 function traverse(from, to) {
-	let index = [...to.children].indexOf(from);
-	if (index > -1) return 1;
 	let current = from;
 	let distance = 0;
 	let parent = from.parentElement;
 	while (parent != null) {
 		if (parent === to) return distance + 1;
 		const children = [...parent.children];
-		if (children.includes(to)) return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
-		index = children.findIndex((child) => child.contains(to));
+		if (to.parentElement === parent) return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
+		const index = children.findIndex((child) => child.contains(to));
 		if (index > -1) {
 			const traversed = traverse(current, children[index]);
 			return traversed == null || traversed === -1 ? -1 : distance + Math.abs(index - children.indexOf(current)) + traversed;
@@ -62,4 +63,4 @@ function traverse(from, to) {
 		parent = parent.parentElement;
 	}
 }
-export { findAncestor, findRelatives };
+export { findAncestor, findRelatives, getDistance };

package/dist/index.js

@@ -3,10 +3,10 @@ import { isBadAttribute, isBooleanAttribute, isEmptyNonBooleanAttribute, isInval
 import { isChildNode, isInDocument } from "./is.js";
 import { getData, setData } from "./data.js";
 import { dispatch, getPosition, off, on } from "./event/index.js";
-import { findAncestor, findRelatives } from "./find/relative.js";
+import { findAncestor, findRelatives, getDistance } from "./find/relative.js";
 import { $ as findElement, $$ as findElements, getElementUnderPointer } from "./find/index.js";
 import { getFocusable, getTabbable, isFocusable, isTabbable } from "./focusable.js";
 import { html, sanitize } from "./html/index.js";
 import touch_default from "./touch.js";
 import { getStyle, getStyles, getTextDirection, setStyle, setStyles, toggleStyles } from "./style.js";
-export { findElement as $, findElement, findElements as $$, findElements, dispatch, findAncestor, findRelatives, getData, getElementUnderPointer, getFocusable, getPosition, getStyle, getStyles, getTabbable, getTextDirection, html, isBadAttribute, isBooleanAttribute, isChildNode, isEmptyNonBooleanAttribute, isEventTarget, isFocusable, isHTMLOrSVGElement, isInDocument, isInvalidBooleanAttribute, isTabbable, off, on, sanitize, setData, setStyle, setStyles, touch_default as supportsTouch, toggleStyles };
+export { findElement as $, findElement, findElements as $$, findElements, dispatch, findAncestor, findRelatives, getData, getDistance, getElementUnderPointer, getFocusable, getPosition, getStyle, getStyles, getTabbable, getTextDirection, html, isBadAttribute, isBooleanAttribute, isChildNode, isEmptyNonBooleanAttribute, isEventTarget, isFocusable, isHTMLOrSVGElement, isInDocument, isInvalidBooleanAttribute, isTabbable, off, on, sanitize, setData, setStyle, setStyles, touch_default as supportsTouch, toggleStyles };

package/dist/toretto.full.js

@@ -305,6 +305,7 @@ function updateDataAttribute(element, key, value) {
 	updateElementValue(element, getName(key), value, element.setAttribute, element.removeAttribute, true);
 }
 const ATTRIBUTE_DATA_PREFIX = "data-";
+function noop() {}
 function calculate() {
 	return new Promise((resolve) => {
 		const values = [];
@@ -312,49 +313,51 @@ function calculate() {
 		function step(now) {
 			if (last != null) values.push(now - last);
 			last = now;
-			if (values.length >= CALCULATION_TOTAL) resolve(values.sort().slice(2, -2).reduce((first, second) => first + second, 0) / (values.length - CALCULATION_TRIM));
+			if (values.length >= CALCULATION_TOTAL) resolve(values.sort().slice(CALCULATION_TRIM_PART, -CALCULATION_TRIM_PART).reduce((first, second) => first + second, 0) / (values.length - CALCULATION_TRIM_TOTAL));
 			else requestAnimationFrame(step);
 		}
 		requestAnimationFrame(step);
 	});
 }
-function noop() {}
 var CALCULATION_TOTAL = 10;
-var CALCULATION_TRIM = 4;
+var CALCULATION_TRIM_PART = 2;
+var CALCULATION_TRIM_TOTAL = 4;
 calculate().then((value) => {});
 function addDelegatedHandler(doc, type, name, passive) {
-	const count = `${name}${COUNT_SUFFIX}`;
-	if (doc[count] != null) {
-		doc[count] += 1;
-		return;
-	}
-	doc[count] = 1;
+	if (DELEGATED.has(name)) return;
+	DELEGATED.add(name);
 	doc.addEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE, { passive });
 }
 function addDelegatedListener(target, type, name, listener, passive) {
 	target[name] ??= /* @__PURE__ */ new Set();
-	target[name]?.add(listener);
+	target[name].add(listener);
 	addDelegatedHandler(document, type, name, passive);
 	return () => {
-		removeDelegatedListener(target, type, name, listener, passive);
+		removeDelegatedListener(target, name, listener);
 	};
 }
 function delegatedEventHandler(event) {
 	const key = `${EVENT_PREFIX}${event.type}${this ? EVENT_SUFFIX_PASSIVE : EVENT_SUFFIX_ACTIVE}`;
 	const items = event.composedPath();
 	const { length } = items;
-	Object.defineProperty(event, "target", {
-		configurable: true,
-		value: items[0]
+	let target = items[0];
+	Object.defineProperties(event, {
+		currentTarget: {
+			configurable: true,
+			get() {
+				return target;
+			}
+		},
+		target: {
+			configurable: true,
+			value: target
+		}
 	});
 	for (let index = 0; index < length; index += 1) {
 		const item = items[index];
 		const listeners = item[key];
 		if (item.disabled || listeners == null) continue;
-		Object.defineProperty(event, "currentTarget", {
-			configurable: true,
-			value: item
-		});
+		target = item;
 		for (const listener of listeners) {
 			listener.call(item, event);
 			if (event.cancelBubble) return;
@@ -364,23 +367,14 @@ function delegatedEventHandler(event) {
 function getDelegatedName(target, type, options) {
 	if (isEventTarget(target) && EVENT_TYPES.has(type) && !options.capture && !options.once && options.signal == null) return `${EVENT_PREFIX}${type}${options.passive ? EVENT_SUFFIX_PASSIVE : EVENT_SUFFIX_ACTIVE}`;
 }
-function removeDelegatedHandler(doc, type, name, passive) {
-	const count = `${name}${COUNT_SUFFIX}`;
-	doc[count] -= 1;
-	if (doc[count] < 1) {
-		doc[count] = void 0;
-		doc.removeEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE);
-	}
-}
-function removeDelegatedListener(target, type, name, listener, passive) {
+function removeDelegatedListener(target, name, listener) {
 	const handlers = target[name];
 	if (handlers == null || !handlers.has(listener)) return false;
 	handlers.delete(listener);
 	if (handlers.size === 0) target[name] = void 0;
-	removeDelegatedHandler(document, type, name, passive);
 	return true;
 }
-const COUNT_SUFFIX = ".count";
+const DELEGATED = /* @__PURE__ */ new Set();
 const EVENT_PREFIX = "@";
 const EVENT_SUFFIX_ACTIVE = ":active";
 const EVENT_SUFFIX_PASSIVE = ":passive";
@@ -455,7 +449,7 @@ function off(target, type, listener, options) {
 	if (!isEventTarget(target) || typeof type !== "string" || typeof listener !== "function") return;
 	const extended = createEventOptions(options);
 	const delegated = getDelegatedName(target, type, extended);
-	if (delegated == null || !removeDelegatedListener(target, type, delegated, listener, extended.passive)) target.removeEventListener(type, listener, extended);
+	if (delegated == null || !removeDelegatedListener(target, delegated, listener)) target.removeEventListener(type, listener, extended);
 }
 function on(target, type, listener, options) {
 	if (!isEventTarget(target) || typeof type !== "string" || typeof listener !== "function") return noop;
@@ -469,15 +463,6 @@ function on(target, type, listener, options) {
 	};
 }
 const PROPERTY_DETAIL = "detail";
-function getDistanceBetweenElements(origin, target) {
-	if (origin === target) return 0;
-	if (origin.parentElement === target) return 1;
-	const children = [...origin.parentElement?.children ?? []];
-	if (children.includes(target)) return Math.abs(children.indexOf(origin) - children.indexOf(target));
-	const comparison = origin.compareDocumentPosition(target);
-	const beforeOrInside = Boolean(comparison & 2 || comparison & 8);
-	if (beforeOrInside || Boolean(comparison & 4 || comparison & 16)) return traverse(beforeOrInside ? origin : target, beforeOrInside ? target : origin) ?? -1;
-}
 function findAncestor(origin, selector) {
 	if (!(origin instanceof Element) || selector == null) return null;
 	if (typeof selector === "string") {
@@ -502,8 +487,8 @@ function findRelatives(origin, selector, context) {
 	let minimum;
 	for (let index = 0; index < length; index += 1) {
 		const element = elements[index];
-		const distance = getDistanceBetweenElements(origin, element);
-		if (distance != null && distance > 0) {
+		const distance = getDistance(origin, element);
+		if (distance > 0) {
 			if (minimum == null || distance < minimum) minimum = distance;
 			distances.push({
 				distance,
@@ -511,19 +496,29 @@ function findRelatives(origin, selector, context) {
 			});
 		}
 	}
-	return distances.filter((found) => found.distance === minimum && found.element !== origin).map((found) => found.element);
+	return distances.filter((found) => found.distance === minimum).map((found) => found.element);
+}
+function getDistance(origin, target) {
+	if (origin === target) return 0;
+	if (origin.parentElement === target || target.parentElement === origin) return 1;
+	if (origin.parentElement != null && origin.parentElement === target.parentElement) {
+		const children = [...origin.parentElement.children];
+		return Math.abs(children.indexOf(origin) - children.indexOf(target));
+	}
+	const comparison = origin.compareDocumentPosition(target);
+	if (comparison & Node.DOCUMENT_POSITION_DISCONNECTED) return -1;
+	const preceding = comparison & Node.DOCUMENT_POSITION_PRECEDING;
+	return traverse(preceding ? origin : target, preceding ? target : origin) ?? -1;
 }
 function traverse(from, to) {
-	let index = [...to.children].indexOf(from);
-	if (index > -1) return 1;
 	let current = from;
 	let distance = 0;
 	let parent = from.parentElement;
 	while (parent != null) {
 		if (parent === to) return distance + 1;
 		const children = [...parent.children];
-		if (children.includes(to)) return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
-		index = children.findIndex((child) => child.contains(to));
+		if (to.parentElement === parent) return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
+		const index = children.findIndex((child) => child.contains(to));
 		if (index > -1) {
 			const traversed = traverse(current, children[index]);
 			return traversed == null || traversed === -1 ? -1 : distance + Math.abs(index - children.indexOf(current)) + traversed;
@@ -913,4 +908,4 @@ function updateStyleProperty(element, key, value) {
 }
 const ATTRIBUTE_DIRECTION = "dir";
 const EXPRESSION_DIRECTION = /^(ltr|rtl)$/i;
-export { findElement as $, findElement, findElements as $$, findElements, dispatch, findAncestor, findRelatives, getData, getElementUnderPointer, getFocusable, getPosition, getStyle, getStyles, getTabbable, getTextDirection, html, isBadAttribute, isBooleanAttribute, isChildNode, isEmptyNonBooleanAttribute, isEventTarget, isFocusable, isHTMLOrSVGElement, isInDocument, isInvalidBooleanAttribute, isTabbable, off, on, sanitize, setData, setStyle, setStyles, touch_default as supportsTouch, toggleStyles };
+export { findElement as $, findElement, findElements as $$, findElements, dispatch, findAncestor, findRelatives, getData, getDistance, getElementUnderPointer, getFocusable, getPosition, getStyle, getStyles, getTabbable, getTextDirection, html, isBadAttribute, isBooleanAttribute, isChildNode, isEmptyNonBooleanAttribute, isEventTarget, isFocusable, isHTMLOrSVGElement, isInDocument, isInvalidBooleanAttribute, isTabbable, off, on, sanitize, setData, setStyle, setStyles, touch_default as supportsTouch, toggleStyles };

package/package.json

@@ -4,7 +4,7 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"@oscarpalmer/atoms": "^0.115"
+		"@oscarpalmer/atoms": "^0.117"
 	},
 	"description": "A collection of badass DOM utilities.",
 	"devDependencies": {
@@ -13,7 +13,7 @@
 		"jsdom": "^27.3",
 		"oxfmt": "^0.19",
 		"oxlint": "^1.34",
-		"rolldown": "1.0.0-beta.55",
+		"rolldown": "1.0.0-beta.56",
 		"tslib": "^2.8",
 		"typescript": "^5.9",
 		"vite": "8.0.0-beta.2",
@@ -93,5 +93,5 @@
 	},
 	"type": "module",
 	"types": "types/index.d.ts",
-	"version": "0.31.0"
+	"version": "0.32.0"
 }

package/src/event/delegation.ts

@@ -3,31 +3,17 @@ import type {CustomEventListener, RemovableEventListener} from '../models';
 
 //
 
-type DocumentWithListenerCounts = Document &
-	Partial<{
-		[key: string]: number;
-	}>;
-
 export type EventTargetWithListeners = EventTarget &
 	Partial<{
 		[key: string]: Set<EventListener | CustomEventListener>;
 	}>;
 
-function addDelegatedHandler(
-	doc: DocumentWithListenerCounts,
-	type: string,
-	name: string,
-	passive: boolean,
-): void {
-	const count = `${name}${COUNT_SUFFIX}`;
-
-	if (doc[count] != null) {
-		(doc[count] as number) += 1;
-
+function addDelegatedHandler(doc: Document, type: string, name: string, passive: boolean): void {
+	if (DELEGATED.has(name)) {
 		return;
 	}
 
-	doc[count] = 1;
+	DELEGATED.add(name);
 
 	doc.addEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE, {
 		passive,
@@ -43,12 +29,12 @@ export function addDelegatedListener(
 ): RemovableEventListener {
 	target[name] ??= new Set();
 
-	target[name]?.add(listener);
+	target[name].add(listener);
 
-	addDelegatedHandler(document as DocumentWithListenerCounts, type, name, passive);
+	addDelegatedHandler(document, type, name, passive);
 
 	return () => {
-		removeDelegatedListener(target, type, name, listener, passive);
+		removeDelegatedListener(target, name, listener);
 	};
 }
 
@@ -58,9 +44,19 @@ function delegatedEventHandler(this: boolean, event: Event): void {
 	const items = event.composedPath();
 	const {length} = items;
 
-	Object.defineProperty(event, 'target', {
-		configurable: true,
-		value: items[0],
+	let target = items[0];
+
+	Object.defineProperties(event, {
+		currentTarget: {
+			configurable: true,
+			get() {
+				return target;
+			},
+		},
+		target: {
+			configurable: true,
+			value: target,
+		},
 	});
 
 	for (let index = 0; index < length; index += 1) {
@@ -71,10 +67,7 @@ function delegatedEventHandler(this: boolean, event: Event): void {
 			continue;
 		}
 
-		Object.defineProperty(event, 'currentTarget', {
-			configurable: true,
-			value: item,
-		});
+		target = item;
 
 		for (const listener of listeners) {
 			(listener as EventListener).call(item, event);
@@ -102,29 +95,10 @@ export function getDelegatedName(
 	}
 }
 
-function removeDelegatedHandler(
-	doc: DocumentWithListenerCounts,
-	type: string,
-	name: string,
-	passive: boolean,
-): void {
-	const count = `${name}${COUNT_SUFFIX}`;
-
-	(doc[count] as number) -= 1;
-
-	if ((doc[count] as number) < 1) {
-		doc[count] = undefined;
-
-		doc.removeEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE);
-	}
-}
-
 export function removeDelegatedListener(
 	target: EventTargetWithListeners,
-	type: string,
 	name: string,
 	listener: EventListener | CustomEventListener,
-	passive: boolean,
 ): boolean {
 	const handlers = target[name];
 
@@ -138,14 +112,12 @@ export function removeDelegatedListener(
 		target[name] = undefined;
 	}
 
-	removeDelegatedHandler(document as DocumentWithListenerCounts, type, name, passive);
-
 	return true;
 }
 
 //
 
-const COUNT_SUFFIX = '.count';
+const DELEGATED = new Set<string>();
 
 const EVENT_PREFIX = '@';
 
@@ -178,6 +150,6 @@ const EVENT_TYPES: Set<string> = new Set([
 	'touchstart',
 ]);
 
-const HANDLER_ACTIVE: EventListener = delegatedEventHandler.bind(false);
+const HANDLER_ACTIVE = delegatedEventHandler.bind(false);
 
-const HANDLER_PASSIVE: EventListener = delegatedEventHandler.bind(true);
+const HANDLER_PASSIVE = delegatedEventHandler.bind(true);

package/src/event/index.ts

@@ -151,13 +151,7 @@ export function off(
 
 	if (
 		delegated == null ||
-		!removeDelegatedListener(
-			target as EventTargetWithListeners,
-			type,
-			delegated,
-			listener,
-			extended.passive,
-		)
+		!removeDelegatedListener(target as EventTargetWithListeners, delegated, listener)
 	) {
 		target.removeEventListener(type, listener as EventListener, extended);
 	}

package/src/find/index.ts

@@ -171,4 +171,4 @@ const TAG_HEAD = 'HEAD';
 //
 
 export {findElement as $, findElements as $$};
-export {findAncestor, findRelatives} from './relative';
+export {findAncestor, findRelatives, getDistance} from './relative';

package/src/find/relative.ts

@@ -1,30 +1,3 @@
-/**
- * - Get the distance between two elements _(i.e., the amount of nodes of between them)_
- * - If the distance cannot be calculated, `-1` is returned
- */
-function getDistanceBetweenElements(origin: Element, target: Element): number | undefined {
-	if (origin === target) {
-		return 0;
-	}
-
-	if (origin.parentElement === target) {
-		return 1;
-	}
-
-	const children = [...(origin.parentElement?.children ?? [])];
-
-	if (children.includes(target)) {
-		return Math.abs(children.indexOf(origin) - children.indexOf(target));
-	}
-
-	const comparison = origin.compareDocumentPosition(target);
-	const beforeOrInside = Boolean(comparison & 2 || comparison & 8);
-
-	if (beforeOrInside || Boolean(comparison & 4 || comparison & 16)) {
-		return traverse(beforeOrInside ? origin : target, beforeOrInside ? target : origin) ?? -1;
-	}
-}
-
 /**
  * Find the closest ancestor element that matches the selector _(string or callback)_
  *
@@ -74,8 +47,7 @@ export function findAncestor(
 /**
  * Finds the closest elements to the origin element that matches the selector
  *
- * - Traverses up, down, and sideways in the _DOM_-tree
- * - _(If you only want to traverse up, use {@link findAncestor})_
+ * Traverses up, down, and sideways in the _DOM_-tree. _(If you only want to traverse up, use {@link findAncestor})_
  * @param origin Element to start from
  * @param selector Selector to match
  * @param context Context to search within
@@ -109,9 +81,9 @@ export function findRelatives(
 
 	for (let index = 0; index < length; index += 1) {
 		const element = elements[index];
-		const distance = getDistanceBetweenElements(origin, element);
+		const distance = getDistance(origin, element);
 
-		if (distance != null && distance > 0) {
+		if (distance > 0) {
 			if (minimum == null || distance < minimum) {
 				minimum = distance;
 			}
@@ -124,17 +96,43 @@ export function findRelatives(
 	}
 
 	return distances
-		.filter(found => found.distance === minimum && found.element !== origin)
+		.filter(found => found.distance === minimum)
 		.map(found => found.element);
 }
 
-function traverse(from: Element, to: Element): number | undefined {
-	let index = [...to.children].indexOf(from);
+/**
+ * Get the distance between two elements _(i.e., the amount of nodes of between them)_
+ * @param origin Origin element
+ * @param target Target element
+ * @returns Distance between elements, or `-1` if distance cannot be calculated
+ */
+export function getDistance(origin: Element, target: Element): number {
+	if (origin === target) {
+		return 0;
+	}
 
-	if (index > -1) {
+	if (origin.parentElement === target || target.parentElement === origin) {
 		return 1;
 	}
 
+	if (origin.parentElement != null && origin.parentElement === target.parentElement) {
+		const children = [...origin.parentElement.children];
+
+		return Math.abs(children.indexOf(origin) - children.indexOf(target));
+	}
+
+	const comparison = origin.compareDocumentPosition(target);
+
+	if (comparison & Node.DOCUMENT_POSITION_DISCONNECTED) {
+		return -1;
+	}
+
+	const preceding = comparison & Node.DOCUMENT_POSITION_PRECEDING;
+
+	return traverse(preceding ? origin : target, preceding ? target : origin) ?? -1;
+}
+
+function traverse(from: Element, to: Element): number | undefined {
 	let current = from;
 	let distance = 0;
 	let parent: Element | null = from.parentElement;
@@ -146,11 +144,11 @@ function traverse(from: Element, to: Element): number | undefined {
 
 		const children = [...parent.children];
 
-		if (children.includes(to)) {
+		if (to.parentElement === parent) {
 			return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
 		}
 
-		index = children.findIndex(child => child.contains(to));
+		const index = children.findIndex(child => child.contains(to));
 
 		if (index > -1) {
 			const traversed = traverse(current, children[index]);

package/types/event/delegation.d.ts

@@ -4,4 +4,4 @@ export type EventTargetWithListeners = EventTarget & Partial<{
 }>;
 export declare function addDelegatedListener(target: EventTargetWithListeners, type: string, name: string, listener: EventListener | CustomEventListener, passive: boolean): RemovableEventListener;
 export declare function getDelegatedName(target: EventTarget, type: string, options: AddEventListenerOptions): string | undefined;
-export declare function removeDelegatedListener(target: EventTargetWithListeners, type: string, name: string, listener: EventListener | CustomEventListener, passive: boolean): boolean;
+export declare function removeDelegatedListener(target: EventTargetWithListeners, name: string, listener: EventListener | CustomEventListener): boolean;

package/types/find/index.d.ts

@@ -23,4 +23,4 @@ export declare function findElements(selector: Selector, context?: Selector | nu
  */
 export declare function getElementUnderPointer(skipIgnore?: boolean): Element | null;
 export { findElement as $, findElements as $$ };
-export { findAncestor, findRelatives } from './relative';
+export { findAncestor, findRelatives, getDistance } from './relative';

package/types/find/relative.d.ts

@@ -11,11 +11,17 @@ export declare function findAncestor(origin: Element, selector: string | ((eleme
 /**
  * Finds the closest elements to the origin element that matches the selector
  *
- * - Traverses up, down, and sideways in the _DOM_-tree
- * - _(If you only want to traverse up, use {@link findAncestor})_
+ * Traverses up, down, and sideways in the _DOM_-tree. _(If you only want to traverse up, use {@link findAncestor})_
  * @param origin Element to start from
  * @param selector Selector to match
  * @param context Context to search within
  * @returns Found elements
  */
 export declare function findRelatives(origin: Element, selector: string, context?: Document | Element): Element[];
+/**
+ * Get the distance between two elements _(i.e., the amount of nodes of between them)_
+ * @param origin Origin element
+ * @param target Target element
+ * @returns Distance between elements, or `-1` if distance cannot be calculated
+ */
+export declare function getDistance(origin: Element, target: Element): number;