@markput/react 0.10.1 → 0.11.0

package/index.js

@@ -392,11 +392,11 @@ var NodeProxy = class NodeProxy {
 		return this.target?.isContentEditable ?? false;
 	}
 	get isCaretAtBeginning() {
-		if (!this.target) return;
+		if (!this.target) return false;
 		return Caret.getCaretIndex(this.target) === 0;
 	}
 	get isCaretAtEnd() {
-		if (!this.target) return;
+		if (!this.target) return false;
 		return Caret.getCaretIndex(this.target) === this.target.textContent.length;
 	}
 	get index() {
@@ -443,16 +443,6 @@ var NodeProxy = class NodeProxy {
 	}
 };
 //#endregion
-//#region ../../core/src/shared/signals/registry.ts
-let _factory;
-function setUseHookFactory(f) {
-	_factory = f;
-}
-function getUseHookFactory() {
-	if (!_factory) throw new Error("[markput] setUseHookFactory() must be called before using signal.use()");
-	return _factory;
-}
-//#endregion
 //#region ../../core/src/shared/signals/alien-signals/system.ts
 let ReactiveFlags = /* @__PURE__ */ function(ReactiveFlags) {
 	ReactiveFlags[ReactiveFlags["None"] = 0] = "None";
@@ -633,17 +623,19 @@ function createReactiveSystem({ update, notify, unwatched }) {
 	}
 }
 //#endregion
-//#region ../../core/src/shared/signals/alien-signals/index.ts
+//#region ../../core/src/shared/signals/signal.ts
 let cycle = 0;
 let batchDepth = 0;
 let notifyIndex = 0;
 let queuedLength = 0;
 let activeSub;
