@weasel-js/core 1.9.3 → 1.9.4

package/dist/tools/builtin/line/useLineTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLineTool.js","names":["LineIcon","useLineTool","options","useMemo","defineTool","cursorFor","insertBindingBehaviors","behaviors"],"sources":["../../../../src/tools/builtin/line/useLineTool.tsx"],"sourcesContent":["import { useMemo } from 'react';\nimport { defineTool } from '../../overlayBinding';\nimport { LineIcon } from '../../../icons';\nimport type { Tool } from '../../overlayBinding';\nimport { insertBindingBehaviors, type InsertToolOptions } from '../shared/insertToolOptions';\nimport { cursorFor } from '@weasel-js/cursor';\n\n/** An endpoint of a line, in world coordinates. */\nexport interface LinePoint { x: number; y: number }\n\n/**\n * Click-down → drag → release line tool. The `drag` binding routes to\n * `insertAction`, which owns the live preview and commits through the\n * `insert` dep with `{ kind: 'line', a, b }` endpoints (not the AABB\n * diagonal), so the drag direction is preserved.\n *\n * Modifiers are applied by `insertAction`:\n *   - shift: constrain to 15° increments\n *   - alt: mirror the end around the start (the drag is treated as a\n *     half-line) — the line-specific reading of the action's\n *     corner ⇄ center origin toggle\n */\nexport function useLineTool(options: InsertToolOptions = {}): Tool<null> {\n  const { behaviors } = options;\n  return useMemo(\n    () =>\n      defineTool<null>({\n        id: 'line',\n        capabilities: ['creates-shapes'],\n        hookName: 'useLineTool',\n        cursor: cursorFor('crosshairLine', { fallback: 'crosshair' }),\n        presentation: {\n          label: 'Line',\n          group: 'shape',\n          icon: <LineIcon />,\n        },\n        bindings: [\n          {\n            spec: { kind: 'drag' },\n            actionId: 'insert',\n            opts: { params: { kind: 'line' } , ...insertBindingBehaviors(behaviors) },\n          },\n        ],\n      }),\n    [behaviors],\n  );\n}\n"],"mappings":";;;;;;;AAsBA,SAAgBC,EAAY,IAA6B,CAAC,GAAe;CACvE,IAAM,EAAE,iBAAcC;CACtB,OAAOC,QAEHC,EAAiB;EACf,IAAI;EACJ,cAAc,CAAC,gBAAgB;EAC/B,UAAU;EACV,QAAQC,EAAU,iBAAiB,EAAE,UAAU,YAAY,CAAC;EAC5D,cAAc;GACZ,OAAO;GACP,OAAO;GACP,MAAM,kBAACL,GAAD,CAAW,CAAA;EACnB;EACA,UAAU,CACR;GACE,MAAM,EAAE,MAAM,OAAO;GACrB,UAAU;GACV,MAAM;IAAE,QAAQ,EAAE,MAAM,OAAO;IAAI,GAAGM,EAAuBC,CAAS;GAAE;EAC1E,CACF;CACF,CAAC,GACH,CAACA,CAAS,CACZ;AACF"}
+{"version":3,"file":"useLineTool.js","names":["LineIcon","useLineTool","options","useMemo","defineTool","cursorFor","insertBindingBehaviors","behaviors"],"sources":["../../../../src/tools/builtin/line/useLineTool.tsx"],"sourcesContent":["import { useMemo } from 'react';\nimport { defineTool } from '../../overlayBinding';\nimport { LineIcon } from '../../../icons';\nimport type { Tool } from '../../overlayBinding';\nimport { insertBindingBehaviors, type InsertToolOptions } from '../shared/insertToolOptions';\nimport { cursorFor } from '@weasel-js/cursor';\n\n/** An endpoint of a line, in world coordinates. */\nexport interface LinePoint { x: number; y: number }\n\n/**\n * Click-down → drag → release line tool. The `drag` binding routes to\n * `insertAction`, which owns the live preview and commits through the\n * `insert` dep with `{ kind: 'line', a, b }` endpoints (not the AABB\n * diagonal), so the drag direction is preserved.\n *\n * Modifiers are applied by `insertAction`:\n *   - shift: constrain to 15° increments\n *   - alt: mirror the end around the start (the drag is treated as a\n *     half-line) — the line-specific reading of the action's\n *     corner ⇄ center origin toggle\n */\nexport function useLineTool(options: InsertToolOptions = {}): Tool<null> {\n  const { behaviors } = options;\n  return useMemo(\n    () =>\n      defineTool<null>({\n        id: 'line',\n        keybinding: { key: '\\\\' },\n        capabilities: ['creates-shapes'],\n        hookName: 'useLineTool',\n        cursor: cursorFor('crosshairLine', { fallback: 'crosshair' }),\n        presentation: {\n          label: 'Line',\n          group: 'shape',\n          icon: <LineIcon />,\n        },\n        bindings: [\n          {\n            spec: { kind: 'drag' },\n            actionId: 'insert',\n            opts: { params: { kind: 'line' } , ...insertBindingBehaviors(behaviors) },\n          },\n        ],\n      }),\n    [behaviors],\n  );\n}\n"],"mappings":";;;;;;;AAsBA,SAAgBC,EAAY,IAA6B,CAAC,GAAe;CACvE,IAAM,EAAE,iBAAcC;CACtB,OAAOC,QAEHC,EAAiB;EACf,IAAI;EACJ,YAAY,EAAE,KAAK,KAAK;EACxB,cAAc,CAAC,gBAAgB;EAC/B,UAAU;EACV,QAAQC,EAAU,iBAAiB,EAAE,UAAU,YAAY,CAAC;EAC5D,cAAc;GACZ,OAAO;GACP,OAAO;GACP,MAAM,kBAACL,GAAD,CAAW,CAAA;EACnB;EACA,UAAU,CACR;GACE,MAAM,EAAE,MAAM,OAAO;GACrB,UAAU;GACV,MAAM;IAAE,QAAQ,EAAE,MAAM,OAAO;IAAI,GAAGM,EAAuBC,CAAS;GAAE;EAC1E,CACF;CACF,CAAC,GACH,CAACA,CAAS,CACZ;AACF"}

