Fixed issue where sub items in the context menu would not get filtered (#4393)

winston-de · web-flow · commit 3fdb0ddc84d1 · 2021-03-31T10:43:18.000-04:00
diff --git a/Files/Helpers/ContextFlyoutItemHelper.cs b/Files/Helpers/ContextFlyoutItemHelper.cs
@@ -44,7 +44,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseContextCommands(NamedP
         public static List<ContextMenuFlyoutItemViewModel> Filter(List<ContextMenuFlyoutItemViewModel> items, List<ListedItem> selectedItems, bool shiftPressed, CurrentInstanceViewModel currentInstanceViewModel)
         {
             items = items.Where(x => Check(item: x, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems, shiftPressed: shiftPressed)).ToList();
-            items.ForEach(x => x.Items = x.Items.Where(y => Check(item: x, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems, shiftPressed: shiftPressed)).ToList());
+            items.ForEach(x => x.Items = x.Items.Where(y => Check(item: y, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems, shiftPressed: shiftPressed)).ToList());
             var overflow = items.Where(x => x.ID == "ItemOverflow").FirstOrDefault();
             if(overflow != null && !shiftPressed)
             {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseContextCommands(NamedP`
`44`	`44`	`public static List<ContextMenuFlyoutItemViewModel> Filter(List<ContextMenuFlyoutItemViewModel> items, List<ListedItem> selectedItems, bool shiftPressed, CurrentInstanceViewModel currentInstanceViewModel)`
`45`	`45`	`{`
`46`	`46`	`items = items.Where(x => Check(item: x, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems, shiftPressed: shiftPressed)).ToList();`
`47`		`- items.ForEach(x => x.Items = x.Items.Where(y => Check(item: x, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems, shiftPressed: shiftPressed)).ToList());`
	`47`	`+ items.ForEach(x => x.Items = x.Items.Where(y => Check(item: y, currentInstanceViewModel: currentInstanceViewModel, selectedItems: selectedItems, shiftPressed: shiftPressed)).ToList());`
`48`	`48`	`var overflow = items.Where(x => x.ID == "ItemOverflow").FirstOrDefault();`
`49`	`49`	`if(overflow != null && !shiftPressed)`
`50`	`50`	`{`