Feature: Disable show more options menu item until shell items are loaded (#11243)

hecksmosis · web-flow · commit 215c79a18203 · 2023-02-13T01:27:51.000-05:00
diff --git a/src/Files.App/BaseLayout.cs b/src/Files.App/BaseLayout.cs
@@ -72,11 +72,15 @@ public AppModel AppModel
 		public CommandBarFlyout ItemContextMenuFlyout { get; set; } = new()
 		{
 			AlwaysExpanded = true,
+			AreOpenCloseAnimationsEnabled = false,
+			Placement = FlyoutPlacementMode.RightEdgeAlignedTop,
 		};
 
 		public CommandBarFlyout BaseContextMenuFlyout { get; set; } = new()
 		{
 			AlwaysExpanded = true,
+			AreOpenCloseAnimationsEnabled = false,
+			Placement = FlyoutPlacementMode.RightEdgeAlignedTop,
 		};
 
 		public BaseLayoutCommandsViewModel? CommandsViewModel { get; protected set; }
@@ -645,9 +649,9 @@ private async Task LoadMenuItemsAsync()
 			ItemContextMenuFlyout.SecondaryCommands.Clear();
 			var (primaryElements, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(items);
 			AddCloseHandler(ItemContextMenuFlyout, primaryElements, secondaryElements);
-			primaryElements.ForEach(i => ItemContextMenuFlyout.PrimaryCommands.Add(i));
+			primaryElements.ForEach(ItemContextMenuFlyout.PrimaryCommands.Add);
 			secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width
-			secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));
+			secondaryElements.ForEach(ItemContextMenuFlyout.SecondaryCommands.Add);
 
 			if (InstanceViewModel!.CanTagFilesInPage)
 				AddNewFileTagsToMenu(ItemContextMenuFlyout);
@@ -756,11 +760,13 @@ private void AddShellItemsToMenu(List<ContextMenuFlyoutItemViewModel> shellMenuI
 						index++;
 					}
 
-					if (overflowItemFlyout.Items.Count > 0)
+					if (overflowItemFlyout.Items.Count > 0 && UserSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu)
 					{
-						(contextMenuFlyout.SecondaryCommands.First(x => x is FrameworkElement fe && fe.Tag as string == "OverflowSeparator") as AppBarSeparator)!.Visibility = Visibility.Visible;
-						overflowItem.Visibility = Visibility.Visible;
+						overflowItem.Label = "ShowMoreOptions".GetLocalizedResource();
+						overflowItem.IsEnabled = true;
 					}
+					else if (!UserSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu)
+						overflowItem.Visibility = Visibility.Collapsed;
 				}
 			}
 			else
diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs
@@ -641,12 +641,12 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "ShowMoreOptions".GetLocalizedResource(),
+					Text = "LoadingMoreOptions".GetLocalizedResource(),
 					Glyph = "\xE712",
 					Items = new List<ContextMenuFlyoutItemViewModel>(),
 					ID = "ItemOverflow",
 					Tag = "ItemOverflow",
-					IsHidden = true,
+					IsEnabled = false,
 				},
 			};
 		}
@@ -1106,17 +1106,16 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
 					ItemType = ItemType.Separator,
 					Tag = "OverflowSeparator",
 					ShowInSearchPage = true,
-					IsHidden = true,
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "ShowMoreOptions".GetLocalizedResource(),
+					Text = "LoadingMoreOptions".GetLocalizedResource(),
 					Glyph = "\xE712",
 					Items = new List<ContextMenuFlyoutItemViewModel>(),
 					ID = "ItemOverflow",
 					Tag = "ItemOverflow",
 					ShowInSearchPage = true,
-					IsHidden = true,
+					IsEnabled = false
 				},
 			};
 		}
diff --git a/src/Files.App/Helpers/ShellContextMenuHelper.cs b/src/Files.App/Helpers/ShellContextMenuHelper.cs
@@ -288,6 +288,9 @@ public static async Task LoadShellMenuItems(string path, CommandBarFlyout itemCo
 					if (flyoutItems is not null)
 						overflowItems.ForEach(i => flyoutItems.Add(i));
 					overflowItem.Visibility = overflowItems.Any() ? Visibility.Visible : Visibility.Collapsed;
+
+					overflowItem.Label = "ShowMoreOptions".GetLocalizedResource();
+					overflowItem.IsEnabled = true;
 				}
 			}
 			catch { }
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -2928,4 +2928,7 @@
   <data name="Never" xml:space="preserve">
     <value>Never</value>
   </data>
