Skip to content

Commit c212f1e

Browse files
fix(BasicLayout): Invalid setting collapsed value (#76)
### Associated issue ### #38 #66 ant-design-blazor/ant-design-pro-blazor#136 ant-design-blazor/ant-design-pro-blazor#134
1 parent fc46101 commit c212f1e

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

src/layout/src/AntDesign.ProLayout.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="AntDesign" Version="0.14.4" />
26+
<PackageReference Include="AntDesign" Version="0.15.5" />
2727
</ItemGroup>
2828

2929
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">

src/layout/src/BasicLayout.razor

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
else
1313
{
1414
<CascadingValue Value="MenuExtraRender" Name="MenuExtraRender">
15+
<CascadingValue Value="Collapsed" Name="Collapsed">
1516
<SiderMenu
1617
MenuData="MenuData"
1718
OpenKeys="OpenKeys"
@@ -22,6 +23,7 @@
2223
Accordion="MenuAccordion"
2324
OnCollapse="HandleCollapse">
2425
</SiderMenu>
26+
</CascadingValue>
2527
</CascadingValue>
2628
}
2729
}

src/layout/src/BasicLayout.razor.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Threading.Tasks;
34
using Microsoft.AspNetCore.Components;
45
using Microsoft.AspNetCore.Components.Web;
@@ -20,6 +21,7 @@ public partial class BasicLayout : IBasicLayout
2021
private readonly bool _isChildrenLayout = false;
2122
private string _genLayoutStyle;
2223
private string _weakModeStyle;
24+
private bool _collapsed;
2325

2426
public string PrefixCls { get; } = "ant-pro";
2527
public string BaseClassName => $"{PrefixCls}-basicLayout";
@@ -61,10 +63,20 @@ protected override void OnInitialized()
6163
SetClassMap();
6264
}
6365

66+
protected override void OnParametersSet()
67+
{
68+
if (Collapsed != _collapsed)
69+
{
70+
_collapsed = Collapsed;
71+
SetStyle();
72+
}
73+
}
74+
6475
protected void SetStyle()
6576
{
6677
var hasLeftPadding = FixSiderbar && Layout != Layout.Top && !IsMobile;
6778
var paddingLeft = hasLeftPadding ? Collapsed ? 48 : SiderWidth : 0;
79+
Logger.LogInformation($"HasLeftPadding: {hasLeftPadding}, Collapsed: {Collapsed}, Padding: {paddingLeft}");
6880
_genLayoutStyle = MenuRender ? $"padding-left: {paddingLeft}px; position: relative;" : "";
6981
_weakModeStyle = ColorWeak ? "filter: invert(80%);" : "";
7082
}

src/layout/src/SiderMenu/BaseMenu.razor

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
Style="@Style"
99
Accordion="@Accordion"
1010
Class="@ClassMapper.Class"
11-
OnOpenChange="SetOpenKeys"
12-
InlineCollapsed="Collapsed">
11+
OnOpenChange="SetOpenKeys">
1312
@menuItemTemplate((MenuData, false))
1413
</Menu>
1514

src/layout/src/SiderMenu/SiderMenu.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Collapsible="false"
55
Collapsed="Collapsed"
66
CollapsedWidth="48"
7-
OnCollapse="HandleSiderCollapse"
87
Style="@SiderStyle"
98
Width="SiderWidth"
109
Theme="SiderTheme"

src/layout/src/SiderMenu/SiderMenu.razor.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ private async Task HandleOnCollapse(bool collapsed)
7373
}
7474
}
7575

76-
private async Task HandleSiderCollapse(bool collapsed)
77-
{
78-
Collapsed = collapsed;
79-
80-
await HandleOnCollapse(collapsed);
81-
}
82-
8376
protected override void OnInitialized()
8477
{
8578
base.OnInitialized();

0 commit comments

Comments
 (0)