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

package/dist/doc.d.ts

@@ -2049,7 +2049,7 @@ declare class ChangeSet {
     */
     pad(before: number, after: number): ChangeSet;
     /**
-    Clip the set to only a sub-region. This can fail, if there are
+    Clip the set to only a sub-region. This can fail if there are
     replacements across the region's sides, in which case the
     method returns null
     */

package/dist/doc.js

@@ -2364,13 +2364,12 @@ class ChangeSet {
         for (let i = 0, pos = 0; i < this.sections.length && pos <= to;) {
             let value = this.data[i >> 1], len = this.sections[i++], ins = this.sections[i++];
             let end = pos + len;
-            if (ins > 0) {
-                if (pos >= from && end <= to)
-                    addSection(sections, data, end - pos, ins, value);
-                else if (end > from && pos < from)
-                    return null;
+            if (pos >= from && end <= to) {
+                addSection(sections, data, len, ins, value);
             }
-            else if (pos < to && end > from) {
+            else if (end > from && pos < to) {
+                if (ins >= 0)
+                    return null;
                 addSection(sections, data, Math.min(end, to) - Math.max(pos, from), ins, value);
             }
             pos = end;

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;
@@ -2999,6 +2988,7 @@ const baseStyles = /*@__PURE__*/buildTheme("." + styleID, {
     ".wg-buffer": {
         verticalAlign: "bottom",
         height: "1em",
+        display: "inline"
     },
     ".wg-blockBuffer": {
         position: "absolute"
@@ -3904,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) {
@@ -3968,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) {
@@ -3997,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;
@@ -4109,6 +4097,8 @@ class InputState {
     }
     clearComposition() {
         let comp = this.composing;
+        if (!comp)
+            return false;
         this.composing = null;
         this.compositionPendingKey = true;
         this.compositionEndedAt = Date.now();
@@ -4195,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 },
@@ -4547,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)
@@ -7417,6 +7421,7 @@ const theme = /*@__PURE__*/Wordgard.styles({
         fill: "currentColor",
         width: "var(--wg-menu-item-size)",
         height: "var(--wg-menu-item-size)",
+        display: "inline-block"
     },
     "wg-menu-spacer": {
         display: "block",

package/dist/schema.js

@@ -809,7 +809,7 @@ function figure(conf = {}) {
 function imageResizing() {
     return [GardState.schemaElement.of(ImageSize), imageResizing.keyBindings, imageResizing.dragHandle];
 }
-const resizeTheme = /*@__PURE__*/Wordgard.theme({
+const resizeStyle = /*@__PURE__*/Wordgard.styles({
     ".wg-resize-hover": {
         display: "inline-block",
         lineHeight: "0.1",
@@ -939,7 +939,7 @@ const resizeHandlers = /*@__PURE__*/(() => [
         GardState.prec.high(resizeHandlers),
         resizeState,
         Decoration.Point.source.of(s => s.field(resizeState).deco),
-        resizeTheme
+        resizeStyle
     ];
 ;return imageResizing})(imageResizing);
 ;image = /*@__PURE__*/(function (image) {

package/dist/set.js

@@ -137,6 +137,7 @@ let SetBuilder$1 = class SetBuilder {
     spilled = null;
     lastTo = -1;
     lastFrom = -1;
+    closed = false;
     get next() {
         return this.spilled || (this.spilled = new SetBuilder());
     }
@@ -147,6 +148,7 @@ let SetBuilder$1 = class SetBuilder {
         else {
             this.chunks.push(chunk);
             this.lastTo = chunk.end;
+            this.closed = true;
         }
     }
     add(source, pre) {
@@ -172,13 +174,14 @@ let SetBuilder$1 = class SetBuilder {
     }
     addInner(value, from, to) {
         let chunk;
-        if (this.chunks.length) {
+        if (this.chunks.length && !this.closed) {
             chunk = this.chunks[this.chunks.length - 1];
             if (chunk.value.length >= 512)
                 chunk = undefined;
         }
         if (!chunk) {
             this.chunks.push(chunk = new Chunk$1(from, [], [], []));
+            this.closed = false;
         }
         chunk.from.push(from - chunk.start);
         chunk.to.push(to - chunk.start);
@@ -470,10 +473,12 @@ class SetBuilder {
     chunks = [];
     lastPos = -1;
     lastSide = -1;
+    closed = false;
     addChunk(chunk) {
         this.chunks.push(chunk);
         this.lastPos = chunk.end;
         this.lastSide = chunk.endSide;
+        this.closed = true;
     }
     add(source, pre) {
         if (typeof source != "function") {
@@ -491,13 +496,15 @@ class SetBuilder {
     }
     addPoint(value, pos) {
         let chunk;
-        if (this.chunks.length) {
+        let wasClosed = this.closed;
+        if (this.chunks.length && !wasClosed) {
             chunk = this.chunks[this.chunks.length - 1];
             if (chunk.value.length >= 512)
                 chunk = undefined;
         }
         if (!chunk) {
             this.chunks.push(chunk = new Chunk(pos, [], []));
+            this.closed = false;
         }
         chunk.pos.push(pos - chunk.start);
         chunk.value.push(value);
@@ -512,6 +519,8 @@ class SetBuilder {
                     if (!chunkI)
                         break;
                     nextChunk = this.chunks[--chunkI];
+                    if (wasClosed)
+                        nextChunk = this.chunks[chunkI] = new Chunk(nextChunk.start, nextChunk.pos.slice(), nextChunk.value.slice());
                     nextI = nextChunk.value.length - 1;
                 }
                 if ((pos - nextChunk.pos[nextI] || value.side - nextChunk.value[nextI].side) >= 0)

package/package.json

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