+  <data name="LoadingMoreOptions" xml:space="preserve">
+    <value>Loading more options...</value>
+  </data>
 </root>
diff --git a/src/Files.App/UserControls/SidebarControl.xaml.cs b/src/Files.App/UserControls/SidebarControl.xaml.cs
@@ -276,12 +276,13 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "ShowMoreOptions".GetLocalizedResource(),
+					Text = "LoadingMoreOptions".GetLocalizedResource(),
 					Glyph = "\xE712",
 					Items = new List<ContextMenuFlyoutItemViewModel>(),
 					ID = "ItemOverflow",
 					Tag = "ItemOverflow",
-					IsHidden = true,
+					IsEnabled = false,
+					IsHidden = !options.ShowShellItems,
 				}
 			}.Where(x => x.ShowItem).ToList();
 		}
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -206,12 +206,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "ShowMoreOptions".GetLocalizedResource(),
+					Text = "LoadingMoreOptions".GetLocalizedResource(),
 					Glyph = "\xE712",
 					Items = new List<ContextMenuFlyoutItemViewModel>(),
 					ID = "ItemOverflow",
 					Tag = "ItemOverflow",
-					IsHidden = true
+					IsEnabled = false,
 				}
 			}.Where(x => x.ShowItem).ToList();
 		}
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -228,12 +228,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "ShowMoreOptions".GetLocalizedResource(),
+					Text = "LoadingMoreOptions".GetLocalizedResource(),
 					Glyph = "\xE712",
 					Items = new List<ContextMenuFlyoutItemViewModel>(),
 					ID = "ItemOverflow",
 					Tag = "ItemOverflow",
-					IsHidden = true
+					IsEnabled = false,
 				}
 			}.Where(x => x.ShowItem).ToList();
 		}
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -153,12 +153,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "ShowMoreOptions".GetLocalizedResource(),
+					Text = "LoadingMoreOptions".GetLocalizedResource(),
 					Glyph = "\xE712",
 					Items = new List<ContextMenuFlyoutItemViewModel>(),
 					ID = "ItemOverflow",
 					Tag = "ItemOverflow",
-					IsHidden = true
+					IsEnabled = false,
 				}
 			};
 		}

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,15 @@ public AppModel AppModel`
`72`	`72`	`public CommandBarFlyout ItemContextMenuFlyout { get; set; } = new()`
`73`	`73`	`{`
`74`	`74`	`AlwaysExpanded = true,`
	`75`	`+ AreOpenCloseAnimationsEnabled = false,`
	`76`	`+ Placement = FlyoutPlacementMode.RightEdgeAlignedTop,`
`75`	`77`	`};`
`76`	`78`
`77`	`79`	`public CommandBarFlyout BaseContextMenuFlyout { get; set; } = new()`
`78`	`80`	`{`
`79`	`81`	`AlwaysExpanded = true,`
	`82`	`+ AreOpenCloseAnimationsEnabled = false,`
	`83`	`+ Placement = FlyoutPlacementMode.RightEdgeAlignedTop,`
`80`	`84`	`};`
`81`	`85`
`82`	`86`	`public BaseLayoutCommandsViewModel? CommandsViewModel { get; protected set; }`
`@@ -645,9 +649,9 @@ private async Task LoadMenuItemsAsync()`
`645`	`649`	`ItemContextMenuFlyout.SecondaryCommands.Clear();`
`646`	`650`	`var (primaryElements, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(items);`
`647`	`651`	`AddCloseHandler(ItemContextMenuFlyout, primaryElements, secondaryElements);`
`648`		`- primaryElements.ForEach(i => ItemContextMenuFlyout.PrimaryCommands.Add(i));`
	`652`	`+ primaryElements.ForEach(ItemContextMenuFlyout.PrimaryCommands.Add);`
`649`	`653`	`secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width`
`650`		`- secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));`
	`654`	`+ secondaryElements.ForEach(ItemContextMenuFlyout.SecondaryCommands.Add);`
`651`	`655`
`652`	`656`	`if (InstanceViewModel!.CanTagFilesInPage)`
`653`	`657`	`AddNewFileTagsToMenu(ItemContextMenuFlyout);`
`@@ -756,11 +760,13 @@ private void AddShellItemsToMenu(List<ContextMenuFlyoutItemViewModel> shellMenuI`
`756`	`760`	`index++;`
`757`	`761`	`}`
`758`	`762`
`759`		`- if (overflowItemFlyout.Items.Count > 0)`
	`763`	`+ if (overflowItemFlyout.Items.Count > 0 && UserSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu)`
`760`	`764`	`{`
`761`		`- (contextMenuFlyout.SecondaryCommands.First(x => x is FrameworkElement fe && fe.Tag as string == "OverflowSeparator") as AppBarSeparator)!.Visibility = Visibility.Visible;`
`762`		`- overflowItem.Visibility = Visibility.Visible;`
	`765`	`+ overflowItem.Label = "ShowMoreOptions".GetLocalizedResource();`
	`766`	`+ overflowItem.IsEnabled = true;`
`763`	`767`	`}`
	`768`	`+ else if (!UserSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu)`
	`769`	`+ overflowItem.Visibility = Visibility.Collapsed;`
`764`	`770`	`}`
`765`	`771`	`}`
`766`	`772`	`else`
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,9 @@ public static async Task LoadShellMenuItems(string path, CommandBarFlyout itemCo`
`288`	`288`	`if (flyoutItems is not null)`
`289`	`289`	`overflowItems.ForEach(i => flyoutItems.Add(i));`
`290`	`290`	`overflowItem.Visibility = overflowItems.Any() ? Visibility.Visible : Visibility.Collapsed;`
	`291`	`+`
	`292`	`+ overflowItem.Label = "ShowMoreOptions".GetLocalizedResource();`
	`293`	`+ overflowItem.IsEnabled = true;`
