@37signals/lexxy 0.1.16-beta → 0.1.18-beta

package/dist/lexxy.esm.js

@@ -1,9 +1,9 @@
 import DOMPurify from 'dompurify';
-import { $getSelection, $isRangeSelection, DecoratorNode, $getNodeByKey, HISTORY_MERGE_TAG, FORMAT_TEXT_COMMAND, UNDO_COMMAND, REDO_COMMAND, PASTE_COMMAND, COMMAND_PRIORITY_LOW, $isNodeSelection, $getRoot, $isLineBreakNode, $isTextNode, $isElementNode, KEY_ARROW_LEFT_COMMAND, KEY_ARROW_RIGHT_COMMAND, KEY_ARROW_UP_COMMAND, KEY_ARROW_DOWN_COMMAND, KEY_DELETE_COMMAND, KEY_BACKSPACE_COMMAND, SELECTION_CHANGE_COMMAND, $createNodeSelection, $setSelection, $createParagraphNode, $createTextNode, KEY_ENTER_COMMAND, COMMAND_PRIORITY_HIGH, $isParagraphNode, $insertNodes, $createLineBreakNode, CLEAR_HISTORY_COMMAND, $addUpdateTag, SKIP_DOM_SELECTION_TAG, createEditor, COMMAND_PRIORITY_NORMAL, KEY_TAB_COMMAND, KEY_SPACE_COMMAND } from 'lexical';
+import { $getSelection, $isRangeSelection, DecoratorNode, $getNodeByKey, HISTORY_MERGE_TAG, FORMAT_TEXT_COMMAND, $createTextNode, UNDO_COMMAND, REDO_COMMAND, PASTE_COMMAND, COMMAND_PRIORITY_LOW, $isNodeSelection, $getRoot, $isLineBreakNode, $isTextNode, $isElementNode, KEY_ARROW_LEFT_COMMAND, KEY_ARROW_RIGHT_COMMAND, KEY_ARROW_UP_COMMAND, KEY_ARROW_DOWN_COMMAND, KEY_DELETE_COMMAND, KEY_BACKSPACE_COMMAND, SELECTION_CHANGE_COMMAND, $createNodeSelection, $setSelection, $createParagraphNode, KEY_ENTER_COMMAND, COMMAND_PRIORITY_HIGH, $isParagraphNode, $insertNodes, $createLineBreakNode, CLEAR_HISTORY_COMMAND, $addUpdateTag, SKIP_DOM_SELECTION_TAG, createEditor, COMMAND_PRIORITY_NORMAL, KEY_TAB_COMMAND, KEY_SPACE_COMMAND } from 'lexical';
 import { $isListNode, $isListItemNode, INSERT_UNORDERED_LIST_COMMAND, INSERT_ORDERED_LIST_COMMAND, $createListNode, ListNode, ListItemNode, registerList } from '@lexical/list';
 import { $isQuoteNode, $isHeadingNode, $createQuoteNode, $createHeadingNode, QuoteNode, HeadingNode, registerRichText } from '@lexical/rich-text';
 import { $isCodeNode, CodeNode, CodeHighlightNode, registerCodeHighlighting, CODE_LANGUAGE_FRIENDLY_NAME_MAP, normalizeCodeLang } from '@lexical/code';
-import { $isLinkNode, $toggleLink, $createLinkNode, LinkNode, AutoLinkNode } from '@lexical/link';
+import { $isLinkNode, $createAutoLinkNode, $toggleLink, $createLinkNode, LinkNode, AutoLinkNode } from '@lexical/link';
 import { $generateNodesFromDOM, $generateHtmlFromNodes } from '@lexical/html';
 import { registerMarkdownShortcuts, TRANSFORMERS } from '@lexical/markdown';
 import { createEmptyHistoryState, registerHistory } from '@lexical/history';
@@ -1019,7 +1019,19 @@ class CommandDispatcher {
   }
 
   dispatchLink(url) {
-    this.#toggleLink(url);
+    this.editor.update(() => {
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) return
+
+      if (selection.isCollapsed()) {
+        const autoLinkNode = $createAutoLinkNode(url);
+        const textNode = $createTextNode(url);
+        autoLinkNode.append(textNode);
+        selection.insertNodes([ autoLinkNode ]);
+      } else {
+        $toggleLink(url);
+      }
+    });
   }
 
   dispatchUnlink() {
@@ -1940,6 +1952,8 @@ class FormatEscaper {
 
     const anchorNode = selection.anchor.getNode();
 
+    if (!this.#isInsideBlockquote(anchorNode)) return false
+
     return this.#handleLists(event, anchorNode)
       || this.#handleBlockquotes(event, anchorNode)
   }
@@ -1964,6 +1978,19 @@ class FormatEscaper {
     return false
   }
 
+  #isInsideBlockquote(node) {
+    let currentNode = node;
+
+    while (currentNode) {
+      if ($isQuoteNode(currentNode)) {
+        return true
+      }
+      currentNode = currentNode.getParent();
+    }
+
+    return false
+  }
+
   #shouldEscapeFromEmptyListItem(node) {
     const listItem = this.#getListItemNode(node);
     if (!listItem) return false
@@ -2261,10 +2288,10 @@ class Contents {
       const selection = $getSelection();
       if (!$isRangeSelection(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);
@@ -2494,10 +2521,7 @@ class Contents {
       const node = $getNodeByKey(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);
@@ -2524,16 +2548,21 @@ class Contents {
       if (!$isRangeSelection(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);
@@ -2545,7 +2574,7 @@ class Contents {
     });
   }
 
-  #removeTrailingEmptyParagraphs(elements) {
+  #withoutTrailingEmptyParagraphs(elements) {
     let lastNonEmptyIndex = elements.length - 1;
 
     // Find the last non-empty paragraph
@@ -2569,6 +2598,16 @@ class Contents {
     return children.length === 0 || children.every(child => $isLineBreakNode(child))
   }
 
+  #removeStandaloneEmptyParagraph() {
+    const root = $getRoot();
+    if (root.getChildrenSize() === 1) {
+      const firstChild = root.getFirstChild();
+      if (firstChild && $isParagraphNode(firstChild) && this.#isElementEmpty(firstChild)) {
+        firstChild.remove();
+      }
+    }
+  }
+
   #insertNodeWrappingAllSelectedLines(newNodeFn) {
     this.editor.update(() => {
       const selection = $getSelection();

package/package.json

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