Update to Fabulous 2.4.0

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "5.2.0",
+      "version": "6.2.3",
       "commands": [
         "fantomas"
       ]

.github/workflows/pull_request.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Check code formatting
       run: |
         dotnet tool restore
-        dotnet fantomas --check -r src samples templates
+        dotnet fantomas --check src samples templates
     - name: Restore
       run: dotnet restore ${SLN_FILE}
     - name: Build

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 name: Release
 on:
   push:
-    tags: ['[0-9]+.[0-9]+.[0-9]+', '[0-9]+.[0-9]+.[0-9]+-preview.[0-9]+']
+    tags: ['[0-9]+.[0-9]+.[0-9]+', '[0-9]+.[0-9]+.[0-9]+-pre[0-9]+']
     paths-ignore: [ 'docs/**' ]
 
 permissions: write-all

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-11-22
+
+### Changed
+- Updated to Fabulous 2.4.0
+
 ## [2.3.0] - 2023-06-30
 
 ### Changed
@@ -45,7 +50,8 @@ No unreleased changes.
 ### Changed
 - Fabulous.XamarinForms has moved from the Fabulous repository to its own repository: [https://github.com/fabulous-dev/Fabulous.XamarinForms](https://github.com/fabulous-dev/Fabulous.XamarinForms)
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.XamarinForms/compare/2.3.0...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.XamarinForms/compare/2.4.0...HEAD
+[2.4.0]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.4.0
 [2.3.0]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.3.0
 [2.2.0]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.2.0
 [2.1.4]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.1.4

Directory.Packages.props

@@ -5,21 +5,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Fabulous" Version="2.3.2" />
-    <PackageVersion Include="FsCheck.NUnit" Version="2.16.5" />
-    <PackageVersion Include="FSharp.Android.Resource" Version="1.0.4" />
-    <PackageVersion Include="FSharp.Core" Version="7.0.300" />
-    <PackageVersion Include="FSharp.Data" Version="6.2.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="Fabulous" Version="2.4.0" />
+    <PackageVersion Include="FsCheck.NUnit" Version="2.16.6" />
+    <PackageVersion Include="FSharp.Android.Resource" Version="1.1.1" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.100" />
+    <PackageVersion Include="FSharp.Data" Version="6.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="NUnit" Version="3.14.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Plugin.Permissions" Version="6.0.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.8.116" />
     <PackageVersion Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageVersion Include="Xamarin.Essentials" Version="1.7.6" />
-    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2578" />
-    <PackageVersion Include="Xamarin.Forms.Maps" Version="5.0.0.2578" />
+    <PackageVersion Include="Xamarin.Essentials" Version="1.8.0" />
+    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2622" />
+    <PackageVersion Include="Xamarin.Forms.Maps" Version="5.0.0.2622" />
     <PackageVersion Include="Xamarin.Forms.PancakeView" Version="2.3.0.759" />
     <PackageVersion Include="Xam.Plugin.Media" Version="6.0.2" />
   </ItemGroup>

Fabulous.XamarinForms.sln

@@ -48,10 +48,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Files", "_Solutio
 		README.md = README.md
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE.md = LICENSE.md
-	    .gitignore = .gitignore
-	    pull_request.yml = .github/workflows/pull_request.yml
-	    build.yml = .github/workflows/build.yml
-	    release.yml = .github/workflows/release.yml
+					.gitignore = .gitignore
+					pull_request.yml = .github/workflows/pull_request.yml
+					build.yml = .github/workflows/build.yml
+					release.yml = .github/workflows/release.yml
+		Directory.Packages.props = Directory.Packages.props
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global

src/Fabulous.XamarinForms/Attributes.fs

@@ -21,10 +21,12 @@ module AppTheme =
 [<Struct>]
 type ValueEventData<'data, 'eventArgs> =
     { Value: 'data
-      Event: 'eventArgs -> obj }
+      Event: 'eventArgs -> MsgValue }
 
 module ValueEventData =
-    let create (value: 'data) (event: 'eventArgs -> obj) = { Value = value; Event = event }
+    let create (value: 'data) (event: 'eventArgs -> 'msg) =
+        { Value = value
+          Event = event >> box >> MsgValue }
 
 /// Xamarin Forms specific attributes that can be encoded as 8 bytes
 module SmallScalars =
@@ -225,7 +227,7 @@ module Attributes =
                         // Set the new event handler
                         let handler =
                             EventHandler<'args>(fun _ args ->
-                                let r = curr.Event args
+                                let (MsgValue r) = curr.Event args
                                 Dispatcher.dispatch node r)
 
                         node.SetHandler(name, ValueSome handler)

src/Fabulous.XamarinForms/Fabulous.XamarinForms.fsproj

@@ -140,7 +140,7 @@
     -->
     <PackageReference Include="FSharp.Core" VersionOverride="7.0.0" PrivateAssets="All" />
     <PackageReference Include="Xamarin.Forms" VersionOverride="5.0.0.1874" />
-    <PackageReference Include="Fabulous" VersionOverride="[2.3.0, 2.4.0)" />
+    <PackageReference Include="Fabulous" VersionOverride="[2.4.0, 2.5.0)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/Fabulous.XamarinForms/Views/Application.fs

@@ -100,17 +100,17 @@ type ApplicationModifiers =
     /// Dispatch a message when the application starts
     [<Extension>]
     static member inline onStart(this: WidgetBuilder<'msg, #IApplication>, onStart: 'msg) =
-        this.AddScalar(Application.Start.WithValue(onStart))
+        this.AddScalar(Application.Start.WithValue(MsgValue onStart))
 
     /// Dispatch a message when the application is paused by the OS
     [<Extension>]
     static member inline onSleep(this: WidgetBuilder<'msg, #IApplication>, onSleep: 'msg) =
-        this.AddScalar(Application.Sleep.WithValue(onSleep))
+        this.AddScalar(Application.Sleep.WithValue(MsgValue onSleep))
 
     /// Dispatch a message when the application is resumed by the OS
     [<Extension>]
     static member inline onResume(this: WidgetBuilder<'msg, #IApplication>, onResume: 'msg) =
-        this.AddScalar(Application.Resume.WithValue(onResume))
+        this.AddScalar(Application.Resume.WithValue(MsgValue onResume))
 
     /// Link a ViewRef to access the direct Application instance
     [<Extension>]

src/Fabulous.XamarinForms/Views/Cells/EntryCell.fs

@@ -41,7 +41,7 @@ module EntryCellBuilders =
             WidgetBuilder<'msg, IEntryCell>(
                 EntryCell.WidgetKey,
                 EntryCell.Label.WithValue(label),
-                EntryCell.TextWithEvent.WithValue(ValueEventData.create text (fun args -> onTextChanged args.NewTextValue |> box))
+                EntryCell.TextWithEvent.WithValue(ValueEventData.create text (fun (args: TextChangedEventArgs) -> onTextChanged args.NewTextValue))
             )
 
 [<Extension>]
@@ -54,32 +54,32 @@ type EntryCellModifiers =
         this.AddScalar(EntryCell.LabelColor.WithValue(AppTheme.create light dark))
 
     /// <summary>Set the horizontal text alignment</summary>
-    /// param name="alignment">The horizontal text alignment</summary>
+    /// <param name="alignment">The horizontal text alignment</param>
     [<Extension>]
     static member inline horizontalTextAlignment(this: WidgetBuilder<'msg, #IEntryCell>, alignment: TextAlignment) =
         this.AddScalar(EntryCell.HorizontalTextAlignment.WithValue(alignment))
 
     /// <summary>Set the vertical text alignment</summary>
-    /// param name="alignment">The vertical text alignment</summary>
+    /// <param name="alignment">The vertical text alignment</param>
     [<Extension>]
     static member inline verticalTextAlignment(this: WidgetBuilder<'msg, #IEntryCell>, alignment: TextAlignment) =
         this.AddScalar(EntryCell.VerticalTextAlignment.WithValue(alignment))
 
     /// <summary>Set the keyboard</summary>
-    /// param name="keyboard">The keyboard type</summary>
+    /// <param name="keyboard">The keyboard type</param>
     [<Extension>]
     static member inline keyboard(this: WidgetBuilder<'msg, #IEntryCell>, keyboard: Keyboard) =
         this.AddScalar(EntryCell.Keyboard.WithValue(keyboard))
 
     /// <summary>Set the placeholder text</summary>
-    /// param name="placeholder">The placeholder</summary>
+    /// <param name="placeholder">The placeholder</param>
     [<Extension>]
     static member inline placeholder(this: WidgetBuilder<'msg, #IEntryCell>, placeholder: string) =
         this.AddScalar(EntryCell.Placeholder.WithValue(placeholder))
 
     [<Extension>]
     static member inline onCompleted(this: WidgetBuilder<'msg, #IEntryCell>, onCompleted: 'msg) =
-        this.AddScalar(EntryCell.OnCompleted.WithValue(onCompleted))
+        this.AddScalar(EntryCell.OnCompleted.WithValue(MsgValue onCompleted))
 
     /// <summary>Link a ViewRef to access the direct EntryCell control instance</summary>
     [<Extension>]

src/Fabulous.XamarinForms/Views/Cells/SwitchCell.fs

@@ -24,7 +24,7 @@ module SwitchCellBuilders =
         static member inline SwitchCell<'msg>(text: string, value: bool, onChanged: bool -> 'msg) =
             WidgetBuilder<'msg, ISwitchCell>(
                 SwitchCell.WidgetKey,
-                SwitchCell.OnWithEvent.WithValue(ValueEventData.create value (fun args -> onChanged args.Value |> box)),
+                SwitchCell.OnWithEvent.WithValue(ValueEventData.create value (fun (args: ToggledEventArgs) -> onChanged args.Value)),
                 SwitchCell.Text.WithValue(text)
             )
 

src/Fabulous.XamarinForms/Views/Cells/_Cell.fs

@@ -47,12 +47,12 @@ type CellModifiers =
 
     [<Extension>]
     static member inline onAppearing(this: WidgetBuilder<'msg, #ICell>, onAppearing: 'msg) =
-        this.AddScalar(Cell.Appearing.WithValue(onAppearing))
+        this.AddScalar(Cell.Appearing.WithValue(MsgValue onAppearing))
 
     [<Extension>]
     static member inline onDisappearing(this: WidgetBuilder<'msg, #ICell>, onDisappearing: 'msg) =
-        this.AddScalar(Cell.Disappearing.WithValue(onDisappearing))
+        this.AddScalar(Cell.Disappearing.WithValue(MsgValue onDisappearing))
 
     [<Extension>]
     static member inline onTapped(this: WidgetBuilder<'msg, #ICell>, onTapped: 'msg) =
-        this.AddScalar(Cell.Tapped.WithValue(onTapped))
+        this.AddScalar(Cell.Tapped.WithValue(MsgValue onTapped))

src/Fabulous.XamarinForms/Views/Collections/ListView.fs

@@ -184,7 +184,7 @@ type ListViewModifiers =
 
     [<Extension>]
     static member inline onRefreshing(this: WidgetBuilder<'msg, #IListView>, onRefreshing: 'msg) =
-        this.AddScalar(ListView.Refreshing.WithValue(onRefreshing))
+        this.AddScalar(ListView.Refreshing.WithValue(MsgValue onRefreshing))
 
     [<Extension>]
     static member inline onScrolled(this: WidgetBuilder<'msg, #IListView>, onScrolled: ScrolledEventArgs -> 'msg) =

src/Fabulous.XamarinForms/Views/Collections/_ItemsView.fs

@@ -52,12 +52,12 @@ type ItemsViewModifiers =
 
     /// <summary>The threshold of items not yet visible in the list at which the RemainingItemsThresholdReached event will be fired.</summary>
     /// <param name="value">The threshold of items not yet visible in the list</param>
-    /// <param="onThresholdReached">Event executed when the RemainingItemsThreshold is reached</param>
+    /// <param name="onThresholdReached">Event executed when the RemainingItemsThreshold is reached</param>
     [<Extension>]
     static member inline remainingItemsThreshold(this: WidgetBuilder<'msg, #IItemsView>, value: int, onThresholdReached: 'msg) =
         this
             .AddScalar(ItemsView.RemainingItemsThreshold.WithValue(value))
-            .AddScalar(ItemsView.RemainingItemsThresholdReached.WithValue(onThresholdReached))
+            .AddScalar(ItemsView.RemainingItemsThresholdReached.WithValue(MsgValue onThresholdReached))
 
     /// <summary>Sets the visibility of the horizontal scroll bar.</summary>
     /// <param name="value">true if the horizontal scroll is enabled; otherwise, false.</param>

src/Fabulous.XamarinForms/Views/Controls/Button.fs

@@ -59,7 +59,7 @@ module ButtonBuilders =
     type Fabulous.XamarinForms.View with
 
         static member inline Button<'msg>(text: string, onClicked: 'msg) =
-            WidgetBuilder<'msg, IButton>(Button.WidgetKey, Button.Text.WithValue(text), Button.Clicked.WithValue(onClicked))
+            WidgetBuilder<'msg, IButton>(Button.WidgetKey, Button.Text.WithValue(text), Button.Clicked.WithValue(MsgValue onClicked))
 
 [<Extension>]
 type ButtonModifiers =
@@ -165,11 +165,11 @@ type ButtonModifiers =
 
     [<Extension>]
     static member inline onPressed(this: WidgetBuilder<'msg, #IButton>, onPressed: 'msg) =
-        this.AddScalar(Button.Pressed.WithValue(onPressed))
+        this.AddScalar(Button.Pressed.WithValue(MsgValue onPressed))
 
     [<Extension>]
     static member inline onReleased(this: WidgetBuilder<'msg, #IButton>, onReleased: 'msg) =
-        this.AddScalar(Button.Released.WithValue(onReleased))
+        this.AddScalar(Button.Released.WithValue(MsgValue onReleased))
 
     /// <summary>Link a ViewRef to access the direct Button control instance</summary>
     [<Extension>]

src/Fabulous.XamarinForms/Views/Controls/CheckBox.fs

@@ -23,7 +23,7 @@ module CheckBoxBuilders =
         static member inline CheckBox<'msg>(isChecked: bool, onCheckedChanged: bool -> 'msg) =
             WidgetBuilder<'msg, ICheckBox>(
                 CheckBox.WidgetKey,
-                CheckBox.IsCheckedWithEvent.WithValue(ValueEventData.create isChecked (fun args -> onCheckedChanged args.Value |> box))
+                CheckBox.IsCheckedWithEvent.WithValue(ValueEventData.create isChecked (fun (args: CheckedChangedEventArgs) -> onCheckedChanged args.Value))
             )
 
 [<Extension>]

