lexxy 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0803aecbfd440c3370e6e56e31d83feb61c5fe7f67b6ed680454a69d72287ef8'
-  data.tar.gz: 29a9e95d82c1cbe491befe7326dc26af484a86a93b8f92426d9a26686d5659aa
+  metadata.gz: 2e36cf0fe5dbfc145f5f63cb4a247a79e95875a95907b8fba0c407b1ee506d9d
+  data.tar.gz: cd060894313224a0ef74a0ea4789230d691b4702f21a49a74bf4903d831c137e
 SHA512:
-  metadata.gz: 8c1dfe3472300ad2486becf99e635797c9ca1908d51ea6357ca2257abff223c1525cbab325c089a48e673055d8ba6d069e844a84abb7ca6d191f57bca81174a9
-  data.tar.gz: 482aea181eb387c79c29052b606dd6c05f42b4140197ce7d0159e7f8974c500c31a423f7c1d7b142abd823c18b40e9ce3af8df1f502ae37ad14404c443bd4e60
+  metadata.gz: 7c19cd19e51116f1a3f8fa648f6eb1aa8a11c0ca5fa286959138509d84ad1bc99cdfee587da48cc00eb290c52765e6672dddf46e16c4489b5c7e2e3cb6c1c488
+  data.tar.gz: e039e4e728b66a0698207463c44e7a21bcf13bdfd45f8aef9621726e5d6d1d8534a81604b342b51ec39361f0e4e3577e2f4500ac0d6d4443d1440a4dbd72ea31

data/app/assets/javascript/lexxy.js

@@ -10103,14 +10103,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 (Tr(childNode)) {
-        childNode = callbacks.reduce(
+        return callbacks.reduce(
           (childNode, callback) => callback(childNode, element) ?? childNode,
           childNode
-        );
+        )
+      } else {
         return childNode
       }
     }
@@ -14523,6 +14523,7 @@ class PastedContentFormatter {
   format() {
     this.#inlinePreservableStyles();
     this.#stripStyleElements();
+    this.#stripInterchangeNewlines();
     this.#unwrapPlaceholderAnchors();
     this.#stripTableCellColorStyles();
     new OfficeFormatter(this.doc).format();
@@ -14558,6 +14559,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
@@ -16405,7 +16435,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, {