More changes

src/Fabulous.Maui/Compatibility/Views/Controls/CompatImageButton.fs

@@ -78,7 +78,7 @@ module CompatImageButtonBuilders =
 
             View.CompatImageButton<'msg>(aspect, light = light, onClicked = onClicked, ?dark = dark)
 
-        static member inline ImageButton<'msg>(aspect: Aspect, light: Stream, onClicked: 'msg, ?dark: Stream) =
+        static member inline CompatImageButton<'msg>(aspect: Aspect, light: Stream, onClicked: 'msg, ?dark: Stream) =
             let light = ImageSource.FromStream(fun () -> light)
 
             let dark =

src/Fabulous.Maui/Compatibility/Views/Controls/Entry.fs

@@ -80,9 +80,9 @@ type EntryModifiers =
         this.AddScalar(Entry.CursorPosition.WithValue(value))
 
     [<Extension>]
-    static member inline font
+    static member inline font<'msg, 'marker when 'marker :> IFabCompatEntry>
         (
-            this: WidgetBuilder<'msg, #IFabCompatEntry>,
+            this: WidgetBuilder<'msg, 'marker>,
             ?size: float,
             ?attributes: FontAttributes,
             ?fontFamily: string,

src/Fabulous.Maui/Compatibility/Views/Controls/FormattedLabel.fs

@@ -2,6 +2,7 @@ namespace Fabulous.Maui.Compatibility
 
 open System.Runtime.CompilerServices
 open Fabulous
+open Fabulous.StackAllocatedCollections
 open Microsoft.Maui.Controls
 
 type IFabCompatFormattedLabel =
@@ -31,4 +32,23 @@ type FormattedLabelModifiers =
     /// <summary>Link a ViewRef to access the direct Label control instance</summary>
     [<Extension>]
     static member inline reference(this: WidgetBuilder<'msg, IFabCompatFormattedLabel>, value: ViewRef<Label>) =
-        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+        this.AddScalar(ViewRefAttributes.ViewRef.WithValue(value.Unbox))
+
+[<Extension>]
+type FormattedLabelCollectionBuilderExtensions =
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabCompatFormattedLabel and 'itemType :> IFabCompatSpan>
+        (
+            _: CollectionBuilder<'msg, 'marker, IFabCompatSpan>,
+            x: WidgetBuilder<'msg, 'itemType>
+        ) : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+
+    [<Extension>]
+    static member inline Yield<'msg, 'marker, 'itemType when 'marker :> IFabCompatFormattedLabel and 'itemType :> IFabCompatSpan>
+        (
+            _: CollectionBuilder<'msg, 'marker, IFabCompatSpan>,
+            x: WidgetBuilder<'msg, Memo.Memoized<'itemType>>
+        ) : Content<'msg> =
+        { Widgets = MutStackArray1.One(x.Compile()) }
+

src/Fabulous.Maui/Compatibility/Views/Layouts/AbsoluteLayout.fs

@@ -20,6 +20,10 @@ module AbsoluteLayout =
 
     let LayoutFlags =
         Attributes.defineBindableEnum<AbsoluteLayoutFlags> AbsoluteLayout.LayoutFlagsProperty
+
+module AbsoluteLayoutAttachedData =
+    let LayoutBounds =
+        Attributes.defineMauiAttachedData FabGridLayoutAttachedDataKeys.Column GridLayoutDefaults.Column
 
 [<AutoOpen>]
 module AbsoluteLayoutBuilders =

src/Fabulous.Maui/Compatibility/Views/Layouts/_CompatLayoutOfView.fs

@@ -13,7 +13,7 @@ module CompatLayoutOfView =
         Attributes.defineListWidgetCollection "LayoutOfWidget_Children" (fun target -> (target :?> Microsoft.Maui.Controls.Layout).Children)
 
 [<Extension>]
-type CollectionBuilderExtensions =
+type CompatLayoutOfViewCollectionBuilderExtensions =
     [<Extension>]
     static member inline Yield
         (

src/Fabulous.Maui/Core/Views/Controls/ImageButton.fs

@@ -3,6 +3,7 @@ namespace Fabulous.Maui
 open Fabulous.Maui.Controls.ImageSources
 open Fabulous
 open Fabulous.Maui.Controls
+open Microsoft.Maui
 
 module ImageButton =
     let WidgetKey = Widgets.register<FabImageButton>()
@@ -17,3 +18,11 @@ module ImageButtonBuilders =
                 ImageSourcePart.Source.WithValue(FabFileImageSource(source)),
                 Button.Clicked.WithValue(fun () -> box onClicked)
             )
+
+        static member inline ImageButton<'msg>(source: string, onClicked: 'msg, aspect: Aspect) =
+            WidgetBuilder<'msg, IFabImageButton>(
+                ImageButton.WidgetKey,
+                ImageSourcePart.Source.WithValue(FabFileImageSource(source)),
+                Image.Aspect.WithValue(aspect),
+                Button.Clicked.WithValue(fun () -> box onClicked)
+            )

src/Fabulous.Maui/Core/Views/Controls/Partials/_TextStyle.fs

@@ -30,3 +30,11 @@ type TextStyleExtraModifiers =
     [<Extension>]
     static member inline textColor(this: WidgetBuilder<'msg, #IFabTextStyle>, value: FabColor) =
         this.textColor(value.ToMauiColor())
+
+    [<Extension>]
+    static member inline font(this: WidgetBuilder<'msg, #IFabTextStyle>, ?size: float, ?fontFamily: string) =
+        match size, fontFamily with
+        | Some size, Some fontFamily -> this.font(Font.OfSize(fontFamily, size))
+        | Some size, None -> this.font(Font.SystemFontOfSize(size))
+        | None, Some fontFamily -> this.font(Font.OfSize(fontFamily, Font.Default.Size))
+        | None, None -> this

src/Fabulous.Maui/Core/Views/Partials/_Transform.fs

@@ -1,8 +1,8 @@
 namespace Fabulous.Maui
 
 open System.Runtime.CompilerServices
+open Fabulous
 open Microsoft.Maui.Handlers.Defaults
-open Fabulous.Maui.Controls
 
 module Transform =
     let AnchorX =
@@ -34,3 +34,45 @@ module Transform =
 
     let TranslationY =
         Attributes.defineMauiProperty "TranslationY" TransformDefaults.TranslationY (fun (target: IFabTransform) -> target.SetTranslationY)
+
+[<Extension>]
+type TransformModifiers =
+    [<Extension>]
+    static member anchorX(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.AnchorX.WithValue(value))
+
+    [<Extension>]
+    static member anchorY(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.AnchorY.WithValue(value))
+
+    [<Extension>]
+    static member rotation(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.Rotation.WithValue(value))
+
+    [<Extension>]
+    static member rotationX(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.RotationX.WithValue(value))
+
+    [<Extension>]
+    static member rotationY(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.RotationY.WithValue(value))
+
+    [<Extension>]
+    static member scale(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.Scale.WithValue(value))
+
+    [<Extension>]
+    static member scaleX(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.ScaleX.WithValue(value))
+
+    [<Extension>]
+    static member scaleY(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.ScaleY.WithValue(value))
+
+    [<Extension>]
+    static member translationX(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.TranslationX.WithValue(value))
+
+    [<Extension>]
+    static member translationY(this: WidgetBuilder<'msg, #IFabTransform>, value: float) =
+        this.AddScalar(Transform.TranslationY.WithValue(value))