src/Fabulous.XamarinForms/Views/Controls/DatePicker.fs

@@ -57,7 +57,7 @@ module DatePickerBuilders =
         static member inline DatePicker<'msg>(date: DateTime, onDateSelected: DateTime -> 'msg) =
             WidgetBuilder<'msg, IDatePicker>(
                 DatePicker.WidgetKey,
-                DatePicker.DateWithEvent.WithValue(ValueEventData.create date (fun args -> onDateSelected args.NewDate |> box))
+                DatePicker.DateWithEvent.WithValue(ValueEventData.create date (fun (args: DateChangedEventArgs) -> onDateSelected args.NewDate))
             )
 
 [<Extension>]

src/Fabulous.XamarinForms/Views/Controls/Editor.fs

@@ -34,7 +34,7 @@ module EditorBuilders =
         static member inline Editor<'msg>(text: string, onTextChanged: string -> 'msg) =
             WidgetBuilder<'msg, IEditor>(
                 Editor.WidgetKey,
-                InputView.TextWithEvent.WithValue(ValueEventData.create text (fun args -> onTextChanged args.NewTextValue |> box))
+                InputView.TextWithEvent.WithValue(ValueEventData.create text (fun (args: TextChangedEventArgs) -> onTextChanged args.NewTextValue))
             )
 
 [<Extension>]
