@37signals/lexxy 1.0.0 → 1.0.1

package/dist/lexxy.esm.js

@@ -2474,14 +2474,14 @@ function extendTextNodeConversion(conversionName, ...callbacks) {
     ...conversionOutput,
     forChild: (lexicalNode, parentNode) => {
       const originalForChild = conversionOutput?.forChild ?? (x => x);
-      let childNode = originalForChild(lexicalNode, parentNode);
-
+      const childNode = originalForChild(lexicalNode, parentNode);
 
       if ($isTextNode(childNode)) {
-        childNode = callbacks.reduce(
+        return callbacks.reduce(
           (childNode, callback) => callback(childNode, element) ?? childNode,
           childNode
-        );
+        )
+      } else {
         return childNode
       }
     }
@@ -6844,6 +6844,7 @@ class PastedContentFormatter {
   format() {
     this.#inlinePreservableStyles();
     this.#stripStyleElements();
+    this.#stripInterchangeNewlines();
     this.#unwrapPlaceholderAnchors();
     this.#stripTableCellColorStyles();
     new OfficeFormatter(this.doc).format();
@@ -6879,6 +6880,35 @@ class PastedContentFormatter {
     }
   }
 
+  // Chrome and Safari append <br class="Apple-interchange-newline"> when the
+  // copied selection ends at a line end (Google Docs does this on every copy).
+  // It marks the end of the selection, not a line the author wrote, so left in
+  // place it pastes as an extra empty paragraph. Only the trailing marker goes:
+  // one at the start of the fragment is a real line boundary.
+  #stripInterchangeNewlines() {
+    for (const br of this.doc.querySelectorAll("br.Apple-interchange-newline")) {
+      if (this.#isAtEndOfBody(br)) {
+        br.remove();
+      }
+    }
+  }
+
+  #isAtEndOfBody(node) {
+    for (let current = node; current && current !== this.doc.body; current = current.parentNode) {
+      for (let sibling = current.nextSibling; sibling; sibling = sibling.nextSibling) {
+        if (!this.#isIgnorableTrailingNode(sibling)) return false
+      }
+    }
+    return true
+  }
+
+  #isIgnorableTrailingNode(node) {
+    if (node.nodeType === Node.COMMENT_NODE) {
+      return true
+    }
+    return node.nodeType === Node.TEXT_NODE && node.textContent.trim() === ""
+  }
+
   // Anchors with non-meaningful hrefs (e.g. "#", "") appear in content copied
   // from rendered views where mentions and interactive elements are wrapped in
   // <a href="#"> tags. Unwrap them so their text content pastes as plain text
@@ -8654,7 +8684,7 @@ class TrixContentExtension extends LexxyExtension {
             priority: 1
           }),
           span: (element) => onlyStyledElements(element, {
-            conversion: extendTextNodeConversion("mark", $applyHighlightStyle),
+            conversion: extendTextNodeConversion("span", $applyHighlightStyle),
             priority: 1
           }),
           strong: (element) => onlyStyledElements(element, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@37signals/lexxy",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Lexxy - A modern rich text editor for Rails.",
   "module": "dist/lexxy.esm.js",
   "type": "module",