@monstermann/signals-modal 0.3.4 → 0.4.0

package/dist/anchor/getAnchorMeasurement.mjs

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

package/dist/anchor/internals.mjs

@@ -1,4 +1,4 @@
-import { SILENT, signal } from "@monstermann/signals";
+import { signal } from "@monstermann/signals";
 
 //#region src/anchor/internals.ts
 const path = "@signals-modal/anchor/internals.ts";
@@ -9,11 +9,17 @@ const meta = {
 };
 const meta1 = {
 	path,
-	line: 6,
+	line: 10,
 	name: "$anchorMeasurements"
 };
-const $anchorElements = signal(/* @__PURE__ */ new Map(), SILENT, meta);
-const $anchorMeasurements = signal(/* @__PURE__ */ new Map(), SILENT, meta1);
+const $anchorElements = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta);
+const $anchorMeasurements = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta1);
 
 //#endregion
 export { $anchorElements, $anchorMeasurements };

package/dist/anchor/withAnchorElement.mjs

@@ -1,29 +1,22 @@
 import { $anchorElements } from "./internals.mjs";
 import { currentModal } from "../createModal.mjs";
-import { INTERNAL, effect, signal } from "@monstermann/signals";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
+import { INTERNAL, signal } from "@monstermann/signals";
 
 //#region src/anchor/withAnchorElement.ts
-const path = "@signals-modal/anchor/withAnchorElement.ts";
 const meta = {
-	path,
-	line: 10,
+	path: "@signals-modal/anchor/withAnchorElement.ts",
+	line: 8,
 	name: "withAnchorElement.$anchorElement"
 };
-const meta1 = {
-	path,
-	line: 12,
-	name: "withAnchorElement"
-};
 function withAnchorElement(anchorElement) {
 	const modal = currentModal();
 	const $anchorElement = signal(anchorElement ?? null, INTERNAL, meta);
-	modal.onDispose(effect(() => {
-		$anchorElements((map) => set(map, modal.key, $anchorElement));
-	}, INTERNAL, meta1));
+	$anchorElements((map) => map.set(modal.key, $anchorElement));
 	modal.onDispose(() => {
-		$anchorElements((map) => remove(map, modal.key));
+		$anchorElements((map) => {
+			map.delete(modal.key);
+			return map;
+		});
 	});
 	return $anchorElement;
 }

package/dist/anchor/withAnchorMeasurement.mjs

@@ -3,8 +3,6 @@ import { currentModal } from "../createModal.mjs";
 import { observePosition } from "../internals/observePosition.mjs";
 import { INTERNAL, effect, memo, signal } from "@monstermann/signals";
 import { origin } from "@monstermann/geometry/Rect/origin.mjs";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
 import { isEqual } from "@monstermann/geometry/Rect/isEqual.mjs";
 import { fromElement } from "@monstermann/geometry/Rect/fromElement.mjs";
 import { fromDOMRect } from "@monstermann/geometry/Rect/fromDOMRect.mjs";
@@ -13,22 +11,17 @@ import { fromDOMRect } from "@monstermann/geometry/Rect/fromDOMRect.mjs";
 const path = "@signals-modal/anchor/withAnchorMeasurement.ts";
 const meta = {
 	path,
-	line: 21,
+	line: 19,
 	name: "withAnchorMeasurement.$rect"
 };
 const meta1 = {
 	path,
-	line: 26,
+	line: 24,
 	name: "withAnchorMeasurement.$measurement"
 };
 const meta2 = {
 	path,
-	line: 30,
-	name: "withAnchorMeasurement"
-};
-const meta3 = {
-	path,
-	line: 39,
+	line: 28,
 	name: "withAnchorMeasurement"
 };
 function withAnchorMeasurement(options) {
@@ -46,11 +39,12 @@ function withAnchorMeasurement(options) {
 		$rect(fromElement(element));
 		return observePosition(element, (bounds) => $rect(fromDOMRect(bounds)));
 	}, INTERNAL, meta2));
-	modal.onDispose(effect(() => {
-		$anchorMeasurements((map) => set(map, modal.key, $rect()));
-	}, INTERNAL, meta3));
+	$anchorMeasurements((map) => map.set(modal.key, $rect));
 	modal.onDispose(() => {
-		$anchorMeasurements((map) => remove(map, modal.key));
+		$anchorMeasurements((map) => {
+			map.delete(modal.key);
+			return map;
+		});
 	});
 	return $measurement;
 }

