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

package/dist/lexxy.esm.js

@@ -2288,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);
@@ -2521,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);
@@ -2551,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);
@@ -2572,7 +2574,7 @@ class Contents {
     });
   }
 
-  #removeTrailingEmptyParagraphs(elements) {
+  #withoutTrailingEmptyParagraphs(elements) {
     let lastNonEmptyIndex = elements.length - 1;
 
     // Find the last non-empty paragraph
@@ -2596,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.17-beta",
+  "version": "0.1.18-beta",
   "description": "Lexxy - A modern rich text editor for Rails.",
   "module": "dist/lexxy.esm.js",
   "type": "module",