@@ -69,7 +69,7 @@ type EditorModifiers =
         this.AddScalar(Editor.AutoSize.WithValue(value))
 
     /// <summary>Sets a value that controls whether the editor will allow text prediction.</summary>
-    /// <param name="true will allow text prediction. otherwise false.</param>
+    /// <param name="value">true will allow text prediction. otherwise false.</param>
     [<Extension>]
     static member inline isPredictionEnabled(this: WidgetBuilder<'msg, #IEditor>, value: bool) =
         this.AddScalar(Editor.IsTextPredictionEnabled.WithValue(value))
@@ -78,7 +78,7 @@ type EditorModifiers =
     /// <param name="onCompleted">Msg to dispatch when editing has completed.</param>
     [<Extension>]
     static member inline onCompleted(this: WidgetBuilder<'msg, #IEditor>, onCompleted: 'msg) =
-        this.AddScalar(Editor.Completed.WithValue(onCompleted))
+        this.AddScalar(Editor.Completed.WithValue(MsgValue onCompleted))
 
     /// <summary>Link a ViewRef to access the direct Editor control instance</summary>
     [<Extension>]

src/Fabulous.XamarinForms/Views/Controls/Entry.fs

@@ -60,7 +60,7 @@ module EntryBuilders =
         static member inline Entry<'msg>(text: string, onTextChanged: string -> 'msg) =
             WidgetBuilder<'msg, IEntry>(
                 Entry.WidgetKey,
