Skip to content

Sidebar and Sidebar2 updates #731

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
merged 2 commits into from
May 22, 2024
Merged

Sidebar and Sidebar2 updates #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af812a
Sidebar and Sidebar2 updates
gvreddy04 May 22, 2024
472fb43
Sidebar and Sidebar2 - docs and demos updated.
gvreddy04 May 22, 2024
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
12 changes: 6 additions & 6 deletions BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

<div class="bb-page">

<Sidebar2 @ref="sidebar2"
ImageSrc="https://demos.blazorbootstrap.com/images/logo/logo-white.svg"
Title="Blazor Bootstrap"
BadgeText="@Version"
DataProvider="Sidebar2DataProvider" />
<Sidebar2 Href="/"
ImageSrc="https://demos.blazorbootstrap.com/images/logo/logo-white.svg"
Title="Blazor Bootstrap"
BadgeText="@Version"
DataProvider="Sidebar2DataProvider" />

<main class="bb-scrollbar">
<div class="content my-4 my-md-4 px-4">
Expand All @@ -22,7 +22,7 @@
</a>
</Callout>
</div>

<MainLayoutBaseFooter Version="@Version"
DocsUrl="@DocsUrl"
BlogUrl="@BlogUrl"
Expand Down
5 changes: 2 additions & 3 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Sidebar @ref="sidebar"
IconName="IconName.BootstrapFill"
<Sidebar Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
DataProvider="SidebarDataProvider" />

