@markput/react 0.6.0 → 0.7.0

package/index.js

@@ -47,18 +47,18 @@ var x = /* @__PURE__ */ function(e) {
 }], C = {
 	Value: "__value__",
 	Meta: "__meta__",
-	Nested: "__nested__"
+	Slot: "__slot__"
 }, w = {
 	Value: "value",
 	Meta: "meta",
-	Nested: "nested"
+	Slot: "slot"
 };
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/core/MarkupDescriptor.ts
+//#region ../../common/core/src/features/parsing/parser/core/MarkupDescriptor.ts
 function T(e, t) {
-	let { segments: n, gapTypes: r, counts: i, valueGapIndices: a } = E(e);
-	D(i, e);
-	let o = i.value === 2, { segments: s, gapTypes: c } = o ? k(n, r, a) : {
+	let { segments: n, gapTypes: r, counts: i, valueGapIndices: a } = D(e);
+	O(i, e);
+	let o = i.value === 2, { segments: s, gapTypes: c } = o ? ee(n, r, a) : {
 		segments: n,
 		gapTypes: r
 	};
@@ -67,23 +67,28 @@ function T(e, t) {
 		index: t,
 		segments: s,
 		gapTypes: c,
-		hasNested: i.nested === 1,
+		hasSlot: i.slot === 1,
 		hasTwoValues: o,
 		segmentGlobalIndices: Array.from({ length: s.length })
 	};
 }
-function E(e) {
+var E = {
+	[w.Value]: C.Value,
+	[w.Meta]: C.Meta,
+	[w.Slot]: C.Slot
+};
+function D(e) {
 	let t = [], n = [], r = [], i = {
 		value: 0,
 		meta: 0,
-		nested: 0
+		slot: 0
 	}, a = [], o = [
 		w.Value,
 		w.Meta,
-		w.Nested
+		w.Slot
 	];
 	for (let t of o) {
-		let n = O[t], r = e.indexOf(n);
+		let n = E[t], r = e.indexOf(n);
 		for (; r !== -1;) a.push({
 			type: t,
 			position: r
@@ -93,7 +98,7 @@ function E(e) {
 	let s = 0;
 	for (let o of a) {
 		let a = e.substring(s, o.position);
-		a.length > 0 && t.push(a), n.push(o.type), i[o.type]++, o.type === w.Value && r.push(n.length - 1), s = o.position + O[o.type].length;
+		a.length > 0 && t.push(a), n.push(o.type), i[o.type]++, o.type === w.Value && r.push(n.length - 1), s = o.position + E[o.type].length;
 	}
 	let c = e.substring(s);
 	return c.length > 0 && t.push(c), {
@@ -103,7 +108,7 @@ function E(e) {
 		valueGapIndices: r
 	};
 }
-function D(e, t) {
+function O(e, t) {
 	let n = [
 		{
 			count: e.value,
@@ -116,34 +121,29 @@ function D(e, t) {
 			name: C.Meta
 		},
 		{
-			count: e.nested,
+			count: e.slot,
 			max: 1,
-			name: C.Nested
+			name: C.Slot
 		}
 	];
 	for (let { count: e, max: r, name: i } of n) if (e > r) throw Error(`Invalid markup: "${t}". Max ${r} "${i}" placeholders, got ${e}`);
-	if (e.value === 0 && e.nested === 0) throw Error(`Invalid markup: "${t}". Need at least one "${C.Value}" or "${C.Nested}"`);
+	if (e.value === 0 && e.slot === 0) throw Error(`Invalid markup: "${t}". Need at least one "${C.Value}" or "${C.Slot}"`);
 }
-var O = {
-	[w.Value]: C.Value,
-	[w.Meta]: C.Meta,
-	[w.Nested]: C.Nested
-};
-function k(e, t, n) {
+function ee(e, t, n) {
 	if (n.length !== 2) return {
 		segments: e,
 		gapTypes: t
 	};
 	let [r, i] = n, a = [], o = e[r], s = e[r + 1];
-	o && s && a.push(A(o, s, e[r + 2]));
+	o && s && a.push(k(o, s, e[r + 2]));
 	for (let t = r + 2; t < i; t++) a.push(e[t]);
 	let c = e[i], l = e[i + 1];
-	return c && l && a.push(A(c, l, e[i + 2])), {
+	return c && l && a.push(k(c, l, e[i + 2])), {
 		segments: a,
 		gapTypes: t.filter((e) => e !== w.Value)
 	};
 }
-function A(e, t, n) {
+function k(e, t, n) {
 	if (!n) return [
 		e,
 		t,
@@ -157,7 +157,11 @@ function A(e, t, n) {
 	];
 }
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/core/MarkupRegistry.ts
+//#region ../../common/core/src/features/parsing/parser/core/MarkupRegistry.ts
+function A(e, t) {
+	let n = e.get(t);
+	return n || (n = [], e.set(t, n)), n;
+}
 var j = class {
 	markups;
 	descriptors;
@@ -176,9 +180,7 @@ var j = class {
 	}
 	addToFirstSegmentIndexMap(e) {
 		let t = e.segmentGlobalIndices[0];
-		if (t === void 0) return;
-		let n = this.firstSegmentIndexMap.get(t);
-		n ? n.push(e) : this.firstSegmentIndexMap.set(t, [e]);
+		t !== void 0 && A(this.firstSegmentIndexMap, t).push(e);
 	}
 	processSegment(e, t, n, r) {
 		let i = this.getSegmentKey(t);
@@ -203,7 +205,7 @@ var j = class {
 	}
 };
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/utils/getSegmentIndex.ts
+//#region ../../common/core/src/features/parsing/parser/utils/getSegmentIndex.ts
 function M(e, t) {
 	if (!t) return e;
 	let n = 5381;
@@ -211,8 +213,8 @@ function M(e, t) {
 	return n >>>= 0, e * 1e6 + (n & 1048575);
 }
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/core/Match.ts
-var ee = class {
+//#region ../../common/core/src/features/parsing/parser/core/Match.ts
+var te = class {
 	gaps = {};
 	captured;
 	expectedSegmentIndex;
@@ -261,9 +263,16 @@ var ee = class {
 		}, this.end = e.end, this.expectedSegmentIndex++, this.expectedSegmentIndex >= this.descriptor.segments.length && (this.expectedSegmentIndex = NaN);
 	}
 	conflictsWith(e) {
-		return !e || this.start >= e.end ? !1 : !e.descriptor.hasNested || e.gaps.nested === void 0 ? !0 : !(this.start >= e.gaps.nested.start && this.end <= e.gaps.nested.end);
+		return !e || this.start >= e.end ? !1 : !e.descriptor.hasSlot || e.gaps.slot === void 0 ? !0 : !(this.start >= e.gaps.slot.start && this.end <= e.gaps.slot.end);
 	}
-}, te = class {
+};
+//#endregion
+//#region ../../common/core/src/features/parsing/parser/core/PatternMatcher.ts
+function ne(e, t) {
+	let n = e.get(t);
+	return n || (n = [], e.set(t, n)), n;
+}
+var re = class {
 	pendingStates = /* @__PURE__ */ new Map();
 	completingStates = /* @__PURE__ */ new Map();
 	completedStates = [];
@@ -284,7 +293,7 @@ var ee = class {
 	}
 	tryStartNewStates(e) {
 		this.registry.firstSegmentIndexMap.get(e.index)?.forEach((t) => {
-			let n = new ee(t, e);
+			let n = new te(t, e);
 			if (!n.isInvalid) {
 				if (n.isCompleted) return this.addToCompleted(n);
 				this.addToWaiting(n);
@@ -299,13 +308,7 @@ var ee = class {
 	}
 	addToWaiting(e) {
 		let t = e.nextSegment;
-		if (e.isAwaitingLastSegment) {
-			let n = this.completingStates.get(t) || [];
-			n.length === 0 && this.completingStates.set(t, n), n.push(e);
-		} else {
-			let n = this.pendingStates.get(t) || [];
-			n.length === 0 && this.pendingStates.set(t, n), n.push(e);
-		}
+		ne(e.isAwaitingLastSegment ? this.completingStates : this.pendingStates, t).push(e);
 	}
 	addToCompleted(e) {
 		let t = e.start, n = 0, r = this.completedStates.length;
@@ -320,92 +323,97 @@ var ee = class {
 	}
 }, N = (e) => e.replace(/[.*+?^${}()|[\]\\\\]/g, "\\$&");
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/core/SegmentMatcher.ts
-function ne(e, t, n) {
+//#region ../../common/core/src/features/parsing/parser/core/SegmentMatcher.ts
+function P(e, t, n) {
 	let r = N(e), i = N(t);
 	return `${r}([^${N(t + n)}]+?)${i}`;
 }
-var re = class {
-	staticRegex;
-	staticToIndex;
-	dynamicRegex;
-	dynamicEntries;
-	dynamicIndices;
+var F = class {
+	static;
+	dynamic;
 	constructor(e) {
 		this.initializeDual(e);
 	}
 	initializeDual(e) {
 		let t = [], n = [], r = /* @__PURE__ */ new Map();
 		if (e.forEach((e, i) => {
-			typeof e == "string" ? (t.push(e), r.set(e, i)) : n.push(e);
+			typeof e == "string" ? (t.push(e), r.set(e, i)) : n.push({
+				segment: e,
+				index: i
+			});
 		}), t.length > 0) {
-			let e = [...t].sort((e, t) => t.length - e.length).map(N);
-			this.staticRegex = RegExp(`(?:${e.join("|")})`, "gu"), this.staticToIndex = r;
+			let e = [...t].toSorted((e, t) => t.length - e.length).map(N);
+			this.static = {
+				regex: RegExp(`(?:${e.join("|")})`, "gu"),
+				toIndex: r
+			};
 		}
 		if (n.length > 0) {
-			let t = /* @__PURE__ */ new Set(), r = [];
-			n.forEach((n) => {
-				let i = e.indexOf(n);
-				if (typeof n == "string") r.push({
-					index: i,
-					pattern: N(n),
+			let e = /* @__PURE__ */ new Set(), t = [];
+			n.forEach(({ segment: n, index: r }) => {
+				let [i, a, o] = n;
+				e.add(r);
+				let s = P(i, a, o).replace("(", `(?<content${r}>`);
+				t.push({
+					index: r,
+					pattern: s,
 					definition: n
 				});
-				else {
-					let [e, a, o] = n;
-					t.add(i);
-					let s = ne(e, a, o).replace("(", `(?<content${i}>`);
-					r.push({
-						index: i,
-						pattern: s,
-						definition: n
-					});
-				}
-			}), r.sort((e, t) => {
+			}), t.sort((e, t) => {
 				let n = typeof e.definition == "string" ? e.definition.length : e.pattern.length;
 				return (typeof t.definition == "string" ? t.definition.length : t.pattern.length) - n;
-			}), this.dynamicEntries = r, this.dynamicIndices = t, this.dynamicRegex = new RegExp(r.map((e, t) => `(?<seg${t}>${e.pattern})`).join("|"), "gu");
+			}), this.dynamic = {
+				entries: t,
+				indices: e,
+				regex: new RegExp(t.map((e, t) => `(?<seg${t}>${e.pattern})`).join("|"), "gu")
+			};
 		}
 	}
 	search(e) {
 		let t = [], n = [];
-		if (this.staticRegex && this.staticToIndex) for (let n of e.matchAll(this.staticRegex)) {
-			let e = this.staticToIndex.get(n[0]);
-			e !== void 0 && t.push({
-				index: e,
-				start: n.index,
-				end: n.index + n[0].length,
-				value: n[0]
-			});
+		if (this.static) {
+			let { regex: n, toIndex: r } = this.static;
+			for (let i of e.matchAll(n)) {
+				let e = r.get(i[0]);
+				e !== void 0 && t.push({
+					index: e,
+					start: i.index,
+					end: i.index + i[0].length,
+					value: i[0]
+				});
+			}
 		}
-		if (this.dynamicRegex && this.dynamicEntries && this.dynamicIndices) for (let t of e.matchAll(this.dynamicRegex)) {
-			let e = t[0], r = t.index, i, a;
-			if (t.groups) {
-				for (let e = 0; e < this.dynamicEntries.length; e++) if (t.groups[`seg${e}`] !== void 0) {
-					i = this.dynamicEntries[e].index, this.dynamicIndices.has(i) && (a = t.groups[`content${i}`]);
-					break;
+		if (this.dynamic) {
+			let { regex: t, entries: r, indices: i } = this.dynamic;
+			for (let a of e.matchAll(t)) {
+				let e = a[0], t = a.index, o, s;
+				if (a.groups) {
+					for (let e = 0; e < r.length; e++) if (a.groups[`seg${e}`] !== void 0) {
+						o = r[e].index, i.has(o) && (s = a.groups[`content${o}`]);
+						break;
+					}
 				}
+				o !== void 0 && n.push({
+					index: o,
+					start: t,
+					end: t + e.length,
+					value: e,
+					captured: s
+				});
 			}
-			i !== void 0 && n.push({
-				index: i,
-				start: r,
-				end: r + e.length,
-				value: e,
-				captured: a
-			});
 		}
 		let r = [...n];
 		for (let e of t) n.some((t) => e.start < t.end && e.end > t.start) || r.push(e);
 		return r.sort((e, t) => e.start - t.start), r;
 	}
-}, ie = (e, t = 0, n = e.length) => ({
+}, I = (e, t = 0, n = e.length) => ({
 	type: "text",
 	content: e.substring(t, n),
 	position: {
 		start: t,
 		end: n
 	}
-}), ae = class {
+}), ie = class {
 	input;
 	build(e, t) {
 		return this.input = t, e.length === 0 ? [this.createTextToken(0, t.length)] : this.buildSinglePass(e);
@@ -428,7 +436,7 @@ var re = class {
 				t.push(e), i = a.end;
 			}
 			let o = this.createMarkToken(a);
-			if (this.hasNestedContent(a)) {
+			if (this.hasSlotContent(a)) {
 				let e = this.getContentBounds(a);
 				n.push({
 					match: a,
@@ -444,11 +452,10 @@ var re = class {
 		return t.push(this.createTextToken(i, this.input.length)), t;
 	}
 	finalizeParent(e, t) {
-		let n = this.createTextToken(e.textPos, t);
-		e.token.children.push(n), e.token.children.some((e) => e.type === "mark") || (e.token.children = []);
+		e.token.children.push(this.createTextToken(e.textPos, t));
 	}
 	createMarkToken(e) {
-		let t = this.extractSubstring(e.gaps.value?.start, e.gaps.value?.end), n = this.extractSubstring(e.gaps.nested?.start, e.gaps.nested?.end), r = this.extractSubstring(e.gaps.meta?.start, e.gaps.meta?.end), i = n || void 0, a = e.gaps.meta === void 0 ? void 0 : r, o = t || i || "";
+		let t = this.extractSubstring(e.gaps.value?.start, e.gaps.value?.end), n = this.extractSubstring(e.gaps.slot?.start, e.gaps.slot?.end), r = this.extractSubstring(e.gaps.meta?.start, e.gaps.meta?.end), i = n || void 0, a = e.gaps.meta === void 0 ? void 0 : r, o = t || i || "";
 		return {
 			type: "mark",
 			content: this.input.substring(e.start, e.end),
@@ -460,39 +467,39 @@ var re = class {
 				start: e.start,
 				end: e.end
 			},
-			nested: this.createNestedInfo(e, i)
+			slot: this.createSlotSourceInfo(e, i)
 		};
 	}
 	getContentBounds(e) {
-		return e.gaps.nested ? e.gaps.nested : e.gaps.value ? e.gaps.value : {
+		return e.gaps.slot ? e.gaps.slot : e.gaps.value ? e.gaps.value : {
 			start: e.start,
 			end: e.start
 		};
 	}
-	hasNestedContent(e) {
-		return e.gaps.nested !== void 0;
+	hasSlotContent(e) {
+		return e.gaps.slot !== void 0;
 	}
 	extractSubstring(e, t) {
 		return e !== void 0 && t !== void 0 ? this.input.substring(e, t) : "";
 	}
 	createTextToken(e, t) {
-		return ie(this.input, e, t);
+		return I(this.input, e, t);
 	}
-	createNestedInfo(e, t) {
-		if (!(!t || e.gaps.nested === void 0)) return {
+	createSlotSourceInfo(e, t) {
+		if (!(!t || e.gaps.slot === void 0)) return {
 			content: t,
-			start: e.gaps.nested.start,
-			end: e.gaps.nested.end
+			start: e.gaps.slot.start,
+			end: e.gaps.slot.end
 		};
 	}
 };
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/utils/processTokens.ts
-function oe(e, t) {
+//#region ../../common/core/src/features/parsing/parser/utils/processTokens.ts
+function L(e, t) {
 	let n = "";
 	for (let r of e) if (r.type === "text") n += r.content;
 	else if (r.children.length > 0) {
-		let e = oe(r.children, t), i = {
+		let e = L(r.children, t), i = {
 			...r,
 			value: e
 		};
@@ -501,85 +508,85 @@ function oe(e, t) {
 	return n;
 }
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/utils/annotate.ts
-function P(e, t) {
+//#region ../../common/core/src/features/parsing/parser/utils/annotate.ts
+function R(e, t) {
 	let n = e;
-	return t.value !== void 0 && (n = n.replaceAll(C.Value, t.value)), t.meta !== void 0 && (n = n.replaceAll(C.Meta, t.meta)), t.nested !== void 0 && (n = n.replaceAll(C.Nested, t.nested)), n;
+	return t.value !== void 0 && (n = n.replaceAll(C.Value, t.value)), t.meta !== void 0 && (n = n.replaceAll(C.Meta, t.meta)), t.slot !== void 0 && (n = n.replaceAll(C.Slot, t.slot)), n;
 }
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/utils/toString.ts
-function F(e) {
+//#region ../../common/core/src/features/parsing/parser/utils/toString.ts
+function z(e) {
 	let t = "";
 	for (let n of e) {
 		if (n.type === "text") {
 			t += n.content;
 			continue;
 		}
-		let e = n.descriptor.markup, r = e.includes(C.Nested) ? n.children.length > 0 ? F(n.children) : n.nested?.content : void 0;
-		t += P(e, {
+		let { markup: e, hasSlot: r } = n.descriptor, i = r ? n.children.length > 0 ? z(n.children) : n.slot?.content : void 0;
+		t += R(e, {
 			value: n.value,
 			meta: n.meta,
-			nested: r
+			slot: i
 		});
 	}
 	return t;
 }
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/Parser.ts
-var se = class e {
+//#region ../../common/core/src/features/parsing/parser/Parser.ts
+var B = class e {
 	registry;
 	segmentMatcher;
 	patternMatcher;
 	treeBuilder;
 	constructor(e) {
-		this.registry = new j(e), this.segmentMatcher = new re(this.registry.segments), this.patternMatcher = new te(this.registry), this.treeBuilder = new ae();
+		this.registry = new j(e), this.segmentMatcher = new F(this.registry.segments), this.patternMatcher = new re(this.registry), this.treeBuilder = new ie();
 	}
 	static parse(t, n) {
 		let r = n?.markup;
-		return !r || r.length === 0 ? [ie(t)] : new e(r).parse(t);
+		return !r || r.length === 0 ? [I(t)] : new e(r).parse(t);
 	}
 	static stringify(e) {
-		return F(e);
+		return z(e);
 	}
 	parse(e) {
 		let t = this.segmentMatcher.search(e), n = this.patternMatcher.process(t);
 		return this.treeBuilder.build(n, e);
 	}
 	stringify(e) {
-		return F(e);
+		return z(e);
 	}
 	transform(e, t) {
-		return oe(this.parse(e), t);
+		return L(this.parse(e), t);
 	}
 	escape(e) {
-		return this.registry.segments.filter((e) => typeof e == "string").sort((e, t) => t.length - e.length).reduce((e, t) => e.replaceAll(t, t.replace(/(.)/g, "\\$1")), e);
+		return this.registry.segments.filter((e) => typeof e == "string").toSorted((e, t) => t.length - e.length).reduce((e, t) => e.replaceAll(t, t.replace(/(.)/g, "\\$1")), e);
 	}
 	unescape(e) {
 		return e.replaceAll(/\\(.)/g, "$1");
 	}
 };
 //#endregion
-//#region ../../common/core/src/features/parsing/ParserV2/utils/denote.ts
-function ce(e, t, n) {
-	return n.length ? oe(new se(n).parse(e), t) : e;
+//#region ../../common/core/src/features/parsing/parser/utils/denote.ts
+function ae(e, t, n) {
+	return n.length ? L(new B(n).parse(e), t) : e;
 }
 //#endregion
 //#region ../../common/core/src/features/parsing/utils/findToken.ts
-function I(e, t, n = 0, r) {
+function V(e, t, n = 0, r) {
 	for (let i of e) {
 		if (i === t) return {
 			depth: n,
 			parent: r
 		};
 		if (i.type === "mark") {
-			let e = I(i.children, t, n + 1, i);
+			let e = V(i.children, t, n + 1, i);
 			if (e) return e;
 		}
 	}
 }
 //#endregion
-//#region ../../common/core/src/features/preparsing/utils/findGap.ts
-function le(e = "", t = "") {
+//#region ../../common/core/src/features/parsing/preparsing/utils/findGap.ts
+function oe(e = "", t = "") {
 	if (e === t) return {};
 	let n;
 	for (let r = 0; r < e.length; r++) if (e[r] !== t[r]) {
@@ -597,8 +604,8 @@ function le(e = "", t = "") {
 	};
 }
 //#endregion
-//#region ../../common/core/src/features/preparsing/utils/getClosestIndexes.ts
-function ue(e, t) {
+//#region ../../common/core/src/features/parsing/preparsing/utils/getClosestIndexes.ts
+function se(e, t) {
 	let n = -1, r = e.length;
 	for (; r - n > 1;) {
 		let i = Math.round((n + r) / 2);
@@ -608,49 +615,49 @@ function ue(e, t) {
 }
 //#endregion
 //#region ../../common/core/src/features/parsing/utils/valueParser.ts
-function de(e) {
+function ce(e) {
 	let { focus: t } = e.nodes, n = e.state.parser.get(), r = e.state.tokens.get();
 	if (!n) return r;
 	let i = n.parse(t.content);
 	return i.length === 1 ? r : r.toSpliced(t.index, 1, ...i);
 }
-function fe(e) {
-	let t = e.state.value.get(), n = pe(e), r = le(e.state.previousValue.get(), t);
+function le(e) {
+	let t = e.state.value.get(), n = de(e), r = oe(e.state.previousValue.get(), t);
 	if (!r.left && !r.right) return e.state.previousValue.set(t), e.state.tokens.get();
 	e.state.previousValue.set(t);
 	let i = e.state.tokens.get();
 	switch (!0) {
 		case r.left !== void 0 && n.includes(r.left) && r.right !== void 0 && Math.abs(r.left - r.right) > 1: {
-			let t = n.indexOf(r.left), a = L(e, t - 1, t);
+			let t = n.indexOf(r.left), a = ue(e, t - 1, t);
 			return i.toSpliced(t - 1, 2, ...a);
 		}
 		case r.left !== void 0: {
-			let [t] = ue(n, r.left), a = L(e, t);
+			let [t] = se(n, r.left), a = ue(e, t);
 			return a.length === 1 ? i : i.toSpliced(t, 1, ...a);
 		}
 		case r.right !== void 0: {
-			let [t] = ue(n, r.right), a = L(e, t);
+			let [t] = se(n, r.right), a = ue(e, t);
 			return a.length === 1 ? i : i.toSpliced(t, 1, ...a);
 		}
-		default: return R(e, t ?? "");
+		default: return H(e, t ?? "");
 	}
 }
-function L(e, ...t) {
+function ue(e, ...t) {
 	let n = "", r = e.state.tokens.get();
 	for (let e of t) {
 		let t = r[e];
 		n += t.content;
 	}
-	return R(e, n);
+	return H(e, n);
 }
-function pe(e) {
+function de(e) {
 	let t = 0;
 	return e.state.tokens.get().map((e) => {
 		let n = e.content.length;
 		return t += n, t - n;
 	}) ?? [];
 }
-function R(e, t) {
+function H(e, t) {
 	let n = e.state.parser.get();
 	return n ? n.parse(t) : [{
 		type: "text",
@@ -663,12 +670,12 @@ function R(e, t) {
 }
 //#endregion
 //#region ../../common/core/src/shared/classes/Reactive.ts
-var me = (e, t) => e === t, z = class e {
+var fe = (e, t) => e === t, pe = class e {
 	#e;
 	#t = /* @__PURE__ */ new Set();
 	#n;
 	constructor(e, t) {
-		this.#e = e, this.#n = t?.equals ?? me;
+		this.#e = e, this.#n = t?.equals ?? fe;
 	}
 	static event() {
 		return new e(void 0, { equals: !1 });
@@ -694,46 +701,46 @@ var me = (e, t) => e === t, z = class e {
 };
 //#endregion
 //#region ../../common/core/src/shared/classes/defineState.ts
-function he(e, t) {
+function me(e, t) {
 	let n = {};
 	return n.get = () => e.get(), n.set = (t) => e.set(t), n.on = (t) => e.on(t), n.use = t(n), n;
 }
-function ge(e, t) {
+function he(e, t) {
 	let n = /* @__PURE__ */ new Map();
-	for (let t in e) n.set(t, new z(e[t]));
+	for (let t in e) n.set(t, new pe(e[t]));
 	return new Proxy(e, { get(e, r) {
 		if (r === "set") return (e) => {
 			for (let t in e) n.get(t)?.set(e[t]);
 		};
 		let i = n.get(r);
-		if (i) return he(i, t);
+		if (i) return me(i, t);
 	} });
 }
 //#endregion
 //#region ../../common/core/src/shared/classes/defineEvents.ts
-function _e(e) {
+function ge(e) {
 	let t = function(t) {
 		e.emit(t);
 	};
 	return t.on = (t) => e.on(t), t;
 }
-function ve(e) {
+function _e(e) {
 	let t = e ? Object.keys(e) : [], n = /* @__PURE__ */ new Map();
-	for (let e of t) n.set(e, z.event());
+	for (let e of t) n.set(e, pe.event());
 	return new Proxy({}, { get(e, t) {
 		let r = n.get(t);
-		return r || (r = z.event(), n.set(t, r)), _e(r);
+		return r || (r = pe.event(), n.set(t, r)), ge(r);
 	} });
 }
 //#endregion
 //#region ../../common/core/src/shared/classes/KeyGenerator.ts
-var ye = class {
+var ve = class {
 	#e = 1;
 	#t = /* @__PURE__ */ new WeakMap();
 	get(e) {
 		return this.#t.has(e) ? this.#t.get(e) : (this.#t.set(e, this.#e), this.#e++);
 	}
-}, B = class {
+}, U = class {
 	static get isSelectedPosition() {
 		let e = window.getSelection();
 		if (e) return e.isCollapsed;
@@ -746,7 +753,7 @@ var ye = class {
 	}
 	static getSelectedNode() {
 		let e = window.getSelection()?.anchorNode;
-		if (e) return e;
+		if (e && document.contains(e)) return e;
 		throw Error("Anchor node of selection is not exists!");
 	}
 	static getAbsolutePosition() {
@@ -838,16 +845,20 @@ var ye = class {
 		let n = window.getSelection()?.getRangeAt(0);
 		n?.setStart(n.endContainer, t), n?.setEnd(n.endContainer, t);
 	}
-}, be = /* @__PURE__ */ new RegExp(/^\w*/), xe = class e {
+}, ye = /* @__PURE__ */ new RegExp(/^\w*/), be = class e {
 	span;
 	node;
 	dividedText;
 	constructor() {
-		let e = B.getCurrentPosition();
-		this.node = B.getSelectedNode(), this.span = B.getFocusedSpan(), this.dividedText = this.getDividedTextBy(e);
+		let e = U.getCurrentPosition();
+		this.node = U.getSelectedNode(), this.span = U.getFocusedSpan(), this.dividedText = this.getDividedTextBy(e);
 	}
 	static find(t, n) {
-		if (t && B.isSelectedPosition) return new e().find(t, n);
+		if (t && U.isSelectedPosition) try {
+			return new e().find(t, n);
+		} catch {
+			return;
+		}
 	}
 	getDividedTextBy(e) {
 		return {
@@ -880,7 +891,7 @@ var ye = class {
 	}
 	matchRightPart() {
 		let { right: e } = this.dividedText;
-		return { word: e.match(be)?.[0] };
+		return { word: e.match(ye)?.[0] };
 	}
 	matchLeftPart(e) {
 		let t = this.makeTriggerRegex(e), { left: n } = this.dividedText, r = n.match(t);
@@ -896,7 +907,7 @@ var ye = class {
 		let t = N(e) + "(\\w*)$";
 		return new RegExp(t);
 	}
-}, Se = class e {
+}, xe = class e {
 	#e;
 	#t;
 	get target() {
@@ -921,19 +932,19 @@ var ye = class {
 		return this.target?.isContentEditable ?? !1;
 	}
 	get isCaretAtBeginning() {
-		if (this.target) return B.getCaretIndex(this.target) === 0;
+		if (this.target) return U.getCaretIndex(this.target) === 0;
 	}
 	get isCaretAtEnd() {
-		if (this.target) return B.getCaretIndex(this.target) === this.target.textContent?.length;
+		if (this.target) return U.getCaretIndex(this.target) === this.target.textContent?.length;
 	}
 	get index() {
 		return this.target?.parentElement ? [...this.target.parentElement.children].indexOf(this.target) : -1;
 	}
 	get caret() {
-		return this.target ? B.getCaretIndex(this.target) : -1;
+		return this.target ? U.getCaretIndex(this.target) : -1;
 	}
 	set caret(e) {
-		this.target && B.trySetIndex(this.target, e);
+		this.target && U.trySetIndex(this.target, e);
 	}
 	get length() {
 		return this.target?.textContent?.length ?? -1;
@@ -957,7 +968,7 @@ var ye = class {
 		this.target = e, this.#t = t;
 	}
 	setCaretToEnd() {
-		B.setCaretToEnd(this.target);
+		U.setCaretToEnd(this.target);
 	}
 	focus() {
 		this.target?.focus();
@@ -967,13 +978,13 @@ var ye = class {
 	}
 };
 //#endregion
-//#region ../../common/core/src/features/text-manipulation/utils/createNewSpan.ts
-function Ce(e, t, n, r) {
+//#region ../../common/core/src/features/editing/utils/createNewSpan.ts
+function Se(e, t, n, r) {
 	return e.slice(0, n) + t + e.slice(n + r.length);
 }
 //#endregion
-//#region ../../common/core/src/features/text-manipulation/utils/deleteMark.ts
-function V(e, t) {
+//#region ../../common/core/src/features/editing/utils/deleteMark.ts
+function Ce(e, t) {
 	let n = {
 		prev: 2,
 		self: 1,
@@ -993,11 +1004,136 @@ function V(e, t) {
 	t.state.recovery.set({
 		anchor: l.prev,
 		caret: u
-	}), t.state.onChange.get()?.(F(t.state.tokens.get()));
+	}), t.state.onChange.get()?.(z(t.state.tokens.get()));
+}
+//#endregion
+//#region ../../common/core/src/features/blocks/config.ts
+function we(e) {
+	return typeof e == "object" && !!e.alwaysShowHandle;
+}
+//#endregion
+//#region ../../common/core/src/features/blocks/splitTokensIntoDragRows.ts
+function Te(e) {
+	let t = [], { content: n, position: r } = e, i = r.start, a = [], o = () => {
+		if (a.length > 0) {
+			let e = a.join("");
+			t.push({
+				content: e,
+				position: {
+					start: i,
+					end: i + e.length
+				},
+				isBlockSeparator: !1
+			}), i += e.length, a.length = 0;
+		}
+	};
+	for (let e = 0; e < n.length; e++) {
+		let r = n[e];
+		r === "\n" ? e + 1 < n.length && n[e + 1] === "\n" ? (o(), t.push({
+			content: "\n\n",
+			position: {
+				start: i,
+				end: i + 2
+			},
+			isBlockSeparator: !0
+		}), i += 2, e++) : (a.push(r), i++) : r === "\r" ? e + 1 < n.length && n[e + 1] === "\n" ? e + 2 < n.length && n[e + 2] === "\r" && e + 3 < n.length && n[e + 3] === "\n" ? (o(), t.push({
+			content: "\n\n",
+			position: {
+				start: i,
+				end: i + 4
+			},
+			isBlockSeparator: !0
+		}), i += 4, e += 3) : (a.push("\n"), i += 2, e++) : (a.push("\n"), i++) : a.push(r);
+	}
+	return o(), t;
+}
+var Ee = 0;
+function W(e) {
+	return `drag-${Ee++}-${e}`;
+}
+function De() {
+	Ee = 0;
+}
+function G(e) {
+	if (e.length === 0) return [];
+	De();
+	let t = [], n = null;
+	for (let r of e) if (r.type === "mark") n = null, t.push({
+		id: W(r.position.start),
+		tokens: [r],
+		startPos: r.position.start,
+		endPos: r.position.end
+	});
+	else if (r.type === "text") {
+		let e = Te(r);
+		for (let r of e) r.isBlockSeparator ? (n !== null && t.push({
+			id: W(n),
+			tokens: [],
+			startPos: n,
+			endPos: n
+		}), n = r.position.end) : r.content.trim().length > 0 && (n = null, t.push({
+			id: W(r.position.start),
+			tokens: [{
+				type: "text",
+				content: r.content,
+				position: r.position
+			}],
+			startPos: r.position.start,
+			endPos: r.position.end
+		}));
+	}
+	return n !== null && t.push({
+		id: W(n),
+		tokens: [],
+		startPos: n,
+		endPos: n
+	}), t;
+}
+//#endregion
+//#region ../../common/core/src/features/blocks/dragOperations.ts
+function K(e) {
+	return e.tokens.length === 0 || e.tokens[0].type === "text";
+}
+function Oe(e, t) {
+	return K(e) && K(t) ? "\n\n" : "";
+}
+function ke(e, t, n) {
+	if (t.length === 0) return e + "\n\n";
+	if (n >= t.length - 1) return e === "" ? "\n\n\n\n" : e + "\n\n";
+	let r = t[n], i = t[n + 1];
+	return i.startPos - r.endPos === 0 ? e.slice(0, r.endPos) + "\n\n\n\n" + e.slice(i.startPos) : e.slice(0, i.startPos) + "\n\n" + e.slice(i.startPos);
+}
+function Ae(e, t, n) {
+	return t.length <= 1 ? "" : n >= t.length - 1 ? e.slice(0, t[n - 1].endPos) : e.slice(0, t[n].startPos) + e.slice(t[n + 1].startPos);
+}
+function je(e, t, n) {
+	let r = t[n], i = e.substring(r.startPos, r.endPos);
+	if (n >= t.length - 1) return e + (K(r), "\n\n") + i;
+	let a = t[n + 1], o = a.startPos - r.endPos === 0 ? "" : "\n\n";
+	return e.slice(0, a.startPos) + i + o + e.slice(a.startPos);
+}
+function Me(e, t) {
+	return t <= 0 || t >= e.length ? 0 : e[t - 1].endPos;
+}
+function Ne(e, t, n) {
+	if (n <= 0 || n >= t.length) return e;
+	let r = t[n - 1], i = t[n];
+	return e.slice(0, r.endPos) + e.slice(i.startPos);
+}
+function Pe(e, t, n, r) {
+	if (n === r || n === r - 1 || t.length < 2 || n < 0 || n >= t.length || r < 0 || r > t.length) return e;
+	let i = t.map((t) => e.substring(t.startPos, t.endPos)), a = [...t], [o] = a.splice(n, 1), [s] = i.splice(n, 1), c = r > n ? r - 1 : r;
+	a.splice(c, 0, o), i.splice(c, 0, s);
+	let l = [];
+	for (let e = 0; e < i.length; e++) l.push(i[e]), e < i.length - 1 && l.push(Oe(a[e], a[e + 1]));
+	return l.join("");
 }
 //#endregion
 //#region ../../common/core/src/features/editable/ContentEditableController.ts
-var we = class {
+function Fe(e) {
+	return e.tagName === "SPAN" && (e.attributes.length === 0 || e.attributes.length === 1 && e.hasAttribute("contenteditable"));
+}
+var Ie = class {
 	#e;
 	constructor(e) {
 		this.store = e;
@@ -1011,10 +1147,65 @@ var we = class {
 	sync() {
 		let e = this.store.refs.container;
 		if (!e) return;
-		let t = this.store.state.readOnly.get() ? "false" : "true", n = e.children, r = this.store.state.drag.get() ? 1 : 2;
-		for (let e = 0; e < n.length; e += r) n[e].contentEditable = t;
+		let t = this.store.state.readOnly.get(), n = t ? "false" : "true", r = e.children, i = !!this.store.state.drag.get();
+		if (i) {
+			let e = G(this.store.state.tokens.get());
+			for (let i = 0; i < e.length && i < r.length; i++) {
+				let a = r[i];
+				e[i].tokens.length === 1 && e[i].tokens[0].type === "mark" ? t || (a.tabIndex = 0) : a.contentEditable = n;
+			}
+		} else for (let e = 0; e < r.length; e += 2) r[e].contentEditable = n;
+		let a = this.store.state.tokens.get();
+		i ? this.#r(a, e, t) : this.#t(a, e);
+	}
+	#t(e, t) {
+		let n = t.children;
+		for (let t = 0; t < e.length; t++) {
+			let r = e[t], i = n[t];
+			i && (r.type === "text" ? i.textContent !== r.content && (i.textContent = r.content) : r.type === "mark" && r.children.length > 0 && this.#n(r.children, i));
+		}
+	}
+	#n(e, t, n) {
+		let r = t.children, i = 0;
+		for (let t of e) if (t.type === "text") {
+			for (; i < r.length;) {
+				let e = r[i];
+				if (Fe(e)) break;
+				i++;
+			}
+			let e = r[i];
+			e && (e.textContent !== t.content && (e.textContent = t.content), n !== void 0 && (e.contentEditable = n), i++);
+		} else if (t.type === "mark" && t.children.length > 0) {
+			for (; i < r.length;) {
+				let e = r[i];
+				if (!Fe(e)) break;
+				i++;
+			}
+			let e = r[i];
+			e && (this.#n(t.children, e, n), i++);
+		}
 	}
-}, Te = class {
+	#r(e, t, n) {
+		let r = n ? "false" : "true", i = G(e);
+		for (let e = 0; e < i.length; e++) {
+			let a = i[e], o = t.children[e];
+			if (!o) continue;
+			if (a.tokens.length === 1 && a.tokens[0].type === "mark") {
+				let e = a.tokens[0];
+				if (e.type === "mark" && e.children.length > 0) {
+					let t = o.hasAttribute("data-testid") ? o.children[n ? 0 : 1] : o;
+					t && this.#n(e.children, t, r);
+				}
+				continue;
+			}
+			let s = n ? 0 : 1;
+			for (let e = 0; e < a.tokens.length; e++) {
+				let t = a.tokens[e], n = o.children[e + s];
+				n && t.type === "text" && n.textContent !== t.content && (n.textContent = t.content);
+			}
+		}
+	}
+}, Le = class {
 	#e;
 	#t;
 	#n;
@@ -1023,20 +1214,24 @@ var we = class {
 	}
 	enable() {
 		this.#e || (this.#e = this.store.events.change.on(() => {
-			let e = this.store.state.onChange.get();
-			if (!this.store.nodes.focus.target) return;
-			let t = this.store.state.tokens.get(), n = t[this.store.nodes.focus.index];
-			n.type === "text" ? n.content = this.store.nodes.focus.content : n.type === "mark" && (n.value = this.store.nodes.focus.content), e?.(F(t)), this.store.events.parse();
+			let e = this.store.state.onChange.get(), { focus: t } = this.store.nodes;
+			if (!t.target || !t.target.isContentEditable) {
+				let t = this.store.state.tokens.get(), n = z(t);
+				e?.(n), this.store.state.previousValue.set(n), this.store.state.tokens.set([...t]);
+				return;
+			}
+			let n = this.store.state.tokens.get(), r = n[t.index];
+			r.type === "text" ? r.content = t.content : r.type === "mark" && (r.value = t.content), e?.(z(n)), this.store.events.parse();
 		}), this.#t = this.store.events.delete.on((e) => {
 			if (!e) return;
 			let { token: t } = e, n = this.store.state.onChange.get(), r = this.store.state.tokens.get(), i = r.indexOf(t);
-			this.store.state.tokens.set(r.toSpliced(i, 1)), n?.(F(this.store.state.tokens.get()));
+			this.store.state.tokens.set(r.toSpliced(i, 1)), n?.(z(this.store.state.tokens.get()));
 		}), this.#n = this.store.events.select.on((e) => {
 			if (!e) return;
-			let t = this.store.state.Mark.get(), n = this.store.state.onChange.get(), { mark: r, match: { option: i, span: a, index: o, source: s } } = e, c = r.type === "mark" ? P(i.markup, {
+			let t = this.store.state.Mark.get(), n = this.store.state.onChange.get(), { mark: r, match: { option: i, span: a, index: o, source: s } } = e, c = r.type === "mark" ? R(i.markup, {
 				value: r.value,
 				meta: r.meta
-			}) : P(i.markup, { value: r.content }), l = Ce(a, c, o, s);
+			}) : R(i.markup, { value: r.content }), l = Se(a, c, o, s);
 			if (this.store.state.recovery.set(t ? {
 				caret: 0,
 				anchor: this.store.nodes.input.next,
@@ -1048,14 +1243,14 @@ var we = class {
 			}), this.store.nodes.input.target) {
 				this.store.nodes.input.content = l;
 				let e = this.store.state.tokens.get(), t = e[this.store.nodes.input.index];
-				t.type === "text" && (t.content = l), this.store.nodes.focus.target = this.store.nodes.input.target, this.store.nodes.input.clear(), n?.(F(e)), this.store.events.parse();
+				t.type === "text" && (t.content = l), this.store.nodes.focus.target = this.store.nodes.input.target, this.store.nodes.input.clear(), n?.(z(e)), this.store.events.parse();
 			}
 		}));
 	}
 	disable() {
 		this.#e?.(), this.#t?.(), this.#n?.(), this.#e = void 0, this.#t = void 0, this.#n = void 0;
 	}
-}, Ee = class {
+}, Re = class {
 	#e;
 	#t;
 	#n;
@@ -1100,150 +1295,49 @@ var we = class {
 	}
 };
 //#endregion
-//#region ../../common/core/src/features/blocks/config.ts
-function De(e) {
-	return typeof e == "object" && !!e.alwaysShowHandle;
-}
-//#endregion
-//#region ../../common/core/src/features/blocks/dragOperations.ts
-function H(e) {
-	return e.tokens.length === 0 || e.tokens[0].type === "text";
-}
-function Oe(e, t) {
-	return H(e) && H(t) ? "\n\n" : "";
-}
-function ke(e, t, n) {
-	if (t.length === 0) return e + "\n\n";
-	if (n >= t.length - 1) return e === "" ? "\n\n\n\n" : e + "\n\n";
-	let r = t[n], i = t[n + 1];
-	return i.startPos - r.endPos === 0 ? e.slice(0, r.endPos) + "\n\n\n\n" + e.slice(i.startPos) : e.slice(0, i.startPos) + "\n\n" + e.slice(i.startPos);
-}
-function Ae(e, t, n) {
-	return t.length <= 1 ? "" : n >= t.length - 1 ? e.slice(0, t[n - 1].endPos) : e.slice(0, t[n].startPos) + e.slice(t[n + 1].startPos);
-}
-function je(e, t, n) {
-	let r = t[n], i = e.substring(r.startPos, r.endPos);
-	if (n >= t.length - 1) return e + (H(r), "\n\n") + i;
-	let a = t[n + 1], o = a.startPos - r.endPos === 0 ? "" : "\n\n";
-	return e.slice(0, a.startPos) + i + o + e.slice(a.startPos);
-}
-function Me(e, t) {
-	return t <= 0 || t >= e.length ? 0 : e[t - 1].endPos;
-}
-function U(e, t, n) {
-	if (n <= 0 || n >= t.length) return e;
-	let r = t[n - 1], i = t[n];
-	return e.slice(0, r.endPos) + e.slice(i.startPos);
-}
-function Ne(e, t, n, r) {
-	if (n === r || n === r - 1 || t.length < 2 || n < 0 || n >= t.length || r < 0 || r > t.length) return e;
-	let i = t.map((t) => e.substring(t.startPos, t.endPos)), a = [...t], [o] = a.splice(n, 1), [s] = i.splice(n, 1), c = r > n ? r - 1 : r;
-	a.splice(c, 0, o), i.splice(c, 0, s);
-	let l = [];
-	for (let e = 0; e < i.length; e++) l.push(i[e]), e < i.length - 1 && l.push(Oe(a[e], a[e + 1]));
-	return l.join("");
-}
-//#endregion
-//#region ../../common/core/src/features/blocks/splitTokensIntoDragRows.ts
-function Pe(e) {
-	let t = [], { content: n, position: r } = e, i = r.start, a = [], o = () => {
-		if (a.length > 0) {
-			let e = a.join("");
-			t.push({
-				content: e,
-				position: {
-					start: i,
-					end: i + e.length
-				},
-				isBlockSeparator: !1
-			}), i += e.length, a.length = 0;
-		}
-	};
-	for (let e = 0; e < n.length; e++) {
-		let r = n[e];
-		r === "\n" ? e + 1 < n.length && n[e + 1] === "\n" ? (o(), t.push({
-			content: "\n\n",
-			position: {
-				start: i,
-				end: i + 2
-			},
-			isBlockSeparator: !0
-		}), i += 2, e++) : (a.push(r), i++) : r === "\r" ? e + 1 < n.length && n[e + 1] === "\n" ? e + 2 < n.length && n[e + 2] === "\r" && e + 3 < n.length && n[e + 3] === "\n" ? (o(), t.push({
-			content: "\n\n",
-			position: {
-				start: i,
-				end: i + 4
-			},
-			isBlockSeparator: !0
-		}), i += 4, e += 3) : (a.push("\n"), i += 2, e++) : (a.push("\n"), i++) : a.push(r);
-	}
-	return o(), t;
-}
-var Fe = 0;
-function W(e) {
-	return `drag-${Fe++}-${e}`;
-}
-function Ie() {
-	Fe = 0;
-}
-function G(e) {
-	if (e.length === 0) return [];
-	Ie();
-	let t = [], n = null;
-	for (let r of e) if (r.type === "mark") n = null, t.push({
-		id: W(r.position.start),
-		tokens: [r],
-		startPos: r.position.start,
-		endPos: r.position.end
-	});
-	else if (r.type === "text") {
-		let e = Pe(r);
-		for (let r of e) r.isBlockSeparator ? (n !== null && t.push({
-			id: W(n),
-			tokens: [],
-			startPos: n,
-			endPos: n
-		}), n = r.position.end) : r.content.trim().length > 0 && (n = null, t.push({
-			id: W(r.position.start),
-			tokens: [{
-				type: "text",
-				content: r.content,
-				position: r.position
-			}],
-			startPos: r.position.start,
-			endPos: r.position.end
-		}));
-	}
-	return n !== null && t.push({
-		id: W(n),
-		tokens: [],
-		startPos: n,
-		endPos: n
-	}), t;
-}
-//#endregion
-//#region ../../common/core/src/features/navigation/index.ts
-function Le(e, t) {
+//#region ../../common/core/src/features/navigation/navigation.ts
+function ze(e, t) {
 	let { focus: n } = e.nodes;
 	if (n.isMark && !n.isEditable || n.isCaretAtBeginning) {
 		let e = n.prev;
 		for (; e.target && e.isMark && !e.isEditable;) e = e.prev;
-		return e.target ? (t.preventDefault(), e.target.focus(), B.setCaretToEnd(e.target), !0) : !1;
+		return e.target ? (t.preventDefault(), e.target.focus(), U.setCaretToEnd(e.target), !0) : !1;
 	}
 	return !1;
 }
-function Re(e, t) {
+function Be(e, t) {
 	let { focus: n } = e.nodes;
 	if (n.isMark && !n.isEditable || n.isCaretAtEnd) {
 		let e = n.next;
 		for (; e.target && e.isMark && !e.isEditable;) e = e.next;
-		return e.target ? (t.preventDefault(), e.target.focus(), B.trySetIndex(e.target, 0), !0) : !1;
+		return e.target ? (t.preventDefault(), e.target.focus(), U.trySetIndex(e.target, 0), !0) : !1;
 	}
 	return !1;
 }
 //#endregion
+//#region ../../common/core/src/features/selection/selectionHelpers.ts
+function Ve(e) {
+	let t = window.getSelection(), n = e.refs.container;
+	if (!t?.rangeCount || !n?.firstChild || !n?.lastChild) return !1;
+	try {
+		let e = t.getRangeAt(0);
+		return n.contains(e.startContainer) && n.contains(e.endContainer) && e.toString().length > 0;
+	} catch {
+		return !1;
+	}
+}
+function He(e, t) {
+	if ((t.ctrlKey || t.metaKey) && t.code === "KeyA") {
+		if (e.state.drag.get()) return;
+		t.preventDefault();
+		let n = window.getSelection(), r = e.refs.container?.firstChild, i = e.refs.container?.lastChild;
+		if (!n || !r || !i) return;
+		n.setBaseAndExtent(r, 0, i, 1), e.state.selecting.set("all");
+	}
+}
+//#endregion
 //#region ../../common/core/src/features/selection/TextSelectionController.ts
-var ze = class {
+var Ue = class {
 	#e;
 	#t;
 	#n;
@@ -1270,21 +1364,7 @@ var ze = class {
 	disable() {
 		this.#e && (document.removeEventListener("mousedown", this.#e), document.removeEventListener("mousemove", this.#t), document.removeEventListener("mouseup", this.#n), document.removeEventListener("selectionchange", this.#r), this.#e = void 0, this.#t = void 0, this.#n = void 0, this.#r = void 0), this.#i = null, this.#a = !1;
 	}
-};
-//#endregion
-//#region ../../common/core/src/features/selection/index.ts
-function Be(e, t) {
-	if ((t.ctrlKey || t.metaKey) && t.code === "KeyA") {
-		if (e.state.drag.get()) return;
-		t.preventDefault();
-		let n = window.getSelection(), r = e.refs.container?.firstChild, i = e.refs.container?.lastChild;
-		if (!n || !r || !i) return;
-		n.setBaseAndExtent(r, 0, i, 1), e.state.selecting.set("all");
-	}
-}
-//#endregion
-//#region ../../common/core/src/features/input/KeyDownController.ts
-var Ve = class {
+}, We = class {
 	#e;
 	#t;
 	#n;
@@ -1295,11 +1375,11 @@ var Ve = class {
 		if (this.#e) return;
 		let e = this.store.refs.container;
 		e && (this.#e = (e) => {
-			e.key === x.LEFT ? Le(this.store, e) : e.key === x.RIGHT ? Re(this.store, e) : (e.key === x.UP || e.key === x.DOWN) && this.#a(e), this.#r(e), this.#i(e), Be(this.store, e);
+			e.key === x.LEFT ? ze(this.store, e) : e.key === x.RIGHT ? Be(this.store, e) : (e.key === x.UP || e.key === x.DOWN) && this.#a(e), this.#r(e), this.#i(e), He(this.store, e);
 		}, this.#t = (e) => {
-			We(this.store, e);
+			Je(this.store, e);
 		}, this.#n = (e) => {
-			He(this.store, e);
+			Ke(this.store, e);
 		}, e.addEventListener("keydown", this.#e), e.addEventListener("paste", this.#t), e.addEventListener("beforeinput", this.#n, !0));
 	}
 	disable() {
@@ -1311,15 +1391,15 @@ var Ve = class {
 		if (!n && (e.key === x.DELETE || e.key === x.BACKSPACE)) {
 			if (t.isMark) {
 				if (t.isEditable && (e.key === x.BACKSPACE && !t.isCaretAtBeginning || e.key === x.DELETE && !t.isCaretAtEnd)) return;
-				e.preventDefault(), V("self", this.store);
+				e.preventDefault(), Ce("self", this.store);
 				return;
 			}
 			if (e.key === x.BACKSPACE && t.isSpan && t.isCaretAtBeginning && t.prev.target) {
-				e.preventDefault(), V("prev", this.store);
+				e.preventDefault(), Ce("prev", this.store);
 				return;
 			}
 			if (e.key === x.DELETE && t.isSpan && t.isCaretAtEnd && t.next.target) {
-				e.preventDefault(), V("next", this.store);
+				e.preventDefault(), Ce("next", this.store);
 				return;
 			}
 		}
@@ -1330,24 +1410,24 @@ var Ve = class {
 		if (a === -1) return;
 		let o = G(this.store.state.tokens.get());
 		if (a >= o.length) return;
-		let s = o[a], c = this.store.state.value.get() ?? this.store.state.previousValue.get() ?? "";
+		let s = o[a], c = this.store.state.previousValue.get() ?? this.store.state.value.get() ?? "";
 		if (this.store.state.onChange.get()) {
 			if (e.key === x.BACKSPACE) {
-				let t = i[a], n = B.getCaretIndex(t) === 0;
+				let t = i[a], n = U.getCaretIndex(t) === 0;
 				if (s.tokens.map((e) => "content" in e ? e.content : "").join("") === "") {
 					e.preventDefault();
 					let t = o.length <= 1 ? "" : a >= o.length - 1 ? c.slice(0, o[a - 1].endPos) : c.slice(0, o[a].startPos) + c.slice(o[a + 1].startPos);
 					this.store.applyValue(t), queueMicrotask(() => {
 						let e = r.children[Math.max(0, a - 1)];
-						e && (e.focus(), B.setCaretToEnd(e));
+						e && (e.focus(), U.setCaretToEnd(e));
 					});
 					return;
 				}
 				if (n && a > 0) {
 					let t = o[a - 1], n = o[a], s = n.startPos - t.endPos;
-					if (H(t) && H(n) && s === 2) {
+					if (K(t) && K(n) && s === 2) {
 						e.preventDefault();
-						let t = Me(o, a), n = U(c, o, a);
+						let t = Me(o, a), n = Ne(c, o, a);
 						this.store.applyValue(n), queueMicrotask(() => {
 							let e = r.children[a - 1];
 							if (e) {
@@ -1360,18 +1440,18 @@ var Ve = class {
 					}
 					e.preventDefault(), queueMicrotask(() => {
 						let e = i[a - 1];
-						e && (e.focus(), B.setCaretToEnd(e));
+						e && (e.focus(), U.setCaretToEnd(e));
 					});
 					return;
 				}
 			}
 			if (e.key === x.DELETE) {
-				let t = i[a], n = B.getCaretIndex(t), s = n === t.textContent?.length;
+				let t = i[a], n = U.getCaretIndex(t), s = n === t.textContent?.length;
 				if (n === 0 && a > 0) {
 					let t = o[a - 1], n = o[a], s = n.startPos - t.endPos;
-					if (H(t) && H(n) && s === 2) {
+					if (K(t) && K(n) && s === 2) {
 						e.preventDefault();
-						let t = Me(o, a), n = U(c, o, a);
+						let t = Me(o, a), n = Ne(c, o, a);
 						this.store.applyValue(n), queueMicrotask(() => {
 							let e = r.children[a - 1];
 							if (e) {
@@ -1384,15 +1464,15 @@ var Ve = class {
 					}
 					e.preventDefault(), queueMicrotask(() => {
 						let e = i[a - 1];
-						e && (e.focus(), B.setCaretToEnd(e));
+						e && (e.focus(), U.setCaretToEnd(e));
 					});
 					return;
 				}
 				if (s && a < o.length - 1) {
 					let t = o[a], n = o[a + 1], s = n.startPos - t.endPos;
-					if (H(t) && H(n) && s === 2) {
+					if (K(t) && K(n) && s === 2) {
 						e.preventDefault();
-						let n = t.endPos, i = U(c, o, a + 1);
+						let n = t.endPos, i = Ne(c, o, a + 1);
 						this.store.applyValue(i), queueMicrotask(() => {
 							let e = r.children[a];
 							if (e) {
@@ -1405,7 +1485,7 @@ var Ve = class {
 					}
 					e.preventDefault(), queueMicrotask(() => {
 						let e = i[a + 1];
-						e && (e.focus(), B.trySetIndex(e, 0));
+						e && (e.focus(), U.trySetIndex(e, 0));
 					});
 					return;
 				}
@@ -1427,25 +1507,25 @@ var Ve = class {
 		if (i === -1) return;
 		let a = G(this.store.state.tokens.get()), o = a[i];
 		if (!o) return;
-		let s = r[i], c = this.store.state.value.get() ?? "";
+		let s = r[i], c = this.store.state.previousValue.get() ?? this.store.state.value.get() ?? "";
 		if (!this.store.state.onChange.get()) return;
-		if (!H(o)) {
+		if (!K(o)) {
 			let e = ke(c, a, i);
 			this.store.applyValue(e), queueMicrotask(() => {
 				let e = t.children, n = i + 1;
 				if (n < e.length) {
 					let t = e[n];
-					t.focus(), B.trySetIndex(t, 0);
+					t.focus(), U.trySetIndex(t, 0);
 				}
 			});
 			return;
 		}
-		let l = K(s, o), u = l === o.startPos ? "\n\n\n\n" : "\n\n", d = c.slice(0, l) + u + c.slice(l);
+		let l = Ge(s, o), u = l === o.startPos ? "\n\n\n\n" : "\n\n", d = c.slice(0, l) + u + c.slice(l);
 		this.store.applyValue(d), queueMicrotask(() => {
 			let e = t.children, n = i + 1;
 			if (n < e.length) {
 				let t = e[n];
-				t.focus(), B.trySetIndex(t, 0);
+				t.focus(), U.trySetIndex(t, 0);
 			}
 		});
 	}
@@ -1459,46 +1539,46 @@ var Ve = class {
 		if (i === -1) return;
 		let a = r[i];
 		if (e.key === x.UP) {
-			if (!B.isCaretOnFirstLine(a) || i === 0) return;
+			if (!U.isCaretOnFirstLine(a) || i === 0) return;
 			e.preventDefault();
-			let t = B.getCaretRect()?.left ?? a.getBoundingClientRect().left, n = r[i - 1];
+			let t = U.getCaretRect()?.left ?? a.getBoundingClientRect().left, n = r[i - 1];
 			n.focus();
 			let o = n.getBoundingClientRect();
-			B.setAtX(n, t, o.bottom - 4);
+			U.setAtX(n, t, o.bottom - 4);
 		} else if (e.key === x.DOWN) {
-			if (!B.isCaretOnLastLine(a) || i >= r.length - 1) return;
+			if (!U.isCaretOnLastLine(a) || i >= r.length - 1) return;
 			e.preventDefault();
-			let t = B.getCaretRect()?.left ?? a.getBoundingClientRect().left, n = r[i + 1];
+			let t = U.getCaretRect()?.left ?? a.getBoundingClientRect().left, n = r[i + 1];
 			n.focus();
 			let o = n.getBoundingClientRect();
-			B.setAtX(n, t, o.top + 4);
+			U.setAtX(n, t, o.top + 4);
 		}
 	}
 };
-function K(e, t) {
+function Ge(e, t) {
 	let n = window.getSelection();
 	if (!n?.rangeCount) return t.endPos;
 	let { focusNode: r, focusOffset: i } = n;
 	return r ? J(r, i, e, t) : t.endPos;
 }
-function He(e, t) {
+function Ke(e, t) {
 	let n = e.state.selecting.get();
-	if (n === "all" && Ge(e)) {
+	if (n === "all" && Ve(e)) {
 		if (t.inputType === "insertFromPaste") {
 			t.preventDefault();
 			return;
 		}
-		t.preventDefault(), Ke(e, t.inputType.startsWith("delete") ? "" : t.data ?? "");
+		t.preventDefault(), Ye(e, t.inputType.startsWith("delete") ? "" : t.data ?? "");
 		return;
 	}
 	if (n === "all" && e.state.selecting.set(void 0), e.state.drag.get()) {
-		qe(e, t);
+		Xe(e, t);
 		return;
 	}
 	let { focus: r } = e.nodes;
-	!r.target || !r.isEditable || Ue(r, t) && e.events.change();
+	!r.target || !r.isEditable || qe(r, t) && e.events.change();
 }
-function Ue(e, t) {
+function qe(e, t) {
 	let n = e.caret, r = e.content, i, a;
 	switch (t.inputType) {
 		case "insertText": {
@@ -1530,25 +1610,15 @@ function Ue(e, t) {
 	}
 	return e.content = i, e.caret = a, !0;
 }
-function We(e, t) {
+function Je(e, t) {
 	let n = e.state.selecting.get();
-	if (n !== "all" || !Ge(e)) {
+	if (n !== "all" || !Ve(e)) {
 		n === "all" && e.state.selecting.set(void 0);
 		return;
 	}
-	t.preventDefault(), Ke(e, t.clipboardData?.getData("text/plain") ?? "");
-}
-function Ge(e) {
-	let t = window.getSelection(), n = e.refs.container;
-	if (!t?.rangeCount || !n?.firstChild || !n?.lastChild) return !1;
-	try {
-		let e = t.getRangeAt(0);
-		return n.contains(e.startContainer) && n.contains(e.endContainer) && e.toString().length > 0;
-	} catch {
-		return !1;
-	}
+	t.preventDefault(), Ye(e, t.clipboardData?.getData("text/plain") ?? "");
 }
-function Ke(e, t) {
+function Ye(e, t) {
 	e.nodes.focus.target = null, e.state.selecting.set(void 0), e.state.onChange.get()?.(t), e.state.value.get() === void 0 && e.state.tokens.set(e.state.parser.get()?.parse(t) ?? [{
 		type: "text",
 		content: t,
@@ -1564,7 +1634,7 @@ function Ke(e, t) {
 		}), n.focus());
 	});
 }
-function qe(e, t) {
+function Xe(e, t) {
 	let n = e.refs.container;
 	if (!n) return;
 	let r = document.activeElement;
@@ -1573,7 +1643,7 @@ function qe(e, t) {
 	if (a === -1) return;
 	let o = i[a], s = G(e.state.tokens.get());
 	if (a >= s.length) return;
-	let c = s[a], l = e.state.value.get() ?? e.state.previousValue.get() ?? "", u = (t) => {
+	let c = s[a], l = e.state.previousValue.get() ?? e.state.value.get() ?? "", u = (t) => {
 		queueMicrotask(() => {
 			let r = n.children[a];
 			if (!r) return;
@@ -1589,7 +1659,7 @@ function qe(e, t) {
 			if (r.length > 0) {
 				let e = J(r[0].startContainer, r[0].startOffset, o, c), t = J(r[0].endContainer, r[0].endOffset, o, c);
 				[i, a] = e <= t ? [e, t] : [t, e];
-			} else i = a = K(o, c);
+			} else i = a = Ge(o, c);
 			e.applyValue(l.slice(0, i) + n + l.slice(a)), u(i + n.length);
 			break;
 		}
@@ -1600,7 +1670,7 @@ function qe(e, t) {
 			if (r.length > 0) {
 				let e = J(r[0].startContainer, r[0].startOffset, o, c), t = J(r[0].endContainer, r[0].endOffset, o, c);
 				[i, a] = e <= t ? [e, t] : [t, e];
-			} else i = a = K(o, c);
+			} else i = a = Ge(o, c);
 			e.applyValue(l.slice(0, i) + n + l.slice(a)), u(i + n.length);
 			break;
 		}
@@ -1619,20 +1689,31 @@ function qe(e, t) {
 		}
 	}
 }
-function Je(e, t, n) {
+function Ze(e) {
+	return e.tagName === "SPAN" && (e.attributes.length === 0 || e.attributes.length === 1 && e.hasAttribute("contenteditable"));
+}
+function Qe(e, t, n) {
 	let r = window.getSelection();
 	if (!r) return !1;
-	if (!t.children || t.children.length === 0) {
-		let i = t.nested?.start ?? t.position.start, a = t.nested?.end ?? t.position.end, o = Math.max(0, Math.min(n - i, a - i)), s = document.createTreeWalker(e, 4).nextNode();
-		if (!s) return !1;
-		let c = document.createRange();
-		return c.setStart(s, Math.min(o, s.length)), c.collapse(!0), r.removeAllRanges(), r.addRange(c), !0;
-	}
 	let i = 0;
 	for (let a of Array.from(e.childNodes)) {
 		if (i >= t.children.length) break;
 		let e = t.children[i];
-		if (a.nodeType === Node.TEXT_NODE && e.type === "text") {
+		if (a.nodeType === Node.ELEMENT_NODE && e.type === "text") {
+			if (!Ze(a)) continue;
+			if (n >= e.position.start && n <= e.position.end) {
+				let t = a.firstChild, i = n - e.position.start;
+				if (t) {
+					let e = document.createRange();
+					e.setStart(t, Math.min(i, t.length)), e.collapse(!0), r.removeAllRanges(), r.addRange(e);
+				} else {
+					let e = document.createRange();
+					e.setStart(a, 0), e.collapse(!0), r.removeAllRanges(), r.addRange(e);
+				}
+				return !0;
+			}
+			i++;
+		} else if (a.nodeType === Node.TEXT_NODE && e.type === "text") {
 			if (n >= e.position.start && n <= e.position.end) {
 				let t = Math.min(n - e.position.start, a.length), i = document.createRange();
 				return i.setStart(a, t), i.collapse(!0), r.removeAllRanges(), r.addRange(i), !0;
@@ -1640,7 +1721,7 @@ function Je(e, t, n) {
 			i++;
 		} else if (a.nodeType === Node.ELEMENT_NODE && e.type === "mark") {
 			let r = i + 1 < t.children.length ? t.children[i + 1] : null;
-			if (!(n === e.position.end && r?.position.start === n) && n >= e.position.start && n <= e.position.end) return Je(a, e, n);
+			if (!(n === e.position.end && r?.position.start === n) && n >= e.position.start && n <= e.position.end) return Qe(a, e, n);
 			i++;
 		}
 	}
@@ -1649,65 +1730,84 @@ function Je(e, t, n) {
 function q(e, t, n) {
 	let r = window.getSelection();
 	if (!r) return;
-	let i = Array.from(e.children);
+	let i = Array.from(e.children), a = e.hasAttribute("data-testid");
+	if (!a && t.tokens.length === 1 && t.tokens[0].type === "mark") {
+		if (Qe(e, t.tokens[0], n)) return;
+		U.setCaretToEnd(e);
+		return;
+	}
 	for (let e = 0; e < t.tokens.length; e++) {
-		let a = t.tokens[e], o = i[e + 1];
-		if (!o) continue;
-		let s = t.tokens[e + 1];
-		if (!(s && n === a.position.end && n === s.position.start) && n >= a.position.start && n <= a.position.end) {
-			if (a.type === "text") {
-				let e = n - a.position.start, t = document.createTreeWalker(o, 4).nextNode();
+		let o = t.tokens[e], s = i[e + (a ? 1 : 0)];
+		if (!s) continue;
+		let c = t.tokens[e + 1];
+		if (!(c && n === o.position.end && n === c.position.start) && n >= o.position.start && n <= o.position.end) {
+			if (o.type === "text") {
+				let e = n - o.position.start, t = document.createTreeWalker(s, 4).nextNode();
 				if (t) {
 					let n = Math.min(e, t.length), i = document.createRange();
 					i.setStart(t, n), i.collapse(!0), r.removeAllRanges(), r.addRange(i);
 					return;
 				}
 			}
-			if (Je(o, a, n)) return;
+			if (Qe(s, o, n)) return;
 			break;
 		}
 	}
-	B.setCaretToEnd(e);
+	U.setCaretToEnd(e);
 }
 function J(e, t, n, r) {
 	if (e === n) {
 		let e = window.getSelection();
 		return e?.focusNode && e.focusNode !== n ? J(e.focusNode, e.focusOffset, n, r) : r.endPos;
 	}
+	if (e.nodeType === Node.TEXT_NODE && e.parentElement === n) {
+		let i = r.tokens[0];
+		return i?.type === "mark" ? Y(e, t, n, i) : i?.type === "text" ? i.position.start + Math.min(t, i.content.length) : r.endPos;
+	}
 	let i = e.nodeType === Node.ELEMENT_NODE ? e : e.parentElement;
 	for (; i && i.parentElement !== n;) i = i.parentElement;
 	if (!i) return r.endPos;
 	let a = Array.from(n.children).indexOf(i);
 	if (a < 0) return r.endPos;
-	let o = a - 1;
-	if (o < 0) return r.startPos;
-	if (o >= r.tokens.length) return r.endPos;
-	let s = r.tokens[o];
-	return s.type === "text" ? s.position.start + Math.min(t, s.content.length) : Ye(e, t, i, s);
-}
-function Ye(e, t, n, r) {
+	let o = n.hasAttribute("data-testid");
+	if (!o && r.tokens.length === 1 && r.tokens[0].type === "mark") return Y(e, t, n, r.tokens[0]);
+	let s = a - (o ? 1 : 0);
+	if (s < 0) return r.startPos;
+	if (s >= r.tokens.length) return r.endPos;
+	let c = r.tokens[s];
+	return c.type === "text" ? c.position.start + Math.min(t, c.content.length) : Y(e, t, i, c);
+}
+function Y(e, t, n, r) {
 	if (!r.children || r.children.length === 0) {
 		if (t === 0) return r.position.start;
-		let e = r.nested?.content.length ?? r.value.length;
-		return e > 0 && t >= e ? r.content.endsWith("\n\n") && r.nested ? r.nested.end : r.position.end : (r.nested?.start ?? r.position.start) + Math.min(t, e);
+		let e = r.slot?.content.length ?? r.value.length;
+		return e > 0 && t >= e ? r.content.endsWith("\n\n") && r.slot ? r.slot.end : r.position.end : (r.slot?.start ?? r.position.start) + Math.min(t, e);
 	}
 	let i = 0;
 	for (let a of Array.from(n.childNodes)) {
 		if (i >= r.children.length) break;
 		let n = r.children[i];
-		if (a.nodeType === Node.TEXT_NODE && n.type === "text") {
+		if (a.nodeType === Node.ELEMENT_NODE && n.type === "text") {
+			if (!Ze(a)) continue;
+			if (e === a) {
+				let e = t === 0 ? 0 : n.content.length;
+				return n.position.start + Math.min(e, n.content.length);
+			}
+			if (a.contains(e)) return n.position.start + Math.min(t, n.content.length);
+			i++;
+		} else if (a.nodeType === Node.TEXT_NODE && n.type === "text") {
 			if (e === a) return n.position.start + Math.min(t, n.content.length);
 			i++;
 		} else if (a.nodeType === Node.ELEMENT_NODE && n.type === "mark") {
-			if (a === e || a.contains(e)) return Ye(e, t, a, n);
+			if (a === e || a.contains(e)) return Y(e, t, a, n);
 			i++;
 		}
 	}
-	return r.nested?.end ?? r.position.end;
+	return r.slot?.end ?? r.position.end;
 }
 //#endregion
-//#region ../../common/core/src/features/FeatureManager.ts
-var Xe = class {
+//#region ../../common/core/src/features/feature-manager/FeatureManager.ts
+var $e = class {
 	#e = [];
 	#t = !1;
 	register(e) {
@@ -1719,21 +1819,21 @@ var Xe = class {
 	disableAll() {
 		this.#t && (this.#t = !1, this.#e.forEach((e) => e.disable()));
 	}
-}, Y = (e, t) => ({
+}, X = (e, t) => ({
 	name: e,
 	enable: () => t.enable(),
 	disable: () => t.disable()
-}), Ze = (e) => {
-	let t = new Xe();
-	return t.register(Y("keydown", e.controllers.keydown)).register(Y("system", e.controllers.system)).register(Y("focus", e.controllers.focus)).register(Y("textSelection", e.controllers.textSelection)).register(Y("contentEditable", e.controllers.contentEditable)), t;
-}, Qe = class {
+}), et = (e) => {
+	let t = new $e();
+	return t.register(X("keydown", e.controllers.keydown)).register(X("system", e.controllers.system)).register(X("focus", e.controllers.focus)).register(X("textSelection", e.controllers.textSelection)).register(X("contentEditable", e.controllers.contentEditable)), t;
+}, tt = class {
 	#e = [];
 	#t = !1;
 	constructor(e) {
 		this.store = e;
 	}
 	enable(e) {
-		let { store: t } = this, n = Ze(t);
+		let { store: t } = this, n = et(t);
 		n.enableAll(), this.#e.push(() => n.disableAll()), this.#n(), e?.getTrigger && this.#r(e.getTrigger);
 	}
 	disable() {
@@ -1742,12 +1842,12 @@ var Xe = class {
 	}
 	syncParser(e, t) {
 		let { store: n } = this, r = t?.map((e) => e.markup);
-		if (r && r.some(Boolean) ? n.state.parser.set(new se(r)) : n.state.parser.set(void 0), this.#t) {
+		if (r && r.some(Boolean) ? n.state.parser.set(new B(r)) : n.state.parser.set(void 0), this.#t) {
 			n.state.recovery.get() || n.events.parse();
 			return;
 		}
 		let i = e ?? n.state.defaultValue.get() ?? "";
-		n.state.tokens.set(R(n, i)), this.#t = !0;
+		n.state.tokens.set(H(n, i)), this.#t = !0;
 	}
 	recoverFocus() {
 		this.store.controllers.contentEditable.sync(), this.store.state.Mark.get() && this.store.controllers.focus.recover();
@@ -1756,11 +1856,11 @@ var Xe = class {
 		let { store: e } = this;
 		this.#e.push(e.events.parse.on(() => {
 			if (e.state.recovery.get()) {
-				let t = F(e.state.tokens.get());
-				e.state.tokens.set(R(e, t)), e.state.previousValue.set(t);
+				let t = z(e.state.tokens.get());
+				e.state.tokens.set(H(e, t)), e.state.previousValue.set(t);
 				return;
 			}
-			e.state.tokens.set(e.nodes.focus.target ? de(e) : fe(e));
+			e.state.tokens.set(e.nodes.focus.target ? ce(e) : le(e));
 		}));
 	}
 	#r(e) {
@@ -1772,13 +1872,13 @@ var Xe = class {
 };
 //#endregion
 //#region ../../common/core/src/features/overlay/filterSuggestions.ts
-function $e(e, t) {
+function nt(e, t) {
 	let n = t.toLowerCase();
 	return e.filter((e) => e.toLowerCase().includes(n));
 }
 //#endregion
 //#region ../../common/core/src/features/overlay/createMarkFromOverlay.ts
-function et(e, t, n) {
+function rt(e, t, n) {
 	let r = e.option.markup;
 	if (!r) throw Error("createMarkFromOverlay: option.markup is required");
 	return {
@@ -1795,17 +1895,17 @@ function et(e, t, n) {
 			index: 0,
 			segments: [],
 			gapTypes: [],
-			hasNested: !1,
+			hasSlot: !1,
 			hasTwoValues: !1,
 			segmentGlobalIndices: []
 		},
 		children: [],
-		nested: void 0
+		slot: void 0
 	};
 }
 //#endregion
 //#region ../../common/core/src/features/overlay/OverlayController.ts
-var tt = class {
+var it = class {
 	#e;
 	#t;
 	#n;
@@ -1822,7 +1922,7 @@ var tt = class {
 		this.#e = this.store.events.clearOverlay.on(() => {
 			t(void 0);
 		}), this.#t = this.store.events.checkOverlay.on(() => {
-			t(xe.find(this.store.state.options.get(), e));
+			t(be.find(this.store.state.options.get(), e));
 		}), this.#n = this.store.events.change.on(() => {
 			let e = this.store.state.showOverlayOn.get(), t = "change";
 			(e === t || Array.isArray(e) && e.includes(t)) && this.store.events.checkOverlay();
@@ -1855,7 +1955,7 @@ var tt = class {
 };
 //#endregion
 //#region ../../common/core/src/features/overlay/suggestionNavigation.ts
-function nt(e, t, n) {
+function at(e, t, n) {
 	if (n === 0) return {
 		action: "none",
 		index: t
@@ -1885,29 +1985,29 @@ function nt(e, t, n) {
 }
 //#endregion
 //#region ../../common/core/src/features/store/Store.ts
-var rt = class {
-	key = new ye();
+var ot = class {
+	key = new ve();
 	nodes = {
-		focus: new Se(void 0, this),
-		input: new Se(void 0, this)
+		focus: new xe(void 0, this),
+		input: new xe(void 0, this)
 	};
 	state;
-	events = ve();
+	events = _e();
 	refs = {
 		container: null,
 		overlay: null
 	};
 	controllers = {
-		overlay: new tt(this),
-		focus: new Ee(this),
-		keydown: new Ve(this),
-		system: new Te(this),
-		textSelection: new ze(this),
-		contentEditable: new we(this)
+		overlay: new it(this),
+		focus: new Re(this),
+		keydown: new We(this),
+		system: new Le(this),
+		textSelection: new Ue(this),
+		contentEditable: new Ie(this)
 	};
-	lifecycle = new Qe(this);
+	lifecycle = new tt(this);
 	constructor(e) {
-		this.state = ge({
+		this.state = he({
 			tokens: [],
 			parser: void 0,
 			previousValue: void 0,
@@ -1920,6 +2020,7 @@ var rt = class {
 			readOnly: !1,
 			options: void 0,
 			showOverlayOn: void 0,
+			Span: void 0,
 			Mark: void 0,
 			Overlay: void 0,
 			className: void 0,
@@ -1932,7 +2033,7 @@ var rt = class {
 	applyValue(e) {
 		let t = this.state.onChange.get();
 		if (!t) return;
-		let n = R(this, e);
+		let n = H(this, e);
 		this.state.tokens.set(n), this.state.previousValue.set(e), t(e);
 	}
 	createHandler() {
@@ -1949,7 +2050,7 @@ var rt = class {
 			}
 		};
 	}
-}, it = class {
+}, st = class {
 	ref;
 	#e;
 	#t;
@@ -1981,14 +2082,17 @@ var rt = class {
 	set meta(e) {
 		this.#t.meta = e, this.#r();
 	}
+	get slot() {
+		return this.#t.slot?.content;
+	}
 	get depth() {
-		return I(this.#e.state.tokens.get(), this.#t).depth;
+		return V(this.#e.state.tokens.get(), this.#t).depth;
 	}
 	get hasChildren() {
-		return this.#t.children.length > 0;
+		return this.#t.children.some((e) => e.type === "mark");
 	}
 	get parent() {
-		return I(this.#e.state.tokens.get(), this.#t)?.parent;
+		return V(this.#e.state.tokens.get(), this.#t)?.parent;
 	}
 	get tokens() {
 		return this.#t.children;
@@ -2000,31 +2104,93 @@ var rt = class {
 	#r() {
 		this.#e.events.change();
 	}
-}, at = (e) => () => {
+}, ct = (e) => () => {
 	let [t, n] = u(() => e.get());
 	return a(() => e.on(n), [e]), t;
 };
 //#endregion
 //#region src/lib/hooks/useCoreFeatures.ts
-function ot(e, t) {
+function lt(e, t) {
 	o(t, () => e.createHandler(), [e]), a(() => (e.lifecycle.enable({ getTrigger: (e) => e.overlay?.trigger }), () => e.lifecycle.disable()), []);
-	let n = e.state.value.use(), r = e.state.Mark.use(), i = e.state.options.use(), s = r ? i : void 0, c = e.state.tokens.use();
+	let n = e.state.value.use(), r = e.state.Mark.use(), i = e.state.options.use(), c = i?.some((e) => e.Mark != null), l = r || c ? i : void 0, u = e.state.tokens.use();
 	a(() => {
-		e.lifecycle.syncParser(n, s);
-	}, [n, s]), a(() => {
+		e.lifecycle.syncParser(n, l);
+	}, [n, l]), s(() => {
+		e.controllers.contentEditable.sync();
+	}, [u]), a(() => {
 		e.lifecycle.recoverFocus();
-	}, [c]);
+	}, [u]);
 }
 //#endregion
 //#region src/lib/providers/StoreContext.ts
-var st = t(void 0);
-st.displayName = "StoreContext";
-function X() {
-	let e = i(st);
+var ut = t(void 0);
+ut.displayName = "StoreContext";
+function Z() {
+	let e = i(ut);
 	if (e === void 0) throw Error("Store not found. Make sure to wrap component in StoreContext.");
 	return e;
 }
-var Z = {
+//#endregion
+//#region src/components/Span.tsx
+var dt = (e) => /* @__PURE__ */ f("span", {});
+//#endregion
+//#region src/lib/hooks/useSlot.ts
+function ft(e, t, n, r) {
+	let i = Z();
+	if (e === "span") {
+		let e = i.state.slots.use(), t = i.state.slotProps.use();
+		return [y("span", e), b("span", t)];
+	}
+	let a = i.state.Mark.use(), o = i.state.Overlay.use(), s = e === "mark" ? a : o, c = _(e === "mark" ? t?.mark : t?.overlay, n ?? {}), l = (e === "mark" ? t?.Mark : t?.Overlay) || s || r;
+	if (!l) throw Error(`No ${e} component found. Provide either option.${e === "mark" ? "Mark" : "Overlay"}, global ${e === "mark" ? "Mark" : "Overlay"}, or a defaultComponent.`);
+	return [l, c];
+}
+function pt(e) {
+	let t = Z(), n = t.state.options.use(), r = t.state.Mark.use(), i = t.state.Span.use();
+	if (e.type === "text") return [i ?? dt, { value: e.content }];
+	let a = n?.[e.descriptor.index], o = {
+		value: e.value,
+		meta: e.meta
+	}, s = _(a?.mark, o), c = a?.Mark || r;
+	if (!c) throw Error("No mark component found. Provide either option.Mark or global Mark.");
+	return [c, s];
+}
+//#endregion
+//#region src/lib/providers/TokenContext.ts
+var mt = t(void 0);
+mt.displayName = "TokenProvider";
+function ht() {
+	let e = i(mt);
+	if (e === void 0) throw Error("Token not found. Make sure to wrap component in TokenContext.Provider.");
+	return e;
+}
+//#endregion
+//#region src/components/Token.tsx
+var Q = n(({ mark: e }) => {
+	let t = Z(), [n, r] = pt(e), i = e.type === "mark" && e.children.length > 0 ? e.children.map((e) => /* @__PURE__ */ f(Q, { mark: e }, t.key.get(e))) : void 0;
+	return /* @__PURE__ */ f(mt, {
+		value: e,
+		children: /* @__PURE__ */ f(n, {
+			...r,
+			children: i
+		})
+	});
+});
+Q.displayName = "Token";
+//#endregion
+//#region src/components/Container.tsx
+var gt = n(() => {
+	let e = Z(), t = e.state.tokens.use(), n = e.state.slots.use(), r = e.state.slotProps.use(), i = e.state.className.use(), a = e.state.style.use(), o = e.key, s = e.refs;
+	return /* @__PURE__ */ f(c(() => y("container", n), [n]), {
+		ref: (e) => s.container = e,
+		...c(() => b("container", r), [r]),
+		className: i,
+		style: a,
+		children: t.map((e) => /* @__PURE__ */ f(Q, { mark: e }, o.get(e)))
+	});
+});
+gt.displayName = "Container";
+var $ = {
 	Container: "_Container_1526r_1",
 	Icon: "_Icon_1526r_5",
 	IconGrip: "_IconGrip_1526r_16",
@@ -2033,7 +2199,7 @@ var Z = {
 	IconTrash: "_IconTrash_1526r_22",
 	Suggestions: "_Suggestions_1526r_43",
 	suggestionActive: "_suggestionActive_1526r_71"
-}, ct = `${Z.Icon} ${Z.IconGrip}`, lt = n(({ blockIndex: t, children: n, readOnly: i, alwaysShowHandle: a, onReorder: o, onRequestMenu: s }) => {
+}, _t = `${$.Icon} ${$.IconGrip}`, vt = n(({ blockIndex: t, children: n, readOnly: i, alwaysShowHandle: a, onReorder: o, onRequestMenu: s }) => {
 	let [c, d] = u(!1), [m, h] = u(!1), [g, _] = u(null), v = l(null), y = l(null), b = r(() => d(!0), []), x = r(() => d(!1), []), S = r((e) => {
 		e.dataTransfer.effectAllowed = "move", e.dataTransfer.setData("text/plain", String(t)), h(!0), v.current && e.dataTransfer.setDragImage(v.current, 0, 0);
 	}, [t]), C = r(() => {
@@ -2059,7 +2225,6 @@ var Z = {
 	}, [t, s]), O = {
 		position: "relative",
 		marginLeft: 0,
-		paddingLeft: i ? 0 : 32,
 		transition: "opacity 0.2s ease",
 		opacity: m ? .4 : 1,
 		background: "transparent",
@@ -2067,9 +2232,9 @@ var Z = {
 		minHeight: "1.2em",
 		userSelect: "none",
 		outline: "none"
-	}, k = {
+	}, ee = {
 		position: "absolute",
-		left: 4,
+		left: i ? 0 : -24,
 		top: 0,
 		bottom: 0,
 		width: 24,
@@ -2078,7 +2243,7 @@ var Z = {
 		opacity: a || c && !m ? 1 : 0,
 		transition: a ? void 0 : "opacity 0.15s ease",
 		pointerEvents: a || c ? "auto" : "none"
-	}, A = {
+	}, k = {
 		width: 24,
 		height: 24,
 		display: "flex",
@@ -2095,9 +2260,9 @@ var Z = {
 		lineHeight: 1,
 		flexShrink: 0,
 		userSelect: "none"
-	}, j = {
+	}, A = {
 		position: "absolute",
-		left: i ? 0 : 32,
+		left: 0,
 		right: 0,
 		height: 2,
 		backgroundColor: "#3b82f6",
@@ -2116,11 +2281,11 @@ var Z = {
 		onDrop: E,
 		children: [
 			g === "before" && /* @__PURE__ */ f("div", { style: {
-				...j,
+				...A,
 				top: -1
 			} }),
 			!i && /* @__PURE__ */ f("div", {
-				style: k,
+				style: ee,
 				children: /* @__PURE__ */ f("button", {
 					ref: y,
 					type: "button",
@@ -2129,83 +2294,41 @@ var Z = {
 					onDragEnd: C,
 					onClick: D,
 					style: {
-						...A,
+						...k,
 						cursor: m ? "grabbing" : "grab"
 					},
 					"aria-label": "Drag to reorder or click for options",
-					children: /* @__PURE__ */ f("span", { className: ct })
+					children: /* @__PURE__ */ f("span", { className: _t })
 				})
 			}),
 			e.count(n) === 0 ? /* @__PURE__ */ f("br", {}) : n,
 			g === "after" && /* @__PURE__ */ f("div", { style: {
-				...j,
+				...A,
 				bottom: -1
 			} })
 		]
 	});
 });
-lt.displayName = "DraggableBlock";
+vt.displayName = "DragMark";
 //#endregion
-//#region src/lib/providers/TokenContext.ts
-var Q = t(void 0);
-Q.displayName = "TokenProvider";
-function ut() {
-	let e = i(Q);
-	if (e === void 0) throw Error("Token not found. Make sure to wrap component in TokenContext.Provider.");
-	return e;
-}
-//#endregion
-//#region src/lib/hooks/useSlot.ts
-function dt(e, t, n, r) {
-	let i = X(), a = i.state.Mark.use(), o = i.state.Overlay.use(), s = e === "mark" ? a : o, c = _(e === "mark" ? t?.mark : t?.overlay, n ?? {}), l = c.slot || s || r;
-	if (!l) throw Error(`No ${e} component found. Provide either option.${e}.slot, global ${e === "mark" ? "Mark" : "Overlay"}, or a defaultComponent.`);
-	return [l, c];
-}
-//#endregion
-//#region src/components/MarkRenderer.tsx
-function ft() {
-	let e = ut(), t = X(), n = t.state.options.use(), r = t.key, i = n?.[e.descriptor.index], a = e.children.map((e) => /* @__PURE__ */ f($, {
-		mark: e,
-		isNested: !0
-	}, r.get(e))), [o, s] = dt("mark", i, {
-		value: e.value,
-		meta: e.meta,
-		nested: e.nested?.content,
-		children: e.children.length > 0 ? a : void 0
-	});
-	return /* @__PURE__ */ f(o, { ...s });
-}
-//#endregion
-//#region src/components/TextSpan.tsx
-var pt = () => {
-	let e = ut(), t = X(), n = l(null), r = t.state.slots.use(), i = t.state.slotProps.use(), a = c(() => y("span", r), [r]), o = c(() => b("span", i), [i]);
-	if (e.type !== "text") throw Error("TextSpan component expects a TextToken");
-	return s(() => {
-		n.current && n.current.textContent !== e.content && (n.current.textContent = e.content);
-	}, [e.content]), /* @__PURE__ */ f(a, {
-		...o,
-		ref: n
-	});
-}, $ = n(({ mark: e, isNested: t = !1 }) => e.type === "mark" ? /* @__PURE__ */ f(Q, {
-	value: e,
-	children: /* @__PURE__ */ f(ft, {})
-}) : t ? /* @__PURE__ */ f(d, { children: e.content }) : /* @__PURE__ */ f(Q, {
-	value: e,
-	children: /* @__PURE__ */ f(pt, {})
-}));
-$.displayName = "Token";
-//#endregion
-//#region src/components/BlockContainer.tsx
-var mt = {
+//#region src/components/DragContainer.tsx
+var yt = `${$.Icon} ${$.IconGrip}`, bt = {
 	id: "block-empty",
 	tokens: [],
 	startPos: 0,
 	endPos: 0
-}, ht = {
+}, xt = (e) => e.tokens.length === 1 && e.tokens[0].type === "mark";
+function St(e, t) {
+	if (!t || !(t instanceof Node)) return -1;
+	let n = t;
+	for (; n && n.parentNode !== e;) n = n.parentNode;
+	return n ? Array.from(e.children).indexOf(n) : -1;
+}
+var Ct = {
 	height: 1,
 	background: "rgba(55, 53, 47, 0.09)",
 	margin: "4px 0"
-}, gt = n(({ position: e, onAdd: t, onDelete: n, onDuplicate: r, onClose: i }) => {
+}, wt = n(({ position: e, onAdd: t, onDelete: n, onDuplicate: r, onClose: i }) => {
 	let o = l(null), [s, c] = u(null), d = l(i);
 	d.current = i, a(() => {
 		let e = (e) => {
@@ -2253,7 +2376,7 @@ var mt = {
 				onMouseDown: (e) => {
 					e.preventDefault(), t(), i();
 				},
-				children: [/* @__PURE__ */ f("span", { className: h(Z.Icon, Z.IconAdd) }), /* @__PURE__ */ f("span", { children: "Add below" })]
+				children: [/* @__PURE__ */ f("span", { className: h($.Icon, $.IconAdd) }), /* @__PURE__ */ f("span", { children: "Add below" })]
 			}),
 			/* @__PURE__ */ p("div", {
 				style: g("duplicate"),
@@ -2262,9 +2385,9 @@ var mt = {
 				onMouseDown: (e) => {
 					e.preventDefault(), r(), i();
 				},
-				children: [/* @__PURE__ */ f("span", { className: h(Z.Icon, Z.IconDuplicate) }), /* @__PURE__ */ f("span", { children: "Duplicate" })]
+				children: [/* @__PURE__ */ f("span", { className: h($.Icon, $.IconDuplicate) }), /* @__PURE__ */ f("span", { children: "Duplicate" })]
 			}),
-			/* @__PURE__ */ f("div", { style: ht }),
+			/* @__PURE__ */ f("div", { style: Ct }),
 			/* @__PURE__ */ p("div", {
 				style: g("delete"),
 				onMouseEnter: () => c("delete"),
@@ -2272,108 +2395,188 @@ var mt = {
 				onMouseDown: (e) => {
 					e.preventDefault(), n(), i();
 				},
-				children: [/* @__PURE__ */ f("span", { className: h(Z.Icon, Z.IconTrash) }), /* @__PURE__ */ f("span", { children: "Delete" })]
+				children: [/* @__PURE__ */ f("span", { className: h($.Icon, $.IconTrash) }), /* @__PURE__ */ f("span", { children: "Delete" })]
 			})
 		]
 	});
 });
-gt.displayName = "BlockMenu";
-var _t = n(() => {
-	let e = X(), t = e.state.tokens.use(), n = e.state.slots.use(), i = e.state.slotProps.use(), a = e.state.className.use(), o = e.state.style.use(), s = e.state.readOnly.use(), m = De(e.state.drag.use()), h = e.state.value.use(), g = e.state.onChange.use(), _ = e.key, v = e.refs, [x, S] = u(null), C = c(() => y("container", n), [n]), w = c(() => b("container", i), [i]), T = c(() => {
+wt.displayName = "BlockMenu";
+var Tt = n(() => {
+	let e = Z(), t = e.state.tokens.use(), n = e.state.slots.use(), i = e.state.slotProps.use(), a = e.state.className.use(), o = e.state.style.use(), s = e.state.readOnly.use(), m = we(e.state.drag.use()), h = e.key, g = e.refs, [_, v] = u(null), [x, S] = u(null), [C, w] = u(null), [T, E] = u(null), D = l(null), O = l(null), ee = c(() => y("container", n), [n]), k = c(() => b("container", i), [i]), A = c(() => {
 		let e = G(t);
-		return e.length > 0 ? e : [mt];
-	}, [t]), E = l(T);
-	E.current = T;
-	let D = r((t, n) => {
-		if (h == null || !g) return;
-		let r = Ne(h, E.current, t, n);
-		r !== h && e.applyValue(r);
-	}, [
-		e,
-		h,
-		g
-	]), O = r((t) => {
-		h == null || !g || (e.applyValue(ke(h, E.current, t)), queueMicrotask(() => {
+		return e.length > 0 ? e : [bt];
+	}, [t]), j = l(A);
+	j.current = A;
+	let M = r((t, n) => {
+		let r = e.state.value.get();
+		if (r == null || !e.state.onChange.get()) return;
+		let i = Pe(r, j.current, t, n);
+		i !== r && e.applyValue(i);
+	}, [e]), te = r((t) => {
+		let n = e.state.value.get();
+		n == null || !e.state.onChange.get() || (e.applyValue(ke(n, j.current, t)), queueMicrotask(() => {
 			let n = e.refs.container;
 			if (!n) return;
 			let r = t + 1;
 			n.children[r]?.focus();
 		}));
-	}, [
-		e,
-		h,
-		g
-	]), k = r((t) => {
-		h == null || !g || e.applyValue(Ae(h, E.current, t));
-	}, [
-		e,
-		h,
-		g
-	]), A = r((t) => {
-		h == null || !g || e.applyValue(je(h, E.current, t));
-	}, [
-		e,
-		h,
-		g
-	]), j = r((e, t) => {
-		S({
+	}, [e]), ne = r((t) => {
+		let n = e.state.value.get();
+		n == null || !e.state.onChange.get() || e.applyValue(Ae(n, j.current, t));
+	}, [e]), re = r((t) => {
+		let n = e.state.value.get();
+		n == null || !e.state.onChange.get() || e.applyValue(je(n, j.current, t));
+	}, [e]), N = r((e, t) => {
+		v({
 			index: e,
 			position: {
 				top: t.bottom + 4,
 				left: t.left
 			}
 		});
-	}, []), M = r(() => S(null), []);
-	return /* @__PURE__ */ p(d, { children: [/* @__PURE__ */ f(C, {
-		ref: (e) => v.container = e,
-		...w,
-		className: a,
-		style: o,
-		children: T.map((e, t) => /* @__PURE__ */ f(lt, {
-			blockIndex: t,
-			readOnly: s,
-			alwaysShowHandle: m,
-			onReorder: D,
-			onRequestMenu: j,
-			children: e.tokens.map((e) => /* @__PURE__ */ f($, { mark: e }, _.get(e)))
-		}, e.id))
-	}), x && /* @__PURE__ */ f(gt, {
-		position: x.position,
-		onAdd: () => {
-			O(x.index), M();
-		},
-		onDelete: () => {
-			k(x.index), M();
-		},
-		onDuplicate: () => {
-			A(x.index), M();
-		},
-		onClose: M
-	})] });
-});
-_t.displayName = "BlockContainer";
-//#endregion
-//#region src/components/Container.tsx
-var vt = n(() => {
-	let e = X(), t = e.state.tokens.use(), n = e.state.slots.use(), r = e.state.slotProps.use(), i = e.state.className.use(), a = e.state.style.use(), o = e.key, s = e.refs;
-	return /* @__PURE__ */ f(c(() => y("container", n), [n]), {
-		ref: (e) => s.container = e,
-		...c(() => b("container", r), [r]),
-		className: i,
-		style: a,
-		children: t.map((e) => /* @__PURE__ */ f($, { mark: e }, o.get(e)))
-	});
+	}, []), P = r(() => v(null), []), F = r(() => {
+		O.current && clearTimeout(O.current), O.current = setTimeout(() => S(null), 120);
+	}, []), I = r(() => {
+		O.current && clearTimeout(O.current);
+	}, []), ie = r((e) => {
+		let t = g.container;
+		if (!t) return;
+		let n = St(t, e.target);
+		if (n === -1 || !xt(j.current[n])) {
+			F();
+			return;
+		}
+		I(), S(n);
+	}, [
+		g,
+		F,
+		I
+	]), L = r(() => F(), [F]), R = r((e) => {
+		let t = g.container;
+		if (!t) return;
+		let n = St(t, e.target);
+		if (n === -1 || !xt(j.current[n])) return;
+		e.preventDefault();
+		let r = t.children[n].getBoundingClientRect(), i = r.left + r.width / 2;
+		E({
+			index: n,
+			position: e.clientX < i ? "before" : "after"
+		});
+	}, [g]), z = r((e) => {
+		g.container && (g.container.contains(e.relatedTarget) || E(null));
+	}, [g]), B = r((e) => {
+		if (!T) return;
+		e.preventDefault();
+		let t = parseInt(e.dataTransfer.getData("text/plain"), 10);
+		if (isNaN(t)) return;
+		let n = T.position === "before" ? T.index : T.index + 1;
+		E(null), M(t, n);
+	}, [T, M]), ae = r((e) => {
+		if (x === null || !g.container) return;
+		e.dataTransfer.effectAllowed = "move", e.dataTransfer.setData("text/plain", String(x)), w(x);
+		let t = g.container.children[x];
+		t && e.dataTransfer.setDragImage(t, 0, 0);
+	}, [x, g]), V = r(() => {
+		w(null), E(null);
+	}, []);
+	return /* @__PURE__ */ p(d, { children: [
+		/* @__PURE__ */ f(ee, {
+			ref: (e) => g.container = e,
+			...k,
+			className: a,
+			style: s ? o : {
+				paddingLeft: 24,
+				...o
+			},
+			onMouseOver: ie,
+			onMouseLeave: L,
+			onDragOver: R,
+			onDragLeave: z,
+			onDrop: B,
+			children: A.map((e, t) => xt(e) ? /* @__PURE__ */ f(Q, { mark: e.tokens[0] }, h.get(e.tokens[0])) : /* @__PURE__ */ f(vt, {
+				blockIndex: t,
+				readOnly: s,
+				alwaysShowHandle: m,
+				onReorder: M,
+				onRequestMenu: N,
+				children: e.tokens.map((e) => /* @__PURE__ */ f(Q, { mark: e }, h.get(e)))
+			}, e.id))
+		}),
+		x !== null && !s && (() => {
+			let e = (g.container?.children[x])?.getBoundingClientRect();
+			return e ? /* @__PURE__ */ f("button", {
+				ref: D,
+				type: "button",
+				draggable: !0,
+				onDragStart: ae,
+				onDragEnd: V,
+				onMouseEnter: I,
+				onMouseLeave: F,
+				onClick: (e) => {
+					e.preventDefault(), D.current && N(x, D.current.getBoundingClientRect());
+				},
+				style: {
+					position: "fixed",
+					top: e.top + e.height / 2 - 12,
+					left: e.left - 24,
+					width: 24,
+					height: 24,
+					display: "flex",
+					alignItems: "center",
+					justifyContent: "center",
+					cursor: C === null ? "grab" : "grabbing",
+					borderRadius: 4,
+					color: "#9ca3af",
+					background: "none",
+					border: "none",
+					padding: 0,
+					zIndex: 100,
+					pointerEvents: "auto",
+					userSelect: "none"
+				},
+				"aria-label": "Drag to reorder or click for options",
+				children: /* @__PURE__ */ f("span", { className: yt })
+			}) : null;
+		})(),
+		T !== null && (() => {
+			let e = (g.container?.children[T.index])?.getBoundingClientRect();
+			return e ? /* @__PURE__ */ f("div", { style: {
+				position: "fixed",
+				left: T.position === "before" ? e.left - 1 : e.right - 1,
+				top: e.top,
+				width: 2,
+				height: e.height,
+				backgroundColor: "#3b82f6",
+				borderRadius: 1,
+				pointerEvents: "none",
+				zIndex: 10
+			} }) : null;
+		})(),
+		_ && /* @__PURE__ */ f(wt, {
+			position: _.position,
+			onAdd: () => {
+				te(_.index), P();
+			},
+			onDelete: () => {
+				ne(_.index), P();
+			},
+			onDuplicate: () => {
+				re(_.index), P();
+			},
+			onClose: P
+		})
+	] });
 });
-vt.displayName = "Container";
+Tt.displayName = "DragContainer";
 //#endregion
 //#region src/lib/hooks/useOverlay.tsx
-function yt() {
-	let e = X(), t = e.state.overlayMatch.use(), n = B.getAbsolutePosition(), i = r(() => e.events.clearOverlay(), []);
+function Et() {
+	let e = Z(), t = e.state.overlayMatch.use(), n = U.getAbsolutePosition(), i = r(() => e.events.clearOverlay(), []);
 	return {
 		match: t,
 		style: n,
 		select: r((n) => {
-			let r = et(t, n.value, n.meta);
+			let r = rt(t, n.value, n.meta);
 			e.events.select({
 				mark: r,
 				match: t
@@ -2392,15 +2595,15 @@ function yt() {
 }
 //#endregion
 //#region src/components/Suggestions/Suggestions.tsx
-var bt = () => {
-	let e = X(), { match: t, select: n, style: r, ref: i } = yt(), [o, s] = u(NaN), d = t.option.overlay?.data || [], p = c(() => $e(d, t.value), [t.value, d]), m = p.length, h = l(o);
+var Dt = () => {
+	let e = Z(), { match: t, select: n, style: r, ref: i } = Et(), [o, s] = u(NaN), d = t.option.overlay?.data || [], p = c(() => nt(d, t.value), [t.value, d]), m = p.length, h = l(o);
 	h.current = o;
 	let g = l(p);
 	return g.current = p, a(() => {
 		let t = e.refs.container;
 		if (!t) return;
 		let r = (e) => {
-			let t = nt(e.key, h.current, m);
+			let t = at(e.key, h.current, m);
 			switch (t.action) {
 				case "up":
 				case "down":
@@ -2420,10 +2623,10 @@ var bt = () => {
 		return t.addEventListener("keydown", r), () => t.removeEventListener("keydown", r);
 	}, [m, n]), p.length ? /* @__PURE__ */ f("ul", {
 		ref: i,
-		className: Z.Suggestions,
+		className: $.Suggestions,
 		style: r,
 		children: p.map((e, t) => {
-			let r = t === o ? Z.suggestionActive : void 0;
+			let r = t === o ? $.suggestionActive : void 0;
 			return /* @__PURE__ */ f("li", {
 				ref: (e) => {
 					r && e && e.scrollIntoView(!1);
@@ -2437,54 +2640,53 @@ var bt = () => {
 			}, e);
 		})
 	}) : null;
-}, xt = n(() => {
-	let e = X(), t = e.state.overlayMatch.use(), n = c(() => t ? e.key.get(t.option) : void 0, [t]), [r, i] = dt("overlay", t?.option, void 0, bt);
+}, Ot = n(() => {
+	let e = Z(), t = e.state.overlayMatch.use(), n = c(() => t ? e.key.get(t.option) : void 0, [t]), [r, i] = ft("overlay", t?.option, void 0, Dt);
 	if (n) return /* @__PURE__ */ f(r, { ...i ?? {} }, n);
 });
-xt.displayName = "OverlayRenderer";
+Ot.displayName = "OverlayRenderer";
 //#endregion
 //#region src/components/MarkedInput.tsx
-function St(e) {
-	let { ref: t, value: n, defaultValue: r, onChange: i, readOnly: a = !1, drag: o = !1, Mark: s, Overlay: c, slots: l, slotProps: d, options: m = S, showOverlayOn: _ = "change", className: v, style: y } = e, b = h(Z.Container, v, d?.container?.className), x = g(y, d?.container?.style), [C] = u(() => new rt({ createUseHook: at }));
-	return C.state.set({
+function kt(e) {
+	let { ref: t, value: n, defaultValue: r, onChange: i, readOnly: a = !1, drag: o = !1, Span: s, Mark: c, Overlay: l, slots: d, slotProps: m, options: _ = S, showOverlayOn: v = "change", className: y, style: b } = e, x = h($.Container, y, m?.container?.className), C = g(b, m?.container?.style), [w] = u(() => new ot({ createUseHook: ct }));
+	return w.state.set({
 		value: n,
 		defaultValue: r,
 		onChange: i,
 		readOnly: a,
 		drag: o,
-		options: m,
-		showOverlayOn: _,
-		Mark: s,
-		Overlay: c,
-		className: b,
-		style: x,
-		slots: l,
-		slotProps: d
-	}), ot(C, t), /* @__PURE__ */ p(st, {
-		value: C,
-		children: [/* @__PURE__ */ f(o ? _t : vt, {}), /* @__PURE__ */ f(xt, {})]
+		options: _,
+		showOverlayOn: v,
+		Span: s,
+		Mark: c,
+		Overlay: l,
+		className: x,
+		style: C,
+		slots: d,
+		slotProps: m
+	}), lt(w, t), /* @__PURE__ */ p(ut, {
+		value: w,
+		children: [/* @__PURE__ */ f(o ? Tt : gt, {}), /* @__PURE__ */ f(Ot, {})]
 	});
 }
 //#endregion
 //#region src/lib/hooks/useMark.tsx
-var Ct = (e = {}) => {
-	let t = X(), n = ut(), r = l(null);
-	if (n.type !== "mark") throw Error("useMark can only be used with mark tokens");
-	let [i] = u(() => new it({
+var At = (e = {}) => {
+	let t = Z(), n = ht(), r = l(null), [i] = u(() => new st({
 		ref: r,
 		store: t,
 		token: n
 	}));
-	wt(r, e, n);
+	jt(r, e, n);
 	let o = t.state.readOnly.use();
 	return a(() => {
 		i.readOnly = o;
 	}, [o]), i;
 };
-function wt(e, t, n) {
+function jt(e, t, n) {
 	a(() => {
 		e.current && !t.controlled && (e.current.textContent = n.content);
 	}, []);
 }
 //#endregion
-export { it as MarkHandler, St as MarkedInput, P as annotate, ce as denote, Ct as useMark, yt as useOverlay };
+export { st as MarkHandler, kt as MarkedInput, dt as Span, R as annotate, ae as denote, At as useMark, Et as useOverlay };