actiontext 7.2.2.1 → 8.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae880abbc66a8b853cce05dc41d2962a78d7ce409fb7329a58f39bb1621cf4b2
-  data.tar.gz: 0eed3fd02e87093e9520e90577fe1fd560e0ef7da9eaa7ccb1e49751d50362ba
+  metadata.gz: 47681928e4eb5de7fb4d7958ec7071174c8671e9750049693f8bc6a4742d90be
+  data.tar.gz: 162c998b362b84e68c0a404014c227a04925c3554de18ad66563dd3b00759040
 SHA512:
-  metadata.gz: 9d2628de4f89b6f688536e657b1e89d058ae119b5c4f253b836cf51b96a35949bccc673e9a86f9e1dbc35013d66651534e1bb94460ce7374b88ef6575f22d5fa
-  data.tar.gz: ad9de254ed7ab1ceb550c44fbae23a594e2abbcaf3533460eb9ecb0544eda5024c6f7c7d3d576c13511bfc11ada6b69f5a75bbf3e1c31cd6afcb1d6121733977
+  metadata.gz: 13900860666132a1931d50ce22c8cb65f5a39f09a65f7fcc893aece5c55b292d7c7c63735450da6181d3736944e1ce4610cb2407a24e6740991ddf0c30f2a3fe
+  data.tar.gz: 02ed293526d7691e072e5f8711e8fd69dabcf6c7aaa3dcaf01d07c29d09d43629acf60f6aa65d22a67727a1f5622ef4c3cfbc8bc69108cd8240fcbb1c960d9d8

data/CHANGELOG.md

@@ -1,85 +1,44 @@
-## Rails 7.2.2.1 (December 10, 2024) ##
+## Rails 8.0.0.beta1 (September 26, 2024) ##
 
-*   Update vendored trix version to 2.1.10
+*   Dispatch direct-upload events on attachment uploads
 
-    *John Hawthorn*
+    When using Action Text's rich textarea,  it's possible to attach files to the
+    editor. Previously, that action didn't dispatch any events, which made it hard
+    to react to the file uploads. For instance, if an upload failed, there was no
+    way to notify the user about it, or remove the attachment from the editor.
 
+    This commits adds new events - `direct-upload:start`, `direct-upload:progress`,
+    and `direct-upload:end` - similar to how Active Storage's direct uploads work.
 
-## Rails 7.2.2 (October 30, 2024) ##
+    *Matheus Richard*, *Brad Rees*
 
-*   No changes.
+*   Add `store_if_blank` option to `has_rich_text`
 
+    Pass `store_if_blank: false` to not create `ActionText::RichText` records when saving with a blank attribute, such as from an optional form parameter.
 
-## Rails 7.2.1.2 (October 23, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.2.1.1 (October 15, 2024) ##
-
-*   Avoid backtracing in plain_text_for_blockquote_node
-
-    [CVE-2024-47888]
+    ```ruby
+    class Message
+      has_rich_text :content, store_if_blank: false
+    end
 
-    *John Hawthorn*
+    Message.create(content: "hi") # creates an ActionText::RichText
+    Message.create(content: "") # does not create an ActionText::RichText
+    ```
 
-## Rails 7.2.1 (August 22, 2024) ##
+    *Alex Ghiculescu*
 
 *   Strip `content` attribute if the key is present but the value is empty
 
     *Jeremy Green*
 
+*   Rename `rich_text_area` methods into `rich_textarea`
 
-## Rails 7.2.0 (August 09, 2024) ##
-*   Only sanitize `content` attribute when present in attachments.
-
-    *Petrik de Heus*
-
-*   Sanitize ActionText HTML ContentAttachment in Trix edit view
-    [CVE-2024-32464]
-
-    *Aaron Patterson*, *Zack Deveau*
-
-*   Use `includes` instead of `eager_load` for `with_all_rich_text`.
-
-    *Petrik de Heus*
-
-*   Delegate `ActionText::Content#deconstruct` to `Nokogiri::XML::DocumentFragment#elements`.
-
-    ```ruby
-    content = ActionText::Content.new <<~HTML
-      <h1>Hello, world</h1>
-
-      <div>The body</div>
-    HTML
-
-    content => [h1, div]
-
-    assert_pattern { h1 => { content: "Hello, world" } }
-    assert_pattern { div => { content: "The body" } }
-    ```
+    Old names are still available as aliases.
 
     *Sean Doyle*
 
