Merge pull request #8 from fabulous-dev/update-to-fabulous-2.2.0

Update to fabulous 2.2.0
fabulous-dev · Jan 24, 2023 · 6bf5d4d · 6bf5d4d
2 parents ae8e06b + 4b67331
commit 6bf5d4d
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,6 @@ on:
 permissions: write-all
 
 env:
-  VERSION: 2.1.3
   CONFIG: Release
   SLN_FILE: Fabulous.MauiControls.NoSamples.sln
   TEMPLATE_PROJ: templates/Fabulous.MauiControls.Templates.proj
@@ -16,13 +15,19 @@ jobs:
   build:
     runs-on: macos-12
     steps:
+    - name: Checkout sources
+      uses: actions/checkout@v3
+    - name: Read last version from CHANGELOG.md
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@v2
+      with:
+        validation_level: warn
+        path: ./CHANGELOG.md
     - name: Set nightly version
       run: |
-        NIGHTLY_VERSION=${VERSION}-nightly-${GITHUB_RUN_ID}
+        NIGHTLY_VERSION=${{ steps.changelog_reader.outputs.version }}-nightly-${GITHUB_RUN_ID}
         echo "Nightly version is $NIGHTLY_VERSION"
         echo "NIGHTLY_VERSION=$NIGHTLY_VERSION" >> "$GITHUB_ENV"
-    - name: Checkout sources
-      uses: actions/checkout@v3
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,11 @@ jobs:
       uses: damienaicheh/[email protected]
     - name: Set release version
       run: |
-        RELEASE_VERSION=${MAJOR}.${MINOR}.${PATCH}
+        if [ "${PRE_RELEASE}" == "" ]; then
+          RELEASE_VERSION=${MAJOR}.${MINOR}.${PATCH}
+        else
+          RELEASE_VERSION=${MAJOR}.${MINOR}.${PATCH}-${PRE_RELEASE}
+        fi
         echo "Release version is $RELEASE_VERSION"
         echo "RELEASE_VERSION=$RELEASE_VERSION" >> "$GITHUB_ENV"
     - name: Get Changelog Entry

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-_No unreleased changes_
+### Changed
+- Rename all marker interfaces to IFab* to avoid naming conflicts with Maui interfaces (https://github.com/fabulous-dev/Fabulous.MauiControls/pull/5)
+- Fix an issue where FlexLayout was not usable (https://github.com/fabulous-dev/Fabulous.MauiControls/pull/6)
+- Upgrade to Fabulous 2.2.0 (https://github.com/fabulous-dev/Fabulous.MauiControls/pull/8)
 
 ## [2.1.3] - 2023-01-14
 
@@ -25,6 +28,6 @@ _No unreleased changes_
 - 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/2.1.3...HEAD
-[2.1.3]: https://github.com/fabulous-dev/Fabulous.MauiControls/compare/2.1.2...2.1.3
-[2.1.2]: https://github.com/fabulous-dev/Fabulous.MauiControls/compare/2.1.1...2.1.2
+[2.1.3]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/2.1.3
+[2.1.2]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/2.1.2
 [2.1.1]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/2.1.1
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Fabulous" Version="2.1.1" />
+    <PackageVersion Include="Fabulous" Version="2.2.0" />
     <PackageVersion Include="FsCheck.NUnit" Version="2.16.4" />
     <PackageVersion Include="FSharp.Android.Resource" Version="1.0.4" />
     <PackageVersion Include="FSharp.Core" Version="7.0.0" />

diff --git a/src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj b/src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj
@@ -150,7 +150,7 @@
       This version will be used as the lower bound in the NuGet package
     -->
     <PackageReference Include="FSharp.Core" VersionOverride="7.0.0" PrivateAssets="All" />
-    <PackageReference Include="Fabulous" VersionOverride="[2.1.0, 2.2.0)" />
+    <PackageReference Include="Fabulous" VersionOverride="[2.2.0, 2.3.0)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Fabulous.MauiControls/Widgets.fs b/src/Fabulous.MauiControls/Widgets.fs
@@ -41,7 +41,27 @@ module Widgets =
                     additionalSetup view node
 
                     Reconciler.update treeContext.CanReuseView ValueNone widget node
-                    struct (node :> IViewNode, box view) }
+                    struct (node :> IViewNode, box view)
+              AttachView =
+                fun (widget, treeContext, parentNode, view) ->
+                    treeContext.Logger.Debug("Attaching view for {0}", typeof<'T>.Name)
+
+                    let view = unbox<'T> view
+                    let weakReference = WeakReference(view)
+
+                    let parentNode =
+                        match parentNode with
+                        | ValueNone -> None
+                        | ValueSome node -> Some node
+
+                    let node = ViewNode(parentNode, treeContext, weakReference)
+
+                    ViewNode.set node view
+
+                    additionalSetup view node
+
+                    Reconciler.update treeContext.CanReuseView ValueNone widget node
+                    node :> IViewNode }
 
         WidgetDefinitionStore.set key definition
         key