Merge pull request #3 from Yinimi/yinimi/mergeAll

Yinimi/merge all
Caliburn-Micro · Nov 11, 2024 · 52a65f3 · 52a65f3
2 parents af09f9c + 290c651
commit 52a65f3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/Caliburn.Micro.Core.Tests/ConductorWithCollectionOneActiveTests.cs b/src/Caliburn.Micro.Core.Tests/ConductorWithCollectionOneActiveTests.cs
@@ -80,9 +80,9 @@ public AsyncActivationScreen(bool simulateAsyncOnActivate, bool simulateAsyncOnD
                 _simulateAsyncTaskDuration = simulateAsyncTaskDuration;
             }
 
-            protected override async Task OnActivateAsync(CancellationToken cancellationToken)
+            protected override async Task OnActivatedAsync(CancellationToken cancellationToken)
             {
-                await base.OnActivateAsync(cancellationToken);
+                await base.OnActivatedAsync(cancellationToken);
 
                 if (_simulateAsyncOnActivate)
                 {

diff --git a/src/Caliburn.Micro.Core/Conductor.cs b/src/Caliburn.Micro.Core/Conductor.cs
@@ -52,7 +52,7 @@ public override async Task DeactivateItemAsync(T item, bool close, CancellationT
 
             if (closeResult.CloseCanOccur)
             {
-                await ChangeActiveItemAsync(default(T), close);
+                await ChangeActiveItemAsync(default(T), close, cancellationToken);
             }
         }
 

diff --git a/src/Caliburn.Micro.Core/ConductorBaseWithActiveItem.cs b/src/Caliburn.Micro.Core/ConductorBaseWithActiveItem.cs
@@ -39,12 +39,13 @@ object IHaveActiveItem.ActiveItem
         /// <returns>A task that represents the asynchronous operation.</returns>
         protected virtual async Task ChangeActiveItemAsync(T newItem, bool closePrevious, CancellationToken cancellationToken)
         {
+            var previousItem = _activeItem;
             newItem = EnsureItem(newItem);
 
             _activeItem = newItem;
             NotifyOfPropertyChange(nameof(ActiveItem));
 
-            await ScreenExtensions.TryDeactivateAsync(_activeItem, closePrevious, cancellationToken);
+            await ScreenExtensions.TryDeactivateAsync(previousItem, closePrevious, cancellationToken);
 
             if (IsActive)
                 await ScreenExtensions.TryActivateAsync(newItem, cancellationToken);

diff --git a/src/Caliburn.Micro.Core/ConductorWithCollectionOneActive.cs b/src/Caliburn.Micro.Core/ConductorWithCollectionOneActive.cs
@@ -109,7 +109,7 @@ private async Task CloseItemCoreAsync(T item, CancellationToken cancellationToke
                         var index = _items.IndexOf(item);
                         var next = DetermineNextItemToActivate(_items, index);
 
-                        await ChangeActiveItemAsync(next, true);
+                        await ChangeActiveItemAsync(next, true, cancellationToken);
                     }
                     else
                     {
@@ -164,7 +164,7 @@ public override async Task<bool> CanCloseAsync(CancellationToken cancellationTok
                             } while (closable.Contains(next));
 
                             var previousActive = ActiveItem;
-                            await ChangeActiveItemAsync(next, true);
+                            await ChangeActiveItemAsync(next, true, cancellationToken);
                             _items.Remove(previousActive);
 
                             var stillToClose = closable.ToList();

diff --git a/src/Caliburn.Micro.Core/Screen.cs b/src/Caliburn.Micro.Core/Screen.cs
@@ -102,13 +102,17 @@ async Task IActivate.ActivateAsync(CancellationToken cancellationToken)
 
             if (!IsInitialized)
             {
+#pragma warning disable CS0618 // Type or member is obsolete
                 await OnInitializeAsync(cancellationToken);
+#pragma warning restore CS0618 // Type or member is obsolete
                 IsInitialized = initialized = true;
                 await OnInitializedAsync(cancellationToken);
             }
 
             Log.Info("Activating {0}.", this);
+#pragma warning disable CS0618 // Type or member is obsolete
             await OnActivateAsync(cancellationToken);
+#pragma warning restore CS0618 // Type or member is obsolete
             IsActive = true;
             await OnActivatedAsync(cancellationToken);