slate-angular 17.2.2 → 17.4.0

package/fesm2022/slate-angular.mjs

@@ -1,4 +1,4 @@
-import { Editor, Range, Element, Transforms, Path, Text as Text$1, Node } from 'slate';
+import { Editor, Range, Element, Transforms, Text as Text$1, Path, Node } from 'slate';
 import { isKeyHotkey } from 'is-hotkey';
 import * as i0 from '@angular/core';
 import { TemplateRef, Component, ChangeDetectionStrategy, ViewChild, Directive, Input, InjectionToken, ComponentRef, IterableDiffers, HostBinding, inject, ViewContainerRef, forwardRef, ElementRef, Inject, NgModule } from '@angular/core';
@@ -515,20 +515,33 @@ const AngularEditor = {
     /**
      * Find a native DOM selection point from a Slate point.
      */
-    toDOMPoint(editor, point) {
+    toDOMPoint(editor, point, options) {
         const [node] = Editor.node(editor, point.path);
         const el = AngularEditor.toDOMNode(editor, node);
         let domPoint;
         // block card
-        const cardTargetAttr = getCardTargetAttribute(el);
-        if (cardTargetAttr) {
-            if (point.offset === FAKE_LEFT_BLOCK_CARD_OFFSET) {
-                const cursorNode = AngularEditor.getCardCursorNode(editor, node, { direction: 'left' });
-                return [cursorNode, 1];
+        const [parentNode] = Editor.parent(editor, point.path);
+        if (editor.isBlockCard(parentNode) || editor.isBlockCard(node)) {
+            if (point.offset < 0) {
+                if (point.offset === FAKE_LEFT_BLOCK_CARD_OFFSET) {
+                    const cursorNode = AngularEditor.getCardCursorNode(editor, node, { direction: 'left' });
+                    return [cursorNode, 1];
+                }
+                else {
+                    const cursorNode = AngularEditor.getCardCursorNode(editor, node, { direction: 'right' });
+                    return [cursorNode, 1];
+                }
             }
-            else {
-                const cursorNode = AngularEditor.getCardCursorNode(editor, node, { direction: 'right' });
-                return [cursorNode, 1];
+            if (Range.isExpanded(options.range)) {
+                const [start, end] = Range.edges(options.range);
+                if (start === point) {
+                    const cursorNode = AngularEditor.getCardCursorNode(editor, parentNode, { direction: 'left' });
+                    return [cursorNode, 1];
+                }
+                else {
+                    const cursorNode = AngularEditor.getCardCursorNode(editor, parentNode, { direction: 'right' });
+                    return [cursorNode, 1];
+                }
             }
         }
         // If we're inside a void node, force the offset to 0, otherwise the zero
@@ -573,8 +586,8 @@ const AngularEditor = {
     toDOMRange(editor, range) {
         const { anchor, focus } = range;
         const isBackward = Range.isBackward(range);
-        const domAnchor = AngularEditor.toDOMPoint(editor, anchor);
-        const domFocus = Range.isCollapsed(range) ? domAnchor : AngularEditor.toDOMPoint(editor, focus);
+        const domAnchor = AngularEditor.toDOMPoint(editor, anchor, { range });
+        const domFocus = Range.isCollapsed(range) ? domAnchor : AngularEditor.toDOMPoint(editor, focus, { range });
         const window = AngularEditor.getWindow(editor);
         const domRange = window.document.createRange();
         const [startNode, startOffset] = isBackward ? domFocus : domAnchor;
@@ -694,25 +707,12 @@ const AngularEditor = {
                     return { path: blockPath, offset: -2 };
                 }
             }
-            // forward
-            // and to the end of previous node
-            if (isCardLeftByTargetAttr(cardTargetAttr) && !isBackward) {
-                const endPath = blockPath[blockPath.length - 1] <= 0 ? blockPath : Path.previous(blockPath);
-                return Editor.end(editor, endPath);
+            if (isCardLeftByTargetAttr(cardTargetAttr)) {
+                return Editor.start(editor, blockPath);
             }
-            // to the of current node
-            if ((isCardCenterByTargetAttr(cardTargetAttr) || isCardRightByTargetAttr(cardTargetAttr)) && !isBackward) {
+            else {
                 return Editor.end(editor, blockPath);
             }
-            // backward
-            // and to the start of next node
-            if (isCardRightByTargetAttr(cardTargetAttr) && isBackward) {
-                return Editor.start(editor, Path.next(blockPath));
-            }
-            // and to the start of current node
-            if ((isCardCenterByTargetAttr(cardTargetAttr) || isCardLeftByTargetAttr(cardTargetAttr)) && isBackward) {
-                return Editor.start(editor, blockPath);
-            }
         }
         if (parentNode) {
             const voidNode = parentNode.closest('[data-slate-void="true"]');
@@ -1159,7 +1159,8 @@ const getNavigatorClipboard = async () => {
                     const blob = await (await fetch(url)).blob();
                     return new File([blob], 'file', { type: blob.type });
                 }));
-                return {
+                clipboardData = {
+                    ...clipboardData,
                     files
                 };
             }
@@ -1167,15 +1168,17 @@ const getNavigatorClipboard = async () => {
                 const htmlContent = await blobAsString(await item.getType('text/html'));
                 const htmlClipboardData = getClipboardFromHTMLText(htmlContent);
                 if (htmlClipboardData) {
-                    return htmlClipboardData;
+                    clipboardData = { ...clipboardData, ...htmlClipboardData };
+                    return clipboardData;
                 }
                 if (htmlContent && htmlContent.trim()) {
-                    clipboardData = { html: htmlContent };
+                    clipboardData = { ...clipboardData, html: htmlContent };
                 }
             }
             if (item.types.includes('text/plain')) {
                 const textContent = await blobAsString(await item.getType('text/plain'));
                 clipboardData = {
+                    ...clipboardData,
                     text: stripHtml(textContent)
                 };
             }
@@ -1216,11 +1219,12 @@ const createClipboardData = (html, elements, text, files) => {
 const getClipboardData = async (dataTransfer) => {
     let clipboardData = null;
     if (dataTransfer) {
+        let filesData = {};
         if (dataTransfer.files.length) {
-            return { files: Array.from(dataTransfer.files) };
+            filesData = { ...filesData, files: Array.from(dataTransfer.files) };
         }
         clipboardData = getDataTransferClipboard(dataTransfer);
-        return clipboardData;
+        return { ...clipboardData, ...filesData };
     }
     if (isClipboardReadSupported()) {
         return await getNavigatorClipboard();
@@ -1240,7 +1244,7 @@ const setClipboardData = async (clipboardData, wrapper, attach, dataTransfer) =>
     if (isClipboardWriteSupported()) {
         const htmlText = buildHTMLText(wrapper, attach, elements);
         // TODO
-        // maybe fail to write when copy some cell in table 
+        // maybe fail to write when copy some cell in table
         return await setNavigatorClipboard(htmlText, elements, text);
     }
     if (dataTransfer) {