Simple cleanup to improve interop (data first)

elmish · Sep 17, 2022 · 81b3932 · 81b3932
1 parent 3873606
commit 81b3932
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/Elmish.WPF.Tests/DynamicViewModelTests.fs b/src/Elmish.WPF.Tests/DynamicViewModelTests.fs
@@ -127,7 +127,7 @@ module Helpers =
        AutoRequery = autoRequery }
      |> CmdData
      |> BaseBindingData
-     |> createBinding) name
+     |> Binding.createBinding) name
 
 
   let internal subModel

diff --git a/src/Elmish.WPF/Binding.fs b/src/Elmish.WPF/Binding.fs
@@ -6,11 +6,12 @@ open Elmish
 
 
 module Binding =
+  let internal createBinding data name = { Data = data |> BindingData.boxT; Name = name }
   open BindingData
 
   let internal mapData f binding =
-    { Name = binding.Name
-      Data = binding.Data |> f }
+    { Data = binding.Data |> f
+      Name = binding.Name }
 
   /// Maps the model of a binding via a contravariant mapping.
   let mapModel (f: 'a -> 'b) (binding: Binding<'b, 'msg>) = f |> mapModel |> mapData <| binding

diff --git a/src/Elmish.WPF/DynamicViewModel.fs b/src/Elmish.WPF/DynamicViewModel.fs
@@ -18,10 +18,6 @@ type Binding<'model, 'msg> =
 [<AutoOpen>]
 module internal Helpers =
 
-  let createBinding data name =
-    { Name = name
-      Data = data |> BindingData.boxT }
-
   type SubModelSelectedItemLast with
     member this.CompareBindings() : Binding<'model, 'msg> -> Binding<'model, 'msg> -> int =
       fun a b -> this.Recursive(a.Data) - this.Recursive(b.Data)