Fix selection options (#4227)

Author: d2dyno1

Files/Views/ModernShellPage.xaml

@@ -248,9 +248,9 @@
                 x:FieldModifier="public"
 
                 MultiselectEnabled="{x:Bind InteractionViewModel.MultiselectEnabled, Mode=TwoWay}"
-                SelectAllInvokedCommand="{x:Bind SelectAllContentPageItemsCommand}"
-                InvertSelectionInvokedCommand="{x:Bind InvertContentPageSelctionCommand}"
-                ClearSelectionInvokedCommand="{x:Bind ClearContentPageSelectionCommand}"
+                SelectAllInvokedCommand="{x:Bind SelectAllContentPageItemsCommand, Mode=OneWay}"
+                InvertSelectionInvokedCommand="{x:Bind InvertContentPageSelctionCommand, Mode=OneWay}"
+                ClearSelectionInvokedCommand="{x:Bind ClearContentPageSelectionCommand, Mode=OneWay}"
 
                 LayoutModeInformation="{x:Bind FolderSettings.LayoutModeInformation, Mode=OneWay}"
                 ToggleLayoutModeDetailsView="{x:Bind FolderSettings.ToggleLayoutModeDetailsView}"
@@ -269,13 +269,13 @@
                 IsMultiPaneActive="{x:Bind IsMultiPaneActive, Mode=OneWay}"
                 IsPageMainPane="{x:Bind IsPageMainPane, Mode=OneWay}"
                 IsPageTypeNotHome="{x:Bind InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
-                NewFileInvokedCommand="{x:Bind CreateNewFileCommand}"
-                NewFolderInvokedCommand="{x:Bind CreateNewFolderCommand}"
-                NewPaneInvokedCommand="{x:Bind OpenNewPaneCommand}"
-                NewTabInvokedCommand="{x:Bind AddNewTabToMultitaskingControlCommand}"
-                NewWindowInvokedCommand="{x:Bind OpenNewWindowCommand}"
-                OpenInTerminalInvokedCommand="{x:Bind OpenDirectoryInDefaultTerminalCommand}"
-                PasteInvokedCommand="{x:Bind PasteItemsFromClipboardCommand}"
+                NewFileInvokedCommand="{x:Bind CreateNewFileCommand, Mode=OneWay}"
+                NewFolderInvokedCommand="{x:Bind CreateNewFolderCommand, Mode=OneWay}"
+                NewPaneInvokedCommand="{x:Bind OpenNewPaneCommand, Mode=OneWay}"
+                NewTabInvokedCommand="{x:Bind AddNewTabToMultitaskingControlCommand, Mode=OneWay}"
+                NewWindowInvokedCommand="{x:Bind OpenNewWindowCommand, Mode=OneWay}"
+                OpenInTerminalInvokedCommand="{x:Bind OpenDirectoryInDefaultTerminalCommand, Mode=OneWay}"
+                PasteInvokedCommand="{x:Bind PasteItemsFromClipboardCommand, Mode=OneWay}"
                 PreviewPaneEnabled="{x:Bind PreviewPaneEnabled, Mode=TwoWay}"
                 ShowMultiPaneControls="{x:Bind converters1:MultiBooleanConverter.AndConvert(IsMultiPaneEnabled, IsPageMainPane), Mode=OneWay}" />
         </Custom:DropShadowPanel>

Files/Views/ModernShellPage.xaml.cs

@@ -119,27 +119,27 @@ public bool IsPageMainPane
             }
         }
 
-        public ICommand SelectAllContentPageItemsCommand { get; private set; }
+        public ICommand SelectAllContentPageItemsCommand => new RelayCommand(() => SlimContentPage?.SelectAllItems());
 
-        public ICommand InvertContentPageSelctionCommand { get; private set; }
+        public ICommand InvertContentPageSelctionCommand => new RelayCommand(() => SlimContentPage?.InvertSelection());
 
-        public ICommand ClearContentPageSelectionCommand { get; private set; }
+        public ICommand ClearContentPageSelectionCommand => new RelayCommand(() => SlimContentPage?.ClearSelection());
 
