Fix #45 : Modified Generator to Reference Properties updates NOT Upda…

…teIncremental when types of Old and New object differs
fabulous-dev · May 17, 2018 · 50803d4 · 50803d4
1 parent 4899cce
commit 50803d4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/Elmish.XamarinForms/DynamicXaml.fs b/Elmish.XamarinForms/DynamicXaml.fs
@@ -3588,8 +3588,9 @@ type Xaml() =
             match prevChildOpt, source.TryContent with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.Content)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.Content <- newChild.CreateAsView()
             | USome _, UNone ->
@@ -6215,8 +6216,9 @@ type Xaml() =
             match prevChildOpt, source.TryContent with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.Content)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.Content <- newChild.CreateAsView()
             | USome _, UNone ->
@@ -7175,8 +7177,9 @@ type Xaml() =
             match prevChildOpt, source.TryContent with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.Content)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.Content <- newChild.CreateAsView()
             | USome _, UNone ->
@@ -9966,8 +9969,9 @@ type Xaml() =
             match prevChildOpt, source.TryCurrentPage with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.CurrentPage)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.CurrentPage <- newChild.CreateAsContentPage()
             | USome _, UNone ->
@@ -10653,8 +10657,9 @@ type Xaml() =
             match prevChildOpt, source.TryContent with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.Content)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.Content <- newChild.CreateAsView()
             | USome _, UNone ->
@@ -10864,8 +10869,9 @@ type Xaml() =
             match prevChildOpt, source.TryMaster with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.Master)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.Master <- newChild.CreateAsPage()
             | USome _, UNone ->
@@ -10875,8 +10881,9 @@ type Xaml() =
             match prevChildOpt, source.TryDetail with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.Detail)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.Detail <- newChild.CreateAsPage()
             | USome _, UNone ->
@@ -11321,8 +11328,9 @@ type Xaml() =
             match prevChildOpt, source.TryView with
             // For structured objects, dependsOn on reference equality
             | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()
-            | USome prevChild, USome newChild ->
+            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->
                 newChild.UpdateIncremental(prevChild, target.View)
+            | USome _, USome newChild
             | UNone, USome newChild ->
                 target.View <- newChild.CreateAsView()
             | USome _, UNone ->

diff --git a/Generator/Program.cs b/Generator/Program.cs
@@ -199,7 +199,7 @@ static int Main(string[] args)
             try {
                 if (args.Length < 2)
                 {
-                    Console.Error.WriteLine("usage: generator <outputPath>");
+                    Console.Error.WriteLine("usage: generator <bindingsPath> <outputPath>");
                     Environment.Exit(1);
                 }
                 var bindingsPath = args[0];
@@ -497,8 +497,9 @@ static string BindTypes (Bindings bindings)
                                     w.WriteLine($"            match prevChildOpt, source.Try{m.BoundUniqueName} with");
                                     w.WriteLine($"            // For structured objects, dependsOn on reference equality");
                                     w.WriteLine($"            | USome prevChild, USome newChild when System.Object.ReferenceEquals(prevChild, newChild) -> ()");
-                                    w.WriteLine($"            | USome prevChild, USome newChild ->");
+                                    w.WriteLine($"            | USome prevChild, USome newChild when prevChild.TargetType = newChild.TargetType ->");
                                     w.WriteLine($"                newChild.UpdateIncremental(prevChild, target.{m.Name})");
+                                    w.WriteLine($"            | USome _, USome newChild");
                                     w.WriteLine($"            | UNone, USome newChild ->");
                                     w.WriteLine($"                target.{m.Name} <- newChild.CreateAs{bt.Name}()");
                                     w.WriteLine($"            | USome _, UNone ->");