@monstermann/signals-modal 0.1.2 → 0.1.3

package/dist/anchor/getAnchorMeasurement.js

@@ -1,9 +1,9 @@
 import { $anchorMeasurements } from "./internals.js";
-import { Rect } from "@monstermann/fn";
+import { origin } from "@monstermann/geometry/Rect/origin.js";
 
 //#region src/anchor/getAnchorMeasurement.ts
 function getAnchorMeasurement(key) {
-	return $anchorMeasurements().get(key) ?? Rect.origin;
+	return $anchorMeasurements().get(key) ?? origin;
 }
 
 //#endregion

package/dist/anchor/withAnchorElement.js

@@ -1,8 +1,8 @@
 import { $anchorElements } from "./internals.js";
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { INTERNAL, effect, signal } from "@monstermann/signals";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
 
 //#region src/anchor/withAnchorElement.ts
 const path = "@signals-modal/anchor/withAnchorElement.ts";

package/dist/anchor/withAnchorMeasurement.js

@@ -1,37 +1,40 @@
 import { $anchorMeasurements } from "./internals.js";
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { observePosition } from "../internals/observePosition.js";
 import { INTERNAL, effect, memo, signal } from "@monstermann/signals";
-import { Rect } from "@monstermann/fn";
+import { origin } from "@monstermann/geometry/Rect/origin.js";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
+import { isEqual } from "@monstermann/geometry/Rect/isEqual.js";
+import { fromElement } from "@monstermann/geometry/Rect/fromElement.js";
+import { fromDOMRect } from "@monstermann/geometry/Rect/fromDOMRect.js";
 
 //#region src/anchor/withAnchorMeasurement.ts
 const path = "@signals-modal/anchor/withAnchorMeasurement.ts";
 const meta = {
 	path,
-	line: 19,
+	line: 21,
 	name: "withAnchorMeasurement.$rect"
 };
 const meta1 = {
 	path,
-	line: 24,
+	line: 26,
 	name: "withAnchorMeasurement.$measurement"
 };
 const meta2 = {
 	path,
-	line: 28,
+	line: 30,
 	name: "withAnchorMeasurement"
 };
 const meta3 = {
 	path,
-	line: 37,
+	line: 39,
 	name: "withAnchorMeasurement"
 };
 function withAnchorMeasurement(options) {
 	const modal = currentModal();
-	const $rect = signal(Rect.origin, {
-		equals: Rect.isEqual,
+	const $rect = signal(origin, {
+		equals: isEqual,
 		internal: true
 	}, meta);
 	const $measurement = memo(() => options.transform ? options.transform($rect()) : $rect(), INTERNAL, meta1);
@@ -40,8 +43,8 @@ function withAnchorMeasurement(options) {
 		const status = options.$status();
 		if (!element) return;
 		if (status === "closed") return;
-		$rect(Rect.fromElement(element));
-		return observePosition(element, (bounds) => $rect(Rect.fromDOMRect(bounds)));
+		$rect(fromElement(element));
+		return observePosition(element, (bounds) => $rect(fromDOMRect(bounds)));
 	}, INTERNAL, meta2));
 	modal.onDispose(effect(() => {
 		$anchorMeasurements((map) => set(map, modal.key, $rect()));

package/dist/anchor/withMouseAnchor.js

@@ -1,43 +1,45 @@
 import { $anchorMeasurements } from "./internals.js";
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { INTERNAL, effect, memo, peek, signal } from "@monstermann/signals";
-import { Rect } from "@monstermann/fn";
+import { origin } from "@monstermann/geometry/Rect/origin.js";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
+import { isEqual } from "@monstermann/geometry/Rect/isEqual.js";
+import { isOrigin } from "@monstermann/geometry/Rect/isOrigin.js";
 import { $mouseX, $mouseY } from "@monstermann/signals-web";
 
 //#region src/anchor/withMouseAnchor.ts
 const path = "@signals-modal/anchor/withMouseAnchor.ts";
 const meta = {
 	path,
-	line: 18,
+	line: 19,
 	name: "withMouseAnchor.$rect"
 };
 const meta1 = {
 	path,
-	line: 23,
+	line: 24,
 	name: "withMouseAnchor.$measurement"
 };
 const meta2 = {
 	path,
-	line: 27,
+	line: 28,
 	name: "withMouseAnchor"
 };
 const meta3 = {
 	path,
-	line: 41,
+	line: 42,
 	name: "withMouseAnchor"
 };
 function withMouseAnchor(options) {
 	const modal = currentModal();
-	const $rect = signal(Rect.origin, {
-		equals: Rect.isEqual,
+	const $rect = signal(origin, {
+		equals: isEqual,
 		internal: true
 	}, meta);
 	const $measurement = memo(() => options.transform ? options.transform($rect()) : $rect(), INTERNAL, meta1);
 	modal.onDispose(effect(() => {
-		if (options.$status() === "closed") $rect(Rect.origin);
-		else if (Rect.isOrigin($rect())) $rect({
+		if (options.$status() === "closed") $rect(origin);
+		else if (isOrigin($rect())) $rect({
 			height: 0,
 			left: peek($mouseX()),
 			top: peek($mouseY()),

package/dist/floating/getFloatingMeasurement.js

@@ -1,9 +1,9 @@
 import { $floatingMeasurements } from "./internals.js";
-import { Rect } from "@monstermann/fn";
+import { origin } from "@monstermann/geometry/Rect/origin.js";
 
 //#region src/floating/getFloatingMeasurement.ts
 function getFloatingMeasurement(key) {
-	return $floatingMeasurements().get(key) ?? Rect.origin;
+	return $floatingMeasurements().get(key) ?? origin;
 }
 
 //#endregion

package/dist/floating/withFloatingElement.js

@@ -1,8 +1,8 @@
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { $floatingElements } from "./internals.js";
 import { INTERNAL, effect, signal } from "@monstermann/signals";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
 
 //#region src/floating/withFloatingElement.ts
 const path = "@signals-modal/floating/withFloatingElement.ts";

package/dist/floating/withFloatingMeasurement.js

@@ -1,37 +1,39 @@
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { $floatingMeasurements } from "./internals.js";
 import { observeDimensions } from "../internals/observeDimensions.js";
 import { INTERNAL, effect, memo, signal } from "@monstermann/signals";
-import { Rect } from "@monstermann/fn";
+import { origin } from "@monstermann/geometry/Rect/origin.js";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
+import { isEqual } from "@monstermann/geometry/Rect/isEqual.js";
+import { fromElement } from "@monstermann/geometry/Rect/fromElement.js";
 
 //#region src/floating/withFloatingMeasurement.ts
 const path = "@signals-modal/floating/withFloatingMeasurement.ts";
 const meta = {
 	path,
-	line: 19,
+	line: 20,
 	name: "withFloatingMeasurement.$rect"
 };
 const meta1 = {
 	path,
-	line: 24,
+	line: 25,
 	name: "withFloatingMeasurement.$measurement"
 };
 const meta2 = {
 	path,
-	line: 28,
+	line: 29,
 	name: "withFloatingMeasurement"
 };
 const meta3 = {
 	path,
-	line: 48,
+	line: 49,
 	name: "withFloatingMeasurement"
 };
 function withFloatingMeasurement(options) {
 	const modal = currentModal();
-	const $rect = signal(Rect.origin, {
-		equals: Rect.isEqual,
+	const $rect = signal(origin, {
+		equals: isEqual,
 		internal: true
 	}, meta);
 	const $measurement = memo(() => options.transform ? options.transform($rect()) : $rect(), INTERNAL, meta1);
@@ -40,7 +42,7 @@ function withFloatingMeasurement(options) {
 		const status = options.$status();
 		if (!element) return;
 		if (status === "closed") return;
-		const bounds = Rect.fromElement(element);
+		const bounds = fromElement(element);
 		$rect({
 			height: bounds.height,
 			left: 0,

package/dist/groups/withModalGroups.js

@@ -1,12 +1,12 @@
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
-import { create } from "../node_modules/@monstermann/set/dist/Set/create.js";
 import { currentModal } from "../createModal.js";
 import { $keysToGroups } from "./internals.js";
 import { getGroupsForModal } from "./getGroupsForModal.js";
-import { mapOrElse } from "../node_modules/@monstermann/map/dist/Map/mapOrElse.js";
-import { addAll } from "../node_modules/@monstermann/set/dist/Set/addAll.js";
 import { INTERNAL, memo } from "@monstermann/signals";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
+import { create } from "@monstermann/set/Set/create.js";
+import { mapOrElse } from "@monstermann/map/Map/mapOrElse.js";
+import { addAll } from "@monstermann/set/Set/addAll.js";
 
 //#region src/groups/withModalGroups.ts
 const meta = {

package/dist/position/internals.js

@@ -1,31 +1,38 @@
 import { SILENT, signal } from "@monstermann/signals";
-import { Rect } from "@monstermann/fn";
+import { setBottom } from "@monstermann/geometry/Rect/setBottom.js";
+import { top } from "@monstermann/geometry/Rect/top.js";
+import { setTop } from "@monstermann/geometry/Rect/setTop.js";
+import { bottom } from "@monstermann/geometry/Rect/bottom.js";
+import { setRight } from "@monstermann/geometry/Rect/setRight.js";
+import { left } from "@monstermann/geometry/Rect/left.js";
+import { setLeft } from "@monstermann/geometry/Rect/setLeft.js";
+import { right } from "@monstermann/geometry/Rect/right.js";
 
 //#region src/position/internals.ts
 const path = "@signals-modal/position/internals.ts";
 const meta = {
 	path,
-	line: 6,
+	line: 13,
 	name: "$positions"
 };
 const meta1 = {
 	path,
-	line: 7,
+	line: 14,
 	name: "$placements"
 };
 const $positions = signal(/* @__PURE__ */ new Map(), SILENT, meta);
 const $placements = signal(/* @__PURE__ */ new Map(), SILENT, meta1);
 function getBoundaryUp(boundary, anchor) {
-	return Rect.setBottom(boundary, Rect.top(anchor));
+	return setBottom(boundary, top(anchor));
 }
 function getBoundaryDown(boundary, anchor) {
-	return Rect.setTop(boundary, Rect.bottom(anchor));
+	return setTop(boundary, bottom(anchor));
 }
 function getBoundaryLeft(boundary, anchor) {
-	return Rect.setRight(boundary, Rect.left(anchor));
+	return setRight(boundary, left(anchor));
 }
 function getBoundaryRight(boundary, anchor) {
-	return Rect.setLeft(boundary, Rect.right(anchor));
+	return setLeft(boundary, right(anchor));
 }
 
 //#endregion

package/dist/position/withBoundary.js

@@ -1,37 +1,39 @@
 import { currentModal } from "../createModal.js";
 import { INTERNAL, effect, memo, signal } from "@monstermann/signals";
-import { Rect } from "@monstermann/fn";
+import { origin } from "@monstermann/geometry/Rect/origin.js";
+import { isEqual } from "@monstermann/geometry/Rect/isEqual.js";
+import { fromWindow } from "@monstermann/geometry/Rect/fromWindow.js";
 
 //#region src/position/withBoundary.ts
 const path = "@signals-modal/position/withBoundary.ts";
 const meta = {
 	path,
-	line: 13,
+	line: 15,
 	name: "withBoundary.$rect"
 };
 const meta1 = {
 	path,
-	line: 18,
+	line: 20,
 	name: "withBoundary.$boundary"
 };
 const meta2 = {
 	path,
-	line: 22,
+	line: 24,
 	name: "withBoundary"
 };
 function withBoundary(options) {
 	const modal = currentModal();
-	const $rect = signal(Rect.origin, {
-		equals: Rect.isEqual,
+	const $rect = signal(origin, {
+		equals: isEqual,
 		internal: true
 	}, meta);
 	const $boundary = memo(() => options.transform ? options.transform($rect()) : $rect(), INTERNAL, meta1);
 	modal.onDispose(effect(() => {
 		if (options.$status() === "closed") return;
 		const ac = new AbortController();
-		$rect(Rect.fromWindow());
+		$rect(fromWindow());
 		window.addEventListener("resize", () => {
-			$rect(Rect.fromWindow());
+			$rect(fromWindow());
 		}, {
 			passive: true,
 			signal: ac.signal

package/dist/position/withPlacement.js

@@ -1,9 +1,10 @@
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { $placements, getBoundaryDown, getBoundaryLeft, getBoundaryRight, getBoundaryUp } from "./internals.js";
 import { INTERNAL, effect, memo } from "@monstermann/signals";
-import { Rect } from "@monstermann/fn";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
+import { width } from "@monstermann/geometry/Rect/width.js";
+import { height } from "@monstermann/geometry/Rect/height.js";
 
 //#region src/position/withPlacement.ts
 const path = "@signals-modal/position/withPlacement.ts";
@@ -25,32 +26,32 @@ const placementResolvers = {
 	"horizontal-center": function(o) {
 		const left = getBoundaryLeft(o.boundary, o.anchor);
 		const right = getBoundaryRight(o.boundary, o.anchor);
-		return Rect.width(right) >= Rect.width(left) ? "right-center" : "left-center";
+		return width(right) >= width(left) ? "right-center" : "left-center";
 	},
 	"horizontal-down": function(o) {
 		const left = getBoundaryLeft(o.boundary, o.anchor);
 		const right = getBoundaryRight(o.boundary, o.anchor);
-		return Rect.width(right) >= Rect.width(left) ? "right-down" : "left-down";
+		return width(right) >= width(left) ? "right-down" : "left-down";
 	},
 	"horizontal-up": function(o) {
 		const left = getBoundaryLeft(o.boundary, o.anchor);
 		const right = getBoundaryRight(o.boundary, o.anchor);
-		return Rect.width(right) >= Rect.width(left) ? "right-up" : "left-up";
+		return width(right) >= width(left) ? "right-up" : "left-up";
 	},
 	"vertical-center": function(o) {
 		const up = getBoundaryUp(o.boundary, o.anchor);
 		const down = getBoundaryDown(o.boundary, o.anchor);
-		return Rect.height(down) >= Rect.height(up) ? "down-center" : "up-center";
+		return height(down) >= height(up) ? "down-center" : "up-center";
 	},
 	"vertical-left": function(o) {
 		const up = getBoundaryUp(o.boundary, o.anchor);
 		const down = getBoundaryDown(o.boundary, o.anchor);
-		return Rect.height(down) >= Rect.height(up) ? "down-left" : "up-left";
+		return height(down) >= height(up) ? "down-left" : "up-left";
 	},
 	"vertical-right": function(o) {
 		const up = getBoundaryUp(o.boundary, o.anchor);
 		const down = getBoundaryDown(o.boundary, o.anchor);
-		return Rect.height(down) >= Rect.height(up) ? "down-right" : "up-right";
+		return height(down) >= height(up) ? "down-right" : "up-right";
 	}
 };
 function withPlacement(options) {

package/dist/position/withPosition.js

@@ -1,184 +1,203 @@
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { currentModal } from "../createModal.js";
 import { $positions, getBoundaryDown, getBoundaryLeft, getBoundaryRight, getBoundaryUp } from "./internals.js";
 import { roundByDPR } from "../internals/roundByDPR.js";
 import { INTERNAL, effect, memo } from "@monstermann/signals";
-import { Rect, pipe } from "@monstermann/fn";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
+import { top } from "@monstermann/geometry/Rect/top.js";
+import { left } from "@monstermann/geometry/Rect/left.js";
+import { right } from "@monstermann/geometry/Rect/right.js";
+import { width } from "@monstermann/geometry/Rect/width.js";
+import { height } from "@monstermann/geometry/Rect/height.js";
+import { pipe } from "@monstermann/fn";
+import { alignCenterX } from "@monstermann/geometry/Rect/alignCenterX.js";
+import { snapBelow } from "@monstermann/geometry/Rect/snapBelow.js";
+import { clamp } from "@monstermann/geometry/Rect/clamp.js";
+import { transform } from "@monstermann/geometry/Rect/transform.js";
+import { centerX } from "@monstermann/geometry/Rect/centerX.js";
+import { alignRight } from "@monstermann/geometry/Rect/alignRight.js";
+import { alignLeft } from "@monstermann/geometry/Rect/alignLeft.js";
+import { alignCenterY } from "@monstermann/geometry/Rect/alignCenterY.js";
+import { snapLeftOf } from "@monstermann/geometry/Rect/snapLeftOf.js";
+import { centerY } from "@monstermann/geometry/Rect/centerY.js";
+import { alignTop } from "@monstermann/geometry/Rect/alignTop.js";
+import { alignBottom } from "@monstermann/geometry/Rect/alignBottom.js";
+import { snapRightOf } from "@monstermann/geometry/Rect/snapRightOf.js";
+import { snapAbove } from "@monstermann/geometry/Rect/snapAbove.js";
 
 //#region src/position/withPosition.ts
 const path = "@signals-modal/position/withPosition.ts";
 const meta = {
 	path,
-	line: 296,
+	line: 315,
 	name: "withPosition.$position"
 };
 const meta1 = {
 	path,
-	line: 305,
+	line: 324,
 	name: "withPosition"
 };
 const positionResolvers = {
 	"down-center": function(o) {
 		const boundary = getBoundaryDown(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignCenterX(o.anchor), Rect.snapBelow(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.centerX(o.anchor) - Rect.left(floating);
+		const floating = pipe(o.floating, alignCenterX(o.anchor), snapBelow(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = centerX(o.anchor) - left(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY: 0
 		};
 	},
 	"down-left": function(o) {
 		const boundary = getBoundaryDown(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignRight(o.anchor), Rect.snapBelow(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.right(o.anchor) - Rect.left(floating);
+		const floating = pipe(o.floating, alignRight(o.anchor), snapBelow(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = right(o.anchor) - left(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY: 0
 		};
 	},
 	"down-right": function(o) {
 		const boundary = getBoundaryDown(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignLeft(o.anchor), Rect.snapBelow(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
+		const floating = pipe(o.floating, alignLeft(o.anchor), snapBelow(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX: 0,
 			originY: 0
 		};
 	},
 	"left-center": function(o) {
 		const boundary = getBoundaryLeft(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignCenterY(o.anchor), Rect.snapLeftOf(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.width(floating);
-		const originY = Rect.centerY(o.anchor) - Rect.top(floating);
+		const floating = pipe(o.floating, alignCenterY(o.anchor), snapLeftOf(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = width(floating);
+		const originY = centerY(o.anchor) - top(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"left-down": function(o) {
 		const boundary = getBoundaryLeft(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignTop(o.anchor), Rect.snapLeftOf(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.width(floating);
-		const originY = Rect.centerY(o.anchor) - Rect.top(floating);
+		const floating = pipe(o.floating, alignTop(o.anchor), snapLeftOf(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = width(floating);
+		const originY = centerY(o.anchor) - top(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"left-up": function(o) {
 		const boundary = getBoundaryLeft(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignBottom(o.anchor), Rect.snapLeftOf(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.width(floating);
-		const originY = Rect.centerY(o.anchor) - Rect.top(floating);
+		const floating = pipe(o.floating, alignBottom(o.anchor), snapLeftOf(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = width(floating);
+		const originY = centerY(o.anchor) - top(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"right-center": function(o) {
 		const boundary = getBoundaryRight(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignCenterY(o.anchor), Rect.snapRightOf(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
+		const floating = pipe(o.floating, alignCenterY(o.anchor), snapRightOf(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
 		const originX = 0;
-		const originY = Rect.centerY(o.anchor) - Rect.top(floating);
+		const originY = centerY(o.anchor) - top(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"right-down": function(o) {
 		const boundary = getBoundaryRight(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignTop(o.anchor), Rect.snapRightOf(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
+		const floating = pipe(o.floating, alignTop(o.anchor), snapRightOf(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
 		const originX = 0;
-		const originY = Rect.centerY(o.anchor) - Rect.top(floating);
+		const originY = centerY(o.anchor) - top(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"right-up": function(o) {
 		const boundary = getBoundaryRight(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignBottom(o.anchor), Rect.snapRightOf(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
+		const floating = pipe(o.floating, alignBottom(o.anchor), snapRightOf(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
 		const originX = 0;
-		const originY = Rect.centerY(o.anchor) - Rect.top(floating);
+		const originY = centerY(o.anchor) - top(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"up-center": function(o) {
 		const boundary = getBoundaryUp(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignCenterX(o.anchor), Rect.snapAbove(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.centerX(o.anchor) - Rect.left(floating);
-		const originY = Rect.height(floating);
+		const floating = pipe(o.floating, alignCenterX(o.anchor), snapAbove(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = centerX(o.anchor) - left(floating);
+		const originY = height(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"up-left": function(o) {
 		const boundary = getBoundaryUp(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignRight(o.anchor), Rect.snapAbove(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
-		const originX = Rect.right(o.anchor) - Rect.left(floating);
-		const originY = Rect.height(floating);
+		const floating = pipe(o.floating, alignRight(o.anchor), snapAbove(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
+		const originX = right(o.anchor) - left(floating);
+		const originY = height(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};
 	},
 	"up-right": function(o) {
 		const boundary = getBoundaryUp(o.boundary, o.anchor);
-		const floating = pipe(o.floating, Rect.alignLeft(o.anchor), Rect.snapAbove(o.anchor), Rect.clamp(boundary), Rect.transform(roundByDPR), o.transform);
+		const floating = pipe(o.floating, alignLeft(o.anchor), snapAbove(o.anchor), clamp(boundary), transform(roundByDPR), o.transform);
 		const originX = 0;
-		const originY = Rect.height(floating);
+		const originY = height(floating);
 		return {
-			floatingX: Rect.left(floating),
-			floatingY: Rect.top(floating),
-			maxHeight: Rect.height(boundary),
-			maxWidth: Rect.width(boundary),
+			floatingX: left(floating),
+			floatingY: top(floating),
+			maxHeight: height(boundary),
+			maxWidth: width(boundary),
 			originX,
 			originY
 		};

package/dist/status/internals.js

@@ -1,11 +1,11 @@
-import { create } from "../node_modules/@monstermann/set/dist/Set/create.js";
-import { remove } from "../node_modules/@monstermann/set/dist/Set/remove.js";
-import { add } from "../node_modules/@monstermann/set/dist/Set/add.js";
 import { onModalClosed } from "./onModalClosed.js";
 import { onModalOpened } from "./onModalOpened.js";
 import { onModalOpening } from "./onModalOpening.js";
 import { onModalDisposed } from "../createModal.js";
 import { INTERNAL, SILENT, signal } from "@monstermann/signals";
+import { create } from "@monstermann/set/Set/create.js";
+import { remove } from "@monstermann/set/Set/remove.js";
+import { add } from "@monstermann/set/Set/add.js";
 
 //#region src/status/internals.ts
 const path = "@signals-modal/status/internals.ts";

package/dist/status/onModalOpened.d.ts

@@ -1,6 +1,6 @@
-import * as _monstermann_signals3 from "@monstermann/signals";
+import * as _monstermann_signals2 from "@monstermann/signals";
 
 //#region src/status/onModalOpened.d.ts
-declare const onModalOpened: _monstermann_signals3.Emitter<string>;
+declare const onModalOpened: _monstermann_signals2.Emitter<string>;
 //#endregion
 export { onModalOpened };

package/dist/status/onModalOpening.d.ts

@@ -1,6 +1,6 @@
-import * as _monstermann_signals2 from "@monstermann/signals";
+import * as _monstermann_signals3 from "@monstermann/signals";
 
 //#region src/status/onModalOpening.d.ts
-declare const onModalOpening: _monstermann_signals2.Emitter<string>;
+declare const onModalOpening: _monstermann_signals3.Emitter<string>;
 //#endregion
 export { onModalOpening };

package/dist/status/withModalStatus.js

@@ -1,5 +1,3 @@
-import { set } from "../node_modules/@monstermann/map/dist/Map/set.js";
-import { remove } from "../node_modules/@monstermann/map/dist/Map/remove.js";
 import { onModalClosed } from "./onModalClosed.js";
 import { onModalOpened } from "./onModalOpened.js";
 import { onModalOpening } from "./onModalOpening.js";
@@ -7,6 +5,8 @@ import { $keysToStatus } from "./internals.js";
 import { currentModal } from "../createModal.js";
 import { onModalClosing } from "./onModalClosing.js";
 import { INTERNAL, signal, watch } from "@monstermann/signals";
+import { set } from "@monstermann/map/Map/set.js";
+import { remove } from "@monstermann/map/Map/remove.js";
 
 //#region src/status/withModalStatus.ts
 const path = "@signals-modal/status/withModalStatus.ts";

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@monstermann/signals-modal",
     "type": "module",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "description": "Composable modal management.",
     "author": "Michael Ostermann <michaelostermann@me.com>",
     "license": "MIT",
@@ -32,12 +32,12 @@
         "release": "bun publish --access public"
     },
     "dependencies": {
-        "@monstermann/fn": "^0.3.1",
+        "@monstermann/fn": "^0.4.0",
         "@monstermann/signals": "^0.1.1",
         "@monstermann/signals-web": "^0.2.0"
     },
     "devDependencies": {
-        "@monstermann/unplugin-fn": "^0.3.1",
+        "@monstermann/unplugin-fn": "^0.4.0",
         "@monstermann/unplugin-signals": "^0.1.1"
     }
 }