-                InputView.TextWithEvent.WithValue(ValueEventData.create text (fun args -> onTextChanged args.NewTextValue |> box))
+                InputView.TextWithEvent.WithValue(ValueEventData.create text (fun (args: TextChangedEventArgs) -> onTextChanged args.NewTextValue))
             )
 
 [<Extension>]
@@ -122,7 +122,7 @@ type EntryModifiers =
 
     [<Extension>]
     static member inline onCompleted(this: WidgetBuilder<'msg, #IEntry>, onCompleted: 'msg) =
-        this.AddScalar(Entry.Completed.WithValue(onCompleted))
+        this.AddScalar(Entry.Completed.WithValue(MsgValue onCompleted))
 
     /// <summary>Link a ViewRef to access the direct Entry control instance</summary>
     [<Extension>]

src/Fabulous.XamarinForms/Views/Controls/ImageButton.fs

@@ -51,7 +51,7 @@ module ImageButtonBuilders =
             WidgetBuilder<'msg, IImageButton>(
                 ImageButton.WidgetKey,
                 ImageButton.Aspect.WithValue(aspect),
-                ImageButton.Clicked.WithValue(onClicked),
+                ImageButton.Clicked.WithValue(MsgValue onClicked),
                 ImageButton.Source.WithValue(AppTheme.create light dark)
             )
 
