Skip to content

[MainLayout] Remove double header reduction #3841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dvoituron merged 3 commits into from
Jun 3, 2025
Merged

[MainLayout] Remove double header reduction #3841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5239e33
Fix #3836 remove double header reduction form main layout.
May 28, 2025
fe675cd
Fix default test
Jun 2, 2025
caa26e0
Merge branch 'dev' into bug/3836/fix-double-header-height-subtraction…
Tyme-Bleyaert Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/Core/Components/MainLayout/FluentMainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@
@Header
</FluentHeader>

@SubHeader
<FluentStack Orientation="Orientation.Vertical" VerticalGap="0" Style="height: 100%;">

<FluentStack Orientation="Orientation.Horizontal" style="height:calc(100% - var(--header-height))" HorizontalGap="0">
@if (NavMenuContent != null)
{
<FluentNavMenu Width="@NavMenuWidth" Collapsible="true" Class="main-layout-navmenu" Title="@NavMenuTitle">
@NavMenuContent
</FluentNavMenu>
}
<FluentBodyContent>
@Body
</FluentBodyContent>
@SubHeader

<FluentStack Orientation="Orientation.Horizontal" HorizontalGap="0" Style="height: 100%;">
@if (NavMenuContent != null)
{
<FluentNavMenu Width="@NavMenuWidth" Collapsible="true" Class="main-layout-navmenu" Title="@NavMenuTitle">
@NavMenuContent
</FluentNavMenu>
}
<FluentBodyContent>
@Body
</FluentBodyContent>
</FluentStack>
</FluentStack>
</FluentLayout>
</FluentLayout>
1 change: 0 additions & 1 deletion src/Core/Components/MainLayout/FluentMainLayout.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ public partial class FluentMainLayout : FluentComponentBase

protected string? StyleValue => new StyleBuilder(Style)
.AddStyle("--header-height", $"{HeaderHeight}px", () => HeaderHeight.HasValue)
.AddStyle("height", $"calc(100% - {HeaderHeight}px)")
.Build();

/// <summary>
Expand Down
30 changes: 30 additions & 0 deletions tests/Core/_ToDo/MainLayout/FluentMainLayoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,35 @@ public void FluentMainLayout_Default()
//Assert
cut.Verify();
}

[Fact]
public void FluentMainLayout_MainContent_Should_HaveCorrectHeight()
{
//Arrange
int? headerHeight = 60;
var expectedHeightStyle = $"height: 100%;";
var header = "<b>render me</b>";
var subHeader = "<b>render me</b>";
var navMenuContent = "<b>render me</b>";
var body = "<b>render me</b>";
string navMenuTitle = default!;
var navMenuWidth = 320;
var cut = TestContext.RenderComponent<FluentMainLayout>(parameters => parameters
.Add(p => p.Header, header)
.Add(p => p.SubHeader, subHeader)
.Add(p => p.HeaderHeight, headerHeight)
.Add(p => p.NavMenuTitle, navMenuTitle)
.Add(p => p.NavMenuContent, navMenuContent)
.Add(p => p.NavMenuWidth, navMenuWidth)
.Add(p => p.Body, body)
);
//Act
var fullContentStack = cut.FindComponent<FluentStack>();
var mainContentStack = fullContentStack.FindComponent<FluentStack>();

//Assert
Assert.Equal(expectedHeightStyle, fullContentStack.Instance.Style, StringComparer.Ordinal);
Assert.Equal(expectedHeightStyle, mainContentStack.Instance.Style, StringComparer.Ordinal);
}
}

Loading