Working on Balance sample app

adospace · Dec 11, 2024 · f3ba038 · f3ba038
1 parent f2dc660
commit f3ba038
Show file tree

Hide file tree

Showing 109 changed files with 2,236 additions and 1,188 deletions.
diff --git a/src/MauiReactor.Scaffold/ComponentTypeGenerator.cs b/src/MauiReactor.Scaffold/ComponentTypeGenerator.cs
@@ -101,7 +101,7 @@ public partial class Component
 
             #line default
             #line hidden
-            this.Write("(params VisualNode?[]? children)\r\n    {\r\n        var @");
+            this.Write("(params IEnumerable<VisualNode?>? children)\r\n    {\r\n        var @");
 
             #line 32 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\ComponentTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(type.Name.ToLower()));
@@ -213,7 +213,8 @@ public partial class Component
 
             #line default
             #line hidden
-            this.Write("?> componentRefAction, params VisualNode?[]? children)\r\n    {\r\n        var @");
+            this.Write("?> componentRefAction, params IEnumerable<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()));

diff --git a/src/MauiReactor.Scaffold/ComponentTypeGenerator.tt b/src/MauiReactor.Scaffold/ComponentTypeGenerator.tt
@@ -27,7 +27,7 @@ public partial class Component
         => new <#= typeName #>();
 
     <# if (typeof(Element).IsAssignableFrom(type)) { #>
-    public static <#= typeName #> <#= type.Name #>(params VisualNode?[]? children)
+    public static <#= typeName #> <#= type.Name #>(params IEnumerable<VisualNode?>? children)
     {
         var @<#= type.Name.ToLower() #> = new <#= typeName #>();
         if (children != null)
@@ -46,7 +46,7 @@ public partial class Component
     }
 
     <# if (typeof(Element).IsAssignableFrom(type)) { #>
-    public static <#= typeName #> <#= type.Name #>(Action<<#= type.FullName #>?> componentRefAction, params VisualNode?[]? children)
+    public static <#= typeName #> <#= type.Name #>(Action<<#= type.FullName #>?> componentRefAction, params IEnumerable<VisualNode?>? children)
     {
         var @<#= type.Name.ToLower() #> = new <#= typeName #>();
         @<#= type.Name.ToLower() #>.ComponentRefAction = componentRefAction;

diff --git a/src/MauiReactor.Scaffold/Program.cs b/src/MauiReactor.Scaffold/Program.cs
@@ -32,7 +32,7 @@ where typeof(BindableObject).IsAssignableFrom(assemblyType)
     scaffoldedTypes.Add(typeToScaffold);
 }
 
-//GenerateComponentPartial(scaffoldedTypes, outputPath);
+GenerateComponentPartial(scaffoldedTypes, outputPath);
 
 Console.WriteLine("Done");
 

diff --git a/src/MauiReactor.Scaffold/TypeGenerator.cs b/src/MauiReactor.Scaffold/TypeGenerator.cs
diff --git a/src/MauiReactor.Scaffold/TypeGenerator.tt b/src/MauiReactor.Scaffold/TypeGenerator.tt
@@ -248,6 +248,16 @@ public partial class <#= TypeName() #> : <#= TypeName() #><<#= FullTypeName() #>
     {
 
     }
+
+    <# if (typeof(Element).IsAssignableFrom(_typeToScaffold)) { #>
+    public <#= TypeName() #>(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
+    <# } #>
 }
 <# } #>
 

diff --git a/src/MauiReactor.ScaffoldGenerator/Helper.cs b/src/MauiReactor.ScaffoldGenerator/Helper.cs
@@ -168,4 +168,18 @@ public static bool IsNewModifierUsed(this IPropertySymbol propertySymbol)
         // No matching property found in the base type or any ancestor type
         return false;
     }
+
+    public static bool IsDerivedFrom(this INamedTypeSymbol type, INamedTypeSymbol baseType)
+    {
+        INamedTypeSymbol? currentBaseType = type.BaseType;
+        while (currentBaseType != null)
+        {
+            if (currentBaseType.Equals(baseType, SymbolEqualityComparer.Default))
+            {
+                return true;
+            }
+            currentBaseType = currentBaseType.BaseType;
+        }
+        return false;
+    }
 }
diff --git a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs
diff --git a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.partial.cs b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.partial.cs
@@ -128,6 +128,9 @@ public ScaffoldTypeGenerator(
             .First()
             .Type
             .GetFullyQualifiedName() : string.Empty;
+
+        var typeOfElement = compilation.FindNamedType("Microsoft.Maui.Controls.Element").EnsureNotNull();
+        IsTypeDerivingFromElement = typeToScaffold.IsDerivedFrom(typeOfElement);
     }
 
     private IPropertySymbol[] Properties { get; }
