lexxy 0.1.17.beta → 0.1.19.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4110accda8b3076f07bc48ae4d079733e7972198cd2b8c6801073b99a2af27a1
-  data.tar.gz: b3a5df5347125312a746dbc4d1a2ad961f642cd1506abcb7610a3eafd70588a9
+  metadata.gz: 0edf37852f38dc8deb59194838075da7752d5a54fa8d56e3d483b640d2afb950
+  data.tar.gz: 61e0232d676d0358fc605e56d494bf981c38ba6586f9901b2eea77d51d5415f4
 SHA512:
-  metadata.gz: c06e2386dcd78237df5381b138511dfe40d23240fb222ce5610e58cd505002a2561f435350f2fd250af0624b6f1fba2a15d5c0a9c554b8f9d3aa78e8435c34c5
-  data.tar.gz: 974cb1bd0ae568f224f006a37d98ba4bcc5a2c4dcd718f91027cbab9b045c6479a939b321fd0704ceecfcd38b76f7095733246efcdb6cb89a827836963d1270e
+  metadata.gz: 8d68a219385971dd5cead807b78144911ab3fc89224d5493cc3706e4ecca0ce2cbf965966ab016c4bfa872c234be5c1d5be9e12fc9e273a561b7324a47f0bb11
+  data.tar.gz: 7f70f60e226d2dc13d29aa754a0b04ad54c784c1d66785a5754848a1cafe0e5f5d7553b727c581637e8c60faba6cd087e2fa18d68bb59d2cf18ebb556df382f9

data/app/assets/javascript/lexxy.js

@@ -5869,6 +5869,10 @@ class ActionTextAttachmentUploadNode extends ActionTextAttachmentNode {
     return new ActionTextAttachmentUploadNode({ ...node }, node.__key)
   }
 
+  static importJSON(serializedNode) {
+    return new ActionTextAttachmentUploadNode({ ...serializedNode })
+  }
+
   constructor({ file, uploadUrl, blobUrlTemplate, editor, progress }, key) {
     super({ contentType: file.type }, key);
     this.file = file;
@@ -5908,6 +5912,17 @@ class ActionTextAttachmentUploadNode extends ActionTextAttachmentNode {
     return { element: img }
   }
 
+  exportJSON() {
+    return {
+      type: "action_text_attachment_upload",
+      version: 1,
+      progress: this.progress,
+      uploadUrl: this.uploadUrl,
+      blobUrlTemplate: this.blobUrlTemplate,
+      ...super.exportJSON()
+    }
+  }
+
   #createDOMForImage() {
     return createElement("img")
   }
@@ -6774,22 +6789,24 @@ class Selection {
     const node = this.nodeAfterCursor;
     if (node instanceof ki) {
       this.#selectInLexical(node);
+      return true
     } else {
       this.#contents.deleteSelectedNodes();
     }
 
-    return true
+    return false
   }
 
   #deletePreviousOrNext() {
     const node = this.nodeBeforeCursor;
     if (node instanceof ki) {
       this.#selectInLexical(node);
+      return true
     } else {
       this.#contents.deleteSelectedNodes();
     }
 
-    return true
+    return false
   }
 
   #getValidSelectionRange() {
@@ -7401,10 +7418,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);
@@ -7634,10 +7651,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);
@@ -7664,16 +7678,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);
@@ -7685,7 +7704,7 @@ class Contents {
     });
   }
 
-  #removeTrailingEmptyParagraphs(elements) {
+  #withoutTrailingEmptyParagraphs(elements) {
     let lastNonEmptyIndex = elements.length - 1;
 
     // Find the last non-empty paragraph
@@ -7709,6 +7728,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();