package/dist/anchor/withMouseAnchor.mjs

@@ -2,8 +2,6 @@ import { $anchorMeasurements } from "./internals.mjs";
 import { currentModal } from "../createModal.mjs";
 import { INTERNAL, effect, memo, peek, signal } from "@monstermann/signals";
 import { origin } from "@monstermann/geometry/Rect/origin.mjs";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
 import { isEqual } from "@monstermann/geometry/Rect/isEqual.mjs";
 import { isOrigin } from "@monstermann/geometry/Rect/isOrigin.mjs";
 import { $mouseX, $mouseY } from "@monstermann/signals-web";
@@ -12,22 +10,17 @@ import { $mouseX, $mouseY } from "@monstermann/signals-web";
 const path = "@signals-modal/anchor/withMouseAnchor.ts";
 const meta = {
 	path,
-	line: 19,
+	line: 17,
 	name: "withMouseAnchor.$rect"
 };
 const meta1 = {
 	path,
-	line: 24,
+	line: 22,
 	name: "withMouseAnchor.$measurement"
 };
 const meta2 = {
 	path,
-	line: 28,
-	name: "withMouseAnchor"
-};
-const meta3 = {
-	path,
-	line: 42,
+	line: 26,
 	name: "withMouseAnchor"
 };
 function withMouseAnchor(options) {
@@ -46,11 +39,12 @@ function withMouseAnchor(options) {
 			width: 0
 		});
 	}, INTERNAL, meta2));
-	modal.onDispose(effect(() => {
-		$anchorMeasurements((map) => set(map, modal.key, $rect()));
-	}, INTERNAL, meta3));
+	$anchorMeasurements((map) => map.set(modal.key, $rect));
 	modal.onDispose(() => {
-		$anchorMeasurements((map) => remove(map, modal.key));
+		$anchorMeasurements((map) => {
+			map.delete(modal.key);
+			return map;
+		});
 	});
 	return $measurement;
 }

package/dist/floating/getFloatingMeasurement.mjs

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

package/dist/floating/internals.mjs

@@ -1,4 +1,4 @@
-import { SILENT, signal } from "@monstermann/signals";
+import { signal } from "@monstermann/signals";
 
 //#region src/floating/internals.ts
 const path = "@signals-modal/floating/internals.ts";
@@ -9,11 +9,17 @@ const meta = {
 };
 const meta1 = {
 	path,
-	line: 6,
+	line: 10,
 	name: "$floatingMeasurements"
 };
-const $floatingElements = signal(/* @__PURE__ */ new Map(), SILENT, meta);
-const $floatingMeasurements = signal(/* @__PURE__ */ new Map(), SILENT, meta1);
+const $floatingElements = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta);
+const $floatingMeasurements = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta1);
 
 //#endregion
 export { $floatingElements, $floatingMeasurements };

package/dist/floating/withFloatingElement.mjs

@@ -1,29 +1,22 @@
 import { currentModal } from "../createModal.mjs";
 import { $floatingElements } from "./internals.mjs";
-import { INTERNAL, effect, signal } from "@monstermann/signals";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
+import { INTERNAL, signal } from "@monstermann/signals";
 
 //#region src/floating/withFloatingElement.ts
-const path = "@signals-modal/floating/withFloatingElement.ts";
 const meta = {
-	path,
-	line: 10,
+	path: "@signals-modal/floating/withFloatingElement.ts",
+	line: 8,
 	name: "withFloatingElement.$anchorElement"
 };
-const meta1 = {
-	path,
-	line: 12,
-	name: "withFloatingElement"
-};
 function withFloatingElement(anchorElement) {
 	const modal = currentModal();
 	const $anchorElement = signal(anchorElement ?? null, INTERNAL, meta);
-	modal.onDispose(effect(() => {
-		$floatingElements((map) => set(map, modal.key, $anchorElement));
-	}, INTERNAL, meta1));
+	$floatingElements((map) => map.set(modal.key, $anchorElement));
 	modal.onDispose(() => {
-		$floatingElements((map) => remove(map, modal.key));
+		$floatingElements((map) => {
+			map.delete(modal.key);
+			return map;
+		});
 	});
 	return $anchorElement;
 }

package/dist/floating/withFloatingMeasurement.mjs

