2.0.17-beta

adospace · Jan 12, 2024 · 0238f26 · 0238f26
1 parent e94326d
commit 0238f26
Show file tree

Hide file tree

Showing 46 changed files with 284 additions and 472 deletions.
diff --git 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.16-beta
+      Version: 2.0.17-beta
 
     steps:
     - name: Checkout

diff --git a/samples/MauiReactor.TestApp/Pages/AnimatedCollectionViewPage.cs b/samples/MauiReactor.TestApp/Pages/AnimatedCollectionViewPage.cs
@@ -52,7 +52,7 @@ public override VisualNode Render()
     private VisualNode RenderItem(ItemModel item)
         => new AnimatedItem
         {
-            new Frame()
+            Frame()
                 .BackgroundColor(Color.Parse("#512BD4"))
                 .Margin(4)
                 .CornerRadius(8)
@@ -68,19 +68,7 @@ class AnimatedItemState
 
 class AnimatedItem : Component<AnimatedItemState>
 {
-    protected override void OnMounted()
-    {
-        InitializeState();
-        base.OnMounted();
-    }
-
-    protected override void OnPropsChanged()
-    {
-        InitializeState();
-        base.OnPropsChanged();
-    }
-
-    void InitializeState()
+    protected override void OnMountedOrPropsChanged()
     {
         State.ScaleX = 0.8;
         State.ScaleY = 0.5;
@@ -89,6 +77,7 @@ void InitializeState()
         {
             s.ScaleX = s.ScaleY = 1.0;
         }));
+        base.OnMountedOrPropsChanged();
     }
 
     public override VisualNode Render() =>

diff --git a/src/MauiReactor.Canvas/DropShadow.cs b/src/MauiReactor.Canvas/DropShadow.cs
@@ -21,7 +21,7 @@ public static partial class DropShadowExtensions
     public static T Size<T>(this T node, float x, float y, RxSizeFAnimation? customAnimation = null) where T : IDropShadow
     {
         node.Size = new PropertyValue<SizeF>(new SizeF(x, y));
-        node.AppendAnimatable(Internals.DropShadow.SizeProperty, customAnimation ?? new RxSimpleSizeFAnimation(new SizeF(x, y)), v => node.Size = new PropertyValue<SizeF>(v.CurrentValue()));
+        node.AppendAnimatable(Internals.DropShadow.SizeProperty, customAnimation ?? new RxSimpleSizeFAnimation(new SizeF(x, y)), v => node.Size = ((RxSizeFAnimation)v).CurrentValue());
         return node;
     }
 }
diff --git a/src/MauiReactor.Scaffold/TypeGenerator.cs b/src/MauiReactor.Scaffold/TypeGenerator.cs
@@ -1207,14 +1207,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxDoubleAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -1326,14 +1319,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxRectAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -1445,14 +1431,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxPointAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -1564,14 +1543,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxThicknessAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -1683,14 +1655,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxCornerRadiusAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -1923,14 +1888,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxThicknessAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -2008,14 +1966,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxThicknessAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -2094,14 +2045,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxThicknessAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -2250,14 +2194,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxCornerRadiusAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));
@@ -2336,14 +2273,7 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write(" = new PropertyValue<");
-
-            #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(property.PropertyType.FullName.ToResevedWordFullTypeName()));
-
-            #line default
-            #line hidden
-            this.Write(">(v.CurrentValue()));\n        return ");
+            this.Write(" = ((RxCornerRadiusAnimation)v).CurrentValue());\n        return ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName().ToLocalVariableName()));