@antdv-next/x 1.1.1 → 1.1.2-beta.2

package/dist/index.umd.js

@@ -48,7 +48,7 @@
 	shiki_dist_themes_vitesse_dark_mjs = __toESM(shiki_dist_themes_vitesse_dark_mjs);
 	shiki_dist_themes_vitesse_light_mjs = __toESM(shiki_dist_themes_vitesse_light_mjs);
 	//#region package.json
-	var version = "1.1.1";
+	var version = "1.1.2-beta.2";
 	//#endregion
 	//#region components/x-provider/context.ts
 	var XProviderContextKey = Symbol("antdv-next-x-provider-context");
@@ -8668,16 +8668,17 @@
 				if (!selection || !selection.isCollapsed) return false;
 				const editable = editableRef.value;
 				if (!editable) return false;
-				let anchorNode = selection.anchorNode;
-				let offset = selection.anchorOffset;
+				const anchorNode = selection.anchorNode;
+				const offset = selection.anchorOffset;
 				if (!anchorNode || !editable.contains(anchorNode)) return false;
-				if (anchorNode === editable && offset > 0) {
-					anchorNode = editable.childNodes[offset - 1] ?? anchorNode;
-					offset = 0;
+				let previous;
+				if (anchorNode === editable) {
+					if (offset <= 0) return false;
+					previous = editable.childNodes[offset - 1];
+				} else {
+					if (anchorNode.nodeType === Node.TEXT_NODE && offset > 0) return false;
+					previous = (anchorNode.nodeType === Node.TEXT_NODE ? anchorNode.parentNode : anchorNode)?.previousSibling;
 				}
-				if (anchorNode.nodeType === Node.TEXT_NODE && offset > 0) return false;
-				const target = anchorNode.nodeType === Node.TEXT_NODE ? anchorNode.parentNode : anchorNode;
-				const previous = target === editable ? editable.childNodes[Math.max(0, selection.anchorOffset - 1)] : target?.previousSibling;
 				if (!(previous instanceof HTMLElement)) return false;
 				const info = getNodeInfo(previous);
 				if (info?.slotKey) {
@@ -8710,8 +8711,34 @@
 				if (event.key === "Enter") keyLock.value = false;
 				senderCtx.value.onKeyUp?.(event);
 			};
+			const normalizeSkillTextInput = () => {
+				const editable = editableRef.value;
+				const skillDom = skillDomRef.value;
+				if (!editable || !skillDom) return;
+				const selection = getSelection();
+				const cursorNode = selection?.anchorNode && skillDom.contains(selection.anchorNode) ? selection.anchorNode : null;
+				const cursorOffset = selection?.anchorOffset ?? 0;
+				const wrapperCls = `${prefixCls.value}-skill-wrapper`;
+				const textNodes = Array.from(skillDom.childNodes).filter((node) => {
+					if (node instanceof HTMLElement && node.classList.contains(wrapperCls)) return false;
+					return node.textContent;
+				});
+				const referenceNode = skillDom.nextSibling;
+				textNodes.forEach((node) => {
+					editable.insertBefore(node, referenceNode);
+				});
+				if (cursorNode && editable.contains(cursorNode)) {
+					const range = document.createRange();
+					const nextOffset = cursorNode.nodeType === Node.TEXT_NODE ? Math.min(cursorOffset, cursorNode.textContent?.length ?? 0) : Math.min(cursorOffset, cursorNode.childNodes.length);
+					range.setStart(cursorNode, nextOffset);
+					range.collapse(true);
+					selection?.removeAllRanges();
+					selection?.addRange(range);
+				}
+			};
 			const onInternalInput = (event) => {
 				removeSpecificBRs();
+				normalizeSkillTextInput();
 				triggerValueChange(event);
 			};
 			const onInternalPaste = (event) => {

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.1.1";
+var version = "1.1.2-beta.2";
 //#endregion
 export { version };

package/dist/sender/components/SlotTextArea.js

@@ -500,16 +500,17 @@ var SlotTextArea_default = /* @__PURE__ */ defineComponent({
 			if (!selection || !selection.isCollapsed) return false;
 			const editable = editableRef.value;
 			if (!editable) return false;
-			let anchorNode = selection.anchorNode;
-			let offset = selection.anchorOffset;
+			const anchorNode = selection.anchorNode;
+			const offset = selection.anchorOffset;
 			if (!anchorNode || !editable.contains(anchorNode)) return false;
-			if (anchorNode === editable && offset > 0) {
-				anchorNode = editable.childNodes[offset - 1] ?? anchorNode;
-				offset = 0;
+			let previous;
+			if (anchorNode === editable) {
+				if (offset <= 0) return false;
+				previous = editable.childNodes[offset - 1];
+			} else {
+				if (anchorNode.nodeType === Node.TEXT_NODE && offset > 0) return false;
+				previous = (anchorNode.nodeType === Node.TEXT_NODE ? anchorNode.parentNode : anchorNode)?.previousSibling;
 			}
-			if (anchorNode.nodeType === Node.TEXT_NODE && offset > 0) return false;
-			const target = anchorNode.nodeType === Node.TEXT_NODE ? anchorNode.parentNode : anchorNode;
-			const previous = target === editable ? editable.childNodes[Math.max(0, selection.anchorOffset - 1)] : target?.previousSibling;
 			if (!(previous instanceof HTMLElement)) return false;
 			const info = getNodeInfo(previous);
 			if (info?.slotKey) {
@@ -542,8 +543,34 @@ var SlotTextArea_default = /* @__PURE__ */ defineComponent({
 			if (event.key === "Enter") keyLock.value = false;
 			senderCtx.value.onKeyUp?.(event);
 		};
+		const normalizeSkillTextInput = () => {
+			const editable = editableRef.value;
+			const skillDom = skillDomRef.value;
+			if (!editable || !skillDom) return;
+			const selection = getSelection();
+			const cursorNode = selection?.anchorNode && skillDom.contains(selection.anchorNode) ? selection.anchorNode : null;
+			const cursorOffset = selection?.anchorOffset ?? 0;
+			const wrapperCls = `${prefixCls.value}-skill-wrapper`;
+			const textNodes = Array.from(skillDom.childNodes).filter((node) => {
+				if (node instanceof HTMLElement && node.classList.contains(wrapperCls)) return false;
+				return node.textContent;
+			});
+			const referenceNode = skillDom.nextSibling;
+			textNodes.forEach((node) => {
+				editable.insertBefore(node, referenceNode);
+			});
+			if (cursorNode && editable.contains(cursorNode)) {
+				const range = document.createRange();
+				const nextOffset = cursorNode.nodeType === Node.TEXT_NODE ? Math.min(cursorOffset, cursorNode.textContent?.length ?? 0) : Math.min(cursorOffset, cursorNode.childNodes.length);
+				range.setStart(cursorNode, nextOffset);
+				range.collapse(true);
+				selection?.removeAllRanges();
+				selection?.addRange(range);
+			}
+		};
 		const onInternalInput = (event) => {
 			removeSpecificBRs();
+			normalizeSkillTextInput();
 			triggerValueChange(event);
 		};
 		const onInternalPaste = (event) => {

package/es/antdv-next-x.esm.js

@@ -2,7 +2,7 @@ import { r as e } from "./chunk-WQLz0Won.js";
 import { S as t, _ as n, a as r, b as i, c as a, d as o, f as s, g as c, h as l, i as u, l as d, m as f, n as p, o as m, p as h, r as g, s as _, t as v, u as y, v as b, x, y as S } from "./Serializer-D1JYN1kI.js";
 import { Comment as C, Fragment as w, Teleport as T, Text as E, Transition as D, TransitionGroup as O, cloneVNode as k, computed as A, createTextVNode as j, createVNode as M, defineComponent as N, getCurrentInstance as P, getCurrentScope as F, h as I, inject as L, isVNode as R, markRaw as ee, mergeDefaults as z, mergeProps as B, nextTick as V, onBeforeMount as te, onBeforeUnmount as H, onBeforeUpdate as ne, onMounted as re, onScopeDispose as ie, onUnmounted as ae, onUpdated as oe, provide as U, reactive as se, ref as W, render as ce, resolveDynamicComponent as le, shallowReactive as ue, shallowRef as G, toRaw as de, toRef as fe, toRefs as pe, toValue as me, triggerRef as he, unref as ge, useAttrs as _e, useId as ve, useSlots as ye, vShow as be, watch as K, watchEffect as xe, withDirectives as Se } from "vue";
 //#region package.json
-var Ce = "1.1.1", we = "anticon", Te = {}, Ee = [
+var Ce = "1.1.2-beta.2", we = "anticon", Te = {}, Ee = [
 	"outlined",
 	"borderless",
 	"filled",
@@ -59236,11 +59236,18 @@ var YW = /* @__PURE__ */ N({
 			let n = r.value;
 			if (!n) return !1;
 			let i = t.anchorNode, a = t.anchorOffset;
-			if (!i || !n.contains(i) || (i === n && a > 0 && (i = n.childNodes[a - 1] ?? i, a = 0), i.nodeType === Node.TEXT_NODE && a > 0)) return !1;
-			let o = i.nodeType === Node.TEXT_NODE ? i.parentNode : i, s = o === n ? n.childNodes[Math.max(0, t.anchorOffset - 1)] : o?.previousSibling;
-			if (!(s instanceof HTMLElement)) return !1;
-			let c = _(s);
-			return c?.slotKey ? (e.preventDefault(), re(c.slotKey, e), !0) : c?.skillKey ? (e.preventDefault(), ie(!0), !0) : !1;
+			if (!i || !n.contains(i)) return !1;
+			let o;
+			if (i === n) {
+				if (a <= 0) return !1;
+				o = n.childNodes[a - 1];
+			} else {
+				if (i.nodeType === Node.TEXT_NODE && a > 0) return !1;
+				o = (i.nodeType === Node.TEXT_NODE ? i.parentNode : i)?.previousSibling;
+			}
+			if (!(o instanceof HTMLElement)) return !1;
+			let s = _(o);
+			return s?.slotKey ? (e.preventDefault(), re(s.slotKey, e), !0) : s?.skillKey ? (e.preventDefault(), ie(!0), !0) : !1;
 		}, de = (e) => {
 			if (!(n.value.onKeyDown?.(e) === !1 || p.value || f.value) && !(e.key === "Backspace" && G(e))) {
 				if (le(e)) {
@@ -59251,9 +59258,19 @@ var YW = /* @__PURE__ */ N({
 			}
 		}, fe = (e) => {
 			e.key === "Enter" && (p.value = !1), n.value.onKeyUp?.(e);
-		}, pe = (e) => {
-			se(), D(e);
+		}, pe = () => {
+			let e = r.value, t = c.value;
+			if (!e || !t) return;
+			let n = L(), i = n?.anchorNode && t.contains(n.anchorNode) ? n.anchorNode : null, a = n?.anchorOffset ?? 0, o = `${m.value}-skill-wrapper`, s = Array.from(t.childNodes).filter((e) => e instanceof HTMLElement && e.classList.contains(o) ? !1 : e.textContent), l = t.nextSibling;
+			if (s.forEach((t) => {
+				e.insertBefore(t, l);
+			}), i && e.contains(i)) {
+				let e = document.createRange(), t = i.nodeType === Node.TEXT_NODE ? Math.min(a, i.textContent?.length ?? 0) : Math.min(a, i.childNodes.length);
+				e.setStart(i, t), e.collapse(!0), n?.removeAllRanges(), n?.addRange(e);
+			}
 		}, me = (e) => {
+			se(), pe(), D(e);
+		}, he = (e) => {
 			e.preventDefault();
 			let t = e.clipboardData?.files, r = e.clipboardData?.getData("text/plain") ?? "";
 			if (!r && t?.length && n.value.onPasteFile) {
@@ -59269,11 +59286,11 @@ var YW = /* @__PURE__ */ N({
 					t.insertNode(n), t.setStartAfter(n), t.collapse(!0), e.removeAllRanges(), e.addRange(t);
 				}
 			}
-			pe(e), n.value.onPaste?.(e);
-		}, he = () => {
+			me(e), n.value.onPaste?.(e);
+		}, ge = () => {
 			let e = L(), t = r.value;
 			!e || !t || e.focusNode === t && e.focusOffset === 0 && T().skill && ee(t, 1);
-		}, ge = (e = "cursor") => {
+		}, _e = (e = "cursor") => {
 			let t = r.value;
 			if (!t) return null;
 			let n = L(), i = document.createRange();
@@ -59329,25 +59346,25 @@ var YW = /* @__PURE__ */ N({
 				F(e);
 				let o = P(e);
 				if (!o.length) return;
-				let s = ge(t);
+				let s = _e(t);
 				if (!s?.range) return;
 				let { range: c, selection: l } = s;
 				a.focus({ preventScroll: i }), n && (L()?.toString() ?? "").endsWith(n) && c.setStart(c.startContainer, Math.max(0, c.startOffset - n.length)), c.deleteContents(), o.forEach((e) => {
 					c.insertNode(e), c.setStartAfter(e);
-				}), c.collapse(!0), l && (l.removeAllRanges(), l.addRange(c)), pe();
+				}), c.collapse(!0), l && (l.removeAllRanges(), l.addRange(c)), me();
 			},
 			clear: () => {
-				I(), ae(), pe();
+				I(), ae(), me();
 			},
 			getValue: T
 		});
-		let _e = (e, t = !1) => {
+		let ve = (e, t = !1) => {
 			!t && e === u.value || (u.value = e, U(e));
 		};
 		return K(() => r.value, (e) => {
-			e && _e(n.value.slotConfig, !0);
+			e && ve(n.value.slotConfig, !0);
 		}, { immediate: !0 }), K(() => n.value.slotConfig, (e) => {
-			_e(e);
+			ve(e);
 		}, { immediate: !0 }), K(() => n.value.skill, (e) => {
 			e === d.value && c.value || (d.value = e, ae(), V(() => {
 				D();
@@ -59373,12 +59390,12 @@ var YW = /* @__PURE__ */ N({
 				"data-placeholder": n.value.placeholder,
 				contenteditable: !n.value.readOnly,
 				spellcheck: !1,
-				onInput: pe,
+				onInput: me,
 				onKeydown: de,
 				onKeyup: fe,
-				onPaste: me,
-				onCut: pe,
-				onSelect: he,
+				onPaste: he,
+				onCut: me,
+				onSelect: ge,
 				onFocus: (e) => {
 					n.value.onFocus?.(e);
 				},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antdv-next/x",
-  "version": "1.1.1",
+  "version": "1.1.2-beta.2",
   "license": "MIT",
   "files": [
     "dist",