Sidebar and Sidebar2 updates (#731)

gvreddy04 · web-flow · commit 414abf46f7ce · 2024-05-22T22:37:22.000+05:30
* Sidebar and Sidebar2 updates
diff --git a/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor
@@ -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">
@@ -22,7 +22,7 @@
                 </a>
             </Callout>
         </div>
-        
+
         <MainLayoutBaseFooter Version="@Version"
                               DocsUrl="@DocsUrl"
                               BlogUrl="@BlogUrl"
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor
@@ -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)
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor
@@ -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)
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor
@@ -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)
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor
@@ -1,6 +1,6 @@
 ﻿<div class="bb-page">
 
-    <Sidebar @ref="sidebar"
+    <Sidebar Href="/"
              IconName="IconName.BootstrapFill"
              Title="Blazor Bootstrap"
              DataProvider="SidebarDataProvider" />
@@ -18,7 +18,6 @@
 </div>
 
 @code {
-    Sidebar sidebar = default!;
     IEnumerable<NavItem>? navItems;
 
     private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor
@@ -1,6 +1,7 @@
 ﻿<div class="bb-page">
 
     <Sidebar @ref="sidebar"
+             Href="/"
              IconName="IconName.BootstrapFill"
              Title="Blazor Bootstrap"
              DataProvider="SidebarDataProvider" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor
@@ -1,6 +1,7 @@
 ﻿<div class="bb-page">
 
     <Sidebar @ref="sidebar"
+             Href="/"
              IconName="IconName.BootstrapFill"
              Title="Blazor Bootstrap"
              BadgeText="v1.3.1"
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor
@@ -1,6 +1,7 @@
 ﻿<div class="bb-page">
 
     <Sidebar @ref="sidebar"
+             Href="/"
              CustomIconName="bi bi-apple"
              Title="Blazor Bootstrap"
              BadgeText="v1.3.1"
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor
@@ -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"
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor
@@ -1,6 +1,6 @@
 ﻿<div class="bb-page">
 
-    <Sidebar @ref="sidebar"
+    <Sidebar Href="/"
              IconName="IconName.BootstrapFill"
              Title="Blazor Bootstrap"
              BadgeText="v1.3.1"
@@ -21,7 +21,6 @@
 </div>
 
 @code {
-    Sidebar sidebar = default!;
     bool applyPurpleStyle = false;
     IEnumerable<NavItem>? navItems;
 
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor
@@ -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)
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor
@@ -1,4 +1,5 @@
-<Sidebar2 IconName="IconName.BootstrapFill"
+<Sidebar2 Href="/"
+          IconName="IconName.BootstrapFill"
           Title="Blazor Bootstrap"
           BadgeText="v2.1.0"
           DataProvider="Sidebar2DataProvider" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor
@@ -1,4 +1,5 @@
-<Sidebar2 IconName="IconName.BootstrapFill"
+<Sidebar2 Href="/"
+          IconName="IconName.BootstrapFill"
           Title="Blazor Bootstrap"
           BadgeText="v2.1.0"
           DataProvider="Sidebar2DataProvider" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor
@@ -1,4 +1,5 @@
-﻿<Sidebar2 IconName="IconName.BootstrapFill"
+﻿<Sidebar2 Href="/"
+          IconName="IconName.BootstrapFill"
           Title="Blazor Bootstrap"
           BadgeText="v2.1.0"
           DataProvider="Sidebar2DataProvider" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor
@@ -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" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor
@@ -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" />
diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor
@@ -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" />
diff --git a/blazorbootstrap/Components/Sidebar/Sidebar.razor b/blazorbootstrap/Components/Sidebar/Sidebar.razor
@@ -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">
@@ -44,6 +44,7 @@
                     <SidebarItemGroup NavItems="@items" />
                 }
             </div>
+
         </aside>
     </CascadingValue>
 </CascadingValue>
diff --git a/blazorbootstrap/Components/Sidebar/Sidebar.razor.cs b/blazorbootstrap/Components/Sidebar/Sidebar.razor.cs
@@ -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>
@@ -178,8 +187,5 @@ private string GetNavMenuCssClass()
     [EditorRequired]
     public string? Title { get; set; } = default!;
 
-    [Parameter]
-    public string? Href { get; set; }
-
     #endregion
 }
diff --git a/blazorbootstrap/Components/Sidebar2/Sidebar2.razor b/blazorbootstrap/Components/Sidebar2/Sidebar2.razor
@@ -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">
diff --git a/blazorbootstrap/Components/Sidebar2/Sidebar2.razor.cs b/blazorbootstrap/Components/Sidebar2/Sidebar2.razor.cs
@@ -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>
diff --git a/docs/docs/05-components/sidebar.mdx b/docs/docs/05-components/sidebar.mdx
diff --git a/docs/docs/05-components/sidebar2.mdx b/docs/docs/05-components/sidebar2.mdx
