Format code

samples/Components/HelloComponent/App.fs

@@ -5,17 +5,10 @@ open Microsoft.Maui.Hosting
 open type Fabulous.Maui.View
 
 module App =
-    let view() =
-        Component() {
-            Application(
-                ContentPage(
-                    Label("Hello from Fabulous for Maui with components!")
-                        .center()
-                )
-            )
-        }
-
-    let createMauiApp() =
+    let view () =
+        Component() { Application(ContentPage(Label("Hello from Fabulous for Maui with components!").center())) }
+
+    let createMauiApp () =
         MauiApp
             .CreateBuilder()
             .UseFabulousApp(view())

samples/Components/MultipleMvus/App.fs

@@ -7,55 +7,56 @@ open type Fabulous.Maui.View
 
 module Counter =
     type Model = { Count: int }
-    type Msg = Increment | Decrement
-
-    let init() = { Count = 0 }
-
+
+    type Msg =
+        | Increment
+        | Decrement
+
+    let init () = { Count = 0 }
+
     let update msg model =
         match msg with
         | Increment -> { Count = model.Count + 1 }
         | Decrement -> { Count = model.Count - 1 }
-        
+
     let program = Program.ForComponent.stateful init update
-    
+
 module Form =
-    type Model =
-        { FirstName: string
-          LastName: string }
-
+    type Model = { FirstName: string; LastName: string }
+
     type Msg =
         | FirstNameChanged of string
         | LastNameChanged of string
-        
-    let init() = { FirstName = ""; LastName = "" }
-    
+
+    let init () = { FirstName = ""; LastName = "" }
+
     let update msg model =
         match msg with
         | FirstNameChanged s -> { model with FirstName = s }
         | LastNameChanged s -> { model with LastName = s }
-        
+
     let program = Program.ForComponent.stateful init update
 
 module App =