@@ -95,13 +95,13 @@ type ImageButtonModifiers =
         this.AddScalar(ImageButton.BorderColor.WithValue(AppTheme.create light dark))
 
     /// <summary>Set the width of the image button border</summary>
-    /// <param name="width">The width of the image button border.</param>
+    /// <param name="value">The width of the image button border.</param>
     [<Extension>]
     static member inline borderWidth(this: WidgetBuilder<'msg, #IImageButton>, value: float) =
         this.AddScalar(ImageButton.BorderWidth.WithValue(value))
 
     /// <summary>Set the corner radius of the image button</summary>
-    /// <param name="radius">The corner radius of the image button.</param>
+    /// <param name="value">The corner radius of the image button.</param>
     [<Extension>]
     static member inline cornerRadius(this: WidgetBuilder<'msg, #IImageButton>, value: int) =
         this.AddScalar(ImageButton.CornerRadius.WithValue(value))
@@ -134,13 +134,13 @@ type ImageButtonModifiers =
     /// <param name="onPressed">Msg to dispatch when image button is pressed</param>
     [<Extension>]
     static member inline onPressed(this: WidgetBuilder<'msg, #IImageButton>, onPressed: 'msg) =
-        this.AddScalar(ImageButton.Pressed.WithValue(onPressed))
+        this.AddScalar(ImageButton.Pressed.WithValue(MsgValue onPressed))
 
     /// <summary>Event that is fired when image button is released.</summary>
     /// <param name="onReleased">Msg to dispatch when image button is released.</param>
     [<Extension>]
     static member inline onReleased(this: WidgetBuilder<'msg, #IImageButton>, onReleased: 'msg) =
-        this.AddScalar(ImageButton.Released.WithValue(onReleased))
+        this.AddScalar(ImageButton.Released.WithValue(MsgValue onReleased))
 
     /// <summary>Link a ViewRef to access the direct ImageButton control instance</summary>
     [<Extension>]

src/Fabulous.XamarinForms/Views/Controls/Picker.fs

@@ -68,7 +68,10 @@ module PickerBuilders =
             WidgetBuilder<'msg, IPicker>(
                 Picker.WidgetKey,
                 Picker.ItemsSource.WithValue(Array.ofList items),
-                Picker.SelectedIndexWithEvent.WithValue(ValueEventData.create selectedIndex (fun args -> onSelectedIndexChanged args.CurrentPosition |> box))
+                Picker.SelectedIndexWithEvent.WithValue(
+                    ValueEventData.create selectedIndex (fun (args: Fabulous.XamarinForms.PositionChangedEventArgs) ->
+                        onSelectedIndexChanged args.CurrentPosition)
+                )
             )
 
 [<Extension>]