Merge pull request #60 from fabulous-dev/use-fabulous-pre7

Use Fabulous pre7
fabulous-dev · Jan 30, 2024 · 595f0a6 · 595f0a6
2 parents e2334e1 + 9b9fab9
commit 595f0a6
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 8 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_
 
+## [8.1.0-pre8] - 2024-01-30
+
+### Changed
+- Use Fabulous 2.5.0-pre7
+
 ## [8.1.0-pre7] - 2024-01-29
 
 ### Changed
@@ -190,7 +195,8 @@ Essentially v2.8.1 and v8.0.0 are similar except for the required .NET version.
 ### Changed
 - Fabulous.MauiControls has moved from the Fabulous repository to its own repository: [https://github.com/fabulous-dev/Fabulous.MauiControls](https://github.com/fabulous-dev/Fabulous.MauiControls)
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.MauiControls/compare/8.1.0-pre7...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.MauiControls/compare/8.1.0-pre8...HEAD
+[8.1.0-pre8]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre8
 [8.1.0-pre7]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre7
 [8.1.0-pre6]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre6
 [8.1.0-pre5]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre5

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Fabulous" Version="2.5.0-pre6" />
+    <PackageVersion Include="Fabulous" Version="2.5.0-pre7" />
     <PackageVersion Include="FsCheck.NUnit" Version="2.16.6" />
     <PackageVersion Include="FSharp.Core" Version="8.0.100" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />

diff --git a/src/Fabulous.MauiControls.Tests/WidgetTests.fs b/src/Fabulous.MauiControls.Tests/WidgetTests.fs
@@ -2,6 +2,7 @@
 
 open System
 open Fabulous
+open Microsoft.Maui.ApplicationModel
 open NUnit.Framework
 
 open Fabulous.Maui
@@ -56,7 +57,8 @@ type WidgetTests() =
               GetViewNode = ViewNode.get
               Logger = ProgramDefaults.defaultLogger()
               Dispatch = dispatch
-              GetComponent = Component.get }
+              GetComponent = Component.get
+              SyncAction = MainThread.BeginInvokeOnMainThread }
 
         let navPage = FabNavigationPage()
         let weakRef = WeakReference(navPage)

diff --git a/src/Fabulous.MauiControls/AppHostBuilderExtensions.fs b/src/Fabulous.MauiControls/AppHostBuilderExtensions.fs
@@ -9,14 +9,22 @@ open System
 [<Extension>]
 type AppHostBuilderExtensions =
     [<Extension>]
-    static member inline private UseFabulousApp(this: MauiAppBuilder, canReuseView, logger, [<InlineIfLambda>] viewFn: unit -> Widget) : MauiAppBuilder =
+    static member inline private UseFabulousApp
+        (
+            this: MauiAppBuilder,
+            canReuseView,
+            logger,
+            syncAction: (unit -> unit) -> unit,
+            [<InlineIfLambda>] viewFn: unit -> Widget
+        ) : MauiAppBuilder =
         this.UseMauiApp(fun (_serviceProvider: IServiceProvider) ->
             let widget = viewFn()
 
             let treeContext: ViewTreeContext =
                 { CanReuseView = canReuseView
                   Logger = logger
                   Dispatch = ignore
+                  SyncAction = syncAction
                   GetViewNode = ViewNode.get
                   GetComponent = Component.get }
 
@@ -31,6 +39,7 @@ type AppHostBuilderExtensions =
         this.UseFabulousApp(
             program.CanReuseView,
             program.State.Logger,
+            program.SyncAction,
             fun () ->
                 (View.Component(program.State, arg) {
                     let! model = Mvu.State
@@ -44,13 +53,23 @@ type AppHostBuilderExtensions =
         this.UseFabulousApp(program, ())
 
     [<Extension>]
-    static member UseFabulousApp(this: MauiAppBuilder, view: unit -> WidgetBuilder<unit, #IFabApplication>, ?canReuseView, ?logger) : MauiAppBuilder =
+    static member UseFabulousApp
+        (
+            this: MauiAppBuilder,
+            view: unit -> WidgetBuilder<unit, #IFabApplication>,
+            ?canReuseView,
+            ?logger,
+            ?syncAction: (unit -> unit) -> unit
+        ) : MauiAppBuilder =
         this.UseFabulousApp(
             (match canReuseView with
              | Some fn -> fn
              | None -> MauiViewHelpers.canReuseView),
             (match logger with
              | Some logger -> logger
              | None -> ProgramDefaults.defaultLogger()),
+            (match syncAction with
+             | Some synAction -> synAction
+             | None -> MauiViewHelpers.defaultSyncAction),
             fun () -> (View.Component() { view() }).Compile()
         )
diff --git a/src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj b/src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj
@@ -155,7 +155,7 @@
       This version will be used as the lower bound in the NuGet package
     -->
     <PackageReference Include="FSharp.Core" VersionOverride="8.0.100" PrivateAssets="All" />
-    <PackageReference Include="Fabulous" Condition="'$(UseLocalProjectReference)' != 'true'" VersionOverride="[2.5.0-pre6]" />
+    <PackageReference Include="Fabulous" Condition="'$(UseLocalProjectReference)' != 'true'" VersionOverride="[2.5.0-pre7]" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Maui.Controls" VersionOverride="8.0.3" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" VersionOverride="8.0.3" />

diff --git a/src/Fabulous.MauiControls/Program.fs b/src/Fabulous.MauiControls/Program.fs
@@ -23,6 +23,9 @@ module MauiViewHelpers =
             | None -> ValueNone
             | Some attr -> ValueSome attr.Value
 
+    let defaultSyncAction (action: unit -> unit) =
+        MainThread.BeginInvokeOnMainThread(action)
+
     /// Extend the canReuseView function to check Microsoft.Maui specific constraints
     let rec canReuseView (prev: Widget) (curr: Widget) =
         if ViewHelpers.canReuseView prev curr && canReuseAutomationId prev curr then
@@ -77,7 +80,7 @@ module Program =
         { State = state
           View = view
           CanReuseView = MauiViewHelpers.canReuseView
-          SyncAction = MainThread.BeginInvokeOnMainThread }
+          SyncAction = MauiViewHelpers.defaultSyncAction }
 
     let stateless (view: unit -> WidgetBuilder<unit, 'marker>) : Program<unit, unit, unit, 'marker> =
         Program.stateful (fun _ -> ()) (fun _ _ -> ()) |> withView view

diff --git a/templates/content/blank/.template.config/template.json b/templates/content/blank/.template.config/template.json
@@ -46,7 +46,7 @@
       "type": "parameter",
       "dataType": "string",
       "replaces": "FabulousPkgVersion",
-      "defaultValue": "2.5.0-pre5"
+      "defaultValue": "2.5.0-pre7"
     },
     "FabulousMauiControlsPkgVersion": {
       "type": "parameter",