Fix For Maui WinUI Registrations (#3577)

reactiveui · Jul 8, 2023 · 3467c36 · 3467c36
1 parent 2ef3d99
commit 3467c36
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 45 deletions.
diff --git a/src/ReactiveUI.Maui/ActivationForViewFetcher.cs b/src/ReactiveUI.Maui/ActivationForViewFetcher.cs
@@ -6,13 +6,15 @@
 using System;
 using System.Reactive.Linq;
 using System.Reflection;
-#if HAS_WINUI
+#if WINUI_TARGET
 using Microsoft.UI.Xaml;
 using Windows.Foundation;
+#endif
 
+#if IS_WINUI
 namespace ReactiveUI.WinUI;
 #endif
-#if HAS_MAUI
+#if IS_MAUI
 using System.ComponentModel;
 using Microsoft.Maui.Controls;
 
@@ -27,13 +29,15 @@ public class ActivationForViewFetcher : IActivationForViewFetcher
 {
     /// <inheritdoc/>
     public int GetAffinityForView(Type view) =>
-#if HAS_WINUI
-       typeof(FrameworkElement).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo())
+#if WINUI_TARGET
+#if IS_MAUI
+       typeof(Page).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ||
 #endif
-#if HAS_MAUI
-        typeof(Page).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ||
+       typeof(FrameworkElement).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo())
+#else
+       typeof(Page).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ||
        typeof(View).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ||
-        typeof(Cell).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo())
+       typeof(Cell).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo())
 #endif
             ? 10 : 0;
 
@@ -42,10 +46,12 @@ public IObservable<bool> GetActivationForView(IActivatableView view)
     {
         var activation =
             GetActivationFor(view as ICanActivate) ??
-#if HAS_WINUI
+#if WINUI_TARGET
             GetActivationFor(view as FrameworkElement) ??
+#if IS_MAUI
+            GetActivationFor(view as Page) ??
 #endif
-#if HAS_MAUI
+#else
             GetActivationFor(view as Page) ??
             GetActivationFor(view as View) ??
             GetActivationFor(view as Cell) ??
@@ -55,9 +61,10 @@ public IObservable<bool> GetActivationForView(IActivatableView view)
         return activation.DistinctUntilChanged();
     }
 
-    private static IObservable<bool>? GetActivationFor(ICanActivate? canActivate) => canActivate?.Activated.Select(_ => true).Merge(canActivate.Deactivated.Select(_ => false));
+    private static IObservable<bool>? GetActivationFor(ICanActivate? canActivate) =>
+        canActivate?.Activated.Select(_ => true).Merge(canActivate.Deactivated.Select(_ => false));
 
-#if HAS_MAUI
+#if !WINUI_TARGET || (WINUI_TARGET && IS_MAUI)
     private static IObservable<bool>? GetActivationFor(Page? page)
     {
         if (page is null)
@@ -85,7 +92,9 @@ public IObservable<bool> GetActivationForView(IActivatableView view)
 
         return appearing.Merge(disappearing);
     }
+#endif
 
+#if !WINUI_TARGET
     private static IObservable<bool>? GetActivationFor(View? view)
     {
         if (view is null)
@@ -135,14 +144,12 @@ public IObservable<bool> GetActivationForView(IActivatableView view)
 
         return appearing.Merge(disappearing);
     }