@@ -3,8 +3,6 @@ import { $floatingMeasurements } from "./internals.mjs";
 import { observeDimensions } from "../internals/observeDimensions.mjs";
 import { INTERNAL, effect, memo, signal } from "@monstermann/signals";
 import { origin } from "@monstermann/geometry/Rect/origin.mjs";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
 import { isEqual } from "@monstermann/geometry/Rect/isEqual.mjs";
 import { fromElement } from "@monstermann/geometry/Rect/fromElement.mjs";
 
@@ -12,22 +10,17 @@ import { fromElement } from "@monstermann/geometry/Rect/fromElement.mjs";
 const path = "@signals-modal/floating/withFloatingMeasurement.ts";
 const meta = {
 	path,
-	line: 20,
+	line: 18,
 	name: "withFloatingMeasurement.$rect"
 };
 const meta1 = {
 	path,
-	line: 25,
+	line: 23,
 	name: "withFloatingMeasurement.$measurement"
 };
 const meta2 = {
 	path,
-	line: 29,
-	name: "withFloatingMeasurement"
-};
-const meta3 = {
-	path,
-	line: 49,
+	line: 27,
 	name: "withFloatingMeasurement"
 };
 function withFloatingMeasurement(options) {
@@ -56,11 +49,12 @@ function withFloatingMeasurement(options) {
 			width: bounds$1.width
 		}));
 	}, INTERNAL, meta2));
-	modal.onDispose(effect(() => {
-		$floatingMeasurements((map) => set(map, modal.key, $rect()));
-	}, INTERNAL, meta3));
+	$floatingMeasurements((map) => map.set(modal.key, $rect));
 	modal.onDispose(() => {
-		$floatingMeasurements((map) => remove(map, modal.key));
+		$floatingMeasurements((map) => {
+			map.delete(modal.key);
+			return map;
+		});
 	});
 	return $measurement;
 }

package/dist/groups/internals.mjs

@@ -1,4 +1,4 @@
-import { INTERNAL, SILENT, memo, signal } from "@monstermann/signals";
+import { INTERNAL, memo, signal } from "@monstermann/signals";
 
 //#region src/groups/internals.ts
 const path = "@signals-modal/groups/internals.ts";
@@ -9,10 +9,13 @@ const meta = {
 };
 const meta1 = {
 	path,
-	line: 5,
+	line: 8,
 	name: "$groupsToKeys"
 };