-*   Fix all Action Text database related models to respect
-    `ActiveRecord::Base.table_name_prefix` configuration.
-
-    *Chedli Bourguiba*
-
-*   Compile ESM package that can be used directly in the browser as actiontext.esm.js
-
-    *Matias Grunberg*
-
-*   Fix using actiontext.js with Sprockets.
-
-    *Matias Grunberg*
-
-*   Upgrade Trix to 2.0.7
-
-    *Hartley McGuire*
-
-*   Fix using Trix with Sprockets.
+*   Only sanitize `content` attribute when present in attachments.
 
-    *Hartley McGuire*
+    *Petrik de Heus*
 
-Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/actiontext/CHANGELOG.md) for previous changes.
+Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/actiontext/CHANGELOG.md) for previous changes.

data/app/assets/javascripts/actiontext.esm.js

@@ -853,25 +853,47 @@ class AttachmentUpload {
   }
   start() {
     this.directUpload.create(this.directUploadDidComplete.bind(this));
+    this.dispatch("start");
   }
   directUploadWillStoreFileWithXHR(xhr) {
     xhr.upload.addEventListener("progress", (event => {
       const progress = event.loaded / event.total * 100;
       this.attachment.setUploadProgress(progress);
+      if (progress) {
+        this.dispatch("progress", {
+          progress: progress
+        });
+      }
     }));
   }
   directUploadDidComplete(error, attributes) {
     if (error) {
-      throw new Error(`Direct upload failed: ${error}`);
+      this.dispatchError(error);
+    } else {
+      this.attachment.setAttributes({
+        sgid: attributes.attachable_sgid,
+        url: this.createBlobUrl(attributes.signed_id, attributes.filename)
+      });
+      this.dispatch("end");
     }
-    this.attachment.setAttributes({
-      sgid: attributes.attachable_sgid,
-      url: this.createBlobUrl(attributes.signed_id, attributes.filename)
-    });
   }
   createBlobUrl(signedId, filename) {
     return this.blobUrlTemplate.replace(":signed_id", signedId).replace(":filename", encodeURIComponent(filename));
   }
+  dispatch(name, detail = {}) {
+    detail.attachment = this.attachment;
+    return dispatchEvent(this.element, `direct-upload:${name}`, {
+      detail: detail
+    });
+  }
+  dispatchError(error) {
+    const event = this.dispatch("error", {
+      error: error
+    });
+    if (!event.defaultPrevented) {
+      alert(error);
+    }
+  }
   get directUploadUrl() {
     return this.element.dataset.directUploadUrl;
   }

data/app/assets/javascripts/actiontext.js

@@ -826,25 +826,47 @@
     }
     start() {
       this.directUpload.create(this.directUploadDidComplete.bind(this));
+      this.dispatch("start");
     }
     directUploadWillStoreFileWithXHR(xhr) {
       xhr.upload.addEventListener("progress", (event => {
         const progress = event.loaded / event.total * 100;
         this.attachment.setUploadProgress(progress);
+        if (progress) {
+          this.dispatch("progress", {
+            progress: progress
+          });
+        }
       }));
     }
     directUploadDidComplete(error, attributes) {
       if (error) {
-        throw new Error(`Direct upload failed: ${error}`);
+        this.dispatchError(error);
+      } else {
+        this.attachment.setAttributes({
+          sgid: attributes.attachable_sgid,
+          url: this.createBlobUrl(attributes.signed_id, attributes.filename)
+        });
+        this.dispatch("end");
       }
-      this.attachment.setAttributes({
-        sgid: attributes.attachable_sgid,
-        url: this.createBlobUrl(attributes.signed_id, attributes.filename)
-      });
     }
     createBlobUrl(signedId, filename) {
       return this.blobUrlTemplate.replace(":signed_id", signedId).replace(":filename", encodeURIComponent(filename));
     }
+    dispatch(name, detail = {}) {
+      detail.attachment = this.attachment;
+      return dispatchEvent(this.element, `direct-upload:${name}`, {
+        detail: detail
+      });
+    }
+    dispatchError(error) {
+      const event = this.dispatch("error", {
+        error: error
+      });
+      if (!event.defaultPrevented) {
+        alert(error);
+      }
+    }
     get directUploadUrl() {
       return this.element.dataset.directUploadUrl;
     }