react-email-rails 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d96423ee9be99d650a3ad7d164cbb8aca228ccbcc2b36d1a9be2bac2e06172
-  data.tar.gz: 370303cb64b83fd747009f59291ddf5f4598bd5670651ed89ec23edcf4b1072e
+  metadata.gz: 4755984b895a6aa5f220079065da541f8b8da23dc905095fb5cae48471fb2096
+  data.tar.gz: 66568a9bd36727d453904f765b2eb73b3aff4b8335b59de57d34933f1e4a4b8a
 SHA512:
-  metadata.gz: ccee408e14a4f0b831ae58d19ce6891687b273a9f017e6b97184bdbeef7a79107a4e7ba32b4e5db551c4160e2a85b62509c9c85e1ee53bca394b77857af4e2c9
-  data.tar.gz: 262e70dd3acaf9b6bd0e8d1854649bb4a475634c4b0569c69dd2498f3a8bd9093bc33e89e35fe2c6785315247838122d081e4a26206c73d8d51da97698aa31a3
+  metadata.gz: d5b407fd84acd1a1f162fe412f5d1ee611a0fdd095a2923b2a38ef2c63e366023a513fa26c09453fbbc1c9821c3681bb2838713dfdcf463dd8c767cdc5375b5c
+  data.tar.gz: 81f890f4900c9dae7631073bb68b66941642456fc895a81a3a78620f7e719df506ead6dcf5fddc38ab746182f544054f243f111968839e99e512e1a89eb0fe4b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.1
+
+- Fix `react:` rendering — and the `mailer`/`message` props — being skipped for actions that opt in through a class-level `default react: true` rather than a per-`mail` `react:` option. `mail` now resolves `react` (in any form: `true`, a component string, or a prop hash) from the mailer's `default`, a per-action `react: false` opts back out, and the internal `react`/`props`/`deep_merge` options never leak onto the message as email headers.
+
 ## 0.6.0
 
 - Every `react:` email now receives `mailer` and `message` props, mirroring Action Mailer's `mailer`/`message` ERB view helpers. Rendering now happens after Action Mailer assigns headers, so `message` includes subject, addressing, and default `from`/`reply_to` values. Per-mail and shared props win on conflict, serializers whose `as_json` returns a Hash receive the context, and collection props keep their original shape. The npm package exports matching `Mailer`/`Message` TypeScript types.

data/README.md

@@ -240,6 +240,14 @@ end
 
 Action Mailer's framework assigns, including `params` and `rendered_format`, are excluded from instance props.
 
+To make React the default for every action, set `default react: true` on the mailer (or `ApplicationMailer`). Each `mail` call then renders the inferred component without repeating `react: true`, and a single action can opt back out with `react: false`:
+
+```ruby
+class ApplicationMailer < ActionMailer::Base
+  default react: true
+end
+```
+
 ### Explicit Components
 
 Pass a component name when the mailer action and component path do not line up:

data/lib/react_email_rails/action_mailer.rb

@@ -28,12 +28,15 @@ module ReactEmailRails::ActionMailer
   end
 
   def mail(headers = {}, &block)
-    return super unless headers.is_a?(Hash) && headers.key?(:react)
+    return super unless headers.is_a?(Hash)
+    return super if headers.empty? && @_mail_was_called
 
-    headers = headers.dup
-    react = headers.delete(:react)
-    props = headers.delete(:props) if headers.key?(:props)
-    deep_merge = headers.delete(:deep_merge) if headers.key?(:deep_merge)
+    react = headers.key?(:react) ? headers[:react] : compute_default(self.class.default[:react])
+    return super unless react
+
+    props = headers[:props]
+    deep_merge = headers[:deep_merge]
+    headers = headers.except(:react, :props, :deep_merge)
 
     component, resolved_props = ReactEmailRails::PropsResolver.new(self).resolve(react, props)
     resolved_props = ReactEmailRails::SharedProps.new(self).merge_into(
@@ -53,6 +56,10 @@ module ReactEmailRails::ActionMailer
 
   private
 
+  def assign_headers_to_message(message, headers)
+    super(message, headers.except(:react, :props, :deep_merge))
+  end
+
   def react_email_render(component, props)
     props = ReactEmailRails::MailerContext.new(self).merge_into(props)
     render_options = ReactEmailRails.configuration.resolve_render_options(self)

data/lib/react_email_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactEmailRails
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-email-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Supertape