-    let view() =
+    let view () =
         Application() {
             ContentPage() {
                 (VStack(spacing = 25.) {
                     Label("App")
-                    
+
                     MvuComponent(Counter.program) {
                         let! model = Mvu.State
-                        
+
                         VStack() {
                             Label($"Count = {model.Count}")
                             Button("Increment", Counter.Increment)
                             Button("Decrement", Counter.Decrement)
                         }
                     }
-                    
+
                     MvuComponent(Form.program) {
                         let! model = Mvu.State
-                        
+
                         VStack() {
                             Label($"Hello {model.FirstName} {model.LastName}")
                             Entry(model.FirstName, Form.FirstNameChanged)

samples/Components/MvuCounter/App.fs

@@ -48,13 +48,13 @@ module App =
                 timerCmd()
             else
                 model, Cmd.none
-                
+
     let program = Program.ForComponent.statefulWithCmd init update
 
-    let view() =
+    let view () =
         MvuComponent(program) {
             let! model = Mvu.State
-            
+
             Application() {
                 ContentPage() {
                     (VStack() {

samples/Components/SimpleCounter/App.fs

@@ -10,20 +10,20 @@ module App =
     let view =
         Component() {
             let! count = State(0)
-            
+
             Application(
                 ContentPage(
                     (VStack() {
                         Label($"%d{count.Current}").centerTextHorizontal()
-                        Button("Increment", fun () -> count.Set(count.Current + 1))
-                        Button("Decrement", fun () -> count.Set(count.Current - 1))
+                        Button("Increment", (fun () -> count.Set(count.Current + 1)))
+                        Button("Decrement", (fun () -> count.Set(count.Current - 1)))
                     })
                         .center()
                 )
             )
         }
-        
-    let createMauiApp() =
+
+    let createMauiApp () =
         MauiApp
             .CreateBuilder()
             .UseFabulousApp(view)

samples/Components/TicTacComponent/App.fs

@@ -186,7 +186,7 @@ module App =
     /// The visual contents of a cell depends on this condition.
     let canPlay model cell =
         (cell = Empty) && (getGameResult model = StillPlaying)
-        
+
     let program =
         Program.ForComponent.stateful init update
         |> Program.ForComponent.withSubscription(fun _ ->
@@ -203,7 +203,7 @@ module App =
     let view () =
         MvuComponent(program) {
             let! model = Mvu.State
-            
+
             Application(
                 ContentPage(
                     Grid(coldefs = [ Star ], rowdefs = [ Star; Auto; Auto ]) {
@@ -263,4 +263,4 @@ module App =
                     }
                 )
             )
-        }
+        }

src/Fabulous.MauiControls/Component.fs

@@ -16,8 +16,9 @@ module Component =
 [<AutoOpen>]
 module ComponentBuilders =
     type Fabulous.Maui.View with
+
         static member inline Component<'marker>() = ComponentBuilder()
-        
+
         static member inline MvuComponent(program: Program<unit, 'model, 'msg>) = MvuComponentBuilder(program, ())
-        
+
         static member inline MvuComponent(program: Program<'arg, 'model, 'msg>, arg: 'arg) = MvuComponentBuilder(program, arg)

src/Fabulous.MauiControls/Program.fs

@@ -73,21 +73,23 @@ module MauiViewHelpers =
         | _ -> true
 
 module Program =
-    let inline private define (view: 'model -> WidgetBuilder<'msg, 'marker>) (program: Program<'arg, 'model, 'msg>): Program<'arg, 'model, 'msg, 'marker> =
+    let inline private define (view: 'model -> WidgetBuilder<'msg, 'marker>) (program: Program<'arg, 'model, 'msg>) : Program<'arg, 'model, 'msg, 'marker> =
         { Program = program
           View = view
           CanReuseView = MauiViewHelpers.canReuseView
           SyncAction = MainThread.BeginInvokeOnMainThread }
 
     /// Create a program for a static view
     let stateless (view: unit -> WidgetBuilder<unit, 'marker>) =
-        let program = Program.ForComponent.define (fun () -> (), Cmd.none) (fun () () -> (), Cmd.none)
+        let program =
+            Program.ForComponent.define (fun () -> (), Cmd.none) (fun () () -> (), Cmd.none)
+
         define view program
 
     /// Create a program using an MVU loop
     let stateful (init: 'arg -> 'model) (update: 'msg -> 'model -> 'model) (view: 'model -> WidgetBuilder<'msg, 'marker>) =
         define view (Program.ForComponent.stateful init update)
-        
+
     /// Create a program using an MVU loop. Add support for Cmd
     let statefulWithCmd
         (init: 'arg -> 'model * Cmd<'msg>)
@@ -119,11 +121,13 @@ module Program =
     /// Subscribe to external source of events.
     /// The subscription is called once - with the initial model, but can dispatch new messages at any time.
     let withSubscription (subscribe: 'model -> Cmd<'msg>) (program: Program<'arg, 'model, 'msg, 'marker>) =
-        { program with Program = Program.ForComponent.withSubscription subscribe program.Program }
+        { program with
+            Program = Program.ForComponent.withSubscription subscribe program.Program }
 
     /// Configure how the output messages from Fabulous will be handled
     let withLogger (logger: Logger) (program: Program<'arg, 'model, 'msg, 'marker>) =
-        { program with Program = Program.ForComponent.withLogger logger program.Program }
+        { program with
+            Program = Program.ForComponent.withLogger logger program.Program }
 
     /// Trace all the updates to the debug output
     let withTrace (trace: string * string -> unit) (program: Program<'arg, 'model, 'msg, 'marker>) =
@@ -144,7 +148,8 @@ module Program =
 
     /// Configure how the unhandled exceptions happening during the execution of a Fabulous app with be handled
     let withExceptionHandler (handler: exn -> bool) (program: Program<'arg, 'model, 'msg, 'marker>) =
-        { program with Program = Program.ForComponent.withExceptionHandler handler program.Program }
+        { program with
+            Program = Program.ForComponent.withExceptionHandler handler program.Program }
 
     /// Allow the app to react to theme changes
     let withThemeAwareness (program: Program<'arg, 'model, 'msg, #IFabApplication>) =

src/Fabulous.MauiControls/Views/Application.fs

@@ -91,12 +91,9 @@ module ApplicationBuilders =
         /// <param name="mainPage">The main page widget</param>
         static member inline Application(mainPage: WidgetBuilder<'msg, #IFabPage>) =
             WidgetHelpers.buildWidgets<'msg, IFabApplication> Application.WidgetKey [| Application.MainPage.WithValue(mainPage.Compile()) |]
-
-        static member inline Application<'msg, 'childMarker & #IFabPage>() =
-            SingleChildBuilder<'msg, IFabApplication, 'childMarker>(
-                Application.WidgetKey,
-                Application.MainPage
-            )
+
+        static member inline Application<'msg, 'childMarker>() =
+            SingleChildBuilder<'msg, IFabApplication, 'childMarker>(Application.WidgetKey, Application.MainPage)
 
 [<Extension>]
 type ApplicationModifiers =