+let mutableScope = false;
 const queued = [];
 const { link, unlink, propagate, checkDirty, shallowPropagate } = createReactiveSystem({
 	update(node) {
-		if (node.depsTail !== void 0) return updateComputed(node);
-		else return updateSignal(node);
+		if ("getter" in node) return updateComputed(node);
+		if ("seq" in node) return updateEvent(node);
+		return updateSignal(node);
 	},
 	notify(effect) {
 		let insertIndex = queuedLength;
@@ -662,8 +654,16 @@ const { link, unlink, propagate, checkDirty, shallowPropagate } = createReactive
 		}
 	},
 	unwatched(node) {
-		if (!(node.flags & ReactiveFlags.Mutable)) effectScopeOper.call(node);
-		else if (node.depsTail !== void 0) {
+		if (!(node.flags & ReactiveFlags.Mutable)) {
+			if ("fn" in node) {
+				const e = node;
+				if (e.cleanup !== void 0) {
+					e.cleanup();
+					e.cleanup = void 0;
+				}
+			}
+			effectScopeOper.call(node);
+		} else if (node.depsTail !== void 0) {
 			node.depsTail = void 0;
 			node.flags = ReactiveFlags.Mutable | ReactiveFlags.Dirty;
 			purgeDeps(node);
@@ -675,67 +675,9 @@ function setActiveSub(sub) {
 	activeSub = sub;
 	return prevSub;
 }
-function startBatch() {
-	++batchDepth;
-}
-function endBatch() {
-	if (!--batchDepth) flush();
-}
-function signal$1(initialValue) {
-	return signalOper.bind({
-		currentValue: initialValue,
-		pendingValue: initialValue,
-		subs: void 0,
-		subsTail: void 0,
-		flags: ReactiveFlags.Mutable
-	});
-}
-function computed$1(getter) {
-	return computedOper.bind({
-		value: void 0,
-		subs: void 0,
-		subsTail: void 0,
-		deps: void 0,
-		depsTail: void 0,
-		flags: ReactiveFlags.None,
-		getter
-	});
-}
-function effect(fn) {
-	const e = {
-		fn,
-		subs: void 0,
-		subsTail: void 0,
-		deps: void 0,
-		depsTail: void 0,
-		flags: ReactiveFlags.Watching | ReactiveFlags.RecursedCheck
-	};
-	const prevSub = setActiveSub(e);
-	if (prevSub !== void 0) link(e, prevSub, 0);
-	try {
-		e.fn();
-	} finally {
-		activeSub = prevSub;
-		e.flags &= ~ReactiveFlags.RecursedCheck;
-	}
-	return effectOper.bind(e);
-}
-function effectScope(fn) {
-	const e = {
-		deps: void 0,
-		depsTail: void 0,
-		subs: void 0,
-		subsTail: void 0,
-		flags: ReactiveFlags.None
-	};
-	const prevSub = setActiveSub(e);
-	if (prevSub !== void 0) link(e, prevSub, 0);
-	try {
-		fn();
-	} finally {
-		activeSub = prevSub;
-	}
-	return effectScopeOper.bind(e);
+function updateSignal(s) {
+	s.flags = ReactiveFlags.Mutable;
+	return s.currentValue !== (s.currentValue = s.pendingValue);
 }
 function updateComputed(c) {
 	++cycle;
@@ -744,26 +686,33 @@ function updateComputed(c) {
 	const prevSub = setActiveSub(c);
 	try {
 		const oldValue = c.value;
-		return oldValue !== (c.value = c.getter(oldValue));
+		const newValue = c.getter(oldValue);
+		if (c.equalsFn !== void 0 && oldValue !== void 0 && c.equalsFn(oldValue, newValue)) return false;
+		return oldValue !== (c.value = newValue);
 	} finally {
 		activeSub = prevSub;
 		c.flags &= ~ReactiveFlags.RecursedCheck;
 		purgeDeps(c);
 	}
 }
-function updateSignal(s) {
-	s.flags = ReactiveFlags.Mutable;
-	return s.currentValue !== (s.currentValue = s.pendingValue);
+function updateEvent(e) {
+	e.flags = ReactiveFlags.Mutable;
+	return true;
 }
 function run(e) {
 	const flags = e.flags;
 	if (flags & ReactiveFlags.Dirty || flags & ReactiveFlags.Pending && checkDirty(e.deps, e)) {
+		if (e.cleanup !== void 0) {
+			e.cleanup();
+			e.cleanup = void 0;
+		}
 		++cycle;
 		e.depsTail = void 0;
 		e.flags = ReactiveFlags.Watching | ReactiveFlags.RecursedCheck;
 		const prevSub = setActiveSub(e);
 		try {
-			e.fn();
+			const result = e.fn();
+			if (typeof result === "function") e.cleanup = result;
 		} finally {
 			activeSub = prevSub;
 			e.flags &= ~ReactiveFlags.RecursedCheck;
@@ -788,36 +737,31 @@ function flush() {
 		queuedLength = 0;
 	}
 }
-function computedOper() {
-	const flags = this.flags;
-	if (flags & ReactiveFlags.Dirty || flags & ReactiveFlags.Pending && (checkDirty(this.deps, this) || (this.flags = flags & ~ReactiveFlags.Pending, false))) {
-		if (updateComputed(this)) {
-			const subs = this.subs;
-			if (subs !== void 0) shallowPropagate(subs);
-		}
-	} else if (!flags) {
-		this.flags = ReactiveFlags.Mutable | ReactiveFlags.RecursedCheck;
-		const prevSub = setActiveSub(this);
-		try {
-			this.value = this.getter();
-		} finally {
-			activeSub = prevSub;
-			this.flags &= ~ReactiveFlags.RecursedCheck;
-		}
-	}
-	const sub = activeSub;
-	if (sub !== void 0) link(this, sub, cycle);
-	return this.value;
+function purgeDeps(sub) {
+	const depsTail = sub.depsTail;
+	let dep = depsTail !== void 0 ? depsTail.nextDep : sub.deps;
+	while (dep !== void 0) dep = unlink(dep, sub);
 }
 function signalOper(...value) {
 	if (value.length) {
-		if (this.pendingValue !== (this.pendingValue = value[0])) {
-			this.flags = ReactiveFlags.Mutable | ReactiveFlags.Dirty;
-			const subs = this.subs;
-			if (subs !== void 0) {
-				propagate(subs);
-				if (!batchDepth) flush();
-			}
+		if (this.isReadonly && !mutableScope) return;
+		const v = value[0];
+		if (v === void 0) {
+			if (this.hasDefault ? this.pendingValue === void 0 || this.pendingValue === this.defaultValue : this.pendingValue === void 0) return;
+			this.pendingValue = void 0;
+		} else {
+			const current = this.pendingValue;
+			const effectiveCurrent = current === void 0 && this.hasDefault ? this.defaultValue : current;
+			if (this.equalsFn !== void 0) {
+				if (this.equalsFn(effectiveCurrent, v)) return;
+			} else if (effectiveCurrent === v) return;
+			this.pendingValue = v;
+		}
+		this.flags = ReactiveFlags.Mutable | ReactiveFlags.Dirty;
+		const subs = this.subs;
+		if (subs !== void 0) {
+			propagate(subs);
+			if (!batchDepth) flush();
 		}
 	} else {
 		if (this.flags & ReactiveFlags.Dirty) {
@@ -834,10 +778,44 @@ function signalOper(...value) {
 			}
 			sub = sub.subs?.sub;
 		}
-		return this.currentValue;
+		const v = this.currentValue;
+		if (v === void 0 && this.hasDefault) return this.defaultValue;
+		return v;
+	}
+}
+function computedOper() {
+	const flags = this.flags;
+	const deps = this.deps;
+	if (flags & ReactiveFlags.Dirty || flags & ReactiveFlags.Pending && (checkDirty(deps, this) || (this.flags = flags & ~ReactiveFlags.Pending, false))) {
+		if (updateComputed(this)) {
+			const subs = this.subs;
+			if (subs !== void 0) shallowPropagate(subs);
+		}
+	} else if (!flags) {
+		this.flags = ReactiveFlags.Mutable | ReactiveFlags.RecursedCheck;
+		const prevSub = setActiveSub(this);
+		try {
+			this.value = this.getter();
+		} finally {
+			activeSub = prevSub;
+			this.flags &= ~ReactiveFlags.RecursedCheck;
+		}
 	}
+	const sub = activeSub;
+	if (sub !== void 0) link(this, sub, cycle);
+	return this.value;
+}
+function eventReadOper() {
+	if (this.flags & ReactiveFlags.Dirty) updateEvent(this);
+	const sub = activeSub;
+	if (sub !== void 0) link(this, sub, cycle);
+	return this.payload;
 }
 function effectOper() {
+	if (this.cleanup !== void 0) {
+		this.cleanup();
+		this.cleanup = void 0;
+	}
 	effectScopeOper.call(this);
 }
 function effectScopeOper() {
@@ -847,111 +825,101 @@ function effectScopeOper() {
 	const sub = this.subs;
 	if (sub !== void 0) unlink(sub);
 }
-function purgeDeps(sub) {
-	const depsTail = sub.depsTail;
-	let dep = depsTail !== void 0 ? depsTail.nextDep : sub.deps;
-	while (dep !== void 0) dep = unlink(dep, sub);
+function isReactive(fn) {
+	if (typeof fn !== "function") return false;
+	const name = fn.name;
+	return name === "bound " + signalOper.name || name === "bound " + computedOper.name;
 }
-//#endregion
-//#region ../../core/src/shared/signals/signal.ts
 function signal(initial, opts) {
-	const hasCustomEquals = opts?.equals !== void 0;
-	const equalsOpt = hasCustomEquals ? opts.equals : void 0;
-	if (hasCustomEquals && equalsOpt === false) {
-		const _default = initial;
-		const hasDefault = initial !== void 0;
-		let seq = 0;
-		const inner = signal$1(void 0);
-		const read = () => {
-			const box = inner();
-			if (box === void 0) return hasDefault ? _default : void 0;
-			return box.v;
-		};
-		const callable = function signalCallable(...args) {
-			if (args.length) if (args[0] === void 0) {
-				if (hasDefault && inner() === void 0) return;
-				inner(void 0);
-			} else inner({
-				v: args[0],
-				seq: seq++
-			});
-			else return read();
-		};
-		callable.use = (() => getUseHookFactory()(callable)());
-		return callable;
-	}
-	if (hasCustomEquals && typeof equalsOpt === "function") {
-		const equalsFn = equalsOpt;
-		const _default = initial;
-		const hasDefault = initial !== void 0;
-		const inner = signal$1(void 0);
-		const read = () => {
-			const v = inner();
-			if (v === void 0 && hasDefault) return _default;
-			return v;
-		};
-		const callable = function signalCallable(...args) {
-			if (args.length) {
-				if (args[0] === void 0) {
-					if (hasDefault && inner() === void 0) return;
-					inner(void 0);
-				} else if (!equalsFn(read(), args[0])) inner(args[0]);
-			} else return read();
-		};
-		callable.use = (() => getUseHookFactory()(callable)());
-		return callable;
-	}
-	const _default = initial;
-	const hasDefault = initial !== void 0;
-	const inner = signal$1(void 0);
-	const read = () => {
-		const v = inner();
-		if (v === void 0 && hasDefault) return _default;
-		return v;
-	};
-	const callable = function signalCallable(...args) {
-		if (args.length) {
-			const v = args[0];
-			if (v === void 0 && hasDefault) {
-				if (inner() === void 0) return;
-				inner(void 0);
-			} else {
-				const current = inner();
-				if ((current === void 0 && hasDefault ? _default : current) !== v) inner(v);
-			}
-		} else return read();
+	const node = {
+		currentValue: initial,
+		pendingValue: initial,
+		defaultValue: initial,
+		hasDefault: initial !== void 0,
+		equalsFn: opts?.equals ?? void 0,
+		isReadonly: !!opts?.readonly,
+		subs: void 0,
+		subsTail: void 0,
+		flags: ReactiveFlags.Mutable
 	};
-	callable.use = (() => getUseHookFactory()(callable)());
-	return callable;
+	return signalOper.bind(node);
 }
-function computed(getter) {
-	const inner = computed$1(getter);
-	const callable = function computedCallable() {
-		return inner();
+function computed(getter, opts) {
+	const node = {
+		value: void 0,
+		subs: void 0,
+		subsTail: void 0,
+		deps: void 0,
+		depsTail: void 0,
+		flags: ReactiveFlags.None,
+		getter,
+		equalsFn: opts?.equals ?? void 0
 	};
-	callable.use = (() => getUseHookFactory()(callable)());
-	return callable;
+	return computedOper.bind(node);
 }
 function event() {
-	let seq = 0;
-	const inner = signal$1(void 0);
-	const callable = function eventCallable(payload) {
-		inner({
-			v: payload,
-			id: ++seq
-		});
+	const node = {
+		payload: void 0,
+		seq: 0,
+		subs: void 0,
+		subsTail: void 0,
+		flags: ReactiveFlags.Mutable
 	};
-	callable.read = () => {
-		const box = inner();
-		return box !== void 0 ? box.v : void 0;
+	const callable = function eventCallable(payload) {
+		node.payload = payload;
+		node.seq++;
+		node.flags = ReactiveFlags.Mutable | ReactiveFlags.Dirty;
+		const subs = node.subs;
+		if (subs !== void 0) {
+			propagate(subs);
+			if (!batchDepth) flush();
+		}
 	};
-	callable.use = () => getUseHookFactory()(callable.read)();
+	callable.read = eventReadOper.bind(node);
 	return callable;
 }
+function alienEffect(fn) {
+	const e = {
+		fn,
+		cleanup: void 0,
+		subs: void 0,
+		subsTail: void 0,
+		deps: void 0,
+		depsTail: void 0,
+		flags: ReactiveFlags.Watching | ReactiveFlags.RecursedCheck
+	};
+	const prevSub = setActiveSub(e);
+	if (prevSub !== void 0) link(e, prevSub, 0);
+	try {
+		const result = e.fn();
+		if (typeof result === "function") e.cleanup = result;
+	} finally {
+		activeSub = prevSub;
+		e.flags &= ~ReactiveFlags.RecursedCheck;
+	}
+	return effectOper.bind(e);
+}
+function effectScope(fn) {
+	const e = {
+		deps: void 0,
+		depsTail: void 0,
+		subs: void 0,
+		subsTail: void 0,
+		flags: ReactiveFlags.None
+	};
+	const prevSub = setActiveSub(e);
+	if (prevSub !== void 0) link(e, prevSub, 0);
+	try {
+		fn();
+	} finally {
+		activeSub = prevSub;
+	}
+	return effectScopeOper.bind(e);
+}
 function watch(dep, fn) {
 	let initialized = false;
 	let oldValue;
-	return effect(() => {
+	return alienEffect(() => {
 		const newValue = "read" in dep ? dep.read() : dep();
 		if (!initialized) {
 			initialized = true;
@@ -960,22 +928,34 @@ function watch(dep, fn) {
 		}
 		const prev = oldValue;
 		oldValue = newValue;
-		const prevSub = setActiveSub(void 0);
-		try {
-			fn(newValue, prev);
-		} finally {
-			setActiveSub(prevSub);
-		}
+		untracked(() => fn(newValue, prev));
 	});
 }
-function batch(fn) {
-	startBatch();
+function batch(fn, opts) {
+	const prevMutable = mutableScope;
+	if (opts?.mutable) mutableScope = true;
+	++batchDepth;
 	try {
 		fn();
 	} finally {
-		endBatch();
+		if (!--batchDepth) flush();
+		mutableScope = prevMutable;
 	}
 }
+function untracked(fn) {
+	const prev = setActiveSub(void 0);
+	try {
+		return fn();
+	} finally {
+		setActiveSub(prev);
+	}
+}
+function listen(target, event, handler, options) {
+	return alienEffect(() => {
+		target.addEventListener(event, handler, options);
+		return () => target.removeEventListener(event, handler, options);
+	});
+}
 //#endregion
 //#region ../../core/src/features/parsing/parser/constants.ts
 /**
@@ -2170,23 +2150,30 @@ function getTokensByUI(store) {
 	const tokens = store.state.tokens();
 	if (!parser) return tokens;
 	const parsed = parser.parse(focus.content);
-	if (parsed.length === 1) return tokens;
+	if (parsed.length <= 1) return tokens;
 	return tokens.toSpliced(focus.index, 1, ...parsed);
 }
-function getTokensByValue(store) {
-	const value = store.state.value();
-	const ranges = getRangeMap(store);
-	const gap = findGap(store.state.previousValue(), value);
+function computeTokensFromValue(store) {
+	const value = store.props.value();
+	const previousValue = store.state.previousValue();
+	const gap = findGap(previousValue, value);
 	if (!gap.left && !gap.right) {
 		store.state.previousValue(value);
 		return store.state.tokens();
 	}
+	if (gap.left === 0 && previousValue !== void 0 && gap.right !== void 0 && gap.right >= previousValue.length) {
+		store.state.previousValue(value);
+		return parseWithParser(store, value ?? "");
+	}
 	store.state.previousValue(value);
+	const ranges = getRangeMap(store);
 	const tokens = store.state.tokens();
 	if (gap.left !== void 0 && ranges.includes(gap.left) && gap.right !== void 0 && Math.abs(gap.left - gap.right) > 1) {
 		const updatedIndex = ranges.indexOf(gap.left);
-		const parsed = parseUnionLabels(store, updatedIndex - 1, updatedIndex);
-		return tokens.toSpliced(updatedIndex - 1, 2, ...parsed);
+		if (updatedIndex > 0) {
+			const parsed = parseUnionLabels(store, updatedIndex - 1, updatedIndex);
+			return tokens.toSpliced(updatedIndex - 1, 2, ...parsed);
+		}
 	}
 	if (gap.left !== void 0) {
 		const [updatedIndex] = getClosestIndexes(ranges, gap.left);
@@ -2235,9 +2222,6 @@ function parseWithParser(store, value) {
 //#region ../../core/src/features/parsing/ParseFeature.ts
 var ParseFeature = class {
 	#scope;
-	#initialized = false;
-	#lastValue;
-	#lastParser;
 	constructor(store) {
 		this.store = store;
 	}
@@ -2246,30 +2230,18 @@ var ParseFeature = class {
 		this.sync();
 		this.#scope = effectScope(() => {
 			this.#subscribeParse();
-			this.#subscribeUpdated();
+			this.#subscribeReactiveParse();
 		});
 	}
 	disable() {
 		this.#scope?.();
 		this.#scope = void 0;
-		this.#initialized = false;
 	}
 	sync() {
 		const { store } = this;
-		const inputValue = store.state.value() ?? store.state.defaultValue() ?? "";
+		const inputValue = store.props.value() ?? store.props.defaultValue() ?? "";
 		store.state.tokens(parseWithParser(store, inputValue));
 		store.state.previousValue(inputValue);
-		this.#lastValue = store.state.value();
-		this.#lastParser = store.computed.parser();
-		this.#initialized = true;
-	}
-	hasChanged() {
-		const value = this.store.state.value();
-		const parser = this.store.computed.parser();
-		if (this.#initialized && value === this.#lastValue && parser === this.#lastParser) return false;
-		this.#lastValue = value;
-		this.#lastParser = parser;
-		return true;
 	}
 	#subscribeParse() {
 		const { store } = this;
@@ -2280,13 +2252,12 @@ var ParseFeature = class {
 				store.state.previousValue(text);
 				return;
 			}
-			store.state.tokens(store.nodes.focus.target ? getTokensByUI(store) : getTokensByValue(store));
+			store.state.tokens(store.nodes.focus.target ? getTokensByUI(store) : computeTokensFromValue(store));
 		});
 	}
-	#subscribeUpdated() {
+	#subscribeReactiveParse() {
 		const { store } = this;
-		watch(store.event.updated, () => {
-			if (!this.hasChanged()) return;
+		watch(computed(() => [store.props.value(), store.computed.parser()]), () => {
 			if (!store.state.recovery()) store.event.parse();
 		});
 	}
@@ -2334,7 +2305,7 @@ function isFullSelection(store) {
 }
 function selectAllText(store, event) {
 	if ((event.ctrlKey || event.metaKey) && event.code === "KeyA") {
-		if (store.state.drag()) return;
+		if (store.computed.isBlock()) return;
 		event.preventDefault();
 		const selection = window.getSelection();
 		const anchorNode = store.refs.container?.firstChild;
@@ -2347,10 +2318,6 @@ function selectAllText(store, event) {
 //#endregion
 //#region ../../core/src/features/selection/TextSelectionFeature.ts
 var TextSelectionFeature = class {
-	#mousedownHandler;
-	#mousemoveHandler;
-	#mouseupHandler;
-	#selectionchangeHandler;
 	#scope;
 	#pressedNode = null;
 	#isPressed = false;
@@ -2358,61 +2325,47 @@ var TextSelectionFeature = class {
 		this.store = store;
 	}
 	enable() {
-		if (this.#mousedownHandler) return;
-		this.#mousedownHandler = (e) => {
-			this.#pressedNode = nodeTarget(e);
-			this.#isPressed = true;
-		};
-		this.#mousemoveHandler = (e) => {
-			const container = this.store.refs.container;
-			if (!container) return;
-			const isPressed = this.#isPressed;
-			const isNotInnerSome = !container.contains(this.#pressedNode) || this.#pressedNode !== e.target;
-			const isInside = window.getSelection()?.containsNode(container, true);
-			if (isPressed && isNotInnerSome && isInside) {
-				if (this.store.state.selecting() !== "drag") this.store.state.selecting("drag");
-			}
-		};
-		this.#mouseupHandler = () => {
-			this.#isPressed = false;
-			this.#pressedNode = null;
-			if (this.store.state.selecting() === "drag") {
+		if (this.#scope) return;
+		this.#scope = effectScope(() => {
+			listen(document, "mousedown", (e) => {
+				this.#pressedNode = nodeTarget(e);
+				this.#isPressed = true;
+			});
+			listen(document, "mousemove", (e) => {
+				const container = this.store.refs.container;
+				if (!container) return;
+				const isPressed = this.#isPressed;
+				const isNotInnerSome = !container.contains(this.#pressedNode) || this.#pressedNode !== e.target;
+				const isInside = window.getSelection()?.containsNode(container, true);
+				if (isPressed && isNotInnerSome && isInside) {
+					if (this.store.state.selecting() !== "drag") this.store.state.selecting("drag");
+				}
+			});
+			listen(document, "mouseup", () => {
+				this.#isPressed = false;
+				this.#pressedNode = null;
+				if (this.store.state.selecting() === "drag") {
+					const sel = window.getSelection();
+					if (!sel || sel.isCollapsed) this.store.state.selecting(void 0);
+				}
+			});
+			listen(document, "selectionchange", () => {
+				if (this.store.state.selecting() !== "drag") return;
 				const sel = window.getSelection();
 				if (!sel || sel.isCollapsed) this.store.state.selecting(void 0);
-			}
-		};
-		this.#selectionchangeHandler = () => {
-			if (this.store.state.selecting() !== "drag") return;
-			const sel = window.getSelection();
-			if (!sel || sel.isCollapsed) this.store.state.selecting(void 0);
-		};
-		this.#scope = effectScope(() => {
-			effect(() => {
+			});
+			alienEffect(() => {
 				if (this.store.state.selecting() !== "drag") return;
 				const container = this.store.refs.container;
 				if (!container) return;
 				container.querySelectorAll("[contenteditable=\"true\"]").forEach((el) => el.contentEditable = "false");
 			});
 		});
-		document.addEventListener("mousedown", this.#mousedownHandler);
-		document.addEventListener("mousemove", this.#mousemoveHandler);
-		document.addEventListener("mouseup", this.#mouseupHandler);
-		document.addEventListener("selectionchange", this.#selectionchangeHandler);
 	}
 	disable() {
 		if (this.store.state.selecting() === "drag") this.store.state.selecting(void 0);
 		this.#scope?.();
 		this.#scope = void 0;
-		if (this.#mousedownHandler) {
-			document.removeEventListener("mousedown", this.#mousedownHandler);
-			if (this.#mousemoveHandler) document.removeEventListener("mousemove", this.#mousemoveHandler);
-			if (this.#mouseupHandler) document.removeEventListener("mouseup", this.#mouseupHandler);
-			if (this.#selectionchangeHandler) document.removeEventListener("selectionchange", this.#selectionchangeHandler);
-			this.#mousedownHandler = void 0;
-			this.#mousemoveHandler = void 0;
-			this.#mouseupHandler = void 0;
-			this.#selectionchangeHandler = void 0;
-		}
 		this.#pressedNode = null;
 		this.#isPressed = false;
 	}
@@ -2420,28 +2373,27 @@ var TextSelectionFeature = class {
 //#endregion
 //#region ../../core/src/features/arrownav/ArrowNavFeature.ts
 var ArrowNavFeature = class {
-	#keydownHandler;
+	#scope;
 	constructor(store) {
 		this.store = store;
 	}
 	enable() {
-		if (this.#keydownHandler) return;
+		if (this.#scope) return;
 		const container = this.store.refs.container;
 		if (!container) return;
-		this.#keydownHandler = (e) => {
-			if (this.store.state.drag()) return;
-			if (!this.store.nodes.focus.target) return;
-			if (e.key === KEYBOARD.LEFT) shiftFocusPrev(this.store, e);
-			else if (e.key === KEYBOARD.RIGHT) shiftFocusNext(this.store, e);
-			selectAllText(this.store, e);
-		};
-		container.addEventListener("keydown", this.#keydownHandler);
+		this.#scope = effectScope(() => {
+			listen(container, "keydown", (e) => {
+				if (this.store.computed.isBlock()) return;
+				if (!this.store.nodes.focus.target) return;
+				if (e.key === KEYBOARD.LEFT) shiftFocusPrev(this.store, e);
+				else if (e.key === KEYBOARD.RIGHT) shiftFocusNext(this.store, e);
+				selectAllText(this.store, e);
+			});
+		});
 	}
 	disable() {
-		const container = this.store.refs.container;
-		if (!container || !this.#keydownHandler) return;
-		container.removeEventListener("keydown", this.#keydownHandler);
-		this.#keydownHandler = void 0;
+		this.#scope?.();
+		this.#scope = void 0;
 	}
 };
 //#endregion
@@ -2567,53 +2519,46 @@ function trimBoundaryTokens({ tokens, startOffset, endOffset }) {
 	});
 }
 var CopyFeature = class {
-	#copyHandler;
-	#cutHandler;
+	#scope;
 	constructor(store) {
 		this.store = store;
 	}
 	enable() {
-		if (this.#copyHandler) return;
-		this.#copyHandler = (e) => {
-			this.#handleCopy(e);
-		};
-		this.#cutHandler = (e) => {
-			if (!this.#handleCopy(e)) return;
-			const result = selectionToTokens(this.store);
-			if (!result || result.tokens.length === 0) return;
-			const first = result.tokens[0];
-			const last = result.tokens[result.tokens.length - 1];
-			const rawStart = first.type === "text" ? first.position.start + result.startOffset : first.position.start;
-			const rawEnd = last.type === "text" ? last.position.start + result.endOffset : last.position.end;
-			const value = this.store.state.previousValue() ?? this.store.state.value() ?? "";
-			if (rawStart === rawEnd) return;
-			const newValue = value.slice(0, rawStart) + value.slice(rawEnd);
-			this.store.state.innerValue(newValue);
-			const newTokens = this.store.state.tokens();
-			let targetIdx = newTokens.findIndex((t) => t.type === "text" && rawStart >= t.position.start && rawStart <= t.position.end);
-			if (targetIdx === -1) targetIdx = newTokens.length - 1;
-			const caretWithinToken = rawStart - newTokens[targetIdx].position.start;
-			this.store.state.recovery({
-				anchor: this.store.nodes.focus,
-				caret: caretWithinToken,
-				isNext: true,
-				childIndex: targetIdx - 2
-			});
-		};
+		if (this.#scope) return;
 		const container = this.store.refs.container;
-		container?.addEventListener("copy", this.#copyHandler);
-		container?.addEventListener("cut", this.#cutHandler);
+		if (!container) return;
+		this.#scope = effectScope(() => {
+			listen(container, "copy", (e) => {
+				this.#handleCopy(e);
+			});
+			listen(container, "cut", (e) => {
+				if (!this.#handleCopy(e)) return;
+				const result = selectionToTokens(this.store);
+				if (!result || result.tokens.length === 0) return;
+				const first = result.tokens[0];
+				const last = result.tokens[result.tokens.length - 1];
+				const rawStart = first.type === "text" ? first.position.start + result.startOffset : first.position.start;
+				const rawEnd = last.type === "text" ? last.position.start + result.endOffset : last.position.end;
+				const value = this.store.computed.currentValue();
+				if (rawStart === rawEnd) return;
+				const newValue = value.slice(0, rawStart) + value.slice(rawEnd);
+				this.store.state.innerValue(newValue);
+				const newTokens = this.store.state.tokens();
+				let targetIdx = newTokens.findIndex((t) => t.type === "text" && rawStart >= t.position.start && rawStart <= t.position.end);
+				if (targetIdx === -1) targetIdx = newTokens.length - 1;
+				const caretWithinToken = rawStart - newTokens[targetIdx].position.start;
+				this.store.state.recovery({
+					anchor: this.store.nodes.focus,
+					caret: caretWithinToken,
+					isNext: true,
+					childIndex: targetIdx - 2
+				});
+			});
+		});
 	}
 	disable() {
-		const container = this.store.refs.container;
-		if (this.#copyHandler) {
-			container?.removeEventListener("copy", this.#copyHandler);
-			this.#copyHandler = void 0;
-		}
-		if (this.#cutHandler) {
-			container?.removeEventListener("cut", this.#cutHandler);
-			this.#cutHandler = void 0;
-		}
+		this.#scope?.();
+		this.#scope = void 0;
 	}
 	#handleCopy(e) {
 		const container = this.store.refs.container;
@@ -2771,7 +2716,7 @@ function deleteMark(place, store) {
 		anchor: caretAnchor.prev,
 		caret
 	});
-	store.state.onChange()?.(toString(store.state.tokens()));
+	store.event.change();
 	queueMicrotask(() => {
 		const target = childAt(store.refs.container, targetIndex);
 		if (!target) return;
@@ -2795,11 +2740,11 @@ var ContentEditableFeature = class {
 	enable() {
 		if (this.#scope) return;
 		this.#scope = effectScope(() => {
-			effect(() => {
-				this.store.state.readOnly();
+			alienEffect(() => {
+				this.store.props.readOnly();
 				this.sync();
 			});
-			effect(() => {
+			alienEffect(() => {
 				if (this.store.state.selecting() === void 0) this.sync();
 			});
 			watch(this.store.event.sync, () => {
@@ -2814,11 +2759,11 @@ var ContentEditableFeature = class {
 	sync() {
 		const container = this.store.refs.container;
 		if (!container) return;
-		const readOnly = this.store.state.readOnly();
+		const readOnly = this.store.props.readOnly();
 		const value = readOnly ? "false" : "true";
 		const children = container.children;
-		const isDrag = !!this.store.state.drag();
-		if (isDrag) {
+		const isBlock = this.store.computed.isBlock();
+		if (isBlock) {
 			const tokens = this.store.state.tokens();
 			for (let i = 0; i < tokens.length && i < children.length; i++) {
 				const el = childAt(container, i);
@@ -2832,7 +2777,7 @@ var ContentEditableFeature = class {
 			if (el) el.contentEditable = value;
 		}
 		const tokens = this.store.state.tokens();
-		if (isDrag) this.#syncDragTextContent(tokens, container, readOnly);
+		if (isBlock) this.#syncDragTextContent(tokens, container, readOnly);
 		else this.#syncTextContent(tokens, container);
 	}
 	#syncTextContent(tokens, parent) {
@@ -3025,37 +2970,32 @@ function isTextLikeRow(token) {
 	return token.descriptor.hasSlot && token.descriptor.segments.length === 1;
 }
 var BlockEditFeature = class {
-	#keydownHandler;
-	#beforeInputHandler;
+	#scope;
 	constructor(store) {
 		this.store = store;
 	}
 	enable() {
-		if (this.#keydownHandler) return;
+		if (this.#scope) return;
 		const container = this.store.refs.container;
 		if (!container) return;
-		this.#keydownHandler = (e) => {
-			if (!this.store.state.drag()) return;
-			if (e.key === KEYBOARD.LEFT || e.key === KEYBOARD.RIGHT) this.#handleBlockArrowLeftRight(e, e.key === KEYBOARD.LEFT ? "left" : "right");
-			else if (e.key === KEYBOARD.UP || e.key === KEYBOARD.DOWN) this.#handleArrowUpDown(e);
-			this.#handleDelete(e);
-			this.#handleEnter(e);
-		};
-		this.#beforeInputHandler = (e) => {
-			if (!this.store.state.drag()) return;
-			if (e.defaultPrevented) return;
-			this.#handleBlockBeforeInput(e);
-		};
-		container.addEventListener("keydown", this.#keydownHandler);
-		container.addEventListener("beforeinput", this.#beforeInputHandler, true);
+		this.#scope = effectScope(() => {
+			listen(container, "keydown", (e) => {
+				if (!this.store.computed.isBlock()) return;
+				if (e.key === KEYBOARD.LEFT || e.key === KEYBOARD.RIGHT) this.#handleBlockArrowLeftRight(e, e.key === KEYBOARD.LEFT ? "left" : "right");
+				else if (e.key === KEYBOARD.UP || e.key === KEYBOARD.DOWN) this.#handleArrowUpDown(e);
+				this.#handleDelete(e);
+				this.#handleEnter(e);
+			});
+			listen(container, "beforeinput", (e) => {
+				if (!this.store.computed.isBlock()) return;
+				if (e.defaultPrevented) return;
+				this.#handleBlockBeforeInput(e);
+			}, true);
+		});
 	}
 	disable() {
-		const container = this.store.refs.container;
-		if (!container || !this.#keydownHandler) return;
-		container.removeEventListener("keydown", this.#keydownHandler);
-		if (this.#beforeInputHandler) container.removeEventListener("beforeinput", this.#beforeInputHandler, true);
-		this.#keydownHandler = void 0;
-		this.#beforeInputHandler = void 0;
+		this.#scope?.();
+		this.#scope = void 0;
 	}
 	#handleDelete(event) {
 		const container = this.store.refs.container;
@@ -3066,8 +3006,8 @@ var BlockEditFeature = class {
 		const rows = this.store.state.tokens();
 		if (blockIndex >= rows.length) return;
 		const token = rows[blockIndex];
-		const value = this.store.state.previousValue() ?? this.store.state.value() ?? "";
-		if (!this.store.state.onChange()) return;
+		const value = this.store.computed.currentValue();
+		if (!this.store.props.onChange()) return;
 		if (event.key === KEYBOARD.BACKSPACE) {
 			const blockDiv = blockDivs[blockIndex];
 			const caretAtStart = Caret.getCaretIndex(blockDiv) === 0;
@@ -3190,9 +3130,9 @@ var BlockEditFeature = class {
 		const rows = this.store.state.tokens();
 		const token = rows[blockIndex];
 		const blockDiv = blockDivs[blockIndex];
-		const value = this.store.state.previousValue() ?? this.store.state.value() ?? "";
-		if (!this.store.state.onChange()) return;
-		const newRowContent = createRowContent(this.store.state.options());
+		const value = this.store.computed.currentValue();
+		if (!this.store.props.onChange()) return;
+		const newRowContent = createRowContent(this.store.props.options());
 		if (!isTextLikeRow(token)) {
 			const newValue = addDragRow(value, rows, blockIndex, newRowContent);
 			this.store.state.innerValue(newValue);
@@ -3289,7 +3229,7 @@ var BlockEditFeature = class {
 		const rows = this.store.state.tokens();
 		if (blockIndex >= rows.length) return;
 		const token = rows[blockIndex];
-		const value = this.store.state.previousValue() ?? this.store.state.value() ?? "";
+		const value = this.store.computed.currentValue();
 		const focusAndSetCaret = (newRawPos) => {
 			queueMicrotask(() => {
 				const target = childAt(container, blockIndex);
@@ -3369,6 +3309,7 @@ var DragFeature = class {
 	}
 	#unsub;
 	enable() {
+		if (this.#unsub) return;
 		this.#unsub = watch(this.store.event.dragAction, (action) => {
 			switch (action.type) {
 				case "reorder":
@@ -3391,17 +3332,17 @@ var DragFeature = class {
 		this.#unsub = void 0;
 	}
 	#reorder(sourceIndex, targetIndex) {
-		const value = this.store.state.value();
-		if (value == null || !this.store.state.onChange()) return;
+		const value = this.store.props.value();
+		if (value == null || !this.store.props.onChange()) return;
 		const newValue = reorderDragRows(value, this.store.state.tokens(), sourceIndex, targetIndex);
 		if (newValue !== value) this.store.state.innerValue(newValue);
 	}
 	#add(afterIndex) {
-		const value = this.store.state.value();
-		if (value == null || !this.store.state.onChange()) return;
+		const value = this.store.props.value();
+		if (value == null || !this.store.props.onChange()) return;
 		const rawRows = this.store.state.tokens();
 		const rows = rawRows.length > 0 ? rawRows : [EMPTY_TEXT_TOKEN];
-		const newRowContent = createRowContent(this.store.state.options());
+		const newRowContent = createRowContent(this.store.props.options());
 		this.store.state.innerValue(addDragRow(value, rows, afterIndex, newRowContent));
 		queueMicrotask(() => {
 			const container = this.store.refs.container;
@@ -3410,14 +3351,14 @@ var DragFeature = class {
 		});
 	}
 	#delete(index) {
-		const value = this.store.state.value();
-		if (value == null || !this.store.state.onChange()) return;
+		const value = this.store.props.value();
+		if (value == null || !this.store.props.onChange()) return;
 		const rows = this.store.state.tokens();
 		this.store.state.innerValue(deleteDragRow(value, rows, index));
 	}
 	#duplicate(index) {
-		const value = this.store.state.value();
-		if (value == null || !this.store.state.onChange()) return;
+		const value = this.store.props.value();
+		if (value == null || !this.store.props.onChange()) return;
 		const rows = this.store.state.tokens();
 		this.store.state.innerValue(duplicateDragRow(value, rows, index));
 	}
@@ -3436,8 +3377,8 @@ function getDragTargetIndex(blockIndex, position) {
 }
 //#endregion
 //#region ../../core/src/features/drag/config.ts
-function getAlwaysShowHandleDrag(drag) {
-	return typeof drag === "object" && !!drag.alwaysShowHandle;
+function getAlwaysShowHandle(draggable) {
+	return typeof draggable === "object" && !!draggable.alwaysShowHandle;
 }
 //#endregion
 //#region ../../core/src/features/events/SystemListenerFeature.ts
@@ -3450,17 +3391,17 @@ var SystemListenerFeature = class {
 		if (this.#scope) return;
 		this.#scope = effectScope(() => {
 			watch(this.store.event.change, () => {
-				const onChange = this.store.state.onChange();
+				const onChange = this.store.props.onChange();
 				const { focus } = this.store.nodes;
 				if (!focus.target || !focus.target.isContentEditable) {
-					const tokens = this.store.state.tokens();
-					const serialized = toString(tokens);
+					const serialized = toString(this.store.state.tokens());
 					onChange?.(serialized);
 					this.store.state.previousValue(serialized);
-					this.store.state.tokens([...tokens]);
+					this.store.bumpTokens();
 					return;
 				}
 				const tokens = this.store.state.tokens();
+				if (focus.index >= tokens.length) return;
 				const token = tokens[focus.index];
 				if (token.type === "text") token.content = focus.content;
 				else token.value = focus.content;
@@ -3482,11 +3423,11 @@ var SystemListenerFeature = class {
 					this.store.state.tokens(newTokens);
 					this.store.state.previousValue(newValue);
 				});
-				this.store.state.onChange()?.(newValue);
+				this.store.props.onChange()?.(newValue);
 			});
 			watch(this.store.event.select, (event) => {
-				const Mark = this.store.state.Mark();
-				const onChange = this.store.state.onChange();
+				const Mark = this.store.props.Mark();
+				const onChange = this.store.props.onChange();
 				const { mark, match: { option, span, index, source } } = event;
 				const markup = option.markup;
 				if (!markup) return;
@@ -3525,51 +3466,43 @@ var SystemListenerFeature = class {
 //#endregion
 //#region ../../core/src/features/focus/FocusFeature.ts
 var FocusFeature = class {
-	#focusinHandler;
-	#focusoutHandler;
-	#clickHandler;
+	#scope;
 	constructor(store) {
 		this.store = store;
 	}
 	enable() {
-		if (this.#focusinHandler) return;
+		if (this.#scope) return;
 		const container = this.store.refs.container;
 		if (!container) return;
-		this.#focusinHandler = (e) => {
-			const target = isHtmlElement(e.target) ? e.target : void 0;
-			this.store.nodes.focus.target = target;
-		};
-		this.#focusoutHandler = () => {
-			this.store.nodes.focus.target = void 0;
-		};
-		this.#clickHandler = () => {
-			const tokens = this.store.state.tokens();
-			if (tokens.length === 1 && tokens[0].type === "text" && tokens[0].content === "") {
-				const container = this.store.refs.container;
-				(container ? firstHtmlChild(container) : null)?.focus();
-			}
-		};
-		container.addEventListener("focusin", this.#focusinHandler);
-		container.addEventListener("focusout", this.#focusoutHandler);
-		container.addEventListener("click", this.#clickHandler);
-		watch(this.store.event.recoverFocus, () => {
-			this.#recover();
-		});
-		watch(this.store.event.afterTokensRendered, () => {
-			this.store.event.sync();
-			if (!this.store.state.Mark()) return;
-			this.store.event.recoverFocus();
+		this.#scope = effectScope(() => {
+			listen(container, "focusin", (e) => {
+				const target = isHtmlElement(e.target) ? e.target : void 0;
+				this.store.nodes.focus.target = target;
+			});
+			listen(container, "focusout", () => {
+				this.store.nodes.focus.target = void 0;
+			});
+			listen(container, "click", () => {
+				const tokens = this.store.state.tokens();
+				if (tokens.length === 1 && tokens[0].type === "text" && tokens[0].content === "") {
+					const container = this.store.refs.container;
+					(container ? firstHtmlChild(container) : null)?.focus();
+				}
+			});
+			watch(this.store.event.recoverFocus, () => {
+				this.#recover();
+			});
+			watch(this.store.event.afterTokensRendered, () => {
+				this.store.event.sync();
+				if (!this.store.props.Mark()) return;
+				this.store.event.recoverFocus();
+			});
 		});
 	}
 	disable() {
-		const container = this.store.refs.container;
-		if (!container || !this.#focusinHandler) return;
-		container.removeEventListener("focusin", this.#focusinHandler);
-		if (this.#focusoutHandler) container.removeEventListener("focusout", this.#focusoutHandler);
-		if (this.#clickHandler) container.removeEventListener("click", this.#clickHandler);
-		this.#focusinHandler = void 0;
-		this.#focusoutHandler = void 0;
-		this.#clickHandler = void 0;
+		this.#scope?.();
+		this.#scope = void 0;
+		this.store.nodes.focus.clear();
 	}
 	#recover() {
 		const recovery = this.store.state.recovery();
@@ -3604,40 +3537,31 @@ var FocusFeature = class {
 //#endregion
 //#region ../../core/src/features/input/InputFeature.ts
 var InputFeature = class {
-	#keydownHandler;
-	#pasteHandler;
-	#beforeInputHandler;
+	#scope;
 	constructor(store) {
 		this.store = store;
 	}
 	enable() {
-		if (this.#keydownHandler) return;
+		if (this.#scope) return;
 		const container = this.store.refs.container;
 		if (!container) return;
-		this.#keydownHandler = (e) => {
-			if (!this.store.state.drag()) this.#handleDelete(e);
-		};
-		this.#pasteHandler = (e) => {
-			const c = this.store.refs.container;
-			if (c) captureMarkupPaste(e, c);
-			handlePaste(this.store, e);
-		};
-		this.#beforeInputHandler = (e) => {
-			handleBeforeInput(this.store, e);
-		};
-		container.addEventListener("keydown", this.#keydownHandler);
-		container.addEventListener("paste", this.#pasteHandler);
-		container.addEventListener("beforeinput", this.#beforeInputHandler, true);
+		this.#scope = effectScope(() => {
+			listen(container, "keydown", (e) => {
+				if (!this.store.computed.isBlock()) this.#handleDelete(e);
+			});
+			listen(container, "paste", (e) => {
+				const c = this.store.refs.container;
+				if (c) captureMarkupPaste(e, c);
+				handlePaste(this.store, e);
+			});
+			listen(container, "beforeinput", (e) => {
+				handleBeforeInput(this.store, e);
+			}, true);
+		});
 	}
 	disable() {
-		const container = this.store.refs.container;
-		if (!container || !this.#keydownHandler) return;
-		container.removeEventListener("keydown", this.#keydownHandler);
-		if (this.#pasteHandler) container.removeEventListener("paste", this.#pasteHandler);
-		if (this.#beforeInputHandler) container.removeEventListener("beforeinput", this.#beforeInputHandler, true);
-		this.#keydownHandler = void 0;
-		this.#pasteHandler = void 0;
-		this.#beforeInputHandler = void 0;
+		this.#scope?.();
+		this.#scope = void 0;
 	}
 	#handleDelete(event) {
 		const { focus } = this.store.nodes;
@@ -3697,7 +3621,7 @@ function handleBeforeInput(store, event) {
 		return;
 	}
 	if (selecting === "all") store.state.selecting(void 0);
-	if (store.state.drag()) return;
+	if (store.computed.isBlock()) return;
 	const { focus } = store.nodes;
 	if (!focus.target || !focus.isEditable) return;
 	if ((event.inputType === "insertFromPaste" || event.inputType === "insertReplacementText") && handleMarkputSpanPaste(store, focus, event)) return;
@@ -3711,7 +3635,7 @@ function handleMarkputSpanPaste(store, focus, event) {
 	event.preventDefault();
 	const token = store.state.tokens()[focus.index];
 	const offset = focus.caret;
-	const currentValue = store.state.previousValue() ?? store.state.value() ?? "";
+	const currentValue = store.computed.currentValue();
 	const ranges = event.getTargetRanges();
 	const childElement = container.children[focus.index];
 	let rawInsertPos;
@@ -3806,8 +3730,9 @@ function handlePaste(store, event) {
 function replaceAllContentWith(store, newContent) {
 	store.nodes.focus.target = null;
 	store.state.selecting(void 0);
-	store.state.onChange()?.(newContent);
-	if (store.state.value() === void 0) store.state.tokens(store.computed.parser()?.parse(newContent) ?? [{
+	store.state.previousValue(newContent);
+	store.props.onChange()?.(newContent);
+	if (store.props.value() === void 0) store.state.tokens(store.computed.parser()?.parse(newContent) ?? [{
 		type: "text",
 		content: newContent,
 		position: {
@@ -3864,93 +3789,50 @@ function createMarkFromOverlay(match, value, meta) {
 //#region ../../core/src/features/overlay/OverlayFeature.ts
 var OverlayFeature = class {
 	#scope;
-	#selectionChangeHandler;
-	#focusinHandler;
-	#focusoutHandler;
-	#escHandler;
-	#clickHandler;
 	constructor(store) {
 		this.store = store;
 	}
 	enable() {
 		if (this.#scope) return;
-		this.store.state.overlayTrigger((option) => option.overlay?.trigger);
 		this.#scope = effectScope(() => {
 			watch(this.store.event.clearOverlay, () => {
 				this.store.state.overlayMatch(void 0);
 			});
 			watch(this.store.event.checkOverlay, () => {
-				const getTrigger = this.store.state.overlayTrigger();
-				if (!getTrigger) return;
-				const match = TriggerFinder.find(this.store.state.options(), getTrigger);
+				const match = TriggerFinder.find(this.store.props.options(), (option) => option.overlay?.trigger);
 				this.store.state.overlayMatch(match);
 			});
 			watch(this.store.event.change, () => {
-				const showOverlayOn = this.store.state.showOverlayOn();
+				const showOverlayOn = this.store.props.showOverlayOn();
 				const type = "change";
 				if (showOverlayOn === type || Array.isArray(showOverlayOn) && showOverlayOn.includes(type)) this.store.event.checkOverlay();
 			});
-			watch(this.store.state.overlayMatch, (match) => {
-				if (match) {
+			alienEffect(() => {
+				if (this.store.state.overlayMatch()) {
 					this.store.nodes.input.target = this.store.nodes.focus.target;
-					this.#enableClose();
-				} else this.#disableClose();
+					listen(window, "keydown", (e) => {
+						if (e.key === KEYBOARD.ESC) this.store.event.clearOverlay();
+					});
+					listen(document, "click", (e) => {
+						const target = e.target instanceof HTMLElement ? e.target : null;
+						if (this.store.refs.overlay?.contains(target)) return;
+						if (this.store.refs.container?.contains(target)) return;
+						this.store.event.clearOverlay();
+					}, true);
+				}
 			});
+			const selectionChangeHandler = () => {
+				if (!this.store.refs.container?.contains(document.activeElement)) return;
+				const showOverlayOn = this.store.props.showOverlayOn();
+				const type = "selectionChange";
+				if (showOverlayOn === type || Array.isArray(showOverlayOn) && showOverlayOn.includes(type)) this.store.event.checkOverlay();
+			};
+			listen(document, "selectionchange", selectionChangeHandler);
 		});
-		const selectionChangeHandler = () => {
-			const showOverlayOn = this.store.state.showOverlayOn();
-			const type = "selectionChange";
-			if (showOverlayOn === type || Array.isArray(showOverlayOn) && showOverlayOn.includes(type)) this.store.event.checkOverlay();
-		};
-		this.#selectionChangeHandler = selectionChangeHandler;
-		this.#focusinHandler = () => {
-			document.addEventListener("selectionchange", selectionChangeHandler);
-		};
-		this.#focusoutHandler = () => {
-			document.removeEventListener("selectionchange", selectionChangeHandler);
-		};
-		const container = this.store.refs.container;
-		if (container) {
-			container.addEventListener("focusin", this.#focusinHandler);
-			container.addEventListener("focusout", this.#focusoutHandler);
-		}
 	}
 	disable() {
-		const container = this.store.refs.container;
-		if (container && this.#focusinHandler) {
-			container.removeEventListener("focusin", this.#focusinHandler);
-			if (this.#focusoutHandler) container.removeEventListener("focusout", this.#focusoutHandler);
-		}
-		if (this.#selectionChangeHandler) document.removeEventListener("selectionchange", this.#selectionChangeHandler);
-		this.#disableClose();
-		this.store.state.overlayTrigger(void 0);
 		this.#scope?.();
 		this.#scope = void 0;
-		this.#selectionChangeHandler = void 0;
-		this.#focusinHandler = void 0;
-		this.#focusoutHandler = void 0;
-	}
-	#enableClose() {
-		if (this.#escHandler) return;
-		this.#escHandler = (e) => {
-			if (e.key === KEYBOARD.ESC) this.store.event.clearOverlay();
-		};
-		this.#clickHandler = (e) => {
-			const target = e.target instanceof HTMLElement ? e.target : null;
-			if (this.store.refs.overlay?.contains(target)) return;
-			if (this.store.refs.container?.contains(target)) return;
-			this.store.event.clearOverlay();
-		};
-		window.addEventListener("keydown", this.#escHandler);
-		document.addEventListener("click", this.#clickHandler, true);
-	}
-	#disableClose() {
-		if (this.#escHandler) {
-			window.removeEventListener("keydown", this.#escHandler);
-			if (this.#clickHandler) document.removeEventListener("click", this.#clickHandler, true);
-			this.#escHandler = void 0;
-			this.#clickHandler = void 0;
-		}
 	}
 };
 //#endregion
@@ -4046,35 +3928,6 @@ function resolveMarkSlot(token, tokenOptions, GlobalMark, GlobalSpan) {
 	return [Component, props];
 }
 //#endregion
-//#region ../../core/src/features/slots/createSlots.ts
-function createNamedSlot(slots, slotProps, name) {
-	return {
-		use: () => [resolveSlot(name, slots.use()), resolveSlotProps(name, slotProps.use())],
-		get: () => [resolveSlot(name, slots()), resolveSlotProps(name, slotProps())]
-	};
-}
-function createOverlaySlot(overlay) {
-	return {
-		use: (option, defaultComponent) => resolveOverlaySlot(overlay.use(), option, defaultComponent),
-		get: (option, defaultComponent) => resolveOverlaySlot(overlay(), option, defaultComponent)
-	};
-}
-function createMarkSlot(options, mark, span) {
-	return {
-		use: (token) => resolveMarkSlot(token, options(), mark.use(), span.use()),
-		get: (token) => resolveMarkSlot(token, options(), mark(), span())
-	};
-}
-function createSlots(signals) {
-	return {
-		container: createNamedSlot(signals.slots, signals.slotProps, "container"),
-		block: createNamedSlot(signals.slots, signals.slotProps, "block"),
-		span: createNamedSlot(signals.slots, signals.slotProps, "span"),
-		overlay: createOverlaySlot(signals.Overlay),
-		mark: createMarkSlot(signals.options, signals.Mark, signals.Span)
-	};
-}
-//#endregion
 //#region ../../core/src/shared/utils/menuUtils.ts
 /**
 * Returns true when `target` is outside `element` (i.e. not contained by it).
@@ -4245,6 +4098,21 @@ var BlockRegistry = class {
 };
 //#endregion
 //#region ../../core/src/store/Store.ts
+const DRAG_HANDLE_WIDTH = 24;
+function buildContainerProps(isDraggableBlock, readOnly, className, style, slotProps) {
+	const containerSlotProps = slotProps?.container;
+	const baseStyle = merge(style, containerSlotProps?.style);
+	const mergedStyle = isDraggableBlock && !readOnly ? {
+		paddingLeft: DRAG_HANDLE_WIDTH,
+		...baseStyle
+	} : baseStyle;
+	const { className: _, style: __, ...otherSlotProps } = resolveSlotProps("container", slotProps) ?? {};
+	return {
+		className: cx(styles.Container, className, containerSlotProps?.className),
+		style: mergedStyle,
+		...otherSlotProps
+	};
+}
 var Store = class {
 	key = new KeyGenerator();
 	blocks = new BlockRegistry();
@@ -4252,54 +4120,65 @@ var Store = class {
 		focus: new NodeProxy(void 0, this),
 		input: new NodeProxy(void 0, this)
 	};
+	props = {
+		value: signal(void 0, { readonly: true }),
+		defaultValue: signal(void 0, { readonly: true }),
+		onChange: signal(void 0, { readonly: true }),
+		options: signal(DEFAULT_OPTIONS, { readonly: true }),
+		readOnly: signal(false, { readonly: true }),
+		layout: signal("inline", { readonly: true }),
+		draggable: signal(false, { readonly: true }),
+		showOverlayOn: signal("change", { readonly: true }),
+		Span: signal(void 0, { readonly: true }),
+		Mark: signal(void 0, { readonly: true }),
+		Overlay: signal(void 0, { readonly: true }),
+		className: signal(void 0, { readonly: true }),
+		style: signal(void 0, {
+			equals: shallow,
+			readonly: true
+		}),
+		slots: signal(void 0, { readonly: true }),
+		slotProps: signal(void 0, { readonly: true })
+	};
 	state = {
 		tokens: signal([]),
-		value: signal(void 0),
-		defaultValue: signal(void 0),
 		previousValue: signal(void 0),
 		innerValue: signal(void 0),
 		recovery: signal(void 0),
 		selecting: signal(void 0),
-		drag: signal(false),
-		overlayMatch: signal(void 0),
-		overlayTrigger: signal(void 0),
-		showOverlayOn: signal("change"),
-		onChange: signal(void 0),
-		options: signal(DEFAULT_OPTIONS),
-		readOnly: signal(false),
-		Span: signal(void 0),
-		Mark: signal(void 0),
-		Overlay: signal(void 0),
-		className: signal(void 0),
-		style: signal(void 0, { equals: shallow }),
-		slots: signal(void 0),
-		slotProps: signal(void 0)
+		overlayMatch: signal(void 0)
 	};
 	computed = {
 		hasMark: computed(() => {
-			if (this.state.Mark()) return true;
-			return this.state.options().some((opt) => "Mark" in opt && opt.Mark != null);
+			if (this.props.Mark()) return true;
+			return this.props.options().some((opt) => "Mark" in opt && opt.Mark != null);
 		}),
+		isBlock: computed(() => this.props.layout() === "block"),
+		isDraggable: computed(() => !!this.props.draggable()),
 		parser: computed(() => {
 			if (!this.computed.hasMark()) return;
-			const markups = this.state.options().map((opt) => opt.markup);
+			const markups = this.props.options().map((opt) => opt.markup);
 			if (!markups.some(Boolean)) return;
-			return new Parser(markups, !!this.state.drag() ? { skipEmptyText: true } : void 0);
+			return new Parser(markups, this.computed.isBlock() ? { skipEmptyText: true } : void 0);
 		}),
-		containerClass: computed(() => cx(styles.Container, this.state.className(), this.state.slotProps()?.container?.className)),
-		containerStyle: computed((prev) => {
-			const next = merge(this.state.style(), this.state.slotProps()?.container?.style);
-			return prev && shallow(prev, next) ? prev : next;
+		currentValue: computed(() => this.state.previousValue() ?? this.props.value() ?? ""),
+		containerComponent: computed(() => resolveSlot("container", this.props.slots())),
+		containerProps: computed(() => buildContainerProps(this.computed.isDraggable() && this.computed.isBlock(), this.props.readOnly(), this.props.className(), this.props.style(), this.props.slotProps()), { equals: shallow }),
+		blockComponent: computed(() => resolveSlot("block", this.props.slots())),
+		blockProps: computed(() => resolveSlotProps("block", this.props.slotProps())),
+		spanComponent: computed(() => resolveSlot("span", this.props.slots())),
+		spanProps: computed(() => resolveSlotProps("span", this.props.slotProps())),
+		overlay: computed(() => {
+			const Overlay = this.props.Overlay();
+			return (option, defaultComponent) => resolveOverlaySlot(Overlay, option, defaultComponent);
+		}),
+		mark: computed(() => {
+			const options = this.props.options();
+			const Mark = this.props.Mark();
+			const Span = this.props.Span();
+			return (token) => resolveMarkSlot(token, options, Mark, Span);
 		})
 	};
-	slot = createSlots({
-		slots: this.state.slots,
-		slotProps: this.state.slotProps,
-		Overlay: this.state.Overlay,
-		options: this.state.options,
-		Mark: this.state.Mark,
-		Span: this.state.Span
-	});
 	event = {
 		change: event(),
 		parse: event(),
@@ -4337,14 +4216,17 @@ var Store = class {
 		watch(this.event.mounted, () => Object.values(this.features).forEach((f) => f.enable()));
 		watch(this.event.unmounted, () => Object.values(this.features).forEach((f) => f.disable()));
 	}
-	setState(values) {
+	setProps(values) {
 		batch(() => {
-			const state = this.state;
+			const props = this.props;
 			for (const key of Object.keys(values)) {
-				if (!(key in state)) continue;
-				state[key](values[key]);
+				if (!(key in props)) continue;
+				props[key](values[key]);
 			}
-		});
+		}, { mutable: true });
+	}
+	bumpTokens() {
+		this.state.tokens([...this.state.tokens()]);
 	}
 };
 //#endregion
@@ -4389,14 +4271,17 @@ var MarkHandler = class {
 	get slot() {
 		return this.#token.slot?.content;
 	}
+	get #tokenInfo() {
+		return findToken(this.#store.state.tokens(), this.#token);
+	}
 	get depth() {
-		return findToken(this.#store.state.tokens(), this.#token)?.depth ?? 0;
+		return this.#tokenInfo?.depth ?? 0;
 	}
 	get hasChildren() {
 		return this.#token.children.some((child) => child.type === "mark");
 	}
 	get parent() {
-		return findToken(this.#store.state.tokens(), this.#token)?.parent;
+		return this.#tokenInfo?.parent;
 	}
 	get tokens() {
 		return this.#token.children;
@@ -4413,14 +4298,6 @@ var MarkHandler = class {
 	}
 };
 //#endregion
-//#region src/lib/hooks/createUseHook.ts
-setUseHookFactory((sig) => {
-	const s = sig;
-	const subscribe = (cb) => watch(s, cb);
-	const getSnapshot = () => s();
-	return () => useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-});
-//#endregion
 //#region src/lib/providers/StoreContext.ts
 const StoreContext = createContext(void 0);
 StoreContext.displayName = "StoreContext";
@@ -4430,6 +4307,31 @@ function useStore() {
 	return store;
 }
 //#endregion
+//#region src/lib/hooks/useMarkput.ts
+function useMarkput(selector) {
+	const store = useStore();
+	const stableRef = useRef(null);
+	if (stableRef.current === null) {
+		const target = selector(store);
+		const derived = computed(() => {
+			if (typeof target === "function") return target();
+			const out = {};
+			for (const k in target) {
+				const val = target[k];
+				out[k] = isReactive(val) ? val() : val;
+			}
+			return out;
+		});
+		stableRef.current = {
+			derived,
+			subscribe: (cb) => watch(derived, cb),
+			getSnapshot: () => derived()
+		};
+	}
+	const { subscribe, getSnapshot } = stableRef.current;
+	return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
+//#endregion
 //#region src/components/Popup/List.tsx
 const List = ({ children }) => /* @__PURE__ */ jsx("ul", {
 	className: styles$1.PopupList,
@@ -4464,8 +4366,10 @@ const Popup = ({ ref, style, children }) => {
 //#region src/components/BlockMenu.tsx
 const BlockMenu = memo(({ token }) => {
 	const blockStore = useStore().blocks.get(token);
-	const menuOpen = blockStore.state.menuOpen.use();
-	const menuPosition = blockStore.state.menuPosition.use();
+	const { menuOpen, menuPosition } = useMarkput(() => ({
+		menuOpen: blockStore.state.menuOpen,
+		menuPosition: blockStore.state.menuPosition
+	}));
 	if (!menuOpen) return null;
 	return /* @__PURE__ */ jsx(Popup, {
 		ref: (el) => blockStore.attachMenu(el),
@@ -4495,12 +4399,14 @@ BlockMenu.displayName = "BlockMenu";
 const iconGrip = `${styles$1.Icon} ${styles$1.IconGrip}`;
 const DragHandle = memo(({ token, blockIndex }) => {
 	const store = useStore();
-	const readOnly = store.state.readOnly.use();
-	const drag = store.state.drag.use();
 	const blockStore = store.blocks.get(token);
-	const isDragging = blockStore.state.isDragging.use();
-	const isHovered = blockStore.state.isHovered.use();
-	const alwaysShowHandle = useMemo(() => getAlwaysShowHandleDrag(drag), [drag]);
+	const { readOnly, draggable } = useMarkput((s) => ({
+		readOnly: s.props.readOnly,
+		draggable: s.props.draggable
+	}));
+	const isDragging = useMarkput(() => blockStore.state.isDragging);
+	const isHovered = useMarkput(() => blockStore.state.isHovered);
+	const alwaysShowHandle = useMemo(() => getAlwaysShowHandle(draggable), [draggable]);
 	if (readOnly) return null;
 	return /* @__PURE__ */ jsx("div", {
 		className: cx(styles$1.SidePanel, alwaysShowHandle ? styles$1.SidePanelAlways : isHovered && !isDragging && styles$1.SidePanelVisible),
@@ -4518,7 +4424,8 @@ DragHandle.displayName = "DragHandle";
 //#endregion
 //#region src/components/DropIndicator.tsx
 const DropIndicator = memo(({ token, position }) => {
-	if (useStore().blocks.get(token).state.dropPosition.use() !== position) return null;
+	const blockStore = useStore().blocks.get(token);
+	if (useMarkput(() => blockStore.state.dropPosition) !== position) return null;
 	return /* @__PURE__ */ jsx("div", {
 		className: styles$1.DropIndicator,
 		style: position === "before" ? { top: -1 } : { bottom: -1 }
@@ -4538,7 +4445,7 @@ function useToken() {
 //#region src/components/Token.tsx
 const Token = memo(({ mark }) => {
 	const store = useStore();
-	const [Component, props] = store.slot.mark.use(mark);
+	const [Component, props] = useMarkput((s) => s.computed.mark)(mark);
 	return /* @__PURE__ */ jsx(TokenContext, {
 		value: mark,
 		children: /* @__PURE__ */ jsx(Component, {
@@ -4552,15 +4459,19 @@ Token.displayName = "Token";
 //#region src/components/Block.tsx
 const Block = memo(({ token, blockIndex }) => {
 	const store = useStore();
-	const [ContainerComponent, containerProps] = store.slot.block.use();
 	const blockStore = store.blocks.get(token);
-	const isDragging = blockStore.state.isDragging.use();
-	return /* @__PURE__ */ jsxs(ContainerComponent, {
+	const Component = useMarkput((s) => s.computed.blockComponent);
+	const slotProps = useMarkput((s) => s.computed.blockProps);
+	const isDragging = useMarkput(() => blockStore.state.isDragging);
+	return /* @__PURE__ */ jsxs(Component, {
 		ref: (el) => blockStore.attachContainer(el, blockIndex, store.event),
 		"data-testid": "block",
-		...containerProps,
-		className: styles$1.Block,
-		style: { opacity: isDragging ? .4 : 1 },
+		...slotProps,
+		className: cx(styles$1.Block, slotProps?.className),
+		style: {
+			opacity: isDragging ? .4 : 1,
+			...slotProps?.style
+		},
 		children: [
 			/* @__PURE__ */ jsx(DropIndicator, {
 				token,
@@ -4583,28 +4494,22 @@ Block.displayName = "Block";
 //#endregion
 //#region src/components/Container.tsx
 const Container = memo(() => {
-	const store = useStore();
-	const drag = store.state.drag.use();
-	const tokens = store.state.tokens.use();
+	const { layout, tokens, key, refs, event } = useMarkput((s) => ({
+		layout: s.props.layout,
+		tokens: s.state.tokens,
+		key: s.key,
+		refs: s.refs,
+		event: s.event
+	}));
+	const Component = useMarkput((s) => s.computed.containerComponent);
+	const props = useMarkput((s) => s.computed.containerProps);
 	useLayoutEffect(() => {
-		store.event.afterTokensRendered();
-	}, [tokens]);
-	const className = store.computed.containerClass.use();
-	const style = store.computed.containerStyle.use();
-	const readOnly = store.state.readOnly.use();
-	const key = store.key;
-	const refs = store.refs;
-	const [ContainerComponent, containerProps] = store.slot.container.use();
-	const containerStyle = drag && !readOnly ? style ? {
-		paddingLeft: 24,
-		...style
-	} : { paddingLeft: 24 } : style;
-	return /* @__PURE__ */ jsx(ContainerComponent, {
+		event.afterTokensRendered();
+	}, [tokens, event]);
+	return /* @__PURE__ */ jsx(Component, {
 		ref: (el) => refs.container = el,
-		...containerProps,
-		className,
-		style: containerStyle,
-		children: drag ? tokens.map((t, i) => /* @__PURE__ */ jsx(Block, {
+		...props,
+		children: layout === "block" ? tokens.map((t, i) => /* @__PURE__ */ jsx(Block, {
 			token: t,
 			blockIndex: i
 		}, key.get(t))) : tokens.map((t) => /* @__PURE__ */ jsx(Token, { mark: t }, key.get(t)))
@@ -4615,14 +4520,20 @@ Container.displayName = "Container";
 //#region src/lib/hooks/useOverlay.tsx
 function useOverlay() {
 	const store = useStore();
-	const match = store.state.overlayMatch.use();
-	if (!match) throw new Error("useOverlay requires an active overlay match");
-	const style = useMemo(() => Caret.getAbsolutePosition(), [match]);
+	const match = useMarkput((s) => s.state.overlayMatch);
+	const style = useMemo(() => {
+		if (!match) return {
+			left: 0,
+			top: 0
+		};
+		return Caret.getAbsolutePosition();
+	}, [match]);
 	const close = useCallback(() => store.event.clearOverlay(), []);
 	return {
 		match,
 		style,
 		select: useCallback((value) => {
+			if (!match) return;
 			const mark = createMarkFromOverlay(match, value.value, value.meta);
 			store.event.select({
 				mark,
@@ -4647,8 +4558,8 @@ const Suggestions = () => {
 	const store = useStore();
 	const { match, select, style, ref } = useOverlay();
 	const [active, setActive] = useState(NaN);
-	const data = match.option.overlay?.data ?? [];
-	const filtered = useMemo(() => filterSuggestions(data, match.value), [match.value, data]);
+	const data = match?.option.overlay?.data ?? [];
+	const filtered = useMemo(() => match ? filterSuggestions(data, match.value) : [], [match, data]);
 	const length = filtered.length;
 	const activeRef = useRef(active);
 	activeRef.current = active;
@@ -4698,9 +4609,9 @@ const Suggestions = () => {
 //#region src/components/OverlayRenderer.tsx
 const OverlayRenderer = memo(() => {
 	const store = useStore();
-	const overlayMatch = store.state.overlayMatch.use();
+	const overlayMatch = useMarkput((s) => s.state.overlayMatch);
 	const key = useMemo(() => overlayMatch ? store.key.get(overlayMatch.option) : void 0, [overlayMatch]);
-	const [Overlay, props] = store.slot.overlay.use(overlayMatch?.option, Suggestions);
+	const [Overlay, props] = useMarkput((s) => s.computed.overlay)(overlayMatch?.option, Suggestions);
 	if (!key) return;
 	return /* @__PURE__ */ jsx(Overlay, { ...props }, key);
 });
@@ -4709,10 +4620,12 @@ OverlayRenderer.displayName = "OverlayRenderer";
 //#region src/components/MarkedInput.tsx
 function MarkedInput(props) {
 	const [store] = useState(() => new Store());
-	store.setState(props);
-	useLayoutEffect(() => store.event.mounted());
+	store.setProps(props);
+	useLayoutEffect(() => {
+		store.event.mounted();
+		return () => store.event.unmounted();
+	}, []);
 	useLayoutEffect(() => store.event.updated());
-	useEffect(() => () => store.event.unmounted(), [store]);
 	useImperativeHandle(props.ref, () => store.handler, [store]);
 	return /* @__PURE__ */ jsxs(StoreContext, {
 		value: store,
@@ -4732,7 +4645,7 @@ const useMark = (options = {}) => {
 		token
 	}), [store, token]);
 	useUncontrolledInit(ref, options, token);
-	const readOnly = store.state.readOnly.use();
+	const readOnly = useMarkput((s) => s.props.readOnly);
 	useEffect(() => {
 		mark.readOnly = readOnly;
 	}, [mark, readOnly]);
@@ -4744,6 +4657,6 @@ function useUncontrolledInit(ref, options, token) {
 	}, []);
 }
 //#endregion
-export { MarkHandler, MarkedInput, MarkputHandler, annotate, denote, useMark, useOverlay };
+export { MarkHandler, MarkedInput, MarkputHandler, annotate, denote, useMark, useMarkput, useOverlay };
 
 //# sourceMappingURL=index.js.map