`291`	`294`	`}`
`292`	`295`	`}`
`293`	`296`	`catch { }`
Original file line number	Diff line number	Diff line change
`@@ -276,12 +276,13 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio`
`276`	`276`	`},`
`277`	`277`	`new ContextMenuFlyoutItemViewModel()`
`278`	`278`	`{`
`279`		`- Text = "ShowMoreOptions".GetLocalizedResource(),`
	`279`	`+ Text = "LoadingMoreOptions".GetLocalizedResource(),`
`280`	`280`	`Glyph = "\xE712",`
`281`	`281`	`Items = new List<ContextMenuFlyoutItemViewModel>(),`
`282`	`282`	`ID = "ItemOverflow",`
`283`	`283`	`Tag = "ItemOverflow",`
`284`		`- IsHidden = true,`
	`284`	`+ IsEnabled = false,`
	`285`	`+ IsHidden = !options.ShowShellItems,`
`285`	`286`	`}`
`286`	`287`	`}.Where(x => x.ShowItem).ToList();`
`287`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,12 +206,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`206`	`206`	`},`
`207`	`207`	`new ContextMenuFlyoutItemViewModel()`
`208`	`208`	`{`
`209`		`- Text = "ShowMoreOptions".GetLocalizedResource(),`
	`209`	`+ Text = "LoadingMoreOptions".GetLocalizedResource(),`
`210`	`210`	`Glyph = "\xE712",`
`211`	`211`	`Items = new List<ContextMenuFlyoutItemViewModel>(),`
`212`	`212`	`ID = "ItemOverflow",`
`213`	`213`	`Tag = "ItemOverflow",`
`214`		`- IsHidden = true`
	`214`	`+ IsEnabled = false,`
`215`	`215`	`}`
`216`	`216`	`}.Where(x => x.ShowItem).ToList();`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,12 +228,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`228`	`228`	`},`
`229`	`229`	`new ContextMenuFlyoutItemViewModel()`
`230`	`230`	`{`
`231`		`- Text = "ShowMoreOptions".GetLocalizedResource(),`
	`231`	`+ Text = "LoadingMoreOptions".GetLocalizedResource(),`
`232`	`232`	`Glyph = "\xE712",`
`233`	`233`	`Items = new List<ContextMenuFlyoutItemViewModel>(),`
`234`	`234`	`ID = "ItemOverflow",`
`235`	`235`	`Tag = "ItemOverflow",`
`236`		`- IsHidden = true`
	`236`	`+ IsEnabled = false,`
`237`	`237`	`}`
`238`	`238`	`}.Where(x => x.ShowItem).ToList();`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`153`	`153`	`},`
`154`	`154`	`new ContextMenuFlyoutItemViewModel()`
`155`	`155`	`{`
`156`		`- Text = "ShowMoreOptions".GetLocalizedResource(),`
	`156`	`+ Text = "LoadingMoreOptions".GetLocalizedResource(),`
`157`	`157`	`Glyph = "\xE712",`
`158`	`158`	`Items = new List<ContextMenuFlyoutItemViewModel>(),`
`159`	`159`	`ID = "ItemOverflow",`
`160`	`160`	`Tag = "ItemOverflow",`
`161`		`- IsHidden = true`
	`161`	`+ IsEnabled = false,`
`162`	`162`	`}`
`163`	`163`	`};`
`164`	`164`	`}`