Merge pull request #1047 from fabulous-dev/type-safe-events

Remove ambiguity when declaring event attributes
fabulous-dev · Aug 7, 2023 · 203440e · 203440e
2 parents 8073849 + afef778
commit 203440e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 _No unreleased changes_
 
+## [2.4.0] - 2023-08-07
+
+### Changed
+- Remove ambiguity when declaring event attributes by using MsgValue instead of obj by @TimLariviere (https://github.com/fabulous-dev/Fabulous/pull/1047)
+
 ## [2.3.2] - 2023-06-01
 
 ### Changed

diff --git a/src/Fabulous/Attributes.fs b/src/Fabulous/Attributes.fs
@@ -84,6 +84,13 @@ type SmallScalarExtensions() =
         ) =
         this.WithValue(value, SmallScalars.IntEnum.encode)
 
+type MsgValue = MsgValue of obj
+
+[<Extension>]
+type SimpleScalarAttributeDefinitionExtensions() =
+    [<Extension>]
+    static member inline WithValue(this: SimpleScalarAttributeDefinition<'args -> MsgValue>, value: 'args -> 'msg) =
+        this.WithValue(value >> box >> MsgValue)
 
 module Attributes =
     /// Define an attribute that can fit into 8 bytes encoded as uint64 (such as float or bool)
@@ -276,11 +283,11 @@ module Attributes =
         { Key = key; Name = name }
 
     /// Define an attribute for EventHandler
-    let inline defineEventNoArg name ([<InlineIfLambda>] getEvent: obj -> IEvent<EventHandler, EventArgs>) : SimpleScalarAttributeDefinition<obj> =
+    let inline defineEventNoArg name ([<InlineIfLambda>] getEvent: obj -> IEvent<EventHandler, EventArgs>) : SimpleScalarAttributeDefinition<MsgValue> =
         let key =
             SimpleScalarAttributeDefinition.CreateAttributeData(
                 ScalarAttributeComparers.noCompare,
-                (fun _ newValueOpt node ->
+                (fun _ (newValueOpt: MsgValue voption) node ->
                     let event = getEvent node.Target
 
                     match node.TryGetHandler(name) with
@@ -290,7 +297,7 @@ module Attributes =
                     match newValueOpt with
                     | ValueNone -> node.SetHandler(name, ValueNone)
 
-                    | ValueSome msg ->
+                    | ValueSome(MsgValue msg) ->
                         let handler = EventHandler(fun _ _ -> Dispatcher.dispatch node msg)
 
                         event.AddHandler handler
@@ -305,11 +312,11 @@ module Attributes =
     let inline defineEvent<'args>
         name
         ([<InlineIfLambda>] getEvent: obj -> IEvent<EventHandler<'args>, 'args>)
-        : SimpleScalarAttributeDefinition<'args -> obj> =
+        : SimpleScalarAttributeDefinition<'args -> MsgValue> =
         let key =
             SimpleScalarAttributeDefinition.CreateAttributeData(
                 ScalarAttributeComparers.noCompare,
-                (fun _ (newValueOpt: ('args -> obj) voption) (node: IViewNode) ->
+                (fun _ (newValueOpt: ('args -> MsgValue) voption) (node: IViewNode) ->
                     let event = getEvent node.Target
 
                     match node.TryGetHandler(name) with
@@ -322,7 +329,7 @@ module Attributes =
                     | ValueSome fn ->
                         let handler =
                             EventHandler<'args>(fun _ args ->
-                                let r = fn args
+                                let (MsgValue r) = fn args
                                 Dispatcher.dispatch node r)
 
                         node.SetHandler(name, ValueSome handler)