From be94c69f116ede6bec01373b1a47277256fd2db9 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Wed, 29 Nov 2023 11:38:28 -0600
Subject: [PATCH] make optional props accept T or Option<T>

---
 examples/optional_props.rs           |  6 +++++
 packages/core-macro/src/props/mod.rs | 33 ++++++++--------------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/examples/optional_props.rs b/examples/optional_props.rs
index c5652a2e7..d5cf1e711 100644
--- a/examples/optional_props.rs
+++ b/examples/optional_props.rs
@@ -12,6 +12,12 @@ fn main() {
 
 fn app(cx: Scope) -> Element {
     cx.render(rsx! {
+        Button {
+            a: "asd".to_string(),
+            c: "asd".to_string(),
+            d: Some("asd".to_string()),
+            e: Some("asd".to_string()),
+        }
         Button {
             a: "asd".to_string(),
             c: "asd".to_string(),
diff --git a/packages/core-macro/src/props/mod.rs b/packages/core-macro/src/props/mod.rs
index 6e6c43d66..f8450e36a 100644
--- a/packages/core-macro/src/props/mod.rs
+++ b/packages/core-macro/src/props/mod.rs
@@ -783,31 +783,16 @@ Finally, call `.build()` to create the instance of `{name}`.
                 None => quote!(),
             };
 
-            // NOTE: both auto_into and strip_option affect `arg_type` and `arg_expr`, but the order of
-            // nesting is different so we have to do this little dance.
-            let arg_type = if field.builder_attr.strip_option {
-                field.type_from_inside_option(false).ok_or_else(|| {
-                    Error::new_spanned(
-                        field_type,
-                        "can't `strip_option` - field is not `Option<...>`",
+            let arg_type = field_type;
+            let (arg_type, arg_expr) =
+                if field.builder_attr.auto_into || field.builder_attr.strip_option {
+                    (
+                        quote!(impl ::core::convert::Into<#arg_type>),
+                        quote!(#field_name.into()),
                     )
-                })?
-            } else {
-                field_type
-            };
-            let (arg_type, arg_expr) = if field.builder_attr.auto_into {
-                (
-                    quote!(impl ::core::convert::Into<#arg_type>),
-                    quote!(#field_name.into()),
-                )
-            } else {
-                (quote!(#arg_type), quote!(#field_name))
-            };
-            let arg_expr = if field.builder_attr.strip_option {
-                quote!(Some(#arg_expr))
-            } else {
-                arg_expr
-            };
+                } else {
+                    (quote!(#arg_type), quote!(#field_name))
+                };
 
             let repeated_fields_error_type_name = syn::Ident::new(
                 &format!(