From 3f15612c8edaf8b112c831675c7a3b7a88060007 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Thu, 11 Jan 2024 17:30:50 -0800
Subject: [PATCH] Fix remaining issues to get desktop running

---
 packages/core-macro/src/props/mod.rs | 4 ++--
 packages/rsx/src/component.rs        | 4 ++--
 packages/rsx/src/node.rs             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core-macro/src/props/mod.rs b/packages/core-macro/src/props/mod.rs
index bd6816070..59358fb9c 100644
--- a/packages/core-macro/src/props/mod.rs
+++ b/packages/core-macro/src/props/mod.rs
@@ -40,7 +40,7 @@ pub fn impl_my_derive(ast: &syn::DeriveInput) -> Result<TokenStream, Error> {
                     #builder_creation
                     #conversion_helper
                     #( #fields )*
-                    #( #extends )*
+                    // #( #extends )*
                     #( #required_fields )*
                     #build_method
                 }
@@ -703,7 +703,7 @@ Finally, call `.build()` to create the instance of `{name}`.
                 impl #impl_generics #name #ty_generics #where_clause {
                     #[doc = #builder_method_doc]
                     #[allow(dead_code, clippy::type_complexity)]
-                    #vis fn builder(_cx: & #extend_lifetime ::dioxus::prelude::ScopeState) -> #builder_name #generics_with_empty {
+                    #vis fn builder() -> #builder_name #generics_with_empty {
                         #builder_name {
                             fields: #empties_tuple,
                             _phantom: ::core::default::Default::default(),
diff --git a/packages/rsx/src/component.rs b/packages/rsx/src/component.rs
index 31091c113..8870a8822 100644
--- a/packages/rsx/src/component.rs
+++ b/packages/rsx/src/component.rs
@@ -163,8 +163,8 @@ impl Component {
         let name = &self.name;
 
         let mut toks = match &self.prop_gen_args {
-            Some(gen_args) => quote! { fc_to_builder(__cx, #name #gen_args) },
-            None => quote! { fc_to_builder(__cx, #name) },
+            Some(gen_args) => quote! { fc_to_builder(#name #gen_args) },
+            None => quote! { fc_to_builder(#name) },
         };
         for field in &self.fields {
             match field.name.to_string().as_str() {
diff --git a/packages/rsx/src/node.rs b/packages/rsx/src/node.rs
index a85b727dc..4da5c8e1a 100644
--- a/packages/rsx/src/node.rs
+++ b/packages/rsx/src/node.rs
@@ -213,7 +213,7 @@ impl ToTokens for BodyNode {
 
                 tokens.append_all(quote! {
                     {
-                        let ___nodes = (#body).into_dyn_node(__cx);
+                        let ___nodes = (#body).into_dyn_node();
                         ___nodes
                     }
                 });