@antdv-next/x 1.2.3-beta.1 → 1.2.4

package/dist/sender/components/SlotTextAreaProseMirror.js

@@ -265,10 +265,10 @@ var SlotTextAreaProseMirror_default = /* @__PURE__ */ defineComponent({
 			(type === "copy" ? senderCtx.value.onCopy : senderCtx.value.onCut)?.(event, info);
 			if (event.defaultPrevented) return true;
 			if (type === "copy" && !slice && !payloadText) return false;
+			if (type === "cut" && isLocked()) return true;
 			try {
 				event.clipboardData?.setData("text/plain", payloadText);
 			} catch {}
-			if (type === "cut" && isLocked()) return true;
 			if (type === "cut" && slice) {
 				flushDom();
 				syncSelectionFromDom();
@@ -414,7 +414,8 @@ var SlotTextAreaProseMirror_default = /* @__PURE__ */ defineComponent({
 							skill: void 0
 						};
 						senderCtx.value.onPaste?.(event, info);
-						if (!event.defaultPrevented) routePasteEvent(event);
+						if (!event.defaultPrevented) if (isLocked()) event.preventDefault();
+						else routePasteEvent(event);
 					},
 					"onCopy": (event) => {
 						routeControlCopyOrCut(event, "copy");
@@ -746,10 +747,37 @@ var SlotTextAreaProseMirror_default = /* @__PURE__ */ defineComponent({
 				if (pos !== null) {
 					const contentNode = editorView.state.doc.nodeAt(pos);
 					if (contentNode && contentNode.type === senderSchema.nodes.contentSlot) try {
-						const from = editorView.posAtDOM(nativeRange.startContainer, nativeRange.startOffset);
-						const to = editorView.posAtDOM(nativeRange.endContainer, nativeRange.endOffset);
 						const contentFrom = pos + 1;
 						const contentTo = pos + contentNode.nodeSize - 1;
+						const domNodeSize = (node) => {
+							if (node.nodeType === Node.TEXT_NODE) return node.textContent?.length ?? 0;
+							if (node.nodeType === Node.ELEMENT_NODE && node.tagName === "BR") return 1;
+							let size = 0;
+							node.childNodes.forEach((child) => {
+								size += domNodeSize(child);
+							});
+							return size;
+						};
+						const contentOffsetAt = (container, offset) => {
+							let current = container;
+							let result = container.nodeType === Node.TEXT_NODE ? offset : Array.from(container.childNodes).slice(0, offset).reduce((sum, child) => sum + domNodeSize(child), 0);
+							while (current && current !== startContent) {
+								const parent = current.parentNode;
+								if (!parent) return null;
+								let sibling = current.previousSibling;
+								while (sibling) {
+									result += domNodeSize(sibling);
+									sibling = sibling.previousSibling;
+								}
+								current = parent;
+							}
+							return current === startContent ? result : null;
+						};
+						const startOffset = contentOffsetAt(nativeRange.startContainer, nativeRange.startOffset);
+						const endOffset = contentOffsetAt(nativeRange.endContainer, nativeRange.endOffset);
+						if (startOffset === null || endOffset === null) return false;
+						const from = contentFrom + startOffset;
+						const to = contentFrom + endOffset;
 						if (contentFrom <= from && from <= to && to <= contentTo) {
 							event.preventDefault();
 							const transaction = editorView.state.tr.delete(from, to);

package/dist/sender/components/SpeechButton/index.js

@@ -1,12 +1,15 @@
 import ActionButton, { useActionButtonContext } from "../ActionButton.js";
 import RecordingIcon_default from "./RecordingIcon.js";
-import { computed, createVNode, defineComponent, mergeProps } from "vue";
+import { computed, createVNode, defineComponent, isVNode, mergeProps } from "vue";
 import { AudioMutedOutlined, AudioOutlined } from "@antdv-next/icons";
 //#region components/sender/components/SpeechButton/index.tsx
+function _isSlot(s) {
+	return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
 var SpeechButton_default = /* @__PURE__ */ defineComponent({
 	name: "SpeechButton",
 	inheritAttrs: false,
-	setup(_, { attrs }) {
+	setup(_, { attrs, slots }) {
 		const context = useActionButtonContext();
 		const mergedDisabled = computed(() => {
 			return attrs.disabled ?? context.value.disabled ?? context.value.onSpeechDisabled;
@@ -21,7 +24,7 @@ var SpeechButton_default = /* @__PURE__ */ defineComponent({
 			"icon": icon.value,
 			"variant": "text",
 			"color": "primary"
-		}, attrs, { "action": "onSpeech" }), null);
+		}, attrs, { "action": "onSpeech" }), _isSlot(slots) ? slots : { default: () => [slots] });
 	}
 });
 //#endregion