test/ant-design-blazor
1
0
Fork 0
mirror of https://gitee.com/ant-design-blazor/ant-design-blazor.git synced 2024-12-04 04:58:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix(module: menu): active parent menu for routed links (#1134)

Browse Source
This commit is contained in:
Andrzej Bakun 2021-02-14 10:26:54 +01:00 committed by GitHub
parent 314b07daf9
commit 954461119e
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/menu/Menu.razor.cs
View File

@ -128,6 +128,7 @@ namespace AntDesign
return;
}
var selectedKeys = new List<string>();
bool skipParentSelection = false;
if (!Multiple)
{
foreach (MenuItem menuitem in MenuItems.Where(x => x != item))
@ -139,14 +140,16 @@ namespace AntDesign
}
else if (menuitem.IsSelected || menuitem.FirstRun)
{
menuitem.Deselect();
if (!menuitem.FirstRun)
skipParentSelection = item.ParentMenu?.Key == menuitem.ParentMenu?.Key;
menuitem.Deselect(skipParentSelection);
}
}
}
if (!item.IsSelected)
{
item.Select();
item.Select(skipParentSelection);
}
selectedKeys.Add(item.Key);
_selectedKeys = selectedKeys.ToArray();

10
components/menu/MenuItem.razor.cs
View File

@ -116,18 +116,20 @@ namespace AntDesign
}
}
public void Select()
public void Select(bool skipParentSelection = false)
{
IsSelected = true;
FirstRun = false;
ParentMenu?.Select();
if (!skipParentSelection)
ParentMenu?.Select();
}
public void Deselect()
public void Deselect(bool sameParentAsSelected = false)
{
IsSelected = false;
FirstRun = false;
ParentMenu?.Deselect();
if (!sameParentAsSelected)
ParentMenu?.Deselect();
}
}
}

2
components/menu/MenuLink.cs
View File

@ -105,7 +105,7 @@ namespace AntDesign
{
Menu.SelectItem(MenuItem);
}
else if (MenuItem.IsSelected)
else if (!_isActive && MenuItem.IsSelected)
{
MenuItem.Deselect();
}