Fix: Fixed issue where Open with and Send To submenus didn't appear properly in Widgets (#14879)

hishitetsu · web-flow · commit 93566ce2b863 · 2024-03-03T08:38:55.000-08:00
diff --git a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
@@ -272,6 +272,13 @@ x.Tag is Win32ContextMenuItem menuItem &&
 				if (manageBitLocker is not null)
 					shellMenuItems.Remove(manageBitLocker);
 
+				var lastItem = shellMenuItems.LastOrDefault();
+				while (lastItem?.ItemType is ContextMenuFlyoutItemType.Separator)
+				{
+					shellMenuItems.Remove(lastItem);
+					lastItem = shellMenuItems.LastOrDefault();
+				}
+
 				ContentPageContextFlyoutFactory.SwapPlaceholderWithShellOption(
 					itemContextMenuFlyout,
 					"ManageBitLockerPlaceholder",
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -140,7 +140,7 @@ private void AdaptiveGridView_RightTapped(object sender, RightTappedRoutedEventA
 			itemContextMenuFlyout.ShowAt(element, new() { Position = e.GetPosition(element) });
 
 			// Load shell menu items
-			_ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout);
+			_ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout, null, true, true);
 
 			e.Handled = true;
 		}
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -142,7 +142,7 @@ private void ListView_RightTapped(object sender, RightTappedRoutedEventArgs e)
 			itemContextMenuFlyout.ShowAt(element, new() { Position = e.GetPosition(element) });
 
 			// Load shell menu items
-			_ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout);
+			_ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout, null, true, true);
 		}
 
 		public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCardItem item, bool isPinned, bool isFolder = false)

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private void AdaptiveGridView_RightTapped(object sender, RightTappedRoutedEventA`
`140`	`140`	`itemContextMenuFlyout.ShowAt(element, new() { Position = e.GetPosition(element) });`
`141`	`141`
`142`	`142`	`// Load shell menu items`
`143`		`- _ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout);`
	`143`	`+ _ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout, null, true, true);`
`144`	`144`
`145`	`145`	`e.Handled = true;`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private void ListView_RightTapped(object sender, RightTappedRoutedEventArgs e)`
`142`	`142`	`itemContextMenuFlyout.ShowAt(element, new() { Position = e.GetPosition(element) });`
`143`	`143`
`144`	`144`	`// Load shell menu items`
`145`		`- _ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout);`
	`145`	`+ _ = ShellContextFlyoutFactory.LoadShellMenuItemsAsync(_flyoutItemPath, itemContextMenuFlyout, null, true, true);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCardItem item, bool isPinned, bool isFolder = false)`