lexxy 0.9.15.alpha.1 → 0.9.15.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d9a254f888998ed62a3d7af0cbf6644a0b82fde3ca02d0eefc604c512e12ba9
-  data.tar.gz: b0d14ac32727c31eaf0709f16f178ad1056d38e30959141ef3e8b2cbb3f170fe
+  metadata.gz: 86b63d9156e8846e2eaab83979bf9fc696eb37743e560cbe590f8d91f7448bd7
+  data.tar.gz: 375a9d775564689646650622857495a59239d65c2e1b6fd48e861f74abddcd84
 SHA512:
-  metadata.gz: 3964a7317fdaf7ac44d2c31f546e073a13942bd3a3839be20f9a32a6159e4bc0daf7db35579a21fba551caaa4f136435be392ef70e99c3461eb40ccf3dfdb6c2
-  data.tar.gz: f3ea71f58d2a94b6226f9c0e4ace4b08f3ab0fb3d08eaff38159c38f736667661db6e60b0918d3e69a9563c89b244c1d8d3d5b052f8e7f0ea2da298d6011dc1d
+  metadata.gz: fff91b9c87fcabab97ae5375233a3819f5aa7097c913df32dea9dd914952451f889cb29c98888c1d6173c67ba3ae67732422952afc13812af25c81bec66e1afe
+  data.tar.gz: bbde40f03c4a7e950e99d0ac2e018b7e1c8251e0a53246bcffdde5a7141117ed860f9b22f2b75fb242a58ed8dbafe0992e24badb07d167028ac6925f1e03896a

data/app/assets/javascript/lexxy.js

@@ -8244,6 +8244,11 @@ function safeCloneEditorState(editorState) {
   return clone
 }
 
+const INITIAL_PREVIEW_POLL_DELAY_MS = 3000;
+const MAX_PREVIEW_POLL_DELAY_MS = 120000;
+const MAX_PREVIEW_POLL_ATTEMPTS = 20;
+
+
 class ActionTextAttachmentNode extends Ji {
   static getType() {
     return "action_text_attachment"
@@ -8318,7 +8323,7 @@ class ActionTextAttachmentNode extends Ji {
     return Lexxy.global.get("attachmentTagName")
   }
 
-  constructor({ tagName, sgid, src, previewSrc, previewable, pendingPreview, altText, caption, contentType, fileName, fileSize, width, height, uploadError }, key) {
+  constructor({ tagName, sgid, src, previewSrc, previewable, previewStatusUrl, pendingPreview, altText, caption, contentType, fileName, fileSize, width, height, uploadError }, key) {
     super(key);
 
     this.tagName = tagName || ActionTextAttachmentNode.TAG_NAME;
@@ -8326,6 +8331,7 @@ class ActionTextAttachmentNode extends Ji {
     this.src = src;
     this.previewSrc = previewSrc;
     this.previewable = parseBoolean(previewable);
+    this.previewStatusUrl = previewStatusUrl;
     this.pendingPreview = pendingPreview;
     this.altText = altText || "";
     this.caption = caption || "";
@@ -8404,6 +8410,8 @@ class ActionTextAttachmentNode extends Ji {
       sgid: this.sgid,
       src: this.src,
       previewable: this.previewable,
+      previewStatusUrl: this.previewStatusUrl,
+      pendingPreview: this.pendingPreview,
       altText: this.altText,
       caption: this.caption,
       contentType: this.contentType,
@@ -8522,41 +8530,61 @@ class ActionTextAttachmentNode extends Ji {
     });
   }
 
+  // While the file-icon is shown, watch for the preview to become ready.
+  // With a status URL, poll it (2xx = processing, anything else = ready).
+  // Without one, preload the preview URL once and swap on load.
   #pollForPreview(figure) {
+    if (this.previewStatusUrl) {
+      this.#waitForPreviewByPollingStatus(figure);
+    } else {
+      this.#waitForPreviewByPreloadingImage(figure);
+    }
+  }
+
+  #waitForPreviewByPollingStatus(figure) {
     let attempt = 0;
-    const maxAttempts = 10;
 
-    const tryLoad = () => {
+    const tryStatus = async () => {
       if (!this.editor.read(() => this.isAttached())) return
 
-      const img = new Image();
-      const cacheBustedSrc = `${this.src}${this.src.includes("?") ? "&" : "?"}_=${Date.now()}`;
+      try {
+        // redirect: "manual" prevents fetch from transparently following a
+        // 3xx response — without it, a status endpoint that redirected to,
+        // say, the preview URL would resolve to a 200 and look like
+        // "still processing." The contract is "any non-2xx means done."
+        const response = await fetch(this.previewStatusUrl, { credentials: "include", redirect: "manual" });
 
-      img.onload = () => {
         if (!this.editor.read(() => this.isAttached())) return
 
-        // The placeholder is a file-type icon SVG (86×100). A real thumbnail
-        // generated from PDF/video content is significantly larger.
-        if (img.naturalWidth > 150 && img.naturalHeight > 150) {
-          this.#swapToPreviewDOM(figure, cacheBustedSrc);
-        } else {
+        if (response.ok) {
           retry();
+        } else {
+          this.#swapToPreviewDOM(figure, this.src);
         }
-      };
-      img.onerror = () => retry();
-      img.src = cacheBustedSrc;
+      } catch {
+        retry();
+      }
     };
 
     const retry = () => {
       attempt++;
-      if (attempt < maxAttempts && this.editor.read(() => this.isAttached())) {
-        const delay = Math.min(2000 * Math.pow(1.5, attempt), 15000);
-        setTimeout(tryLoad, delay);
+      if (attempt < MAX_PREVIEW_POLL_ATTEMPTS && this.editor.read(() => this.isAttached())) {
+        const delay = Math.min(2000 * Math.pow(1.5, attempt), MAX_PREVIEW_POLL_DELAY_MS);
+        setTimeout(tryStatus, delay);
       }
     };
 
     // Give the server time to start processing before the first attempt
-    setTimeout(tryLoad, 3000);
+    setTimeout(tryStatus, INITIAL_PREVIEW_POLL_DELAY_MS);
+  }
+
+  #waitForPreviewByPreloadingImage(figure) {
+    const img = new Image();
+    img.onload = () => {
+      if (!this.editor.read(() => this.isAttached())) return
+      this.#swapToPreviewDOM(figure, this.src);
+    };
+    img.src = this.src;
   }
 
   #swapToPreviewDOM(figure, previewSrc) {
@@ -11185,7 +11213,7 @@ class ImageGalleryNode extends Bi {
   replaceWithSingularChild() {
     if (this.#hasSingularChild) {
       const child = this.getFirstChild();
-      return this.replace(child)
+      return this.replace($makeSafeForRoot(child))
     }
   }
 
@@ -11613,6 +11641,7 @@ class AttachmentNodeConversion {
       fileName: blob.filename,
       fileSize: blob.byte_size,
       previewable: blob.previewable,
+      previewStatusUrl: blob.preview_status_url
     }
   }
 
@@ -15264,7 +15293,7 @@ class LexicalPromptElement extends HTMLElement {
 
     const popoverRect = this.popoverElement.getBoundingClientRect();
 
-    if (popoverRect.right > window.innerWidth) {
+    if (popoverRect.right > editorRect.right) {
       this.popoverElement.toggleAttribute("data-clipped-at-right", true);
     }