@@ -156,6 +159,7 @@ public ScaffoldTypeGenerator(
     public INamedTypeSymbol TypeofColor { get; }
 
     private string? BaseTypeNamespace { get; }
+
     public bool IsBaseGenericType =>
         TypeToScaffold.BaseType.EnsureNotNull().IsGenericType;
 
@@ -244,6 +248,8 @@ private bool IsTypeNotAbstractWithEmptyConstructor
     private bool IsTypeSealed
         => TypeToScaffold.IsSealed;
 
+    private bool IsTypeDerivingFromElement { get; }    
+
     private string GetDelegateParametersDescriptor(IEventSymbol ev)
     {
         /*

diff --git a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt
@@ -434,6 +434,16 @@ namespace <#= Namespace #>
         {
 
         }
+
+        <# if (IsTypeDerivingFromElement) { #>
+        public <#= GeneratorType.Name #>(params IEnumerable<VisualNode?>? children)
+        {
+            if (children != null)
+            {
+                this.AddChildren(children);
+            }
+        }        
+        <# } #>
     }
     <# } #>
 
@@ -450,6 +460,16 @@ namespace <#= Namespace #>
         {
 
         }
+
+        <# if (IsTypeDerivingFromElement) { #>
+        public <#= GeneratorType.Name #>(params IEnumerable<VisualNode?>? children)
+        {
+            if (children != null)
+            {
+                this.AddChildren(children);
+            }
+        }        
+        <# } #>
     }
     <# } #>
 

diff --git a/src/MauiReactor/AbsoluteLayout.cs b/src/MauiReactor/AbsoluteLayout.cs
@@ -55,6 +55,14 @@ public AbsoluteLayout()
     public AbsoluteLayout(Action<Microsoft.Maui.Controls.AbsoluteLayout?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public AbsoluteLayout(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class AbsoluteLayoutExtensions

diff --git a/src/MauiReactor/ActivityIndicator.cs b/src/MauiReactor/ActivityIndicator.cs
@@ -55,6 +55,14 @@ public ActivityIndicator()
     public ActivityIndicator(Action<Microsoft.Maui.Controls.ActivityIndicator?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public ActivityIndicator(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class ActivityIndicatorExtensions

diff --git a/src/MauiReactor/BaseShellItem.cs b/src/MauiReactor/BaseShellItem.cs
@@ -129,6 +129,14 @@ public BaseShellItem()
     public BaseShellItem(Action<Microsoft.Maui.Controls.BaseShellItem?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public BaseShellItem(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class BaseShellItemExtensions

diff --git a/src/MauiReactor/Border.cs b/src/MauiReactor/Border.cs
@@ -55,6 +55,14 @@ public Border()
     public Border(Action<Microsoft.Maui.Controls.Border?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public Border(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class BorderExtensions

diff --git a/src/MauiReactor/BoxView.cs b/src/MauiReactor/BoxView.cs
@@ -55,6 +55,14 @@ public BoxView()
     public BoxView(Action<Microsoft.Maui.Controls.BoxView?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public BoxView(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class BoxViewExtensions

diff --git a/src/MauiReactor/Button.cs b/src/MauiReactor/Button.cs
@@ -155,6 +155,14 @@ public Button()
     public Button(Action<Microsoft.Maui.Controls.Button?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public Button(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class ButtonExtensions

diff --git a/src/MauiReactor/CarouselView.cs b/src/MauiReactor/CarouselView.cs
@@ -129,6 +129,14 @@ public CarouselView()
     public CarouselView(Action<Microsoft.Maui.Controls.CarouselView?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public CarouselView(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class CarouselViewExtensions

diff --git a/src/MauiReactor/CheckBox.cs b/src/MauiReactor/CheckBox.cs
@@ -103,6 +103,14 @@ public CheckBox()
     public CheckBox(Action<Microsoft.Maui.Controls.CheckBox?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public CheckBox(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class CheckBoxExtensions

diff --git a/src/MauiReactor/CollectionView.cs b/src/MauiReactor/CollectionView.cs
@@ -55,6 +55,14 @@ public CollectionView()
     public CollectionView(Action<Microsoft.Maui.Controls.CollectionView?> componentRefAction) : base(componentRefAction)
     {
     }
+
+    public CollectionView(params IEnumerable<VisualNode?>? children)
+    {
+        if (children != null)
+        {
+            this.AddChildren(children);
+        }
+    }
 }
 
 public static partial class CollectionViewExtensions

diff --git a/src/MauiReactor/Compatibility/Layout.cs b/src/MauiReactor/Compatibility/Layout.cs
@@ -236,4 +236,4 @@ public static partial class LayoutStyles
     public static Dictionary<string, Action<ILayout>> Themes { get; } = [];
 }
 
-#pragma warning restore CS0618 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
diff --git a/src/MauiReactor/Component.cs b/src/MauiReactor/Component.cs
@@ -157,20 +157,26 @@ protected virtual void OnMountedOrPropsChanged()
 
         }
 
-        public INavigation? Navigation
-            => ContainerPage?.Navigation ?? NavigationProvider.Navigation;
+        public INavigation Navigation
+            => ContainerPage?.Navigation ?? NavigationProvider.Navigation ?? throw new InvalidOperationException("Navigation not available");
+
+        public bool IsNavigationAvailable
+            => ContainerPage?.Navigation != null || NavigationProvider.Navigation != null;
 
         private Microsoft.Maui.Controls.Page? _containerPage;
 
-        public Microsoft.Maui.Controls.Page? ContainerPage
+        public Microsoft.Maui.Controls.Page ContainerPage
         {
             get
             {
                 _containerPage ??= ((IVisualNode)this).GetContainerPage();
-                return _containerPage;
+                return _containerPage ?? throw new InvalidOperationException("ContainerPage not available");
             }
         }
 
+        public bool IsContainerPageAvailable
+            => _containerPage != null || ((IVisualNode)this).GetContainerPage() != null;
+
         public static IServiceProvider Services
             => ServiceCollectionProvider.ServiceProvider;