From 2288ec818fb1175781e2c11b1d37cbc8ad4458ca Mon Sep 17 00:00:00 2001 From: Omid Mafakher Date: Tue, 3 Jun 2025 23:19:12 +0200 Subject: [PATCH 1/2] #98 fix issue of crash when host navigate back --- src/AvaloniaInside.Shell/StackContentView.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/AvaloniaInside.Shell/StackContentView.cs b/src/AvaloniaInside.Shell/StackContentView.cs index 98ffb74..fbcbabe 100644 --- a/src/AvaloniaInside.Shell/StackContentView.cs +++ b/src/AvaloniaInside.Shell/StackContentView.cs @@ -60,8 +60,13 @@ public async Task PushViewAsync(object view, // Bring to front if exists in collection if (Children.Contains(control)) - Children.Remove(control); - Children.Add(control); + { + Children.Move(Children.IndexOf(control), Children.Count - 1); + } + else + { + Children.Add(control); + } await OnContentUpdateAsync(control, cancellationToken); await UpdateCurrentViewAsync(current, control, navigateType, false, cancellationToken); From 5356153aeba03867c6a9e2db3000eec9918dc99c Mon Sep 17 00:00:00 2001 From: Omid Mafakher Date: Tue, 3 Jun 2025 23:22:38 +0200 Subject: [PATCH 2/2] Update src/AvaloniaInside.Shell/StackContentView.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/AvaloniaInside.Shell/StackContentView.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/AvaloniaInside.Shell/StackContentView.cs b/src/AvaloniaInside.Shell/StackContentView.cs index fbcbabe..91dd1a6 100644 --- a/src/AvaloniaInside.Shell/StackContentView.cs +++ b/src/AvaloniaInside.Shell/StackContentView.cs @@ -61,7 +61,11 @@ public async Task PushViewAsync(object view, // Bring to front if exists in collection if (Children.Contains(control)) { - Children.Move(Children.IndexOf(control), Children.Count - 1); + var currentIndex = Children.IndexOf(control); + if (currentIndex != Children.Count - 1) + { + Children.Move(currentIndex, Children.Count - 1); + } } else {