@code {
Sidebar sidebar = default!;
IEnumerable<NavItem>? navItems;

private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
Expand Down
3 changes: 1 addition & 2 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Sidebar @ref="sidebar"
<Sidebar Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
DataProvider="SidebarDataProvider" />

@code {
Sidebar sidebar = default!;
IEnumerable<NavItem>? navItems;

private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
Expand Down
3 changes: 1 addition & 2 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Sidebar @ref="sidebar"
<Sidebar Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
DataProvider="SidebarDataProvider" />

@code {
Sidebar sidebar = default!;
IEnumerable<NavItem>? navItems;

private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
Expand Down
3 changes: 1 addition & 2 deletions ...ootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="bb-page">

<Sidebar @ref="sidebar"
<Sidebar Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
DataProvider="SidebarDataProvider" />
Expand All @@ -18,7 +18,6 @@
</div>

@code {
Sidebar sidebar = default!;
IEnumerable<NavItem>? navItems;

private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
Expand Down
1 change: 1 addition & 0 deletions ...Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar @ref="sidebar"
Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
DataProvider="SidebarDataProvider" />
Expand Down
1 change: 1 addition & 0 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar @ref="sidebar"
Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
BadgeText="v1.3.1"
Expand Down
1 change: 1 addition & 0 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar @ref="sidebar"
Href="/"
CustomIconName="bi bi-apple"
Title="Blazor Bootstrap"
BadgeText="v1.3.1"
Expand Down
1 change: 1 addition & 0 deletions ...ootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar @ref="sidebar"
Href="/"
ImageSrc="https://demos.blazorbootstrap.com/images/logo/logo-white.svg"
Title="Blazor Bootstrap"
BadgeText="v1.3.1"
Expand Down
3 changes: 1 addition & 2 deletions BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="bb-page">

<Sidebar @ref="sidebar"
<Sidebar Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
BadgeText="v1.3.1"
Expand All @@ -21,7 +21,6 @@
</div>

@code {
Sidebar sidebar = default!;
bool applyPurpleStyle = false;
IEnumerable<NavItem>? navItems;

Expand Down
3 changes: 1 addition & 2 deletions ...Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Sidebar @ref="sidebar"
<Sidebar Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
DataProvider="SidebarDataProvider" />

@code {
Sidebar sidebar = default!;
IEnumerable<NavItem>? navItems;

private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
Expand Down
3 changes: 2 additions & 1 deletion BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Sidebar2 IconName="IconName.BootstrapFill"
<Sidebar2 Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
BadgeText="v2.1.0"
DataProvider="Sidebar2DataProvider" />
Expand Down
3 changes: 2 additions & 1 deletion BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Sidebar2 IconName="IconName.BootstrapFill"
<Sidebar2 Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
BadgeText="v2.1.0"
DataProvider="Sidebar2DataProvider" />
Expand Down
3 changes: 2 additions & 1 deletion BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Sidebar2 IconName="IconName.BootstrapFill"
<Sidebar2 Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
BadgeText="v2.1.0"
DataProvider="Sidebar2DataProvider" />
Expand Down
3 changes: 2 additions & 1 deletion ...tstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar2 IconName="IconName.BootstrapFill"
<Sidebar2 Href="/"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
BadgeText="v2.1.0"
DataProvider="Sidebar2DataProvider" />
Expand Down
3 changes: 2 additions & 1 deletion BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar2 CustomIconName="bi bi-apple"
<Sidebar2 Href="/"
CustomIconName="bi bi-apple"
Title="Blazor Bootstrap"
BadgeText="v2.1.0"
DataProvider="Sidebar2DataProvider" />
Expand Down
3 changes: 2 additions & 1 deletion ...tstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="bb-page">

<Sidebar2 ImageSrc="https://demos.blazorbootstrap.com/images/logo/logo-white.svg"
<Sidebar2 Href="/"
ImageSrc="https://demos.blazorbootstrap.com/images/logo/logo-white.svg"
Title="Blazor Bootstrap"
BadgeText="v2.1.0"
DataProvider="Sidebar2DataProvider" />
Expand Down
5 changes: 3 additions & 2 deletions blazorbootstrap/Components/Sidebar/Sidebar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

<CascadingValue IsFixed="true" Value="this">
<CascadingValue Value="@collapseSidebar">
<aside @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" role="navigation"
@attributes="@AdditionalAttributes">
<aside @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" role="navigation" @attributes="@AdditionalAttributes">

<div class="bb-sidebar-top-row navbar">
<div class="container-fluid ps-3">
<a class="navbar-brand d-flex align-items-center" href="@Href">
Expand Down Expand Up @@ -44,6 +44,7 @@
<SidebarItemGroup NavItems="@items" />
}
</div>

</aside>
</CascadingValue>
</CascadingValue>
12 changes: 9 additions & 3 deletions blazorbootstrap/Components/Sidebar/Sidebar.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,15 @@ private string GetNavMenuCssClass()
[EditorRequired]
public SidebarDataProviderDelegate? DataProvider { get; set; } = default!;

/// <summary>
/// Gets or sets the Href.
/// </summary>
/// <remarks>
/// Default value is null.
/// </remarks>
[Parameter]
public string? Href { get; set; }

/// <summary>
/// Gets or sets the IconName.
/// </summary>
Expand Down Expand Up @@ -178,8 +187,5 @@ private string GetNavMenuCssClass()
[EditorRequired]
public string? Title { get; set; } = default!;

[Parameter]
public string? Href { get; set; }

#endregion
}
2 changes: 1 addition & 1 deletion blazorbootstrap/Components/Sidebar2/Sidebar2.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<aside @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" role="navigation" @attributes="@AdditionalAttributes">
<div class="bb-sidebar2-top-row navbar">
<div class="container-fluid ps-3">
<a class="navbar-brand d-flex align-items-center" href="">
<a class="navbar-brand d-flex align-items-center" href="@Href">
@if (!string.IsNullOrWhiteSpace(ImageSrc))
{
<span class="navbar-brand-image me-2">
Expand Down
9 changes: 9 additions & 0 deletions blazorbootstrap/Components/Sidebar2/Sidebar2.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,15 @@ private string GetNavMenuCssClass()
[EditorRequired]
public Sidebar2DataProviderDelegate? DataProvider { get; set; } = default!;

/// <summary>
/// Gets or sets the Href.
/// </summary>
/// <remarks>
/// Default value is null.
/// </remarks>
[Parameter]
public string? Href { get; set; }

/// <summary>
/// Gets or sets the IconName.
/// </summary>
Expand Down
Loading