package/dist/tools/builtin/pen/usePenTool.js

@@ -1,18 +1,20 @@
 import { pxExtent as e, withinPxRadius as t } from "../../../core/viewport/pxExtent.js";
-import { defaultCommitAdapter as n } from "../../../interactions/actions/defaultCommitAdapter.js";
-import { createDeleteOp as r } from "../../../core/ops/delete.js";
-import { createInsertOp as i } from "../../../core/ops/create.js";
-import { anchorsToPath as a, pathToAnchors as o } from "../../../features/paths/anchors.js";
+import { anchorsToPath as n, pathToAnchors as r } from "../../../features/paths/anchors.js";
+import { asNodeId as i } from "../../../core/scene/types.js";
+import { defaultCommitAdapter as a } from "../../../interactions/actions/defaultCommitAdapter.js";
+import { createDeleteOp as o } from "../../../core/ops/delete.js";
 import { defineTool as s } from "../../overlayBinding.js";
 import c from "../../../icons/PenIcon.js";
 import { nearestPathAnchor as l, reverseAnchors as u } from "../../../features/paths/nearestAnchor.js";
 import { constrainTo45 as d } from "../../../util/constrainTo45.js";
-import { createElement as f, useCallback as p, useMemo as m, useReducer as h, useRef as g } from "react";
-import { useLatest as _ } from "@weasel-js/react";
-import { ActionDisabledReason as v } from "@weasel-js/routing";
-import { cursorFor as y } from "@weasel-js/cursor";
+import { createPointerFollower as f } from "../shared/pointerFollower.js";
+import { boundsOfPath as p } from "@weasel-js/geom";
+import { createElement as m, useCallback as h, useMemo as g, useReducer as _, useRef as v } from "react";
+import { useLatest as y } from "@weasel-js/react";
+import { ActionDisabledReason as b } from "@weasel-js/routing";
+import { cursorFor as x } from "@weasel-js/cursor";
 //#region src/tools/builtin/pen/usePenTool.ts