-const $keysToGroups = signal(/* @__PURE__ */ new Map(), SILENT, meta);
+const $keysToGroups = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta);
 const $groupsToKeys = memo(() => {
 	const map = /* @__PURE__ */ new Map();
 	for (const [key, groups] of $keysToGroups()) for (const group of groups) {

package/dist/groups/withModalGroups.mjs

@@ -2,25 +2,26 @@ import { currentModal } from "../createModal.mjs";
 import { $keysToGroups } from "./internals.mjs";
 import { getGroupsForModal } from "./getGroupsForModal.mjs";
 import { INTERNAL, memo } from "@monstermann/signals";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
-import { create } from "@monstermann/set/Set/create.mjs";
-import { mapOrElse } from "@monstermann/map/Map/mapOrElse.mjs";
-import { addAll } from "@monstermann/set/Set/addAll.mjs";
 
 //#region src/groups/withModalGroups.ts
 const meta = {
 	path: "@signals-modal/groups/withModalGroups.ts",
-	line: 28,
+	line: 24,
 	name: "withModalGroups"
 };
 function withModalGroups(groups) {
 	const modal = currentModal();
 	$keysToGroups((keys) => {
-		return mapOrElse(keys, modal.key, (set$1) => addAll(set$1, groups), (map) => set(map, modal.key, create(groups)));
+		if (!keys.has(modal.key)) keys.set(modal.key, /* @__PURE__ */ new Set());
+		const g = keys.get(modal.key);
+		for (const group of groups) g.add(group);
+		return keys;
 	});
 	modal.onDispose(() => {
-		$keysToGroups((keys) => remove(keys, modal.key));
+		$keysToGroups((keys) => {
+			keys.delete(modal.key);
+			return keys;
+		});
 	});
 	return memo(() => getGroupsForModal(modal.key), INTERNAL, meta);
 }

package/dist/position/getModalPlacement.mjs

@@ -2,7 +2,7 @@ import { $placements } from "./internals.mjs";
 
 //#region src/position/getModalPlacement.ts
 function getModalPlacement(key) {
-	return $placements().get(key);
+	return $placements().get(key)?.();
 }
 
 //#endregion

package/dist/position/getModalPosition.mjs

@@ -2,7 +2,7 @@ import { $positions } from "./internals.mjs";
 
 //#region src/position/getModalPosition.ts
 function getModalPosition(key) {
-	return $positions().get(key);
+	return $positions().get(key)?.();
 }
 
 //#endregion

package/dist/position/internals.mjs

@@ -1,4 +1,4 @@
-import { SILENT, signal } from "@monstermann/signals";
+import { signal } from "@monstermann/signals";
 import { setBottom } from "@monstermann/geometry/Rect/setBottom.mjs";
 import { top } from "@monstermann/geometry/Rect/top.mjs";
 import { setTop } from "@monstermann/geometry/Rect/setTop.mjs";
@@ -12,16 +12,22 @@ import { right } from "@monstermann/geometry/Rect/right.mjs";
 const path = "@signals-modal/position/internals.ts";
 const meta = {
 	path,
-	line: 13,
+	line: 14,
 	name: "$positions"
 };
 const meta1 = {
 	path,
-	line: 14,
+	line: 19,
 	name: "$placements"
 };
-const $positions = signal(/* @__PURE__ */ new Map(), SILENT, meta);
-const $placements = signal(/* @__PURE__ */ new Map(), SILENT, meta1);
+const $positions = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta);
+const $placements = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta1);
 function getBoundaryUp(boundary, anchor) {
 	return setBottom(boundary, top(anchor));
 }

package/dist/position/withPlacement.mjs

@@ -1,23 +1,15 @@
 import { currentModal } from "../createModal.mjs";
 import { $placements, getBoundaryDown, getBoundaryLeft, getBoundaryRight, getBoundaryUp } from "./internals.mjs";
-import { INTERNAL, effect, memo } from "@monstermann/signals";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
+import { INTERNAL, memo } from "@monstermann/signals";
 import { width } from "@monstermann/geometry/Rect/width.mjs";
 import { height } from "@monstermann/geometry/Rect/height.mjs";
 
 //#region src/position/withPlacement.ts
-const path = "@signals-modal/position/withPlacement.ts";
 const meta = {
-	path,
-	line: 99,
+	path: "@signals-modal/position/withPlacement.ts",
+	line: 97,
 	name: "withPlacement.$placement"
 };
-const meta1 = {
-	path,
-	line: 107,
-	name: "withPlacement"
-};
 const placementResolvers = {
 	"down-center": () => "down-center",
 	"left-down": () => "left-down",
@@ -57,11 +49,12 @@ function withPlacement(options) {
 			floating: options.$floatingMeasurement()
 		});
 	}, INTERNAL, meta);
-	modal.onDispose(effect(() => {
-		$placements((p) => set(p, modal.key, $placement()));
-	}, void 0, meta1));
+	$placements((p) => p.set(modal.key, $placement));
 	modal.onDispose(() => {
-		$placements((p) => remove(p, modal.key));
+		$placements((p) => {
+			p.delete(modal.key);
+			return p;
+		});
 	});
 	return $placement;
 }

package/dist/position/withPosition.mjs

@@ -1,9 +1,7 @@
 import { currentModal } from "../createModal.mjs";
 import { $positions, getBoundaryDown, getBoundaryLeft, getBoundaryRight, getBoundaryUp } from "./internals.mjs";
 import { roundByDPR } from "../internals/roundByDPR.mjs";
-import { INTERNAL, effect, memo } from "@monstermann/signals";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
+import { INTERNAL, memo } from "@monstermann/signals";
 import { top } from "@monstermann/geometry/Rect/top.mjs";
 import { left } from "@monstermann/geometry/Rect/left.mjs";
 import { right } from "@monstermann/geometry/Rect/right.mjs";
@@ -26,17 +24,11 @@ import { snapRightOf } from "@monstermann/geometry/Rect/snapRightOf.mjs";
 import { snapAbove } from "@monstermann/geometry/Rect/snapAbove.mjs";
 
 //#region src/position/withPosition.ts
-const path = "@signals-modal/position/withPosition.ts";
 const meta = {
-	path,
-	line: 315,
+	path: "@signals-modal/position/withPosition.ts",
+	line: 313,
 	name: "withPosition.$position"
 };
