From ffeef86e671e039a958b50abe6b9f61e3fdfd794 Mon Sep 17 00:00:00 2001
From: Adolfo Marinucci <adospace@msn.com>
Date: Tue, 2 Jan 2024 23:57:10 +0100
Subject: [PATCH] More fixes and performance improvements

---
 .github/workflows/build-deploy.yml            |    2 +-
 samples/UnitTests/TestScaffoldGenerator.cs    |    9 +
 .../ComponentTypeGenerator.cs                 |   73 +-
 .../ComponentTypeGenerator.tt                 |   14 +-
 .../ComponentPartialClassGenerator.cs         |    2 +-
 .../ComponentPartialClassGenerator.partial.cs |    7 +-
 .../ComponentPartialClassGenerator.tt         |    2 +-
 .../ComponentPartialClassSourceGenerator.cs   |   43 +-
 src/MauiReactor/Component.cs                  |    6 +-
 src/MauiReactor/Component.partial.cs          | 1050 ++++++++++++++++-
 src/MauiReactor/ContentPage.partial.cs        |    2 +-
 src/MauiReactor/Grid.partial.cs               |   11 +-
 .../HorizontalStackLayout.partial.cs          |    4 +-
 src/MauiReactor/Label.partial.cs              |    2 +-
 src/MauiReactor/ScrollView.partial.cs         |    4 +-
 .../VerticalStackLayout.partial.cs            |    4 +-
 16 files changed, 1201 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index bdf101ee..35e362e1 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       Solution_Name: ./src/MauiReactor.Build.sln
       TemplatePack_Name: ./src/MauiReactor.TemplatePack/MauiReactor.TemplatePack.csproj
-      Version: 2.0.13-beta
+      Version: 2.0.14-beta
 
     steps:
     - name: Checkout
diff --git a/samples/UnitTests/TestScaffoldGenerator.cs b/samples/UnitTests/TestScaffoldGenerator.cs
index 70442e5b..f2ee7fde 100644
--- a/samples/UnitTests/TestScaffoldGenerator.cs
+++ b/samples/UnitTests/TestScaffoldGenerator.cs
@@ -54,6 +54,9 @@ partial class MyComponent
             
                 [Prop]
                 Action<int?>? _myProp10;