-#endif
-
-#if HAS_WINUI
-    private static IObservable<bool> GetActivationFor(FrameworkElement? view)
+#else
+    private static IObservable<bool>? GetActivationFor(FrameworkElement? view)
     {
         if (view is null)
         {
-            return Observable<bool>.Empty;
+            return null;
         }
 
         var viewLoaded = Observable.FromEvent<TypedEventHandler<FrameworkElement, object>, bool>(

diff --git a/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs b/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
@@ -3,7 +3,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;

diff --git a/src/ReactiveUI.Maui/Common/BooleanToVisibilityTypeConverter.cs b/src/ReactiveUI.Maui/Common/BooleanToVisibilityTypeConverter.cs
@@ -4,11 +4,10 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
-#if HAS_MAUI
-using Microsoft.Maui;
-#endif
-#if HAS_WINUI
+#if WINUI_TARGET
 using Microsoft.UI.Xaml;
+#else
+using Microsoft.Maui;
 #endif
 
 namespace ReactiveUI
@@ -46,7 +45,7 @@ public bool TryConvert(object? from, Type toType, object? conversionHint, out ob
             {
                 var fromAsBool = (hint & BooleanToVisibilityHint.Inverse) != 0 ? !fromBool : fromBool;
 
-#if !NETFX_CORE && !HAS_UNO && !HAS_WINUI
+#if !WINUI_TARGET
                 var notVisible = (hint & BooleanToVisibilityHint.UseHidden) != 0 ? Visibility.Hidden : Visibility.Collapsed;
 #else
                 var notVisible = Visibility.Collapsed;

diff --git a/src/ReactiveUI.Maui/Common/ReactivePage.cs b/src/ReactiveUI.Maui/Common/ReactivePage.cs
@@ -3,12 +3,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_MAUI
-using Microsoft.Maui.Controls;
-#endif
-#if HAS_WINUI
+#if WINUI_TARGET
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+#else
+using Microsoft.Maui.Controls;
 #endif
 
 namespace ReactiveUI
@@ -81,7 +80,7 @@ class ReactivePage<TViewModel> :
             Page, IViewFor<TViewModel>
             where TViewModel : class
     {
-#if HAS_WINUI
+#if WINUI_TARGET
         /// <summary>
         /// The view model dependency property.
         /// </summary>
@@ -123,7 +122,7 @@ class ReactivePage<TViewModel> :
             set => ViewModel = (TViewModel?)value;
         }
 
-#if HAS_MAUI
+#if !WINUI_TARGET
         /// <inheritdoc/>
         protected override void OnBindingContextChanged()
         {

diff --git a/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs b/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
@@ -3,7 +3,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.UI.Xaml;

diff --git a/src/ReactiveUI.Maui/Common/RoutedViewHost.cs b/src/ReactiveUI.Maui/Common/RoutedViewHost.cs
@@ -3,7 +3,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

diff --git a/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs b/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs
@@ -3,7 +3,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;

diff --git a/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj b/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj
@@ -6,13 +6,11 @@
     <PackageDescription>Contains the ReactiveUI platform specific extensions for Microsoft Maui</PackageDescription>
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;maui;android;ios;mac;forms;net</PackageTags>
     <UseMaui>true</UseMaui>
+    <DefineConstants>IS_MAUI</DefineConstants>
   </PropertyGroup>
 
 	<PropertyGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
-		<DefineConstants>HAS_WINUI</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="!$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
-		<DefineConstants>HAS_MAUI</DefineConstants>
+		<DefineConstants>$(DefineConstants);WINUI_TARGET;</DefineConstants>
 	</PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
@@ -26,8 +24,5 @@
   <ItemGroup>
     <Compile Remove="Common\RoutedViewHost.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
-  </ItemGroup>
 
 </Project>
diff --git a/src/ReactiveUI.Maui/Registrations.cs b/src/ReactiveUI.Maui/Registrations.cs
@@ -5,13 +5,15 @@
 
 using System;
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System.Reactive.Concurrency;
 using Splat;
+#endif
 
+#if IS_WINUI
 namespace ReactiveUI.WinUI;
 #endif
-#if HAS_MAUI
+#if IS_MAUI
 namespace ReactiveUI.Maui;
 #endif
 
@@ -37,7 +39,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
         registerFunction(() => new ActivationForViewFetcher(), typeof(IActivationForViewFetcher));
         registerFunction(() => new BooleanToVisibilityTypeConverter(), typeof(IBindingTypeConverter));
 
-#if HAS_WINUI
+#if WINUI_TARGET
         registerFunction(() => new PlatformOperations(), typeof(IPlatformOperations));
         registerFunction(() => new DependencyObjectObservableForProperty(), typeof(ICreatesObservableForProperty));
         registerFunction(() => new AutoDataTemplateBindingHook(), typeof(IPropertyBindingHook));

diff --git a/src/ReactiveUI.Maui/WinUI/DependencyObjectObservableForProperty.cs b/src/ReactiveUI.Maui/WinUI/DependencyObjectObservableForProperty.cs
@@ -3,7 +3,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System;
 using System.Globalization;
 using System.Linq.Expressions;

diff --git a/src/ReactiveUI.Maui/WinUI/DispatcherQueueScheduler.cs b/src/ReactiveUI.Maui/WinUI/DispatcherQueueScheduler.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 // <auto-generated />
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System.Reactive.Disposables;
 using System.Threading;
 using Microsoft.UI.Dispatching;

diff --git a/src/ReactiveUI.Maui/WinUI/TransitioningContentControl.Empty.cs b/src/ReactiveUI.Maui/WinUI/TransitioningContentControl.Empty.cs
@@ -3,7 +3,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-#if HAS_WINUI
+#if WINUI_TARGET
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.UI.Xaml.Controls;
 

diff --git a/src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj b/src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj
@@ -4,9 +4,9 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <PackageDescription>Contains the ReactiveUI platform specific extensions for WinUI Desktop</PackageDescription>
     <RootNamespace>ReactiveUI.WinUI.Desktop</RootNamespace>
-    <DefineConstants>HAS_WINUI</DefineConstants>
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;winui</PackageTags>
     <UseWinUI>true</UseWinUI>
+    <DefineConstants>IS_WINUI;WINUI_TARGET;</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>