Skip to content

Commit 2651572

Browse files
authored
fix: resolve layout direction issue in Boilerplate #10971 (#10975)
1 parent d2ff39e commit 2651572

File tree

7 files changed

+50
-53
lines changed

7 files changed

+50
-53
lines changed

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppAiChatPanel.razor.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ namespace Boilerplate.Client.Core.Components.Layout;
88

99
public partial class AppAiChatPanel
1010
{
11+
[CascadingParameter] public BitDir? CurrentDir { get; set; }
12+
13+
[CascadingParameter(Name = Parameters.CurrentTheme)]
14+
public AppThemeType? CurrentTheme { get; set; }
15+
16+
17+
[AutoInject] private HubConnection hubConnection = default!;
18+
19+
1120
private bool isOpen;
1221
private bool isLoading;
1322
private string? userInput;
@@ -24,16 +33,6 @@ public partial class AppAiChatPanel
2433
//#endif
2534

2635

27-
[AutoInject] private HubConnection hubConnection = default!;
28-
29-
30-
[CascadingParameter(Name = Parameters.CurrentTheme)]
31-
public AppThemeType? CurrentTheme { get; set; }
32-
33-
[CascadingParameter(Name = Parameters.CurrentDir)]
34-
public BitDir? CurrentDir { get; set; }
35-
36-
3736
protected override Task OnInitAsync()
3837
{
3938
//#if(module == "Sales")

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Header/AppMenu.razor.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ namespace Boilerplate.Client.Core.Components.Layout.Header;
66

77
public partial class AppMenu
88
{
9-
private bool isOpen;
10-
private bool showCultures;
11-
private bool isSignOutConfirmOpen;
12-
private BitChoiceGroupItem<string>[] cultures = default!;
9+
[CascadingParameter] public BitDir? CurrentDir { get; set; }
10+
11+
[CascadingParameter(Name = Parameters.CurrentTheme)]
12+
public AppThemeType? CurrentTheme { get; set; }
13+
14+
[CascadingParameter(Name = Parameters.CurrentUser)]
15+
public UserDto? CurrentUser { get; set; }
16+
1317

1418
[AutoInject] private Cookie cookie = default!;
1519
[AutoInject] private ThemeService themeService = default!;
@@ -19,14 +23,11 @@ public partial class AppMenu
1923
[AutoInject] private SignInModalService signInModalService = default!;
2024

2125

22-
[CascadingParameter(Name = Parameters.CurrentDir)]
23-
public BitDir? CurrentDir { get; set; }
24-
25-
[CascadingParameter(Name = Parameters.CurrentTheme)]
26-
public AppThemeType? CurrentTheme { get; set; }
26+
private bool isOpen;
27+
private bool showCultures;
28+
private bool isSignOutConfirmOpen;
29+
private BitChoiceGroupItem<string>[] cultures = default!;
2730

28-
[CascadingParameter(Name = Parameters.CurrentUser)]
29-
public UserDto? CurrentUser { get; set; }
3031

3132
private string? ProfileImageUrl => CurrentUser?.GetProfileImageUrl(AbsoluteServerAddress);
3233

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Header/Header.razor.cs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ namespace Boilerplate.Client.Core.Components.Layout.Header;
44

55
public partial class Header : AppComponentBase
66
{
7+
[CascadingParameter] public BitDir? CurrentDir { get; set; }
8+
9+
10+
[AutoInject] private History history = default!;
11+
12+
713
private string? pageTitle;
814
private string? pageSubtitle;
915
private bool showGoBackButton;
1016
private Action unsubscribePageTitleChanged = default!;
1117

12-
[CascadingParameter(Name = Parameters.CurrentDir)]
13-
public BitDir? CurrentDir { get; set; }
14-
15-
16-
[AutoInject] private History history = default!;
1718

1819
protected override async Task OnInitAsync()
1920
{
@@ -29,13 +30,6 @@ protected override async Task OnInitAsync()
2930
NavigationManager.LocationChanged += NavigationManager_LocationChanged;
3031
}
3132

32-
private void NavigationManager_LocationChanged(object? sender, LocationChangedEventArgs e)
33-
{
34-
// The sign-in and sign-up button hrefs are bound to NavigationManager.GetRelativePath().
35-
// To ensure the bound values update with each route change, it's necessary to call StateHasChanged on location changes.
36-
StateHasChanged();
37-
}
38-
3933

4034
private void OpenNavPanel()
4135
{
@@ -47,6 +41,14 @@ private async Task GoBack()
4741
await history.GoBack();
4842
}
4943

44+
private void NavigationManager_LocationChanged(object? sender, LocationChangedEventArgs e)
45+
{
46+
// The sign-in and sign-up button hrefs are bound to NavigationManager.GetRelativePath().
47+
// To ensure the bound values update with each route change, it's necessary to call StateHasChanged on location changes.
48+
StateHasChanged();
49+
}
50+
51+
5052
protected override async ValueTask DisposeAsync(bool disposing)
5153
{
5254
await base.DisposeAsync(disposing);

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Header/IdentityHeader.razor.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22

33
public partial class IdentityHeader : AppComponentBase
44
{
5-
private BitDropdownItem<string>[] cultures = default!;
5+
[CascadingParameter] public BitDir? CurrentDir { get; set; }
6+
7+
[CascadingParameter(Name = Parameters.CurrentTheme)]
8+
public AppThemeType? CurrentTheme { get; set; }
69

710

811
[AutoInject] private History history = default!;
912
[AutoInject] private ThemeService themeService = default!;
1013
[AutoInject] private CultureService cultureService = default!;
1114

1215

13-
[CascadingParameter(Name = Parameters.CurrentDir)]
14-
public BitDir? CurrentDir { get; set; }
15-
16-
[CascadingParameter(Name = Parameters.CurrentTheme)]
17-
public AppThemeType? CurrentTheme { get; set; }
16+
private BitDropdownItem<string>[] cultures = default!;
1817

1918

2019
protected override async Task OnInitAsync()
@@ -29,6 +28,7 @@ protected override async Task OnInitAsync()
2928
}
3029
}
3130

31+
3232
private async Task HandleGoHomeLink()
3333
{
3434
NavigationManager.NavigateTo(Urls.HomePage, replace: true);

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/MainLayout.razor

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
@*+:cnd:noEmit*@
22
@inherits LayoutComponentBase
33

4-
<CascadingValue Name="@Parameters.CurrentUser" Value=currentUser>
5-
<CascadingValue Name=@Parameters.IsOnline Value=isOnline>
6-
<CascadingValue Name="@Parameters.CurrentDir" Value=currentDir>
7-
<CascadingValue Name="@Parameters.CurrentTheme" Value=currentTheme>
8-
<CascadingValue Name="@Parameters.CurrentRouteData" Value=currentRouteData>
4+
<CascadingValue Value="currentDir">
5+
<CascadingValue Name=@Parameters.IsOnline Value="isOnline">
6+
<CascadingValue Name="@Parameters.CurrentUser" Value="currentUser">
7+
<CascadingValue Name="@Parameters.CurrentTheme" Value="currentTheme">
8+
<CascadingValue Name="@Parameters.CurrentRouteData" Value="currentRouteData">
99

1010
<BitAppShell PersistScroll>
1111
<main class="@GetMainCssClass()">

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Home/HomePage.razor.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ namespace Boilerplate.Client.Core.Components.Pages.Home;
66

77
public partial class HomePage
88
{
9-
[CascadingParameter(Name = Parameters.CurrentDir)]
10-
public BitDir? CurrentDir { get; set; }
9+
[CascadingParameter] public BitDir? CurrentDir { get; set; }
1110

1211

1312
//#if(module != "Sales")
@@ -16,11 +15,10 @@ public partial class HomePage
1615
private bool isLoadingNuget = true;
1716
private bool isLoadingGitHub = true;
1817

19-
[AutoInject] private IStatisticsController statisticsController = default!;
20-
//#endif
2118

19+
[AutoInject] private IStatisticsController statisticsController = default!;
20+
2221

23-
//#if(module != "Sales")
2422
protected override async Task OnInitAsync()
2523
{
2624
await base.OnInitAsync();
@@ -36,9 +34,8 @@ protected override async Task OnInitAsync()
3634

3735
await Task.WhenAll(LoadNuget(), LoadGitHub());
3836
}
39-
//#endif
37+
4038

41-
//#if(module != "Sales")
4239
private async Task LoadNuget()
4340
{
4441
try
@@ -75,7 +72,6 @@ private async Task LoadGitHub()
7572
}
7673
}
7774
//#endif
78-
7975
//#if(module == "Sales")
8076
private async Task HandleOnSearchBoxClick()
8177
{

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ namespace Boilerplate.Client.Core.Components;
44

55
public class Parameters
66
{
7-
public const string CurrentDir = nameof(CurrentDir);
87
public const string CurrentTheme = nameof(CurrentTheme);
98
public const string CurrentRouteData = nameof(CurrentRouteData);
109

0 commit comments

Comments
 (0)