+
+                [Prop("MyTestMethod")]
+                int _myProp11;
             }            
             """);
 
@@ -106,6 +109,12 @@ public MyComponent MyProp10(Action<int?>? propValue)
                         _myProp10 = propValue;
                         return this;
                     }
+            
+                    public MyComponent MyTestMethod(int propValue)
+                    {
+                        _myProp11 = propValue;
+                        return this;
+                    }
 
                     public MyComponent MyProp2(int? propValue)
                     {
diff --git a/src/MauiReactor.Scaffold/ComponentTypeGenerator.cs b/src/MauiReactor.Scaffold/ComponentTypeGenerator.cs
index 20efa296..f05b07de 100644
--- a/src/MauiReactor.Scaffold/ComponentTypeGenerator.cs
+++ b/src/MauiReactor.Scaffold/ComponentTypeGenerator.cs
@@ -185,9 +185,80 @@ public partial class Component
             
             #line default
             #line hidden
-            this.Write(";\r\n    }\r\n\r\n    ");
+            this.Write(";\r\n    }\r\n    \r\n    ");
             
             #line 48 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+ if (typeof(Element).IsAssignableFrom(type)) { 
+            
+            #line default
+            #line hidden
+            this.Write("    public static ");
+            
+            #line 49 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+            
+            #line default
+            #line hidden
+            this.Write(" ");
+            
+            #line 49 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(type.Name));
+            
+            #line default
+            #line hidden
+            this.Write("(Action<");
+            
+            #line 49 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(type.FullName));
+            
+            #line default
+            #line hidden
+            this.Write("?> componentRefAction, params VisualNode?[]? children)\r\n    {\r\n        var @");
+            
+            #line 51 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(type.Name.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write(" = GetNodeFromPool<");
+            
+            #line 51 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+            
+            #line default
+            #line hidden
+            this.Write(">();\r\n        @");
+            
+            #line 52 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(type.Name.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write(".ComponentRefAction = componentRefAction;\r\n        if (children != null)\r\n       " +
+                    " {\r\n            @");
+            
+            #line 55 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(type.Name.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write(".AddChildren(children);\r\n        }\r\n        return @");
+            
+            #line 57 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(type.Name.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write(";\r\n    }\r\n    ");
+            
+            #line 59 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
+ } 
+            
+            #line default
+            #line hidden
+            this.Write("    ");
+            
+            #line 60 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
  } 
             
             #line default
diff --git a/src/MauiReactor.Scaffold/ComponentTypeGenerator.tt b/src/MauiReactor.Scaffold/ComponentTypeGenerator.tt
index 721f4b6b..40f8ab57 100644
--- a/src/MauiReactor.Scaffold/ComponentTypeGenerator.tt
+++ b/src/MauiReactor.Scaffold/ComponentTypeGenerator.tt
@@ -44,7 +44,19 @@ public partial class Component
         @<#= type.Name.ToLower() #>.ComponentRefAction = componentRefAction;
         return @<#= type.Name.ToLower() #>;
     }
-
+    
+    <# if (typeof(Element).IsAssignableFrom(type)) { #>
+    public static <#= typeName #> <#= type.Name #>(Action<<#= type.FullName #>?> componentRefAction, params VisualNode?[]? children)
+    {
+        var @<#= type.Name.ToLower() #> = GetNodeFromPool<<#= typeName #>>();
+        @<#= type.Name.ToLower() #>.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @<#= type.Name.ToLower() #>.AddChildren(children);
+        }
+        return @<#= type.Name.ToLower() #>;
+    }
+    <# } #>
     <# } #>
 }
 
diff --git a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.cs b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.cs
index 6dcc555e..8b39bc4d 100644
--- a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.cs
+++ b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.cs
@@ -156,7 +156,7 @@ public virtual string TransformText()
             this.Write(" ");
             
             #line 30 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ComponentPartialClassGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(GetPropMethodName(fieldItem.FieldName)));
+            this.Write(this.ToStringHelper.ToStringWithCulture(fieldItem.GetPropMethodName()));
             
             #line default
             #line hidden
diff --git a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.partial.cs b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.partial.cs
index ccf150af..46ec5eb0 100644
--- a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.partial.cs
+++ b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.partial.cs
@@ -24,17 +24,12 @@ public string TransformAndPrettify()
             return $"// <auto-generated />{Environment.NewLine}{ret}";
         }
 
-        private string GetPropMethodName(string fieldName)
-        {
-            fieldName = fieldName.TrimStart('_');
-            fieldName = char.ToUpper(fieldName[0]) + fieldName.Substring(1);
-            return fieldName;
-        }
 
         private IEnumerable<GeneratorFieldItem> GetInjectFields()
         {
             return _classItem.FieldItems.Where(_ => _.Value.Type == FieldAttributeType.Inject).OrderBy(_ => _.Key).Select(_=>_.Value);
         }
+
         private IEnumerable<GeneratorFieldItem> GetPropFields()
         {
             return _classItem.FieldItems.Where(_ => _.Value.Type == FieldAttributeType.Prop).OrderBy(_ => _.Key).Select(_ => _.Value);
diff --git a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.tt b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.tt
index 0701736f..291bcfb2 100644
--- a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.tt
+++ b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassGenerator.tt
@@ -27,7 +27,7 @@ namespace <#= _classItem.Namespace #>
 		<# } #>
 
 		<# foreach (var fieldItem in GetPropFields()) { #>
-		public <#= _classItem.ClassName #> <#= GetPropMethodName(fieldItem.FieldName) #>(<#= fieldItem.FieldTypeFullyQualifiedName #> propValue)
+		public <#= _classItem.ClassName #> <#= fieldItem.GetPropMethodName() #>(<#= fieldItem.FieldTypeFullyQualifiedName #> propValue)
 		{
 			<#= fieldItem.FieldName #> = propValue;
 			return this;
diff --git a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassSourceGenerator.cs b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassSourceGenerator.cs
index 207c1730..8acf9874 100644
--- a/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassSourceGenerator.cs
+++ b/src/MauiReactor.ScaffoldGenerator/ComponentPartialClassSourceGenerator.cs
@@ -20,6 +20,7 @@ public void Initialize(GeneratorInitializationContext context)
     {
         context.RegisterForPostInitialization((i) => i.AddSource("ComponentAttributes.g.cs", @"using System;
 
+#nullable enable
 namespace MauiReactor
 {
     [AttributeUsage(AttributeTargets.Field)]
@@ -33,7 +34,7 @@ public InjectAttribute()
     [AttributeUsage(AttributeTargets.Field)]
     internal class PropAttribute : Attribute
     {
-        public PropAttribute() 
+        public PropAttribute(string? methodName = null) 
         {
         }
     }
@@ -118,15 +119,33 @@ void generateClassItem(FieldDeclarationSyntax fieldDeclaration, FieldAttributeTy
                 generatingClassItems[fullyQualifiedTypeName] = generatingClassItem = new GeneratorClassItem(namespaceName, className);
             }
 
-            foreach (var variableFieldName in fieldDeclaration.Declaration.Variables.Select(_=>_.Identifier.ValueText))
+            foreach (var variableFieldSyntax in fieldDeclaration.Declaration.Variables)
             {
+                var variableFieldName = variableFieldSyntax.Identifier.ValueText;
+
                 if (generatingClassItem.FieldItems.ContainsKey(variableFieldName))
                 {
                     return;
                 }
 
+                string? methodName = null;
+                if (attributeType == FieldAttributeType.Prop)
+                {
+                    if (semanticModel.GetDeclaredSymbol(variableFieldSyntax) 
+                        is IFieldSymbol variableDeclaratorFieldSymbol)
+                    {
+                        var propAttributeData = variableDeclaratorFieldSymbol.GetAttributes()
+                            .FirstOrDefault(_ => _.AttributeClass?.Name == "PropAttribute" || _.AttributeClass?.Name == "Prop");
+
+                        if (propAttributeData?.ConstructorArguments.Length > 0)
+                        {
+                            methodName = propAttributeData.ConstructorArguments[0].Value?.ToString();
+                        }
+                    }
+                }
+
                 generatingClassItem.FieldItems[variableFieldName]
-                    = new GeneratorFieldItem(variableFieldName, fieldTypeFullyQualifiedName, attributeType);
+                    = new GeneratorFieldItem(variableFieldName, fieldTypeFullyQualifiedName, attributeType, methodName);
             }
         }
 
@@ -201,17 +220,33 @@ public GeneratorClassItem(string @namespace, string className)
 
 public class GeneratorFieldItem
 {
-    public GeneratorFieldItem(string fieldName, string fieldTypeFullyQualifiedName, FieldAttributeType type)
+    private readonly string? _propMethodName;
+
+    public GeneratorFieldItem(string fieldName, string fieldTypeFullyQualifiedName, FieldAttributeType type, string? propMethodName)
     {
         FieldName = fieldName;
         FieldTypeFullyQualifiedName = fieldTypeFullyQualifiedName;
         Type = type;
+        _propMethodName = propMethodName;
     }
 
     public string FieldName { get; }
+
     public string FieldTypeFullyQualifiedName { get; }
 
     public FieldAttributeType Type { get; }
+
+    public string GetPropMethodName()
+    {
+        if (_propMethodName != null)
+        {
+            return _propMethodName;
+        }
+
+        var fieldName = FieldName.TrimStart('_');
+        fieldName = char.ToUpper(fieldName[0]) + fieldName.Substring(1);
+        return fieldName;
+    }
 }
 
 public enum FieldAttributeType
diff --git a/src/MauiReactor/Component.cs b/src/MauiReactor/Component.cs
index f7a9aa0e..e44700b0 100644
--- a/src/MauiReactor/Component.cs
+++ b/src/MauiReactor/Component.cs
@@ -276,7 +276,7 @@ object IComponentWithProps.Props
 
         internal override void MergeWith(VisualNode newNode)
         {
-            if (!_derivedProps && newNode is IComponentWithProps newComponentWithProps)
+            if (!_derivedProps && newNode != this && newNode is IComponentWithProps newComponentWithProps)
             {
                 if (newNode.GetType() == GetType())
                 {
@@ -311,7 +311,7 @@ protected Component(S? state = null, P? props = null)
             : base(props)
         {
             _state = state;
-            _derivedState = state != null;
+            _derivedState = state != null;
         }
 
         internal override void Reset()
@@ -458,7 +458,7 @@ protected virtual void SetState(Action<S> action, bool invalidateComponent = tru
 
         internal override void MergeWith(VisualNode newNode)
         {
-            if (!_derivedState && newNode is IComponentWithState newComponentWithState)
+            if (!_derivedState && newNode != this && newNode is IComponentWithState newComponentWithState)
             {
                 _newComponent = newComponentWithState;
                 if (newNode.GetType() == this.GetType())
diff --git a/src/MauiReactor/Component.partial.cs b/src/MauiReactor/Component.partial.cs
index fdef5471..3038457c 100644
--- a/src/MauiReactor/Component.partial.cs
+++ b/src/MauiReactor/Component.partial.cs
@@ -31,6 +31,18 @@ public static ListView ListView(Action<Microsoft.Maui.Controls.ListView?> compon
         return @listview;
     }
 
+    public static ListView ListView(Action<Microsoft.Maui.Controls.ListView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @listview = GetNodeFromPool<ListView>();
+        @listview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @listview.AddChildren(children);
+        }
+
+        return @listview;
+    }
+
     public static TabbedPage TabbedPage() => GetNodeFromPool<TabbedPage>();
     public static TabbedPage TabbedPage(params VisualNode? []? children)
     {
@@ -50,6 +62,18 @@ public static TabbedPage TabbedPage(Action<Microsoft.Maui.Controls.TabbedPage?>
         return @tabbedpage;
     }
 
+    public static TabbedPage TabbedPage(Action<Microsoft.Maui.Controls.TabbedPage?> componentRefAction, params VisualNode? []? children)
+    {
+        var @tabbedpage = GetNodeFromPool<TabbedPage>();
+        @tabbedpage.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @tabbedpage.AddChildren(children);
+        }
+
+        return @tabbedpage;
+    }
+
     public static Page Page() => GetNodeFromPool<Page>();
     public static Page Page(params VisualNode? []? children)
     {
@@ -69,6 +93,18 @@ public static Page Page(Action<Microsoft.Maui.Controls.Page?> componentRefAction
         return @page;
     }
 
+    public static Page Page(Action<Microsoft.Maui.Controls.Page?> componentRefAction, params VisualNode? []? children)
+    {
+        var @page = GetNodeFromPool<Page>();
+        @page.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @page.AddChildren(children);
+        }
+
+        return @page;
+    }
+
     public static TemplatedPage TemplatedPage() => GetNodeFromPool<TemplatedPage>();
     public static TemplatedPage TemplatedPage(params VisualNode? []? children)
     {
@@ -88,6 +124,18 @@ public static TemplatedPage TemplatedPage(Action<Microsoft.Maui.Controls.Templat
         return @templatedpage;
     }
 
+    public static TemplatedPage TemplatedPage(Action<Microsoft.Maui.Controls.TemplatedPage?> componentRefAction, params VisualNode? []? children)
+    {
+        var @templatedpage = GetNodeFromPool<TemplatedPage>();
+        @templatedpage.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @templatedpage.AddChildren(children);
+        }
+
+        return @templatedpage;
+    }
+
     public static ContentPage ContentPage() => GetNodeFromPool<ContentPage>();
     public static ContentPage ContentPage(params VisualNode? []? children)
     {
@@ -107,6 +155,18 @@ public static ContentPage ContentPage(Action<Microsoft.Maui.Controls.ContentPage
         return @contentpage;
     }
 
+    public static ContentPage ContentPage(Action<Microsoft.Maui.Controls.ContentPage?> componentRefAction, params VisualNode? []? children)
+    {
+        var @contentpage = GetNodeFromPool<ContentPage>();
+        @contentpage.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @contentpage.AddChildren(children);
+        }
+
+        return @contentpage;
+    }
+
     public static NavigationPage NavigationPage() => GetNodeFromPool<NavigationPage>();
     public static NavigationPage NavigationPage(params VisualNode? []? children)
     {
@@ -126,6 +186,18 @@ public static NavigationPage NavigationPage(Action<Microsoft.Maui.Controls.Navig
         return @navigationpage;
     }
 
+    public static NavigationPage NavigationPage(Action<Microsoft.Maui.Controls.NavigationPage?> componentRefAction, params VisualNode? []? children)
+    {
+        var @navigationpage = GetNodeFromPool<NavigationPage>();
+        @navigationpage.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @navigationpage.AddChildren(children);
+        }
+
+        return @navigationpage;
+    }
+
     public static FlyoutPage FlyoutPage() => GetNodeFromPool<FlyoutPage>();
     public static FlyoutPage FlyoutPage(params VisualNode? []? children)
     {
@@ -145,6 +217,18 @@ public static FlyoutPage FlyoutPage(Action<Microsoft.Maui.Controls.FlyoutPage?>
         return @flyoutpage;
     }
 
+    public static FlyoutPage FlyoutPage(Action<Microsoft.Maui.Controls.FlyoutPage?> componentRefAction, params VisualNode? []? children)
+    {
+        var @flyoutpage = GetNodeFromPool<FlyoutPage>();
+        @flyoutpage.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @flyoutpage.AddChildren(children);
+        }
+
+        return @flyoutpage;
+    }
+
     public static Button Button() => GetNodeFromPool<Button>();
     public static Button Button(params VisualNode? []? children)
     {
@@ -164,6 +248,18 @@ public static Button Button(Action<Microsoft.Maui.Controls.Button?> componentRef
         return @button;
     }
 
+    public static Button Button(Action<Microsoft.Maui.Controls.Button?> componentRefAction, params VisualNode? []? children)
+    {
+        var @button = GetNodeFromPool<Button>();
+        @button.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @button.AddChildren(children);
+        }
+
+        return @button;
+    }
+
     public static Label Label() => GetNodeFromPool<Label>();
     public static Label Label(params VisualNode? []? children)
     {
@@ -183,6 +279,18 @@ public static Label Label(Action<Microsoft.Maui.Controls.Label?> componentRefAct
         return @label;
     }
 
+    public static Label Label(Action<Microsoft.Maui.Controls.Label?> componentRefAction, params VisualNode? []? children)
+    {
+        var @label = GetNodeFromPool<Label>();
+        @label.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @label.AddChildren(children);
+        }
+
+        return @label;
+    }
+
     public static StackLayout StackLayout() => GetNodeFromPool<StackLayout>();
     public static StackLayout StackLayout(params VisualNode? []? children)
     {
@@ -202,6 +310,18 @@ public static StackLayout StackLayout(Action<Microsoft.Maui.Controls.StackLayout
         return @stacklayout;
     }
 
+    public static StackLayout StackLayout(Action<Microsoft.Maui.Controls.StackLayout?> componentRefAction, params VisualNode? []? children)
+    {
+        var @stacklayout = GetNodeFromPool<StackLayout>();
+        @stacklayout.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @stacklayout.AddChildren(children);
+        }
+
+        return @stacklayout;
+    }
+
     public static VerticalStackLayout VerticalStackLayout() => GetNodeFromPool<VerticalStackLayout>();
     public static VerticalStackLayout VerticalStackLayout(params VisualNode? []? children)
     {
@@ -221,6 +341,18 @@ public static VerticalStackLayout VerticalStackLayout(Action<Microsoft.Maui.Cont
         return @verticalstacklayout;
     }
 
+    public static VerticalStackLayout VerticalStackLayout(Action<Microsoft.Maui.Controls.VerticalStackLayout?> componentRefAction, params VisualNode? []? children)
+    {
+        var @verticalstacklayout = GetNodeFromPool<VerticalStackLayout>();
+        @verticalstacklayout.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @verticalstacklayout.AddChildren(children);
+        }
+
+        return @verticalstacklayout;
+    }
+
     public static HorizontalStackLayout HorizontalStackLayout() => GetNodeFromPool<HorizontalStackLayout>();
     public static HorizontalStackLayout HorizontalStackLayout(params VisualNode? []? children)
     {
@@ -240,6 +372,18 @@ public static HorizontalStackLayout HorizontalStackLayout(Action<Microsoft.Maui.
         return @horizontalstacklayout;
     }
 
+    public static HorizontalStackLayout HorizontalStackLayout(Action<Microsoft.Maui.Controls.HorizontalStackLayout?> componentRefAction, params VisualNode? []? children)
+    {
+        var @horizontalstacklayout = GetNodeFromPool<HorizontalStackLayout>();
+        @horizontalstacklayout.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @horizontalstacklayout.AddChildren(children);
+        }
+
+        return @horizontalstacklayout;
+    }
+
     public static Grid Grid() => GetNodeFromPool<Grid>();
     public static Grid Grid(params VisualNode? []? children)
     {
@@ -259,6 +403,18 @@ public static Grid Grid(Action<Microsoft.Maui.Controls.Grid?> componentRefAction
         return @grid;
     }
 
+    public static Grid Grid(Action<Microsoft.Maui.Controls.Grid?> componentRefAction, params VisualNode? []? children)
+    {
+        var @grid = GetNodeFromPool<Grid>();
+        @grid.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @grid.AddChildren(children);
+        }
+
+        return @grid;
+    }
+
     public static Shell Shell() => GetNodeFromPool<Shell>();
     public static Shell Shell(params VisualNode? []? children)
     {
@@ -278,6 +434,18 @@ public static Shell Shell(Action<Microsoft.Maui.Controls.Shell?> componentRefAct
         return @shell;
     }
 
+    public static Shell Shell(Action<Microsoft.Maui.Controls.Shell?> componentRefAction, params VisualNode? []? children)
+    {
+        var @shell = GetNodeFromPool<Shell>();
+        @shell.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @shell.AddChildren(children);
+        }
+
+        return @shell;
+    }
+
     public static BaseShellItem BaseShellItem() => GetNodeFromPool<BaseShellItem>();
     public static BaseShellItem BaseShellItem(params VisualNode? []? children)
     {
@@ -297,6 +465,18 @@ public static BaseShellItem BaseShellItem(Action<Microsoft.Maui.Controls.BaseShe
         return @baseshellitem;
     }
 
+    public static BaseShellItem BaseShellItem(Action<Microsoft.Maui.Controls.BaseShellItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @baseshellitem = GetNodeFromPool<BaseShellItem>();
+        @baseshellitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @baseshellitem.AddChildren(children);
+        }
+
+        return @baseshellitem;
+    }
+
     public static ShellGroupItem ShellGroupItem() => GetNodeFromPool<ShellGroupItem>();
     public static ShellGroupItem ShellGroupItem(params VisualNode? []? children)
     {
@@ -316,6 +496,18 @@ public static ShellGroupItem ShellGroupItem(Action<Microsoft.Maui.Controls.Shell
         return @shellgroupitem;
     }
 
+    public static ShellGroupItem ShellGroupItem(Action<Microsoft.Maui.Controls.ShellGroupItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @shellgroupitem = GetNodeFromPool<ShellGroupItem>();
+        @shellgroupitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @shellgroupitem.AddChildren(children);
+        }
+
+        return @shellgroupitem;
+    }
+
     public static ShellItem ShellItem() => GetNodeFromPool<ShellItem>();
     public static ShellItem ShellItem(params VisualNode? []? children)
     {
@@ -335,6 +527,18 @@ public static ShellItem ShellItem(Action<Microsoft.Maui.Controls.ShellItem?> com
         return @shellitem;
     }
 
+    public static ShellItem ShellItem(Action<Microsoft.Maui.Controls.ShellItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @shellitem = GetNodeFromPool<ShellItem>();
+        @shellitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @shellitem.AddChildren(children);
+        }
+
+        return @shellitem;
+    }
+
     public static FlyoutItem FlyoutItem() => GetNodeFromPool<FlyoutItem>();
     public static FlyoutItem FlyoutItem(params VisualNode? []? children)
     {
@@ -354,6 +558,18 @@ public static FlyoutItem FlyoutItem(Action<Microsoft.Maui.Controls.FlyoutItem?>
         return @flyoutitem;
     }
 
+    public static FlyoutItem FlyoutItem(Action<Microsoft.Maui.Controls.FlyoutItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @flyoutitem = GetNodeFromPool<FlyoutItem>();
+        @flyoutitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @flyoutitem.AddChildren(children);
+        }
+
+        return @flyoutitem;
+    }
+
     public static ShellContent ShellContent() => GetNodeFromPool<ShellContent>();
     public static ShellContent ShellContent(params VisualNode? []? children)
     {
@@ -373,6 +589,18 @@ public static ShellContent ShellContent(Action<Microsoft.Maui.Controls.ShellCont
         return @shellcontent;
     }
 
+    public static ShellContent ShellContent(Action<Microsoft.Maui.Controls.ShellContent?> componentRefAction, params VisualNode? []? children)
+    {
+        var @shellcontent = GetNodeFromPool<ShellContent>();
+        @shellcontent.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @shellcontent.AddChildren(children);
+        }
+
+        return @shellcontent;
+    }
+
     public static TabBar TabBar() => GetNodeFromPool<TabBar>();
     public static TabBar TabBar(params VisualNode? []? children)
     {
@@ -392,6 +620,18 @@ public static TabBar TabBar(Action<Microsoft.Maui.Controls.TabBar?> componentRef
         return @tabbar;
     }
 
+    public static TabBar TabBar(Action<Microsoft.Maui.Controls.TabBar?> componentRefAction, params VisualNode? []? children)
+    {
+        var @tabbar = GetNodeFromPool<TabBar>();
+        @tabbar.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @tabbar.AddChildren(children);
+        }
+
+        return @tabbar;
+    }
+
     public static Tab Tab() => GetNodeFromPool<Tab>();
     public static Tab Tab(params VisualNode? []? children)
     {
@@ -411,6 +651,18 @@ public static Tab Tab(Action<Microsoft.Maui.Controls.Tab?> componentRefAction)
         return @tab;
     }
 
+    public static Tab Tab(Action<Microsoft.Maui.Controls.Tab?> componentRefAction, params VisualNode? []? children)
+    {
+        var @tab = GetNodeFromPool<Tab>();
+        @tab.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @tab.AddChildren(children);
+        }
+
+        return @tab;
+    }
+
     public static ShellSection ShellSection() => GetNodeFromPool<ShellSection>();
     public static ShellSection ShellSection(params VisualNode? []? children)
     {
@@ -430,6 +682,18 @@ public static ShellSection ShellSection(Action<Microsoft.Maui.Controls.ShellSect
         return @shellsection;
     }
 
+    public static ShellSection ShellSection(Action<Microsoft.Maui.Controls.ShellSection?> componentRefAction, params VisualNode? []? children)
+    {
+        var @shellsection = GetNodeFromPool<ShellSection>();
+        @shellsection.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @shellsection.AddChildren(children);
+        }
+
+        return @shellsection;
+    }
+
     public static MenuItem MenuItem() => GetNodeFromPool<MenuItem>();
     public static MenuItem MenuItem(params VisualNode? []? children)
     {
@@ -449,6 +713,18 @@ public static MenuItem MenuItem(Action<Microsoft.Maui.Controls.MenuItem?> compon
         return @menuitem;
     }
 
+    public static MenuItem MenuItem(Action<Microsoft.Maui.Controls.MenuItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @menuitem = GetNodeFromPool<MenuItem>();
+        @menuitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @menuitem.AddChildren(children);
+        }
+
+        return @menuitem;
+    }
+
     public static MenuBarItem MenuBarItem() => GetNodeFromPool<MenuBarItem>();
     public static MenuBarItem MenuBarItem(params VisualNode? []? children)
     {
@@ -468,10 +744,22 @@ public static MenuBarItem MenuBarItem(Action<Microsoft.Maui.Controls.MenuBarItem
         return @menubaritem;
     }
 
-    public static MenuFlyout MenuFlyout() => GetNodeFromPool<MenuFlyout>();
-    public static MenuFlyout MenuFlyout(params VisualNode? []? children)
+    public static MenuBarItem MenuBarItem(Action<Microsoft.Maui.Controls.MenuBarItem?> componentRefAction, params VisualNode? []? children)
     {
-        var @menuflyout = GetNodeFromPool<MenuFlyout>();
+        var @menubaritem = GetNodeFromPool<MenuBarItem>();
+        @menubaritem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @menubaritem.AddChildren(children);
+        }
+
+        return @menubaritem;
+    }
+
+    public static MenuFlyout MenuFlyout() => GetNodeFromPool<MenuFlyout>();
+    public static MenuFlyout MenuFlyout(params VisualNode? []? children)
+    {
+        var @menuflyout = GetNodeFromPool<MenuFlyout>();
         if (children != null)
         {
             @menuflyout.AddChildren(children);
@@ -487,6 +775,18 @@ public static MenuFlyout MenuFlyout(Action<Microsoft.Maui.Controls.MenuFlyout?>
         return @menuflyout;
     }
 
+    public static MenuFlyout MenuFlyout(Action<Microsoft.Maui.Controls.MenuFlyout?> componentRefAction, params VisualNode? []? children)
+    {
+        var @menuflyout = GetNodeFromPool<MenuFlyout>();
+        @menuflyout.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @menuflyout.AddChildren(children);
+        }
+
+        return @menuflyout;
+    }
+
     public static MenuFlyoutItem MenuFlyoutItem() => GetNodeFromPool<MenuFlyoutItem>();
     public static MenuFlyoutItem MenuFlyoutItem(params VisualNode? []? children)
     {
@@ -506,6 +806,18 @@ public static MenuFlyoutItem MenuFlyoutItem(Action<Microsoft.Maui.Controls.MenuF
         return @menuflyoutitem;
     }
 
+    public static MenuFlyoutItem MenuFlyoutItem(Action<Microsoft.Maui.Controls.MenuFlyoutItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @menuflyoutitem = GetNodeFromPool<MenuFlyoutItem>();
+        @menuflyoutitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @menuflyoutitem.AddChildren(children);
+        }
+
+        return @menuflyoutitem;
+    }
+
     public static MenuFlyoutSubItem MenuFlyoutSubItem() => GetNodeFromPool<MenuFlyoutSubItem>();
     public static MenuFlyoutSubItem MenuFlyoutSubItem(params VisualNode? []? children)
     {
@@ -525,6 +837,18 @@ public static MenuFlyoutSubItem MenuFlyoutSubItem(Action<Microsoft.Maui.Controls
         return @menuflyoutsubitem;
     }
 
+    public static MenuFlyoutSubItem MenuFlyoutSubItem(Action<Microsoft.Maui.Controls.MenuFlyoutSubItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @menuflyoutsubitem = GetNodeFromPool<MenuFlyoutSubItem>();
+        @menuflyoutsubitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @menuflyoutsubitem.AddChildren(children);
+        }
+
+        return @menuflyoutsubitem;
+    }
+
     public static MenuFlyoutSeparator MenuFlyoutSeparator() => GetNodeFromPool<MenuFlyoutSeparator>();
     public static MenuFlyoutSeparator MenuFlyoutSeparator(params VisualNode? []? children)
     {
@@ -544,6 +868,18 @@ public static MenuFlyoutSeparator MenuFlyoutSeparator(Action<Microsoft.Maui.Cont
         return @menuflyoutseparator;
     }
 
+    public static MenuFlyoutSeparator MenuFlyoutSeparator(Action<Microsoft.Maui.Controls.MenuFlyoutSeparator?> componentRefAction, params VisualNode? []? children)
+    {
+        var @menuflyoutseparator = GetNodeFromPool<MenuFlyoutSeparator>();
+        @menuflyoutseparator.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @menuflyoutseparator.AddChildren(children);
+        }
+
+        return @menuflyoutseparator;
+    }
+
     public static ToolbarItem ToolbarItem() => GetNodeFromPool<ToolbarItem>();
     public static ToolbarItem ToolbarItem(params VisualNode? []? children)
     {
@@ -563,6 +899,18 @@ public static ToolbarItem ToolbarItem(Action<Microsoft.Maui.Controls.ToolbarItem
         return @toolbaritem;
     }
 
+    public static ToolbarItem ToolbarItem(Action<Microsoft.Maui.Controls.ToolbarItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @toolbaritem = GetNodeFromPool<ToolbarItem>();
+        @toolbaritem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @toolbaritem.AddChildren(children);
+        }
+
+        return @toolbaritem;
+    }
+
     public static BoxView BoxView() => GetNodeFromPool<BoxView>();
     public static BoxView BoxView(params VisualNode? []? children)
     {
@@ -582,6 +930,18 @@ public static BoxView BoxView(Action<Microsoft.Maui.Controls.BoxView?> component
         return @boxview;
     }
 
+    public static BoxView BoxView(Action<Microsoft.Maui.Controls.BoxView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @boxview = GetNodeFromPool<BoxView>();
+        @boxview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @boxview.AddChildren(children);
+        }
+
+        return @boxview;
+    }
+
     public static ScrollView ScrollView() => GetNodeFromPool<ScrollView>();
     public static ScrollView ScrollView(params VisualNode? []? children)
     {
@@ -601,6 +961,18 @@ public static ScrollView ScrollView(Action<Microsoft.Maui.Controls.ScrollView?>
         return @scrollview;
     }
 
+    public static ScrollView ScrollView(Action<Microsoft.Maui.Controls.ScrollView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @scrollview = GetNodeFromPool<ScrollView>();
+        @scrollview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @scrollview.AddChildren(children);
+        }
+
+        return @scrollview;
+    }
+
     public static Image Image() => GetNodeFromPool<Image>();
     public static Image Image(params VisualNode? []? children)
     {
@@ -620,6 +992,18 @@ public static Image Image(Action<Microsoft.Maui.Controls.Image?> componentRefAct
         return @image;
     }
 
+    public static Image Image(Action<Microsoft.Maui.Controls.Image?> componentRefAction, params VisualNode? []? children)
+    {
+        var @image = GetNodeFromPool<Image>();
+        @image.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @image.AddChildren(children);
+        }
+
+        return @image;
+    }
+
     public static GestureRecognizer GestureRecognizer() => GetNodeFromPool<GestureRecognizer>();
     public static GestureRecognizer GestureRecognizer(params VisualNode? []? children)
     {
@@ -639,6 +1023,18 @@ public static GestureRecognizer GestureRecognizer(Action<Microsoft.Maui.Controls
         return @gesturerecognizer;
     }
 
+    public static GestureRecognizer GestureRecognizer(Action<Microsoft.Maui.Controls.GestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @gesturerecognizer = GetNodeFromPool<GestureRecognizer>();
+        @gesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @gesturerecognizer.AddChildren(children);
+        }
+
+        return @gesturerecognizer;
+    }
+
     public static TapGestureRecognizer TapGestureRecognizer() => GetNodeFromPool<TapGestureRecognizer>();
     public static TapGestureRecognizer TapGestureRecognizer(params VisualNode? []? children)
     {
@@ -658,6 +1054,18 @@ public static TapGestureRecognizer TapGestureRecognizer(Action<Microsoft.Maui.Co
         return @tapgesturerecognizer;
     }
 
+    public static TapGestureRecognizer TapGestureRecognizer(Action<Microsoft.Maui.Controls.TapGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @tapgesturerecognizer = GetNodeFromPool<TapGestureRecognizer>();
+        @tapgesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @tapgesturerecognizer.AddChildren(children);
+        }
+
+        return @tapgesturerecognizer;
+    }
+
     public static DragGestureRecognizer DragGestureRecognizer() => GetNodeFromPool<DragGestureRecognizer>();
     public static DragGestureRecognizer DragGestureRecognizer(params VisualNode? []? children)
     {
@@ -677,6 +1085,18 @@ public static DragGestureRecognizer DragGestureRecognizer(Action<Microsoft.Maui.
         return @draggesturerecognizer;
     }
 
+    public static DragGestureRecognizer DragGestureRecognizer(Action<Microsoft.Maui.Controls.DragGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @draggesturerecognizer = GetNodeFromPool<DragGestureRecognizer>();
+        @draggesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @draggesturerecognizer.AddChildren(children);
+        }
+
+        return @draggesturerecognizer;
+    }
+
     public static DropGestureRecognizer DropGestureRecognizer() => GetNodeFromPool<DropGestureRecognizer>();
     public static DropGestureRecognizer DropGestureRecognizer(params VisualNode? []? children)
     {
@@ -696,6 +1116,18 @@ public static DropGestureRecognizer DropGestureRecognizer(Action<Microsoft.Maui.
         return @dropgesturerecognizer;
     }
 
+    public static DropGestureRecognizer DropGestureRecognizer(Action<Microsoft.Maui.Controls.DropGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @dropgesturerecognizer = GetNodeFromPool<DropGestureRecognizer>();
+        @dropgesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @dropgesturerecognizer.AddChildren(children);
+        }
+
+        return @dropgesturerecognizer;
+    }
+
     public static PanGestureRecognizer PanGestureRecognizer() => GetNodeFromPool<PanGestureRecognizer>();
     public static PanGestureRecognizer PanGestureRecognizer(params VisualNode? []? children)
     {
@@ -715,6 +1147,18 @@ public static PanGestureRecognizer PanGestureRecognizer(Action<Microsoft.Maui.Co
         return @pangesturerecognizer;
     }
 
+    public static PanGestureRecognizer PanGestureRecognizer(Action<Microsoft.Maui.Controls.PanGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @pangesturerecognizer = GetNodeFromPool<PanGestureRecognizer>();
+        @pangesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @pangesturerecognizer.AddChildren(children);
+        }
+
+        return @pangesturerecognizer;
+    }
+
     public static PinchGestureRecognizer PinchGestureRecognizer() => GetNodeFromPool<PinchGestureRecognizer>();
     public static PinchGestureRecognizer PinchGestureRecognizer(params VisualNode? []? children)
     {
@@ -734,6 +1178,18 @@ public static PinchGestureRecognizer PinchGestureRecognizer(Action<Microsoft.Mau
         return @pinchgesturerecognizer;
     }
 
+    public static PinchGestureRecognizer PinchGestureRecognizer(Action<Microsoft.Maui.Controls.PinchGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @pinchgesturerecognizer = GetNodeFromPool<PinchGestureRecognizer>();
+        @pinchgesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @pinchgesturerecognizer.AddChildren(children);
+        }
+
+        return @pinchgesturerecognizer;
+    }
+
     public static PointerGestureRecognizer PointerGestureRecognizer() => GetNodeFromPool<PointerGestureRecognizer>();
     public static PointerGestureRecognizer PointerGestureRecognizer(params VisualNode? []? children)
     {
@@ -753,6 +1209,18 @@ public static PointerGestureRecognizer PointerGestureRecognizer(Action<Microsoft
         return @pointergesturerecognizer;
     }
 
+    public static PointerGestureRecognizer PointerGestureRecognizer(Action<Microsoft.Maui.Controls.PointerGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @pointergesturerecognizer = GetNodeFromPool<PointerGestureRecognizer>();
+        @pointergesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @pointergesturerecognizer.AddChildren(children);
+        }
+
+        return @pointergesturerecognizer;
+    }
+
     public static SwipeGestureRecognizer SwipeGestureRecognizer() => GetNodeFromPool<SwipeGestureRecognizer>();
     public static SwipeGestureRecognizer SwipeGestureRecognizer(params VisualNode? []? children)
     {
@@ -772,6 +1240,18 @@ public static SwipeGestureRecognizer SwipeGestureRecognizer(Action<Microsoft.Mau
         return @swipegesturerecognizer;
     }
 
+    public static SwipeGestureRecognizer SwipeGestureRecognizer(Action<Microsoft.Maui.Controls.SwipeGestureRecognizer?> componentRefAction, params VisualNode? []? children)
+    {
+        var @swipegesturerecognizer = GetNodeFromPool<SwipeGestureRecognizer>();
+        @swipegesturerecognizer.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @swipegesturerecognizer.AddChildren(children);
+        }
+
+        return @swipegesturerecognizer;
+    }
+
     public static Shapes.EllipseGeometry EllipseGeometry() => GetNodeFromPool<Shapes.EllipseGeometry>();
     public static Shapes.EllipseGeometry EllipseGeometry(Action<Microsoft.Maui.Controls.Shapes.EllipseGeometry?> componentRefAction)
     {
@@ -831,6 +1311,18 @@ public static Shapes.RoundRectangle RoundRectangle(Action<Microsoft.Maui.Control
         return @roundrectangle;
     }
 
+    public static Shapes.RoundRectangle RoundRectangle(Action<Microsoft.Maui.Controls.Shapes.RoundRectangle?> componentRefAction, params VisualNode? []? children)
+    {
+        var @roundrectangle = GetNodeFromPool<Shapes.RoundRectangle>();
+        @roundrectangle.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @roundrectangle.AddChildren(children);
+        }
+
+        return @roundrectangle;
+    }
+
     public static Shapes.Line Line() => GetNodeFromPool<Shapes.Line>();
     public static Shapes.Line Line(params VisualNode? []? children)
     {
@@ -850,6 +1342,18 @@ public static Shapes.Line Line(Action<Microsoft.Maui.Controls.Shapes.Line?> comp
         return @line;
     }
 
+    public static Shapes.Line Line(Action<Microsoft.Maui.Controls.Shapes.Line?> componentRefAction, params VisualNode? []? children)
+    {
+        var @line = GetNodeFromPool<Shapes.Line>();
+        @line.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @line.AddChildren(children);
+        }
+
+        return @line;
+    }
+
     public static Shapes.Path Path() => GetNodeFromPool<Shapes.Path>();
     public static Shapes.Path Path(params VisualNode? []? children)
     {
@@ -869,6 +1373,18 @@ public static Shapes.Path Path(Action<Microsoft.Maui.Controls.Shapes.Path?> comp
         return @path;
     }
 
+    public static Shapes.Path Path(Action<Microsoft.Maui.Controls.Shapes.Path?> componentRefAction, params VisualNode? []? children)
+    {
+        var @path = GetNodeFromPool<Shapes.Path>();
+        @path.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @path.AddChildren(children);
+        }
+
+        return @path;
+    }
+
     public static Shapes.Polygon Polygon() => GetNodeFromPool<Shapes.Polygon>();
     public static Shapes.Polygon Polygon(params VisualNode? []? children)
     {
@@ -888,6 +1404,18 @@ public static Shapes.Polygon Polygon(Action<Microsoft.Maui.Controls.Shapes.Polyg
         return @polygon;
     }
 
+    public static Shapes.Polygon Polygon(Action<Microsoft.Maui.Controls.Shapes.Polygon?> componentRefAction, params VisualNode? []? children)
+    {
+        var @polygon = GetNodeFromPool<Shapes.Polygon>();
+        @polygon.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @polygon.AddChildren(children);
+        }
+
+        return @polygon;
+    }
+
     public static Shapes.Polyline Polyline() => GetNodeFromPool<Shapes.Polyline>();
     public static Shapes.Polyline Polyline(params VisualNode? []? children)
     {
@@ -907,6 +1435,18 @@ public static Shapes.Polyline Polyline(Action<Microsoft.Maui.Controls.Shapes.Pol
         return @polyline;
     }
 
+    public static Shapes.Polyline Polyline(Action<Microsoft.Maui.Controls.Shapes.Polyline?> componentRefAction, params VisualNode? []? children)
+    {
+        var @polyline = GetNodeFromPool<Shapes.Polyline>();
+        @polyline.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @polyline.AddChildren(children);
+        }
+
+        return @polyline;
+    }
+
     public static Shapes.Rectangle Rectangle() => GetNodeFromPool<Shapes.Rectangle>();
     public static Shapes.Rectangle Rectangle(params VisualNode? []? children)
     {
@@ -926,6 +1466,18 @@ public static Shapes.Rectangle Rectangle(Action<Microsoft.Maui.Controls.Shapes.R
         return @rectangle;
     }
 
+    public static Shapes.Rectangle Rectangle(Action<Microsoft.Maui.Controls.Shapes.Rectangle?> componentRefAction, params VisualNode? []? children)
+    {
+        var @rectangle = GetNodeFromPool<Shapes.Rectangle>();
+        @rectangle.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @rectangle.AddChildren(children);
+        }
+
+        return @rectangle;
+    }
+
     public static Shapes.GeometryGroup GeometryGroup() => GetNodeFromPool<Shapes.GeometryGroup>();
     public static Shapes.GeometryGroup GeometryGroup(Action<Microsoft.Maui.Controls.Shapes.GeometryGroup?> componentRefAction)
     {
@@ -953,6 +1505,18 @@ public static Shapes.Ellipse Ellipse(Action<Microsoft.Maui.Controls.Shapes.Ellip
         return @ellipse;
     }
 
+    public static Shapes.Ellipse Ellipse(Action<Microsoft.Maui.Controls.Shapes.Ellipse?> componentRefAction, params VisualNode? []? children)
+    {
+        var @ellipse = GetNodeFromPool<Shapes.Ellipse>();
+        @ellipse.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @ellipse.AddChildren(children);
+        }
+
+        return @ellipse;
+    }
+
     public static Border Border() => GetNodeFromPool<Border>();
     public static Border Border(params VisualNode? []? children)
     {
@@ -972,6 +1536,18 @@ public static Border Border(Action<Microsoft.Maui.Controls.Border?> componentRef
         return @border;
     }
 
+    public static Border Border(Action<Microsoft.Maui.Controls.Border?> componentRefAction, params VisualNode? []? children)
+    {
+        var @border = GetNodeFromPool<Border>();
+        @border.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @border.AddChildren(children);
+        }
+
+        return @border;
+    }
+
     public static FlexLayout FlexLayout() => GetNodeFromPool<FlexLayout>();
     public static FlexLayout FlexLayout(params VisualNode? []? children)
     {
@@ -991,6 +1567,18 @@ public static FlexLayout FlexLayout(Action<Microsoft.Maui.Controls.FlexLayout?>
         return @flexlayout;
     }
 
+    public static FlexLayout FlexLayout(Action<Microsoft.Maui.Controls.FlexLayout?> componentRefAction, params VisualNode? []? children)
+    {
+        var @flexlayout = GetNodeFromPool<FlexLayout>();
+        @flexlayout.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @flexlayout.AddChildren(children);
+        }
+
+        return @flexlayout;
+    }
+
     public static CollectionView CollectionView() => GetNodeFromPool<CollectionView>();
     public static CollectionView CollectionView(params VisualNode? []? children)
     {
@@ -1010,6 +1598,18 @@ public static CollectionView CollectionView(Action<Microsoft.Maui.Controls.Colle
         return @collectionview;
     }
 
+    public static CollectionView CollectionView(Action<Microsoft.Maui.Controls.CollectionView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @collectionview = GetNodeFromPool<CollectionView>();
+        @collectionview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @collectionview.AddChildren(children);
+        }
+
+        return @collectionview;
+    }
+
     public static GroupableItemsView GroupableItemsView() => GetNodeFromPool<GroupableItemsView>();
     public static GroupableItemsView GroupableItemsView(params VisualNode? []? children)
     {
@@ -1029,6 +1629,18 @@ public static GroupableItemsView GroupableItemsView(Action<Microsoft.Maui.Contro
         return @groupableitemsview;
     }
 
+    public static GroupableItemsView GroupableItemsView(Action<Microsoft.Maui.Controls.GroupableItemsView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @groupableitemsview = GetNodeFromPool<GroupableItemsView>();
+        @groupableitemsview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @groupableitemsview.AddChildren(children);
+        }
+
+        return @groupableitemsview;
+    }
+
     public static ReorderableItemsView ReorderableItemsView() => GetNodeFromPool<ReorderableItemsView>();
     public static ReorderableItemsView ReorderableItemsView(params VisualNode? []? children)
     {
@@ -1048,6 +1660,18 @@ public static ReorderableItemsView ReorderableItemsView(Action<Microsoft.Maui.Co
         return @reorderableitemsview;
     }
 
+    public static ReorderableItemsView ReorderableItemsView(Action<Microsoft.Maui.Controls.ReorderableItemsView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @reorderableitemsview = GetNodeFromPool<ReorderableItemsView>();
+        @reorderableitemsview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @reorderableitemsview.AddChildren(children);
+        }
+
+        return @reorderableitemsview;
+    }
+
     public static SelectableItemsView SelectableItemsView() => GetNodeFromPool<SelectableItemsView>();
     public static SelectableItemsView SelectableItemsView(params VisualNode? []? children)
     {
@@ -1067,6 +1691,18 @@ public static SelectableItemsView SelectableItemsView(Action<Microsoft.Maui.Cont
         return @selectableitemsview;
     }
 
+    public static SelectableItemsView SelectableItemsView(Action<Microsoft.Maui.Controls.SelectableItemsView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @selectableitemsview = GetNodeFromPool<SelectableItemsView>();
+        @selectableitemsview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @selectableitemsview.AddChildren(children);
+        }
+
+        return @selectableitemsview;
+    }
+
     public static StructuredItemsView StructuredItemsView() => GetNodeFromPool<StructuredItemsView>();
     public static StructuredItemsView StructuredItemsView(params VisualNode? []? children)
     {
@@ -1086,6 +1722,18 @@ public static StructuredItemsView StructuredItemsView(Action<Microsoft.Maui.Cont
         return @structureditemsview;
     }
 
+    public static StructuredItemsView StructuredItemsView(Action<Microsoft.Maui.Controls.StructuredItemsView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @structureditemsview = GetNodeFromPool<StructuredItemsView>();
+        @structureditemsview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @structureditemsview.AddChildren(children);
+        }
+
+        return @structureditemsview;
+    }
+
     public static ContentView ContentView() => GetNodeFromPool<ContentView>();
     public static ContentView ContentView(params VisualNode? []? children)
     {
@@ -1105,6 +1753,18 @@ public static ContentView ContentView(Action<Microsoft.Maui.Controls.ContentView
         return @contentview;
     }
 
+    public static ContentView ContentView(Action<Microsoft.Maui.Controls.ContentView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @contentview = GetNodeFromPool<ContentView>();
+        @contentview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @contentview.AddChildren(children);
+        }
+
+        return @contentview;
+    }
+
     public static Frame Frame() => GetNodeFromPool<Frame>();
     public static Frame Frame(params VisualNode? []? children)
     {
@@ -1124,6 +1784,18 @@ public static Frame Frame(Action<Microsoft.Maui.Controls.Frame?> componentRefAct
         return @frame;
     }
 
+    public static Frame Frame(Action<Microsoft.Maui.Controls.Frame?> componentRefAction, params VisualNode? []? children)
+    {
+        var @frame = GetNodeFromPool<Frame>();
+        @frame.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @frame.AddChildren(children);
+        }
+
+        return @frame;
+    }
+
     public static TemplatedView TemplatedView() => GetNodeFromPool<TemplatedView>();
     public static TemplatedView TemplatedView(params VisualNode? []? children)
     {
@@ -1143,6 +1815,18 @@ public static TemplatedView TemplatedView(Action<Microsoft.Maui.Controls.Templat
         return @templatedview;
     }
 
+    public static TemplatedView TemplatedView(Action<Microsoft.Maui.Controls.TemplatedView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @templatedview = GetNodeFromPool<TemplatedView>();
+        @templatedview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @templatedview.AddChildren(children);
+        }
+
+        return @templatedview;
+    }
+
     public static ImageButton ImageButton() => GetNodeFromPool<ImageButton>();
     public static ImageButton ImageButton(params VisualNode? []? children)
     {
@@ -1162,6 +1846,18 @@ public static ImageButton ImageButton(Action<Microsoft.Maui.Controls.ImageButton
         return @imagebutton;
     }
 
+    public static ImageButton ImageButton(Action<Microsoft.Maui.Controls.ImageButton?> componentRefAction, params VisualNode? []? children)
+    {
+        var @imagebutton = GetNodeFromPool<ImageButton>();
+        @imagebutton.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @imagebutton.AddChildren(children);
+        }
+
+        return @imagebutton;
+    }
+
     public static RadioButton RadioButton() => GetNodeFromPool<RadioButton>();
     public static RadioButton RadioButton(params VisualNode? []? children)
     {
@@ -1181,6 +1877,18 @@ public static RadioButton RadioButton(Action<Microsoft.Maui.Controls.RadioButton
         return @radiobutton;
     }
 
+    public static RadioButton RadioButton(Action<Microsoft.Maui.Controls.RadioButton?> componentRefAction, params VisualNode? []? children)
+    {
+        var @radiobutton = GetNodeFromPool<RadioButton>();
+        @radiobutton.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @radiobutton.AddChildren(children);
+        }
+
+        return @radiobutton;
+    }
+
     public static WebView WebView() => GetNodeFromPool<WebView>();
     public static WebView WebView(params VisualNode? []? children)
     {
@@ -1200,6 +1908,18 @@ public static WebView WebView(Action<Microsoft.Maui.Controls.WebView?> component
         return @webview;
     }
 
+    public static WebView WebView(Action<Microsoft.Maui.Controls.WebView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @webview = GetNodeFromPool<WebView>();
+        @webview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @webview.AddChildren(children);
+        }
+
+        return @webview;
+    }
+
     public static RefreshView RefreshView() => GetNodeFromPool<RefreshView>();
     public static RefreshView RefreshView(params VisualNode? []? children)
     {
@@ -1219,6 +1939,18 @@ public static RefreshView RefreshView(Action<Microsoft.Maui.Controls.RefreshView
         return @refreshview;
     }
 
+    public static RefreshView RefreshView(Action<Microsoft.Maui.Controls.RefreshView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @refreshview = GetNodeFromPool<RefreshView>();
+        @refreshview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @refreshview.AddChildren(children);
+        }
+
+        return @refreshview;
+    }
+
     public static SearchBar SearchBar() => GetNodeFromPool<SearchBar>();
     public static SearchBar SearchBar(params VisualNode? []? children)
     {
@@ -1238,6 +1970,18 @@ public static SearchBar SearchBar(Action<Microsoft.Maui.Controls.SearchBar?> com
         return @searchbar;
     }
 
+    public static SearchBar SearchBar(Action<Microsoft.Maui.Controls.SearchBar?> componentRefAction, params VisualNode? []? children)
+    {
+        var @searchbar = GetNodeFromPool<SearchBar>();
+        @searchbar.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @searchbar.AddChildren(children);
+        }
+
+        return @searchbar;
+    }
+
     public static SwipeView SwipeView() => GetNodeFromPool<SwipeView>();
     public static SwipeView SwipeView(params VisualNode? []? children)
     {
@@ -1257,6 +2001,18 @@ public static SwipeView SwipeView(Action<Microsoft.Maui.Controls.SwipeView?> com
         return @swipeview;
     }
 
+    public static SwipeView SwipeView(Action<Microsoft.Maui.Controls.SwipeView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @swipeview = GetNodeFromPool<SwipeView>();
+        @swipeview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @swipeview.AddChildren(children);
+        }
+
+        return @swipeview;
+    }
+
     public static SwipeItem SwipeItem() => GetNodeFromPool<SwipeItem>();
     public static SwipeItem SwipeItem(params VisualNode? []? children)
     {
@@ -1276,6 +2032,18 @@ public static SwipeItem SwipeItem(Action<Microsoft.Maui.Controls.SwipeItem?> com
         return @swipeitem;
     }
 
+    public static SwipeItem SwipeItem(Action<Microsoft.Maui.Controls.SwipeItem?> componentRefAction, params VisualNode? []? children)
+    {
+        var @swipeitem = GetNodeFromPool<SwipeItem>();
+        @swipeitem.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @swipeitem.AddChildren(children);
+        }
+
+        return @swipeitem;
+    }
+
     public static SwipeItems SwipeItems() => GetNodeFromPool<SwipeItems>();
     public static SwipeItems SwipeItems(params VisualNode? []? children)
     {
@@ -1295,6 +2063,18 @@ public static SwipeItems SwipeItems(Action<Microsoft.Maui.Controls.SwipeItems?>
         return @swipeitems;
     }
 
+    public static SwipeItems SwipeItems(Action<Microsoft.Maui.Controls.SwipeItems?> componentRefAction, params VisualNode? []? children)
+    {
+        var @swipeitems = GetNodeFromPool<SwipeItems>();
+        @swipeitems.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @swipeitems.AddChildren(children);
+        }
+
+        return @swipeitems;
+    }
+
     public static CheckBox CheckBox() => GetNodeFromPool<CheckBox>();
     public static CheckBox CheckBox(params VisualNode? []? children)
     {
@@ -1314,6 +2094,18 @@ public static CheckBox CheckBox(Action<Microsoft.Maui.Controls.CheckBox?> compon
         return @checkbox;
     }
 
+    public static CheckBox CheckBox(Action<Microsoft.Maui.Controls.CheckBox?> componentRefAction, params VisualNode? []? children)
+    {
+        var @checkbox = GetNodeFromPool<CheckBox>();
+        @checkbox.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @checkbox.AddChildren(children);
+        }
+
+        return @checkbox;
+    }
+
     public static Slider Slider() => GetNodeFromPool<Slider>();
     public static Slider Slider(params VisualNode? []? children)
     {
@@ -1333,6 +2125,18 @@ public static Slider Slider(Action<Microsoft.Maui.Controls.Slider?> componentRef
         return @slider;
     }
 
+    public static Slider Slider(Action<Microsoft.Maui.Controls.Slider?> componentRefAction, params VisualNode? []? children)
+    {
+        var @slider = GetNodeFromPool<Slider>();
+        @slider.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @slider.AddChildren(children);
+        }
+
+        return @slider;
+    }
+
     public static Stepper Stepper() => GetNodeFromPool<Stepper>();
     public static Stepper Stepper(params VisualNode? []? children)
     {
@@ -1352,6 +2156,18 @@ public static Stepper Stepper(Action<Microsoft.Maui.Controls.Stepper?> component
         return @stepper;
     }
 
+    public static Stepper Stepper(Action<Microsoft.Maui.Controls.Stepper?> componentRefAction, params VisualNode? []? children)
+    {
+        var @stepper = GetNodeFromPool<Stepper>();
+        @stepper.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @stepper.AddChildren(children);
+        }
+
+        return @stepper;
+    }
+
     public static Editor Editor() => GetNodeFromPool<Editor>();
     public static Editor Editor(params VisualNode? []? children)
     {
@@ -1371,6 +2187,18 @@ public static Editor Editor(Action<Microsoft.Maui.Controls.Editor?> componentRef
         return @editor;
     }
 
+    public static Editor Editor(Action<Microsoft.Maui.Controls.Editor?> componentRefAction, params VisualNode? []? children)
+    {
+        var @editor = GetNodeFromPool<Editor>();
+        @editor.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @editor.AddChildren(children);
+        }
+
+        return @editor;
+    }
+
     public static Switch Switch() => GetNodeFromPool<Switch>();
     public static Switch Switch(params VisualNode? []? children)
     {
@@ -1390,6 +2218,18 @@ public static Switch Switch(Action<Microsoft.Maui.Controls.Switch?> componentRef
         return @switch;
     }
 
+    public static Switch Switch(Action<Microsoft.Maui.Controls.Switch?> componentRefAction, params VisualNode? []? children)
+    {
+        var @switch = GetNodeFromPool<Switch>();
+        @switch.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @switch.AddChildren(children);
+        }
+
+        return @switch;
+    }
+
     public static DatePicker DatePicker() => GetNodeFromPool<DatePicker>();
     public static DatePicker DatePicker(params VisualNode? []? children)
     {
@@ -1409,6 +2249,18 @@ public static DatePicker DatePicker(Action<Microsoft.Maui.Controls.DatePicker?>
         return @datepicker;
     }
 
+    public static DatePicker DatePicker(Action<Microsoft.Maui.Controls.DatePicker?> componentRefAction, params VisualNode? []? children)
+    {
+        var @datepicker = GetNodeFromPool<DatePicker>();
+        @datepicker.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @datepicker.AddChildren(children);
+        }
+
+        return @datepicker;
+    }
+
     public static Entry Entry() => GetNodeFromPool<Entry>();
     public static Entry Entry(params VisualNode? []? children)
     {
@@ -1428,6 +2280,18 @@ public static Entry Entry(Action<Microsoft.Maui.Controls.Entry?> componentRefAct
         return @entry;
     }
 
+    public static Entry Entry(Action<Microsoft.Maui.Controls.Entry?> componentRefAction, params VisualNode? []? children)
+    {
+        var @entry = GetNodeFromPool<Entry>();
+        @entry.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @entry.AddChildren(children);
+        }
+
+        return @entry;
+    }
+
     public static ActivityIndicator ActivityIndicator() => GetNodeFromPool<ActivityIndicator>();
     public static ActivityIndicator ActivityIndicator(params VisualNode? []? children)
     {
@@ -1447,6 +2311,18 @@ public static ActivityIndicator ActivityIndicator(Action<Microsoft.Maui.Controls
         return @activityindicator;
     }
 
+    public static ActivityIndicator ActivityIndicator(Action<Microsoft.Maui.Controls.ActivityIndicator?> componentRefAction, params VisualNode? []? children)
+    {
+        var @activityindicator = GetNodeFromPool<ActivityIndicator>();
+        @activityindicator.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @activityindicator.AddChildren(children);
+        }
+
+        return @activityindicator;
+    }
+
     public static ProgressBar ProgressBar() => GetNodeFromPool<ProgressBar>();
     public static ProgressBar ProgressBar(params VisualNode? []? children)
     {
@@ -1466,6 +2342,18 @@ public static ProgressBar ProgressBar(Action<Microsoft.Maui.Controls.ProgressBar
         return @progressbar;
     }
 
+    public static ProgressBar ProgressBar(Action<Microsoft.Maui.Controls.ProgressBar?> componentRefAction, params VisualNode? []? children)
+    {
+        var @progressbar = GetNodeFromPool<ProgressBar>();
+        @progressbar.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @progressbar.AddChildren(children);
+        }
+
+        return @progressbar;
+    }
+
     public static AbsoluteLayout AbsoluteLayout() => GetNodeFromPool<AbsoluteLayout>();
     public static AbsoluteLayout AbsoluteLayout(params VisualNode? []? children)
     {
@@ -1485,6 +2373,18 @@ public static AbsoluteLayout AbsoluteLayout(Action<Microsoft.Maui.Controls.Absol
         return @absolutelayout;
     }
 
+    public static AbsoluteLayout AbsoluteLayout(Action<Microsoft.Maui.Controls.AbsoluteLayout?> componentRefAction, params VisualNode? []? children)
+    {
+        var @absolutelayout = GetNodeFromPool<AbsoluteLayout>();
+        @absolutelayout.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @absolutelayout.AddChildren(children);
+        }
+
+        return @absolutelayout;
+    }
+
     public static IndicatorView IndicatorView() => GetNodeFromPool<IndicatorView>();
     public static IndicatorView IndicatorView(params VisualNode? []? children)
     {
@@ -1504,6 +2404,18 @@ public static IndicatorView IndicatorView(Action<Microsoft.Maui.Controls.Indicat
         return @indicatorview;
     }
 
+    public static IndicatorView IndicatorView(Action<Microsoft.Maui.Controls.IndicatorView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @indicatorview = GetNodeFromPool<IndicatorView>();
+        @indicatorview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @indicatorview.AddChildren(children);
+        }
+
+        return @indicatorview;
+    }
+
     public static Picker Picker() => GetNodeFromPool<Picker>();
     public static Picker Picker(params VisualNode? []? children)
     {
@@ -1523,6 +2435,18 @@ public static Picker Picker(Action<Microsoft.Maui.Controls.Picker?> componentRef
         return @picker;
     }
 
+    public static Picker Picker(Action<Microsoft.Maui.Controls.Picker?> componentRefAction, params VisualNode? []? children)
+    {
+        var @picker = GetNodeFromPool<Picker>();
+        @picker.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @picker.AddChildren(children);
+        }
+
+        return @picker;
+    }
+
     public static TableView TableView() => GetNodeFromPool<TableView>();
     public static TableView TableView(params VisualNode? []? children)
     {
@@ -1542,6 +2466,18 @@ public static TableView TableView(Action<Microsoft.Maui.Controls.TableView?> com
         return @tableview;
     }
 
+    public static TableView TableView(Action<Microsoft.Maui.Controls.TableView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @tableview = GetNodeFromPool<TableView>();
+        @tableview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @tableview.AddChildren(children);
+        }
+
+        return @tableview;
+    }
+
     public static TextCell TextCell() => GetNodeFromPool<TextCell>();
     public static TextCell TextCell(params VisualNode? []? children)
     {
@@ -1561,6 +2497,18 @@ public static TextCell TextCell(Action<Microsoft.Maui.Controls.TextCell?> compon
         return @textcell;
     }
 
+    public static TextCell TextCell(Action<Microsoft.Maui.Controls.TextCell?> componentRefAction, params VisualNode? []? children)
+    {
+        var @textcell = GetNodeFromPool<TextCell>();
+        @textcell.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @textcell.AddChildren(children);
+        }
+
+        return @textcell;
+    }
+
     public static ImageCell ImageCell() => GetNodeFromPool<ImageCell>();
     public static ImageCell ImageCell(params VisualNode? []? children)
     {
@@ -1580,6 +2528,18 @@ public static ImageCell ImageCell(Action<Microsoft.Maui.Controls.ImageCell?> com
         return @imagecell;
     }
 
+    public static ImageCell ImageCell(Action<Microsoft.Maui.Controls.ImageCell?> componentRefAction, params VisualNode? []? children)
+    {
+        var @imagecell = GetNodeFromPool<ImageCell>();
+        @imagecell.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @imagecell.AddChildren(children);
+        }
+
+        return @imagecell;
+    }
+
     public static SwitchCell SwitchCell() => GetNodeFromPool<SwitchCell>();
     public static SwitchCell SwitchCell(params VisualNode? []? children)
     {
@@ -1599,6 +2559,18 @@ public static SwitchCell SwitchCell(Action<Microsoft.Maui.Controls.SwitchCell?>
         return @switchcell;
     }
 
+    public static SwitchCell SwitchCell(Action<Microsoft.Maui.Controls.SwitchCell?> componentRefAction, params VisualNode? []? children)
+    {
+        var @switchcell = GetNodeFromPool<SwitchCell>();
+        @switchcell.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @switchcell.AddChildren(children);
+        }
+
+        return @switchcell;
+    }
+
     public static EntryCell EntryCell() => GetNodeFromPool<EntryCell>();
     public static EntryCell EntryCell(params VisualNode? []? children)
     {
@@ -1618,6 +2590,18 @@ public static EntryCell EntryCell(Action<Microsoft.Maui.Controls.EntryCell?> com
         return @entrycell;
     }
 
+    public static EntryCell EntryCell(Action<Microsoft.Maui.Controls.EntryCell?> componentRefAction, params VisualNode? []? children)
+    {
+        var @entrycell = GetNodeFromPool<EntryCell>();
+        @entrycell.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @entrycell.AddChildren(children);
+        }
+
+        return @entrycell;
+    }
+
     public static ViewCell ViewCell() => GetNodeFromPool<ViewCell>();
     public static ViewCell ViewCell(params VisualNode? []? children)
     {
@@ -1637,6 +2621,18 @@ public static ViewCell ViewCell(Action<Microsoft.Maui.Controls.ViewCell?> compon
         return @viewcell;
     }
 
+    public static ViewCell ViewCell(Action<Microsoft.Maui.Controls.ViewCell?> componentRefAction, params VisualNode? []? children)
+    {
+        var @viewcell = GetNodeFromPool<ViewCell>();
+        @viewcell.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @viewcell.AddChildren(children);
+        }
+
+        return @viewcell;
+    }
+
     public static CarouselView CarouselView() => GetNodeFromPool<CarouselView>();
     public static CarouselView CarouselView(params VisualNode? []? children)
     {
@@ -1656,6 +2652,18 @@ public static CarouselView CarouselView(Action<Microsoft.Maui.Controls.CarouselV
         return @carouselview;
     }
 
+    public static CarouselView CarouselView(Action<Microsoft.Maui.Controls.CarouselView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @carouselview = GetNodeFromPool<CarouselView>();
+        @carouselview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @carouselview.AddChildren(children);
+        }
+
+        return @carouselview;
+    }
+
     public static GraphicsView GraphicsView() => GetNodeFromPool<GraphicsView>();
     public static GraphicsView GraphicsView(params VisualNode? []? children)
     {
@@ -1675,6 +2683,18 @@ public static GraphicsView GraphicsView(Action<Microsoft.Maui.Controls.GraphicsV
         return @graphicsview;
     }
 
+    public static GraphicsView GraphicsView(Action<Microsoft.Maui.Controls.GraphicsView?> componentRefAction, params VisualNode? []? children)
+    {
+        var @graphicsview = GetNodeFromPool<GraphicsView>();
+        @graphicsview.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @graphicsview.AddChildren(children);
+        }
+
+        return @graphicsview;
+    }
+
     public static Shadow Shadow() => GetNodeFromPool<Shadow>();
     public static Shadow Shadow(params VisualNode? []? children)
     {
@@ -1694,6 +2714,18 @@ public static Shadow Shadow(Action<Microsoft.Maui.Controls.Shadow?> componentRef
         return @shadow;
     }
 
+    public static Shadow Shadow(Action<Microsoft.Maui.Controls.Shadow?> componentRefAction, params VisualNode? []? children)
+    {
+        var @shadow = GetNodeFromPool<Shadow>();
+        @shadow.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @shadow.AddChildren(children);
+        }
+
+        return @shadow;
+    }
+
     public static Window Window() => GetNodeFromPool<Window>();
     public static Window Window(params VisualNode? []? children)
     {
@@ -1712,4 +2744,16 @@ public static Window Window(Action<Microsoft.Maui.Controls.Window?> componentRef
         @window.ComponentRefAction = componentRefAction;
         return @window;
     }
+
+    public static Window Window(Action<Microsoft.Maui.Controls.Window?> componentRefAction, params VisualNode? []? children)
+    {
+        var @window = GetNodeFromPool<Window>();
+        @window.ComponentRefAction = componentRefAction;
+        if (children != null)
+        {
+            @window.AddChildren(children);
+        }
+
+        return @window;
+    }
 }
\ No newline at end of file
diff --git a/src/MauiReactor/ContentPage.partial.cs b/src/MauiReactor/ContentPage.partial.cs
index 9b7b1c25..a3431ef7 100644
--- a/src/MauiReactor/ContentPage.partial.cs
+++ b/src/MauiReactor/ContentPage.partial.cs
@@ -54,6 +54,6 @@ public partial class Component
     public static ContentPage ContentPage(string title) 
         => GetNodeFromPool<ContentPage>().Title(title);
 
-    public static ContentPage ContentPage(string title, params VisualNode[] children)
+    public static ContentPage ContentPage(string title, params VisualNode?[]? children)
         => ContentPage(children).Title(title);
 }
diff --git a/src/MauiReactor/Grid.partial.cs b/src/MauiReactor/Grid.partial.cs
index 829c046f..ebf02f20 100644
--- a/src/MauiReactor/Grid.partial.cs
+++ b/src/MauiReactor/Grid.partial.cs
@@ -34,8 +34,9 @@ public Grid(IEnumerable<RowDefinition> rows, IEnumerable<ColumnDefinition> colum
     partial void OnReset()
     {
         var thisAsIGrid = (IGrid)this;
-        thisAsIGrid.RowDefinitions.Clear();
-        thisAsIGrid.ColumnDefinitions.Clear();
+        //NOTE: Do no use .Clear(), definitions must be recreated
+        thisAsIGrid.RowDefinitions = [];
+        thisAsIGrid.ColumnDefinitions = [];
     }
 
     partial void OnBeginUpdate()
@@ -190,13 +191,13 @@ public static T GridColumnSpan<T>(this T visualNodeWithAttachedProperties, int c
 
 public partial class Component
 {
-    public static Grid Grid(string rows, string columns, params VisualNode[] children)
+    public static Grid Grid(string rows, string columns, params VisualNode?[]? children)
         => Grid(children).Rows(rows).Columns(columns);
 
-    public static Grid Grid(RowDefinitionCollection rows, ColumnDefinitionCollection columns, params VisualNode[] children)
+    public static Grid Grid(RowDefinitionCollection rows, ColumnDefinitionCollection columns, params VisualNode?[]? children)
         => Grid(children).Rows(rows).Columns(columns);
 
-    public static Grid Grid(IEnumerable<RowDefinition> rows, IEnumerable<ColumnDefinition> columns, params VisualNode[] children)
+    public static Grid Grid(IEnumerable<RowDefinition> rows, IEnumerable<ColumnDefinition> columns, params VisualNode?[]? children)
         => Grid(children).Rows(rows).Columns(columns);
 
 }
diff --git a/src/MauiReactor/HorizontalStackLayout.partial.cs b/src/MauiReactor/HorizontalStackLayout.partial.cs
index 139b337b..14c67166 100644
--- a/src/MauiReactor/HorizontalStackLayout.partial.cs
+++ b/src/MauiReactor/HorizontalStackLayout.partial.cs
@@ -15,13 +15,13 @@ public HStack() { }
 public partial class Component
 {
 
-    public static HStack HStack(params VisualNode[] children)
+    public static HStack HStack(params VisualNode?[] children)
     {
         var hstack = GetNodeFromPool<HStack>();
         hstack.AddChildren(children);
         return hstack;
     }
-    public static HStack HStack(double spacing, params VisualNode[] children) 
+    public static HStack HStack(double spacing, params VisualNode?[] children) 
         => HStack(children)
             .Spacing(spacing);
 }
diff --git a/src/MauiReactor/Label.partial.cs b/src/MauiReactor/Label.partial.cs
index 724bc819..ab569735 100644
--- a/src/MauiReactor/Label.partial.cs
+++ b/src/MauiReactor/Label.partial.cs
@@ -12,7 +12,7 @@ public partial class Component
     public static Label Label(object? text) =>
         GetNodeFromPool<Label>().Text(text?.ToString() ?? string.Empty);
 
-    public static Label Label(object? text, params VisualNode[] children)
+    public static Label Label(object? text, params VisualNode?[]? children)
         => Label(children).Text(text?.ToString() ?? string.Empty);
 
     public static Label Label(Func<string> textFunc) =>
diff --git a/src/MauiReactor/ScrollView.partial.cs b/src/MauiReactor/ScrollView.partial.cs
index c86c3965..06c88e33 100644
--- a/src/MauiReactor/ScrollView.partial.cs
+++ b/src/MauiReactor/ScrollView.partial.cs
@@ -53,8 +53,8 @@ public class VScrollView : ScrollView
 
 public partial class Component
 {
-    public static ScrollView HScrollView(params VisualNode[] children)
+    public static ScrollView HScrollView(params VisualNode?[]? children)
         => ScrollView(children).Orientation(ScrollOrientation.Horizontal);
-    public static ScrollView VScrollView(params VisualNode[] children) 
+    public static ScrollView VScrollView(params VisualNode?[]? children) 
         => ScrollView(children).Orientation(ScrollOrientation.Horizontal);
 }
diff --git a/src/MauiReactor/VerticalStackLayout.partial.cs b/src/MauiReactor/VerticalStackLayout.partial.cs
index 33f9a590..73e42623 100644
--- a/src/MauiReactor/VerticalStackLayout.partial.cs
+++ b/src/MauiReactor/VerticalStackLayout.partial.cs
@@ -15,13 +15,13 @@ public VStack()
 
 public partial class Component
 {
-    public static VStack VStack(params VisualNode[] children)
+    public static VStack VStack(params VisualNode?[] children)
     {
         var vstack = GetNodeFromPool<VStack>();
         vstack.AddChildren(children);
         return vstack;
     }
-    public static VStack VStack(double spacing, params VisualNode[] children) =>
+    public static VStack VStack(double spacing, params VisualNode?[] children) =>
         VStack(children)
             .Spacing(spacing);