slate-vue3 0.0.28 → 0.0.30

package/dist/index.js

@@ -5761,7 +5761,7 @@ const DOMEditor = {
     return { path: path2, offset };
   },
   toSlateRange: (editor, domRange, options) => {
-    var _a2;
+    var _a2, _b2;
     const { exactMatch, suppressThrow } = options;
     const el = isDOMSelection(domRange) ? domRange.anchorNode : domRange.startContainer;
     let anchorNode;
@@ -5776,18 +5776,18 @@ const DOMEditor = {
         focusNode = domRange.focusNode;
         focusOffset = domRange.focusOffset;
         if (IS_FIREFOX) {
-          const attributes = anchorNode instanceof HTMLElement ? anchorNode.attributes : null;
-          if (attributes && attributes.getNamedItem("data-slate-editor")) {
-            while (anchorNode == null ? void 0 : anchorNode.firstElementChild) {
+          const anchorAttr = anchorNode instanceof HTMLElement ? anchorNode.attributes : null;
+          if (anchorAttr == null ? void 0 : anchorAttr.getNamedItem("data-slate-editor")) {
+            while (anchorNode instanceof HTMLElement && anchorNode.firstElementChild) {
               anchorNode = anchorNode.firstElementChild;
             }
-            while (focusNode == null ? void 0 : focusNode.lastElementChild) {
+            while (focusNode instanceof HTMLElement && focusNode.lastElementChild) {
               focusNode = focusNode.lastElementChild;
             }
-            anchorNode = anchorNode.firstChild;
+            anchorNode = anchorNode == null ? void 0 : anchorNode.firstChild;
             anchorOffset = 0;
-            focusNode = focusNode.lastChild;
-            focusOffset = focusNode.length;
+            focusNode = focusNode == null ? void 0 : focusNode.lastChild;
+            focusOffset = ((_a2 = focusNode == null ? void 0 : focusNode.textContent) == null ? void 0 : _a2.length) || 0;
           } else {
             if (anchorNode) {
               const [el2, offset] = getFirefoxNodeEl(anchorNode, anchorOffset);
@@ -5834,7 +5834,7 @@ const DOMEditor = {
         `Cannot resolve a Slate range from DOM range: ${domRange}`
       );
     }
-    if (IS_FIREFOX && ((_a2 = focusNode.textContent) == null ? void 0 : _a2.endsWith("\n\n")) && focusOffset === focusNode.textContent.length) {
+    if (IS_FIREFOX && ((_b2 = focusNode.textContent) == null ? void 0 : _b2.endsWith("\n\n")) && focusOffset === focusNode.textContent.length) {
       focusOffset--;
     }
     const anchor = DOMEditor.toSlatePoint(editor, [anchorNode, anchorOffset], {
@@ -7325,6 +7325,15 @@ function createAndroidInputManager({
     handleInput
   };
 }
+const useEditor = () => {
+  const editor = inject(SLATE_USE_EDITOR);
+  if (editor === void 0) {
+    throw new Error(
+      `The \`useEditor\` hook must be used inside the <Slate> component's context.`
+    );
+  }
+  return editor;
+};
 const MUTATION_OBSERVER_CONFIG$1 = {
   subtree: true,
   childList: true,
@@ -7334,7 +7343,7 @@ const useAndroidInputManager = !IS_ANDROID ? () => null : ({ node: node2, ...opt
   if (!IS_ANDROID) {
     return null;
   }
-  const editor = inject("editorRef");
+  const editor = useEditor();
   const isMounted = ref(false);
   onMounted(() => isMounted.value = true);
   onUnmounted(() => isMounted.value = false);
@@ -7374,15 +7383,6 @@ const useDecorate = () => {
   }
   return decorate;
 };
-const useEditor = () => {
-  const editor = inject(SLATE_USE_EDITOR);
-  if (editor === void 0) {
-    throw new Error(
-      `The \`useEditor\` hook must be used inside the <Slate> component's context.`
-    );
-  }
-  return editor;
-};
 const StringComp = defineComponent({
   name: "slate-string",
   props: ["isLast", "leaf", "element", "text"],
@@ -8009,6 +8009,7 @@ const Editable = defineComponent({
     const placeholderHeight = ref();
     const onPlaceholderResize = (h2) => placeholderHeight.value = h2;
     const androidInputManagerRef = ref(null);
+    const processing = ref(false);
     const onDOMSelectionChange = (event) => {
       const target = event == null ? void 0 : event.target;
       const targetElement = target instanceof HTMLElement ? target : null;
@@ -8018,7 +8019,8 @@ const Editable = defineComponent({
       }
       const el = DOMEditor.toDOMNode(editor, editor);
       const root2 = el.getRootNode();
-      if (IS_WEBKIT && root2 instanceof ShadowRoot) {
+      if (!processing.value && IS_WEBKIT && root2 instanceof ShadowRoot) {
+        processing.value = true;
         const active = getActiveElement();
         if (active) {
           document.execCommand("indent");
@@ -8216,17 +8218,29 @@ const Editable = defineComponent({
       if (HAS_BEFORE_INPUT_SUPPORT) {
         const el = DOMEditor.toDOMNode(editor, editor);
         const root2 = el.getRootNode();
-        if (IS_WEBKIT && root2 instanceof ShadowRoot) {
+        if (processing.value && IS_WEBKIT && root2 instanceof ShadowRoot) {
           const ranges = event.getTargetRanges();
           const range2 = ranges[0];
           const newRange = new window.Range();
+          let endContainer = range2.endContainer;
+          let endOffset = range2.endOffset;
+          if (endContainer.nodeType === 3 && endContainer.textContent === "" && endContainer.previousSibling) {
+            endContainer = endContainer.previousSibling;
+          }
+          while (endContainer instanceof HTMLElement && !endContainer.attributes.getNamedItem("data-slate-string") && endContainer.lastElementChild) {
+            endContainer = endContainer.lastElementChild;
+          }
+          if (endContainer instanceof HTMLElement && endContainer.attributes.getNamedItem("data-slate-string") && endContainer.lastChild) {
+            endContainer = endContainer.lastChild;
+          }
           newRange.setStart(range2.startContainer, range2.startOffset);
-          newRange.setEnd(range2.endContainer, range2.endOffset);
+          newRange.setEnd(endContainer, endOffset);
           const slateRange = DOMEditor.toSlateRange(editor, newRange, {
             exactMatch: false,
             suppressThrow: false
           });
           Transforms.select(editor, slateRange);
+          processing.value = false;
           event.preventDefault();
           event.stopImmediatePropagation();
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slate-vue3",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -15,7 +15,7 @@
     "build": "vite build",
     "preview": "vite preview",
     "build-all": "vite build --mode=lib",
-    "e2e": "playwright test",
+    "e2e": "node --no-experimental-strip-types node_modules/@playwright/test/cli.js test",
     "e2e-ui": "playwright test --ui",
     "test": "vitest"
   },