lexxy 0.1.16.beta → 0.1.18.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e4b2ba7be7dc40772a5d88716d907113e742771a1ebd83d24e8361823681516
-  data.tar.gz: 3a5533d0ca719b02923597e638968594986c89bc0dcb2284abf835b00c208a24
+  metadata.gz: d349d41ecbbcda9310a94ca35f54b0c888dd484a6edb7728a34c02a1576f0a36
+  data.tar.gz: b806d34fb4fc44969d94f1d625fbb0edf2410ab4eb91c3d71abe66170bc3483b
 SHA512:
-  metadata.gz: 8ee0059a0a1849194bbfe200da4e00a802dd93784b33029d0f9de3cc82a64b6c0b87dfa49de03570bb71259d3cab9a4874c83810d45e92b9f8cbf778086f00ca
-  data.tar.gz: d7508eb4457d066ebaeb3b3e75ff536c1b955bcf361ba9501645d16c47aafad8687758939c18dce86809ef23e91163dd4e729fa30521d0443d5f094d8d6e4dea
+  metadata.gz: 7062ff796823d7218ad93683b81bc215813a9c7844da2d57626da33021fb6c25a4049d8b7f534a28df2f210a7f8ae2f9f19324f542417743556e9955871ab606
+  data.tar.gz: 38049c719a2bce471c97281f034040aaf26fd2c673b0839d9a36f44568405f5200bb2250be665ffba747db2f637f6711390881558ac199fcb0a566bf46d4a640

data/app/assets/javascript/lexxy.js

@@ -6132,7 +6132,19 @@ class CommandDispatcher {
   }
 
   dispatchLink(url) {
-    this.#toggleLink(url);
+    this.editor.update(() => {
+      const selection = Lr();
+      if (!yr(selection)) return
+
+      if (selection.isCollapsed()) {
+        const autoLinkNode = I$1(url);
+        const textNode = sr(url);
+        autoLinkNode.append(textNode);
+        selection.insertNodes([ autoLinkNode ]);
+      } else {
+        J$1(url);
+      }
+    });
   }
 
   dispatchUnlink() {
@@ -7053,6 +7065,8 @@ class FormatEscaper {
 
     const anchorNode = selection.anchor.getNode();
 
+    if (!this.#isInsideBlockquote(anchorNode)) return false
+
     return this.#handleLists(event, anchorNode)
       || this.#handleBlockquotes(event, anchorNode)
   }
@@ -7077,6 +7091,19 @@ class FormatEscaper {
     return false
   }
 
+  #isInsideBlockquote(node) {
+    let currentNode = node;
+
+    while (currentNode) {
+      if (Ot$1(currentNode)) {
+        return true
+      }
+      currentNode = currentNode.getParent();
+    }
+
+    return false
+  }
+
   #shouldEscapeFromEmptyListItem(node) {
     const listItem = this.#getListItemNode(node);
     if (!listItem) return false
@@ -7374,10 +7401,10 @@ class Contents {
       const selection = Lr();
       if (!yr(selection)) return
 
-      const topLevelElement = selection.anchor.getNode().getTopLevelElementOrThrow();
+      const topLevelElement = selection.anchor.getNode().getTopLevelElement();
 
       // Check if format is already applied
-      if (isFormatAppliedFn(topLevelElement)) {
+      if (topLevelElement && isFormatAppliedFn(topLevelElement)) {
         this.#unwrap(topLevelElement);
       } else {
         this.#insertNodeWrappingAllSelectedNodes(newNodeFn);
@@ -7607,10 +7634,7 @@ class Contents {
       const node = xo(nodeKey);
       if (!node) return
 
-      let previousNode = node;
-      try {
-        previousNode = node.getTopLevelElementOrThrow();
-      } catch {}
+      const previousNode = node.getTopLevelElement() || node;
 
       const newNode = options.attachment ? this.#createCustomAttachmentNodeWithHtml(html, options.attachment) : this.#createHtmlNodeWith(html);
       previousNode.insertAfter(newNode);
@@ -7637,16 +7661,21 @@ class Contents {
       if (!yr(selection)) return
 
       const selectedNodes = selection.extract();
-      if (selectedNodes.length === 0) return
-
+      if (selectedNodes.length === 0) {
+        return
+      }
       const topLevelElements = new Set();
       selectedNodes.forEach((node) => {
         const topLevel = node.getTopLevelElementOrThrow();
         topLevelElements.add(topLevel);
       });
 
-      const elements = this.#removeTrailingEmptyParagraphs(Array.from(topLevelElements));
-      if (elements.length === 0) return
+      const elements = this.#withoutTrailingEmptyParagraphs(Array.from(topLevelElements));
+      if (elements.length === 0) {
+        this.#removeStandaloneEmptyParagraph();
+        this.insertAtCursor(newNodeFn());
+        return
+      }
 
       const wrappingNode = newNodeFn();
       elements[0].insertBefore(wrappingNode);
@@ -7658,7 +7687,7 @@ class Contents {
     });
   }
 
-  #removeTrailingEmptyParagraphs(elements) {
+  #withoutTrailingEmptyParagraphs(elements) {
     let lastNonEmptyIndex = elements.length - 1;
 
     // Find the last non-empty paragraph
@@ -7682,6 +7711,16 @@ class Contents {
     return children.length === 0 || children.every(child => jn(child))
   }
 
+  #removeStandaloneEmptyParagraph() {
+    const root = No();
+    if (root.getChildrenSize() === 1) {
+      const firstChild = root.getFirstChild();
+      if (firstChild && Ii(firstChild) && this.#isElementEmpty(firstChild)) {
+        firstChild.remove();
+      }
+    }
+  }
+
   #insertNodeWrappingAllSelectedLines(newNodeFn) {
     this.editor.update(() => {
       const selection = Lr();