-const meta1 = {
-	path,
-	line: 324,
-	name: "withPosition"
-};
 const positionResolvers = {
 	"down-center": function(o) {
 		const boundary = getBoundaryDown(o.boundary, o.anchor);
@@ -213,11 +205,12 @@ function withPosition(options) {
 			transform: options.transform ?? ((r) => r)
 		});
 	}, INTERNAL, meta);
-	modal.onDispose(effect(() => {
-		$positions((p) => set(p, modal.key, $position()));
-	}, INTERNAL, meta1));
+	$positions((p) => p.set(modal.key, $position));
 	modal.onDispose(() => {
-		$positions((p) => remove(p, modal.key));
+		$positions((p) => {
+			p.delete(modal.key);
+			return p;
+		});
 	});
 	return $position;
 }

package/dist/status/internals.mjs

@@ -2,7 +2,7 @@ import { onModalClosed } from "./onModalClosed.mjs";
 import { onModalOpened } from "./onModalOpened.mjs";
 import { onModalOpening } from "./onModalOpening.mjs";
 import { onModalDisposed } from "../createModal.mjs";
-import { INTERNAL, SILENT, signal } from "@monstermann/signals";
+import { INTERNAL, signal } from "@monstermann/signals";
 import { create } from "@monstermann/set/Set/create.mjs";
 import { add } from "@monstermann/set/Set/add.mjs";
 import { remove } from "@monstermann/set/Set/remove.mjs";
@@ -16,10 +16,13 @@ const meta = {
 };
 const meta1 = {
 	path,
-	line: 13,
+	line: 17,
 	name: "$openedModals"
 };
-const $keysToStatus = signal(/* @__PURE__ */ new Map(), SILENT, meta);
+const $keysToStatus = signal(/* @__PURE__ */ new Map(), {
+	mutable: true,
+	silent: true
+}, meta);
 const $openedModals = signal(create(), INTERNAL, meta1);
 onModalOpening((key) => $openedModals((m) => add(m, key)));
 onModalOpened((key) => $openedModals((m) => add(m, key)));

package/dist/status/withModalStatus.mjs

@@ -8,31 +8,32 @@ import { isModalOpen } from "./isModalOpen.mjs";
 import { onModalClosing } from "./onModalClosing.mjs";
 import { openModal } from "./openModal.mjs";
 import { INTERNAL, memo, signal, watch } from "@monstermann/signals";
-import { set } from "@monstermann/map/Map/set.mjs";
-import { remove } from "@monstermann/map/Map/remove.mjs";
 
 //#region src/status/withModalStatus.ts
 const path = "@signals-modal/status/withModalStatus.ts";
 const meta = {
 	path,
-	line: 23,
+	line: 21,
 	name: "withModalStatus.$status"
 };
 const meta1 = {
 	path,
-	line: 28,
+	line: 29,
 	name: "withModalStatus"
 };
 const meta2 = {
 	path,
-	line: 36,
+	line: 37,
 	name: "withModalStatus.$isOpen"
 };
 function withModalStatus(status = "closed") {
 	const modal = currentModal();
 	const $status = signal(status, INTERNAL, meta);
-	$keysToStatus((keys) => set(keys, modal.key, $status));
-	modal.onDispose(() => $keysToStatus((keys) => remove(keys, modal.key)));
+	$keysToStatus((keys) => keys.set(modal.key, $status));
+	modal.onDispose(() => $keysToStatus((keys) => {
+		keys.delete(modal.key);
+		return keys;
+	}));
 	modal.onDispose(watch($status, (status$1) => {
 		if (status$1 === "closed") onModalClosed(modal.key);
 		else if (status$1 === "closing") onModalClosing(modal.key);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@monstermann/signals-modal",
     "type": "module",
-    "version": "0.3.4",
+    "version": "0.4.0",
     "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.4.2",
-        "@monstermann/signals": "^0.1.2",
-        "@monstermann/signals-web": "^0.2.2"
+        "@monstermann/fn": "^0.4.4",
+        "@monstermann/signals": "^0.2.0",
+        "@monstermann/signals-web": "^0.2.3"
     },
     "devDependencies": {
-        "@monstermann/unplugin-fn": "^0.4.2",
-        "@monstermann/unplugin-signals": "^0.1.2"
+        "@monstermann/unplugin-fn": "^0.4.4",
+        "@monstermann/unplugin-signals": "^0.2.0"
     }
 }