-function b() {
+function S() {
 	return {
 		finishedSubpaths: [],
 		current: null,
@@ -22,99 +24,110 @@ function b() {
 		continuing: null
 	};
 }
-function x(e) {
+function C(e) {
 	e.finishedSubpaths = [], e.current = null, e.cursor = null, e.draggingHandleAt = null, e.closeHintActive = !1, e.continuing = null;
 }
-function S(e) {
+function w(e) {
 	return (e.current ? e.current.anchors.length : 0) + e.finishedSubpaths.reduce((e, t) => e + t.anchors.length, 0);
 }
-function C(e, t) {
-	let n = [...e];
-	return t && t.anchors.length > 0 && n.push(t), a(n.map((e) => e.anchors), n.map((e) => e.closed));
+function T(e, t) {
+	let r = [...e];
+	return t && t.anchors.length > 0 && r.push(t), n(r.map((e) => e.anchors), r.map((e) => e.closed));
 }
-function w(e) {
-	let { wrapPath: d, adapter: w, autoSelect: k = !0, autoCommitOnClose: A = !0, closeHitRadius: j = 8, anchorSnapRadius: M = 8, snapPoint: N } = e, P = g(null);
-	P.current === null && (P.current = b());
-	let F = _({
-		wrapPath: d,
-		adapter: w,
-		autoSelect: k,
-		autoCommitOnClose: A,
+function E(e = {}) {
+	let { autoSelect: d = !0, autoCommitOnClose: E = !0, closeHitRadius: j = 8, anchorSnapRadius: M = 8, snapPoint: N } = e, P = v(null);
+	P.current === null && (P.current = S());
+	let F = y({
+		autoSelect: d,
+		autoCommitOnClose: E,
 		closeHitRadius: j,
 		anchorSnapRadius: M,
 		snapPoint: N
-	}), [, I] = h((e) => e + 1, 0), L = p((e, t, n) => {
-		let r = e.continuing, i = [...e.finishedSubpaths, ...t ? [t] : []];
-		if (!n || i.length === 0) return;
-		let { anchors: s, closed: c } = o(C(i, null));
-		r.reversed && (s[0] = u(s[0]));
-		let l = o(r.original);
-		l.anchors.splice(r.sub, 1, s[0]), l.closed.splice(r.sub, 1, c[0]), l.anchors.push(...s.slice(1)), l.closed.push(...c.slice(1));
-		let d = {
-			...a(l.anchors, l.closed),
-			fillRule: r.original.fillRule
+	}), [, I] = _((e) => e + 1, 0), L = h((e, t, a) => {
+		let o = a.editAnchors, s = e.continuing, c = [...e.finishedSubpaths, ...t ? [t] : []];
+		if (!o || c.length === 0) return;
+		let { anchors: l, closed: d } = r(T(c, null));
+		s.reversed && (l[0] = u(l[0]));
+		let f = r(s.original);
+		f.anchors.splice(s.sub, 1, l[0]), f.closed.splice(s.sub, 1, d[0]), f.anchors.push(...l.slice(1)), f.closed.push(...d.slice(1));
+		let p = {
+			...n(f.anchors, f.closed),
+			fillRule: s.original.fillRule
 		};
-		O(d, r.original) || (n.applyEdit(r.id, d, "Continue path"), F.current.autoSelect && F.current.adapter.setSelection([r.id]));
-	}, [F]), R = p((e, t) => {
+		A(p, s.original) || (o.applyEdit(s.id, p, "Continue path"), F.current.autoSelect && a.selection?.set([i(s.id)]));
+	}, [F]), R = h((e, t) => {
 		let n = e.current && e.current.anchors.length > 0 ? e.current : null;
 		if (e.continuing) {
-			L(e, n, t.editAnchors), x(e);
+			L(e, n, t), C(e);
+			return;
+		}
+		let r = n && n.anchors.length >= 2 ? n : null;
+		if (e.finishedSubpaths.length === 0 && !r) {
+			C(e);
 			return;
 		}
-		if (e.finishedSubpaths.length === 0 && !n) return;
-		let r = e.finishedSubpaths.every((e) => e.closed) && (n === null || n.closed), i = C(e.finishedSubpaths, n), a = F.current.wrapPath(i, { closed: r }), o = F.current.adapter.addNode(a);
-		F.current.autoSelect && F.current.adapter.setSelection([o]), x(e);
-	}, [L, F]), z = p((e, t, n) => {
+		let i = e.finishedSubpaths.every((e) => e.closed) && (r === null || r.closed), a = T(e.finishedSubpaths, r), o = t.insert?.commit(p(a), {
+			kind: "path",
+			path: a,
+			closed: i
+		}) ?? null;
+		o !== null && F.current.autoSelect && t.selection?.set([o]), C(e);
+	}, [L, F]), z = h((e, t, n) => {
 		if (!n || n.end === null || !e.current || e.current.anchors.length === 0) return !1;
 		let r = e.continuing;
 		if (r && n.id === r.id && n.sub === r.sub) return !1;
 		let i = t.scene;
-		return !i && !t.applyOps || !(r ? t.editAnchors?.editOps : F.current.adapter.makeNode) ? !1 : r?.id === n.id || i?.get(n.id) !== void 0;
-	}, [F]), B = p((e, t, s) => {
-		let c = t.editAnchors, l = t.scene, d = e.current, { anchors: f, closed: p } = o(C([...e.finishedSubpaths, d], null)), m = c.getEditablePath(s.id), h = o(m), g = s.end === "last" ? u(h.anchors[s.sub]) : h.anchors[s.sub], _ = f[f.length - 1], v = _[_.length - 1], y = d.anchors[d.anchors.length - 1].outHandle ?? g[0].outHandle;
-		y && (v.outHandle = { ...y }), _.push(...g.slice(1));
-		let b = e.continuing, S = b?.id === s.id, w = S ? {
+		return !i && !t.applyOps || !(r ? t.editAnchors?.editOps : t.insert?.build) ? !1 : r?.id === n.id || i?.get(n.id) !== void 0;
+	}, []), B = h((e, t, s) => {
+		let c = t.editAnchors, l = t.scene, d = e.current, { anchors: f, closed: m } = r(T([...e.finishedSubpaths, d], null)), h = c.getEditablePath(s.id), g = r(h), _ = s.end === "last" ? u(g.anchors[s.sub]) : g.anchors[s.sub], v = f[f.length - 1], y = v[v.length - 1], b = d.anchors[d.anchors.length - 1].outHandle ?? _[0].outHandle;
+		b && (y.outHandle = { ...b }), v.push(..._.slice(1));
+		let x = e.continuing, S = x?.id === s.id, w = S ? {
 			anchors: [],
 			closed: []
 		} : {
-			anchors: h.anchors.filter((e, t) => t !== s.sub),
-			closed: h.closed.filter((e, t) => t !== s.sub)
-		}, T = "Join paths", E = [], D;
-		if (b) {
-			b.reversed && (f[0] = u(f[0]));
-			let e = o(b.original);
-			e.anchors.splice(b.sub, 1, f[0]), e.closed.splice(b.sub, 1, p[0]), e.anchors.push(...f.slice(1), ...w.anchors), e.closed.push(...p.slice(1), ...w.closed), S && (e.anchors.splice(s.sub, 1), e.closed.splice(s.sub, 1));
+			anchors: g.anchors.filter((e, t) => t !== s.sub),
+			closed: g.closed.filter((e, t) => t !== s.sub)
+		}, E = "Join paths", D = [], O;
+		if (x) {
+			x.reversed && (f[0] = u(f[0]));
+			let e = r(x.original);
+			e.anchors.splice(x.sub, 1, f[0]), e.closed.splice(x.sub, 1, m[0]), e.anchors.push(...f.slice(1), ...w.anchors), e.closed.push(...m.slice(1), ...w.closed), S && (e.anchors.splice(s.sub, 1), e.closed.splice(s.sub, 1));
 			let t = {
-				...a(e.anchors, e.closed),
-				fillRule: b.original.fillRule
+				...n(e.anchors, e.closed),
+				fillRule: x.original.fillRule
 			};
-			E.push(...c.editOps(b.id, t, T)), D = b.id;
+			D.push(...c.editOps(x.id, t, E)), O = x.id;
 		} else {
-			let e = a([...f, ...w.anchors], [...p, ...w.closed]), t = F.current.adapter.makeNode(F.current.wrapPath(e, { closed: !1 }));
-			E.push(i({ node: t })), D = t.id;
+			let e = n([...f, ...w.anchors], [...m, ...w.closed]), r = t.insert.build(p(e), {
+				kind: "path",
+				path: e,
+				closed: !1
+			});
+			if (r === null) return;
+			D.push(...r.ops), O = r.id;
 		}
-		S || E.push(r({ node: l.get(s.id) }));
-		let O = t.applyOps;
-		O ? O(E, T) : l.applyBatch(E, T, n(l)), F.current.autoSelect && F.current.adapter.setSelection([D]), x(e);
-	}, [F]), V = p((e, t, n) => {
-		let r = P.current;
-		if (r.current || r.finishedSubpaths.length > 0) return !1;
-		let i = F.current.closeHitRadius, a = E(e), s = l(D(e, t, n, i), {
+		S || D.push(o({ node: l.get(s.id) }));
+		let k = t.applyOps;
+		k ? k(D, E) : l.applyBatch(D, E, a(l)), F.current.autoSelect && t.selection?.set([i(O)]), C(e);
+	}, [F]), V = h((e, t, n) => {
+		let i = P.current;
+		if (i.current || i.finishedSubpaths.length > 0) return !1;
+		let a = F.current.closeHitRadius, o = O(e), s = l(k(e, t, n, a), {
 			x: t,
 			y: n
-		}, i, a, (e) => e.end !== null);
+		}, a, o, (e) => e.end !== null);
 		if (!s) return !1;
-		let c = e.editAnchors.getEditablePath(s.id), d = o(c).anchors[s.sub], f = s.end === "first" && d.length > 1;
-		return r.current = {
+		let c = e.editAnchors.getEditablePath(s.id), d = r(c).anchors[s.sub], f = s.end === "first" && d.length > 1;
+		return i.current = {
 			anchors: f ? u(d) : d,
 			closed: !1
-		}, r.continuing = {
+		}, i.continuing = {
 			id: s.id,
 			sub: s.sub,
 			reversed: f,
 			original: c
 		}, !0;
-	}, [F]), H = p((e, t) => {
+	}, [F]), H = h((e, t) => {
 		let n = F.current.snapPoint;
 		return n ? n({
 			x: e,
@@ -123,13 +136,13 @@ function w(e) {
 			x: e,
 			y: t
 		};
-	}, [F]), U = p((e, t, n) => {
+	}, [F]), U = h((e, t, n) => {
 		let r = F.current.anchorSnapRadius;
 		if (r > 0) {
-			let i = l(D(e, t, n, r), {
+			let i = l(k(e, t, n, r), {
 				x: t,
 				y: n
-			}, r, E(e));
+			}, r, O(e));
 			if (i) return {
 				x: i.x,
 				y: i.y,
@@ -140,7 +153,28 @@ function w(e) {
 			...H(t, n),
 			hit: null
 		};
-	}, [H, F]), W = p((e, n, r, i, a) => t(n - i, r - a, F.current.closeHitRadius, E(e)), [F]), G = m(() => {
+	}, [H, F]), W = h((e, n, r, i, a) => t(n - i, r - a, F.current.closeHitRadius, O(e)), [F]), G = g(() => {
+		let e, n = f(() => r()), r = () => {
+			let r = P.current;
+			!r.current && r.finishedSubpaths.length === 0 && n.unfollow();
+			let i = r.current ? n.pointer()?.get() ?? null : null;
+			r.cursor = i ? H(i.worldX, i.worldY) : null;
+			let a = r.current && r.current.anchors.length >= 3 ? r.current.anchors[0] : null;
+			r.closeHintActive = a !== null && r.cursor !== null && t(a.x - r.cursor.x, a.y - r.cursor.y, F.current.closeHitRadius, e?.get().scale ?? {
+				x: 1,
+				y: 1
+			}), I();
+		};
+		return {
+			refresh: r,
+			update(t) {
+				e = t.view, n.follow(t.pointer), r();
+			},
+			stop() {
+				n.unfollow(), I();
+			}
+		};
+	}, [H, F]), K = g(() => {
 		let e = () => P.current;
 		return [
 			{
@@ -149,10 +183,13 @@ function w(e) {
 				eligible: { capability: "creates-paths" },
 				requires: [
 					"view",
+					"pointer",
 					"areaSelect",
 					"editAnchors",
 					"scene",
-					"applyOps"
+					"applyOps",
+					"insert",
+					"selection"
 				],
 				invoker: {
 					timing: "immediate",
@@ -160,14 +197,14 @@ function w(e) {
 						let r = n;
 						if (r?.pressX === void 0 || r.pressY === void 0) return;
 						if (V(t, r.pressX, r.pressY)) {
-							I();
+							G.update(t);
 							return;
 						}
 						let { x: i, y: a, hit: o } = U(t, r.pressX, r.pressY), s = e();
 						if (s.current && s.current.anchors.length >= 3) {
 							let e = s.current.anchors[0];
 							if (W(t, e.x, e.y, i, a)) {
-								s.current.closed = !0, s.finishedSubpaths.push(s.current), s.current = null, s.closeHintActive = !1, F.current.autoCommitOnClose && R(s, t), I();
+								s.current.closed = !0, s.finishedSubpaths.push(s.current), s.current = null, s.closeHintActive = !1, F.current.autoCommitOnClose && R(s, t), G.update(t);
 								return;
 							}
 						}
@@ -178,7 +215,7 @@ function w(e) {
 						}, s.current.anchors.push({
 							x: i,
 							y: a
-						}), c && B(s, t, o), I();
+						}), c && B(s, t, o), G.update(t);
 					}
 				}
 			},
@@ -186,13 +223,17 @@ function w(e) {
 				id: "pen.finishOpen",
 				label: "Pen — finish open path",
 				eligible: { capability: "creates-paths" },
-				requires: ["editAnchors"],
-				enabled: () => S(e()) >= 2 || v.NotApplicable,
+				requires: [
+					"editAnchors",
+					"insert",
+					"selection"
+				],
+				enabled: () => w(e()) >= 2 || b.NotApplicable,
 				invoker: {
 					timing: "immediate",
 					run: (t, n) => {
 						let r = e();
-						n?.viaDoubleClick && r.current && (r.current.anchors.pop(), r.current.anchors.length === 0 && (r.current = null)), R(r, t), I();
+						n?.viaDoubleClick && r.current && (r.current.anchors.pop(), r.current.anchors.length === 0 && (r.current = null)), R(r, t), G.refresh();
 					}
 				}
 			},
@@ -202,10 +243,13 @@ function w(e) {
 				eligible: { capability: "creates-paths" },
 				requires: [
 					"view",
+					"pointer",
 					"areaSelect",
 					"editAnchors",
 					"scene",
-					"applyOps"
+					"applyOps",
+					"insert",
+					"selection"
 				],
 				invoker: {
 					timing: "ongoing",
@@ -223,18 +267,18 @@ function w(e) {
 						}
 						n.draggingHandleAt = n.current.anchors.length - 1, t.modifiers.alt && (n.current.anchors[n.draggingHandleAt].altBroken = !0);
 						let o = !i;
-						return T(n, t.world, t.modifiers.shift, o, F.current.snapPoint), I(), {
+						return D(n, t.world, t.modifiers.shift, o, F.current.snapPoint), G.update(t.deps), {
 							onMove: (t) => {
 								let n = e();
-								n.draggingHandleAt !== null && (t.modifiers.alt && n.current && (n.current.anchors[n.draggingHandleAt].altBroken = !0), T(n, t.world, t.modifiers.shift, o, F.current.snapPoint), I());
+								n.draggingHandleAt !== null && (t.modifiers.alt && n.current && (n.current.anchors[n.draggingHandleAt].altBroken = !0), D(n, t.world, t.modifiers.shift, o, F.current.snapPoint), I());
 							},
 							onEnd: (n, r) => {
 								let s = e();
 								if (r === "cancel") {
-									i ? x(s) : s.current && s.draggingHandleAt === s.current.anchors.length - 1 && (s.current.anchors.pop(), s.current.anchors.length === 0 && (s.current = null)), s.draggingHandleAt = null, I();
+									i ? C(s) : s.current && s.draggingHandleAt === s.current.anchors.length - 1 && (s.current.anchors.pop(), s.current.anchors.length === 0 && (s.current = null)), s.draggingHandleAt = null, G.refresh();
 									return;
 								}
-								s.draggingHandleAt !== null && (n.modifiers.alt && s.current && (s.current.anchors[s.draggingHandleAt].altBroken = !0), T(s, n.world, n.modifiers.shift, o, F.current.snapPoint), s.draggingHandleAt = null), a && s.current && B(s, t.deps, a), I();
+								s.draggingHandleAt !== null && (n.modifiers.alt && s.current && (s.current.anchors[s.draggingHandleAt].altBroken = !0), D(s, n.world, n.modifiers.shift, o, F.current.snapPoint), s.draggingHandleAt = null), a && s.current && B(s, t.deps, a), G.refresh();
 							}
 						};
 					}
@@ -244,12 +288,16 @@ function w(e) {
 				id: "pen.finish",
 				label: "Pen — finish path",
 				eligible: { capability: "creates-paths" },
-				requires: ["editAnchors"],
-				enabled: () => S(e()) > 0 || v.NotApplicable,
+				requires: [
+					"editAnchors",
+					"insert",
+					"selection"
+				],
+				enabled: () => w(e()) > 0 || b.NotApplicable,
 				invoker: {
 					timing: "immediate",
 					run: (t) => {
-						R(e(), t), I();
+						R(e(), t), G.refresh();
 					}
 				}
 			},
@@ -259,12 +307,12 @@ function w(e) {
 				eligible: { capability: "creates-paths" },
 				enabled: () => {
 					let t = e();
-					return t.current !== null || t.finishedSubpaths.length > 0 || v.NotApplicable;
+					return t.current !== null || t.finishedSubpaths.length > 0 || b.NotApplicable;
 				},
 				invoker: {
 					timing: "immediate",
 					run: () => {
-						x(e()), I();
+						C(e()), G.refresh();
 					}
 				}
 			}
@@ -276,22 +324,24 @@ function w(e) {
 		V,
 		z,
 		B,
-		F
+		F,
+		G
 	]);
-	return m(() => s({
+	return g(() => s({
 		id: "pen",
+		keybinding: { key: "P" },
 		capabilities: ["creates-paths"],
 		hookName: "usePenTool",
-		cursor: () => P.current?.closeHintActive ? "pointer" : y("pen", { fallback: "crosshair" }),
+		cursor: () => P.current?.closeHintActive ? "pointer" : x("pen", { fallback: "crosshair" }),
 		presentation: {
 			label: "Pen",
-			icon: f(c),
+			icon: m(c),
 			group: "draw"
 		},
 		initScratch: () => P.current,
-		actions: G,
+		actions: K,
 		onDeactivate: () => {
-			x(P.current), I();
+			C(P.current), G.stop();
 		},
 		bindings: [
 			{
@@ -351,9 +401,9 @@ function w(e) {
 				actionId: "pen.cancel"
 			}
 		]
-	}), [G]);
+	}), [K, G]);
 }
-w.prefs = {
+E.prefs = {
 	name: "Pen",
 	description: "Pen-tool behavior.",
 	children: { autoCommitOnClose: {
@@ -363,7 +413,7 @@ w.prefs = {
 		default: !0
 	} }
 };
-function T(e, t, n, r, i) {
+function D(e, t, n, r, i) {
 	if (e.current === null || e.draggingHandleAt === null) return;
 	let a = e.current.anchors[e.draggingHandleAt], o = i ? i(t) : t, s = o.x - a.x, c = o.y - a.y;
 	if (n) {
@@ -378,16 +428,16 @@ function T(e, t, n, r, i) {
 		y: a.y - c
 	});
 }
-function E(e) {
+function O(e) {
 	return e.view?.get().scale ?? {
 		x: 1,
 		y: 1
 	};
 }
-function D(t, n, r, i) {
+function k(t, n, r, i) {
 	let a = t.areaSelect, o = t.editAnchors;
 	if (!a || !o) return [];
-	let s = t.view, c = e(i, E(t)), l = a.hitTestArea({
+	let s = t.view, c = e(i, O(t)), l = a.hitTestArea({
 		x: n - c.x,
 		y: r - c.y,
 		width: 2 * c.x,
@@ -402,13 +452,13 @@ function D(t, n, r, i) {
 	}
 	return u;
 }
-function O(e, t) {
+function A(e, t) {
 	if (e.commands.length !== t.commands.length || e.coords.length !== t.coords.length) return !1;
 	for (let n = 0; n < e.commands.length; n++) if (e.commands[n] !== t.commands[n]) return !1;
 	for (let n = 0; n < e.coords.length; n++) if (e.coords[n] !== t.coords[n]) return !1;
 	return !0;
 }
 //#endregion
-export { w as usePenTool };
+export { E as usePenTool };
 
 //# sourceMappingURL=usePenTool.js.map