Merge branch 'main' into yuleng/cmdpal/AddGotoPage

the last one (probably)

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/GoToPageArgsViewModel.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.UI.ViewModels.Models;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+public partial class GoToPageArgsViewModel(IGoToPageArgs _args, WeakReference<IPageContext> context) :
+    ExtensionObjectViewModel(context)
+{
+    public ExtensionObject<IGoToPageArgs> Model { get; } = new(_args);
+
+    // Remember - "observable" properties from the model (via PropChanged)
+    // cannot be marked [ObservableProperty]
+    public string PageId { get; private set; } = string.Empty;
+
+    public NavigationMode NavigationMode { get; private set; } = NavigationMode.Push;
+
+    public override void InitializeProperties()
+    {
+        var model = Model.Unsafe;
+        if (model == null)
+        {
+            return;
+        }
+
+        PageId = model.PageId;
+        NavigationMode = model.NavigationMode;
+
+        UpdateProperty(nameof(PageId));
+        UpdateProperty(nameof(NavigationMode));
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -285,6 +285,57 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         }
     }
 
+    private void HandleGoToPageArgs(IGoToPageArgs args)
+    {
+        GoToPageArgsViewModel vm = new(args, new(ViewModel.CurrentPage));
+        var initializeDialogTask = Task.Run(() => { InitializeGoToPage(vm); });
+        initializeDialogTask.Wait();
+
+        var pageID = vm.PageId;
+        var navigationMode = vm.NavigationMode;
+
+        if (string.IsNullOrEmpty(pageID))
+        {
+            _toast.ShowToast("Invalid page id");
+            return;
+        }
+
+        var tlcManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
+        var toplevelCommand = tlcManager.LookupCommand(pageID);
+
+        if (toplevelCommand == null)
+        {
+            return;
+        }
+
+        switch (navigationMode)
+        {
+            case NavigationMode.Push:
+                break;
+
+            case NavigationMode.GoHome:
+                while (RootFrame.CanGoBack)
+                {
+                    GoBack(false, false);
+                }
+
+                break;
+
+            case NavigationMode.GoBack:
+                if (RootFrame.CanGoBack)
+                {
+                    GoBack(false, false);
+                }
+
+                break;
+        }
+
+        var msg = new PerformCommandMessage(toplevelCommand) { WithAnimation = true };
+        WeakReferenceMessenger.Default.Send<PerformCommandMessage>(msg);
+
+        return;
+    }
+
     // This gets called from the UI thread
     private void HandleConfirmArgs(IConfirmationArgs args)
     {
@@ -341,6 +392,11 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         vm.SafeInitializePropertiesSynchronous();
     }
 
+    private void InitializeGoToPage(GoToPageArgsViewModel vm)
+    {
+        vm.SafeInitializePropertiesSynchronous();
+    }
+
     private void HandleCommandResultOnUiThread(ICommandResult? result)
     {
         try
@@ -404,6 +460,16 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                                 HandleCommandResultOnUiThread(a.Result);
                             }
 
+                            break;
+                        }
+
+                    case CommandResultKind.GoToPage:
+                        {
+                            if (result.Args is IGoToPageArgs a)
+                            {
+                                HandleGoToPageArgs(a);
+                            }
+
                             break;
                         }
                 }

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleGoToPage.cs

@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension;
+
+public sealed partial class SampleGoToPage : ListPage
+{
+    private int depth;
+
+    public SampleGoToPage(int depth)
+    {
+        this.depth = depth;
+        Icon = new IconInfo("\uEA37");
+        Name = "Here is the " + depth + "th layer of the stack";
+    }
+
+    public override IListItem[] GetItems()
+    {
+        var goBackArgs = new GoToPageArgs
+        {
+            PageId = "com.microsoft.SamplePages.LandingPage",
+            NavigationMode = NavigationMode.GoBack,
+        };
+
+        var goHomeArgs = new GoToPageArgs
+        {
+            PageId = "com.microsoft.SamplePages.LandingPage",
+            NavigationMode = NavigationMode.GoHome,
+        };
+
+        var pushLandingPageArgs = new GoToPageArgs
+        {
+            PageId = "com.microsoft.SamplePages.LandingPage",
+            NavigationMode = NavigationMode.Push,
+        };
+
+        return [
+            new ListItem(new SampleGoToPage(depth + 1)),
+            new ListItem(
+                new AnonymousCommand(() => { })
+                {
+                    Result = CommandResult.GoToPage(goBackArgs),
+                })
+            {
+                Title = "Go back and then go to landing page.",
+                Icon = new IconInfo("\uEA37"),
+            },
+            new ListItem(
+                new AnonymousCommand(() => { })
+                {
+                    Result = CommandResult.GoToPage(goHomeArgs),
+                })
+            {
+                Title = "Go back to home page and then go to landing page.",
+                Icon = new IconInfo("\uEA37"),
+            },
+            new ListItem(
+                new AnonymousCommand(() => { })
+                {
+                    Result = CommandResult.GoToPage(pushLandingPageArgs),
+                })
+            {
+                Title = "Push landing page.",
+                Icon = new IconInfo("\uEA37"),
+            },
+        ];
+    }
+}

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleLandingPage.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension;
+
+public sealed partial class SampleLandingPage : ListPage
+{
+    public SampleLandingPage()
+    {
+        Icon = new IconInfo("\uEA37");
+        Name = "This is a sample landing page to land for GotoPage call.";
+        Id = "com.microsoft.SamplePages.LandingPage";
+    }
+
+    public override IListItem[] GetItems()
+    {
+        return [
+            new ListItem(new NoOpCommand())
+            {
+                Title = "This is a basic item in the list",
+                Subtitle = "I don't do anything though",
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "This is a sample landing page to land for GotoPage call.",
+                Subtitle = "I don't do anything though",
+            },
+        ];
+    }
+}

src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesCommandsProvider.cs

@@ -21,6 +21,11 @@ public partial class SamplePagesCommandsProvider : CommandProvider
            Title = "Sample Pages",
            Subtitle = "View example commands",
        },
+       new CommandItem(new SampleLandingPage())
+       {
+           Title = "Sample Landing Pages",
+           Subtitle = "Sample Landing pages example for goto page",
+       },
     ];
 
     public override ICommandItem[] TopLevelCommands()

src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs

@@ -79,11 +79,18 @@ public partial class SamplesListPage : ListPage
         {
             Title = "Evil samples",
             Subtitle = "Samples designed to break the palette in many different evil ways",
-        }
+        },
+
+        new ListItem(new SampleGoToPage(0))
+        {
+            Title = "Sample GoTo Page",
+            Subtitle = "A list of items",
+        },
     ];
 
     public SamplesListPage()
     {
+        Id = "com.microsoft.SamplePages";
         Name = "Samples";
         Icon = new IconInfo("\ue946"); // Info
     }