@nerd-bible/wordgard 0.6.2-beta11 → 0.6.2-beta12

package/dist/editor.d.ts

@@ -731,7 +731,7 @@ declare class Wordgard {
     Facet that allows you to register handlers to override paste
     behavior.
     */
-    static pasteHandler: GardState.Facet<(wg: Wordgard, event: InputEvent | null, slice: wordgard_doc.Slice, html: string, text: string) => boolean, readonly ((wg: Wordgard, event: InputEvent | null, slice: wordgard_doc.Slice, html: string, text: string) => boolean)[]>;
+    static pasteHandler: GardState.Facet<(wg: Wordgard, event: ClipboardEvent, slice: wordgard_doc.Slice, html: string, text: string) => boolean, readonly ((wg: Wordgard, event: ClipboardEvent, slice: wordgard_doc.Slice, html: string, text: string) => boolean)[]>;
     /**
     Perform a paste with the given content. This will run {@link
     Wordgard.pasteHandler paste handlers} and, if none handles the

package/dist/editor.js

@@ -952,17 +952,6 @@ function getSelection(root) {
     }
     return target.getSelection();
 }
-function getSelectionRange(root) {
-    let sel = getSelection(root);
-    if (!sel)
-        return null;
-    if (browser.safari && root.nodeType == 11) {
-        let range = sel.getComposedRanges(root)[0];
-        if (range)
-            return range;
-    }
-    return new StaticRange(sel.getRangeAt(0));
-}
 function hasSelection(dom, selection) {
     if (!selection.focusNode)
         return false;
@@ -3905,6 +3894,8 @@ class InputState {
         this.lastKeyCode = event.keyCode;
         this.lastKeyTime = Date.now();
         this.shiftKey = event.keyCode == 16 || event.shiftKey;
+        if (this.composing && event.isComposing === false)
+            compositionEnd(this.wg);
         return false;
     }
     ignoreDuringComposition(event) {
@@ -3969,6 +3960,8 @@ class InputState {
         return this.domMapping.mapPos(this.getDOMPos(node, offset), assoc);
     }
     beforeInput(event, data) {
+        if (this.composing && event.isComposing === false)
+            compositionEnd(this.wg);
         let type = event.inputType, range;
         let { wg } = this, sel = wg.state.selection;
         if (data.domRange) {
@@ -3998,14 +3991,8 @@ class InputState {
             Command.dispatch(wg, insertText, { from, to, insert, userEvent: "input.type" });
         }
         else if (type == "insertFromPaste") {
-            let isSel = this.unflushedSelection;
-            if (!isSel) {
-                let r = data.domRange.range, domSel = getSelectionRange(wg.root);
-                isSel = !!domSel && isEquivalentPosition(r.startContainer, r.startOffset, domSel.startContainer, domSel.startOffset) &&
-                    isEquivalentPosition(r.endContainer, r.endOffset, domSel.endContainer, domSel.endOffset);
-            }
             let transfer = event.dataTransfer;
-            doPaste(wg, getHTML(transfer), getText(transfer), isSel ? null : range, event);
+            doPaste(wg, getHTML(transfer), getText(transfer), this.unflushedSelection ? wg.state.selection : range, null);
         }
         else if ((type == "insertReplacementText" || type == "insertFromYank")) {
             let transfer = event.dataTransfer;
@@ -4110,6 +4097,8 @@ class InputState {
     }
     clearComposition() {
         let comp = this.composing;
+        if (!comp)
+            return false;
         this.composing = null;
         this.compositionPendingKey = true;
         this.compositionEndedAt = Date.now();
@@ -4196,8 +4185,15 @@ function computeHandlers(state) {
 function doPaste(wg, html, text, targetRange, event) {
     let { from, to } = targetRange || wg.state.selection.replacementRange;
     let slice = readClipboard(wg.state, html, text, wg.state.doc.resolve(from), wg.inputState.shiftKey);
-    if (!targetRange && wg.state.facet(pasteHandler).some(h => h(wg, event, slice || Slice.empty, text, html)))
-        return;
+    if (!targetRange) {
+        if (!event) {
+            event = new ClipboardEvent("paste", { clipboardData: new DataTransfer });
+            event.clipboardData.setData("text/html", html);
+            event.clipboardData.setData("text/plain", text);
+        }
+        if (wg.state.facet(pasteHandler).some(h => h(wg, event, slice || Slice.empty, text, html)))
+            return;
+    }
     if (slice) {
         wg.dispatch({
             changes: { correct: { from, to, insert: slice, fit: true }, local: true },
@@ -4548,6 +4544,13 @@ const baseHandlers = {
     },
     copy,
     cut: copy,
+    paste(wg, event) {
+        let data = event.clipboardData;
+        if (!data)
+            return false;
+        doPaste(wg, getHTML(data), getText(data), null, event);
+        return true;
+    },
     drop(wg, event) {
         let data = event.dataTransfer;
         if (!data || wg.state.readOnly)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.6.2-beta11",
+  "version": "0.6.2-beta12",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",