-        public ICommand PasteItemsFromClipboardCommand { get; private set; }
+        public ICommand PasteItemsFromClipboardCommand => new RelayCommand(async () => await UIFilesystemHelpers.PasteItemAsync(FilesystemViewModel.WorkingDirectory, this));
 
-        public ICommand CopyPathOfWorkingDirectoryCommand { get; private set; }
+        public ICommand CopyPathOfWorkingDirectoryCommand => new RelayCommand(CopyWorkingLocation);
 
-        public ICommand OpenNewWindowCommand { get; private set; }
+        public ICommand OpenNewWindowCommand => new RelayCommand(NavigationHelpers.LaunchNewWindow);
 
-        public ICommand OpenNewPaneCommand { get; private set; }
+        public ICommand OpenNewPaneCommand => new RelayCommand(() => PaneHolder?.OpenPathInNewPane("NewTab".GetLocalized()));
 
-        public ICommand OpenDirectoryInDefaultTerminalCommand { get; private set; }
+        public ICommand OpenDirectoryInDefaultTerminalCommand => new RelayCommand(() => NavigationHelpers.OpenDirectoryInTerminal(this.FilesystemViewModel.WorkingDirectory, this));
 
-        public ICommand AddNewTabToMultitaskingControlCommand { get; private set; }
+        public ICommand AddNewTabToMultitaskingControlCommand => new RelayCommand(async () => await MainPageViewModel.AddNewTabByPathAsync(typeof(PaneHolderPage), "NewTab".GetLocalized()));
 
-        public ICommand CreateNewFileCommand { get; private set; }
+        public ICommand CreateNewFileCommand => new RelayCommand(() => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemType.File, null, this));
 
-        public ICommand CreateNewFolderCommand { get; private set; }
+        public ICommand CreateNewFolderCommand => new RelayCommand(() => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemType.Folder, null, this));
 
         public static readonly DependencyProperty IsPageMainPaneProperty =
             DependencyProperty.Register("IsPageMainPane", typeof(bool), typeof(ModernShellPage), new PropertyMetadata(true));
@@ -212,25 +212,6 @@ public ModernShellPage()
             AppServiceConnectionHelper.ConnectionChanged += AppServiceConnectionHelper_ConnectionChanged;
         }
 
-        private void InitializeCommands()
-        {
-            if (this.SlimContentPage != null)
-            {
-                SelectAllContentPageItemsCommand = new RelayCommand(this.SlimContentPage.SelectAllItems);
-                ClearContentPageSelectionCommand = new RelayCommand(this.SlimContentPage.ClearSelection);
-                InvertContentPageSelctionCommand = new RelayCommand(this.SlimContentPage.InvertSelection);
-            }
-            PasteItemsFromClipboardCommand = new RelayCommand(async () => await UIFilesystemHelpers.PasteItemAsync(FilesystemViewModel.WorkingDirectory, this));
-            CopyPathOfWorkingDirectoryCommand = new RelayCommand(CopyWorkingLocation);
-            OpenNewWindowCommand = new RelayCommand(NavigationHelpers.LaunchNewWindow);
-            OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("NewTab".GetLocalized()));
-            OpenDirectoryInDefaultTerminalCommand = new RelayCommand(() => NavigationHelpers.OpenDirectoryInTerminal(this.FilesystemViewModel.WorkingDirectory, this));
-            AddNewTabToMultitaskingControlCommand = new RelayCommand(async () => await MainPageViewModel.AddNewTabByPathAsync(typeof(PaneHolderPage), "NewTab".GetLocalized()));
-
-            CreateNewFileCommand = new RelayCommand(() => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemType.File, null, this));
-            CreateNewFolderCommand = new RelayCommand(() => UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemType.Folder, null, this));
-        }
-
         private void CopyWorkingLocation()
         {
             try
@@ -900,7 +881,6 @@ private void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryM
         private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs e)
         {
             ContentPage = await GetContentOrNullAsync();
-            InitializeCommands();
             NavigationToolbar.ClearSearchBoxQueryText(true);
             if (ItemDisplayFrame.CurrentSourcePageType == typeof(GenericFileBrowser)
                 || ItemDisplayFrame.CurrentSourcePageType == typeof(GridViewBrowser))