Skip to content

Fix default with optional props #4995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkelleyrtp merged 2 commits into from
Nov 19, 2025
Merged

Fix default with optional props #4995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceda5aa
fix default with optional props
ealmloff Nov 19, 2025
21b11a9
fix core macro tests
ealmloff Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/core-macro/src/props/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,10 @@ mod field_info {
|| !builder_attr.ignore_option && type_from_inside_option(&field.ty).is_some();
if !builder_attr.strip_option && strip_option_auto {
builder_attr.strip_option = true;
builder_attr.default = Some(
syn::parse(quote!(::core::default::Default::default()).into()).unwrap(),
);
// only change the default if it isn't manually set above
builder_attr.default.get_or_insert_with(|| {
syn::parse(quote!(::core::default::Default::default()).into()).unwrap()
});
}

Ok(FieldInfo {
Expand Down
4 changes: 2 additions & 2 deletions packages/core-macro/tests/rsx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ mod test_default_into {
pub str_default: String,

// Test options
#[props(into, default = Some("abc"))]
#[props(into, default = Some("abc".into()))]
pub opt_into_w_default_val: Option<String>,

#[props(into, default)]
pub opt_into_w_default: Option<String>,

#[props(default = Some("abc"))]
#[props(default = Some("abc".into()))]
pub opt_default: Option<String>,

// Test no default
Expand Down
Loading