Merge branch 'main' into delete-library-items

Nexus-Mods · Aug 20, 2024 · fb43fac · fb43fac
2 parents a5aebb5 + bc0174d
commit fb43fac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/NexusMods.App.UI/Controls/Navigation/NavigationMenuItem.cs b/src/NexusMods.App.UI/Controls/Navigation/NavigationMenuItem.cs
@@ -1,7 +1,6 @@
 using System.Reactive;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 using DynamicData.Kernel;
 using NexusMods.App.UI.Resources;
 using NexusMods.App.UI.WorkspaceSystem;
@@ -41,8 +40,8 @@ public NavigationMenuItem()
 
         _contextMenuCommand = ReactiveCommand.Create<OpenPageBehaviorType>(openPageBehaviorType =>
         {
-            NavigationInformation = NavigationInformation.From(openPageBehaviorType);
-            OnClick(new RoutedEventArgs());
+            var navigationInformation = NavigationInformation.From(openPageBehaviorType);
+            NavigationCommand?.Execute(navigationInformation).Subscribe();
         });
 
         var contextMenu = new ContextMenu

diff --git a/src/NexusMods.App.UI/Pages/Settings/SettingsPage.cs b/src/NexusMods.App.UI/Pages/Settings/SettingsPage.cs
@@ -17,8 +17,6 @@ public SettingsPageFactory(IServiceProvider serviceProvider) : base(serviceProvi
     public static readonly PageFactoryId StaticId = PageFactoryId.From(Guid.Parse("3DE311A0-0AB0-4191-9CA5-5CE8EA76C393"));
     public override PageFactoryId Id => StaticId;
 
-    public override Optional<OpenPageBehaviorType> DefaultOpenPageBehavior => OpenPageBehaviorType.NewPanel;
-
     public override ISettingsPageViewModel CreateViewModel(SettingsPageContext context)
     {
         return ServiceProvider.GetRequiredService<ISettingsPageViewModel>();

diff --git a/src/NexusMods.App.UI/WorkspaceSystem/Panel/PanelViewModel.cs b/src/NexusMods.App.UI/WorkspaceSystem/Panel/PanelViewModel.cs
@@ -65,6 +65,11 @@ public PanelViewModel(IWorkspaceController workspaceController, PageFactoryContr
             .Bind(out _tabs)
             .Subscribe();
 
+        this.WhenAnyValue(vm => vm.SelectedTabId)
+            .Select(selectedTabId => Tabs.FirstOrDefault(tab => tab.Id == selectedTabId))
+            .WhereNotNull()
+            .SubscribeWithErrorLogging(selectedTab => SelectedTab = selectedTab);
+
         this.WhenActivated(disposables =>
         {
             this.WhenAnyValue(vm => vm.LogicalBounds)
@@ -129,9 +134,7 @@ public PanelViewModel(IWorkspaceController workspaceController, PageFactoryContr
                 .Connect()
                 .WhenPropertyChanged(item => item.Header.IsSelected)
                 .Where(propertyValue => propertyValue.Value)
-                .Select(propertyValue => propertyValue.Sender)
-                .Do(vm => SelectedTab = vm)
-                .Select(vm => vm.Id)
+                .Select(propertyValue => propertyValue.Sender.Id)
                 .BindToVM(this, vm => vm.SelectedTabId)
                 .DisposeWith(disposables);
 
@@ -226,9 +229,9 @@ public void FromData(PanelData data)
             for (uint i = 0; i < data.Tabs.Length; i++)
             {
                 var tab = data.Tabs[i];
-                var newTabPage = _factoryController.Create(tab.PageData, WindowId, WorkspaceId, Id, tabId: Optional<PanelTabId>.None);
+                var newTabPage = _factoryController.Create(tab.PageData, WindowId, WorkspaceId, Id, tabId: tab.Id);
 
-                var vm = new PanelTabViewModel(_workspaceController, WorkspaceId, Id)
+                var vm = new PanelTabViewModel(_workspaceController, WorkspaceId, Id, tab.Id)
                 {
                     Contents = newTabPage,
                     Header =
@@ -238,8 +241,6 @@ public void FromData(PanelData data)
                     },
                 };
 
-                newTabPage.ViewModel.TabId = vm.Id;
-
                 updater.Add(vm);
             }
         });

diff --git a/src/NexusMods.App.UI/WorkspaceSystem/PanelTab/PanelTabViewModel.cs b/src/NexusMods.App.UI/WorkspaceSystem/PanelTab/PanelTabViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using DynamicData.Kernel;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
@@ -7,7 +8,7 @@ namespace NexusMods.App.UI.WorkspaceSystem;
 public class PanelTabViewModel : AViewModel<IPanelTabViewModel>, IPanelTabViewModel
 {
     /// <inheritdoc/>
-    public PanelTabId Id { get; } = PanelTabId.From(Guid.NewGuid());
+    public PanelTabId Id { get; }
 
     /// <inheritdoc/>
     public IPanelTabHeaderViewModel Header { get; }
@@ -26,8 +27,9 @@ public class PanelTabViewModel : AViewModel<IPanelTabViewModel>, IPanelTabViewMo
 
     private TabHistory History { get; }
 
-    public PanelTabViewModel(IWorkspaceController workspaceController, WorkspaceId workspaceId, PanelId panelId)
+    public PanelTabViewModel(IWorkspaceController workspaceController, WorkspaceId workspaceId, PanelId panelId, Optional<PanelTabId> tabId = default)
     {
+        Id = tabId.HasValue ? tabId.Value : PanelTabId.From(Guid.NewGuid());
         Header = new PanelTabHeaderViewModel(Id);
         History = new TabHistory(
             openPageFunc: pageData => {