diff --git a/Documentation/Blazorise.Docs/Components/Commercial/Faq.razor b/Documentation/Blazorise.Docs/Components/Commercial/Faq.razor index 75ae7e9772..6f85ac0d9a 100644 --- a/Documentation/Blazorise.Docs/Components/Commercial/Faq.razor +++ b/Documentation/Blazorise.Docs/Components/Commercial/Faq.razor @@ -10,16 +10,16 @@ { var index = faqInfos.IndexOf( faqInfo ) + 1; - - + + @($"{index}. {faqInfo.Title}") - - + + @faqInfo.Body - - + + } @code { diff --git a/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor b/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor index 9d9504e06a..970f31b89a 100644 --- a/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor +++ b/Documentation/Blazorise.Docs/Pages/Commercial/AffiliatesPage.razor @@ -152,97 +152,97 @@ Frequently Asked Questions - - + + What is Blazorise? - - + + Blazorise is a component library for Blazor, a web framework for building interactive web applications using C# instead of JavaScript. Blazorise provides a set of reusable UI components, such as buttons, forms, and modals, that you can use to build responsive and mobile-friendly web applications. - - + + - - + + How are referrals tracked? - - + + a. After signing up, you will receive a personalized referral link that you can use right away. Our affiliate tracking software tracks conversions through your link. b. To track all of your referrals, we use cookies that last 90 days. - - + + - - + + Can I run ads as an Affiliate? - - + + a. You can NOT run ads for branded keywords such as Blazorise, blazorise, or any variations thereof, including misspellings. b. You can run ads for anything that’s not branded, but the user should be directed to the Blazorise website first. We track all our paid traffic and any affiliates that violate our terms and conditions will be removed from our program. - - + + - - + + When will I get paid? - - + + We pay commissions around the 20 of each month for verified sales from the previous month. - - + + - - + + How do I get paid? - - + + We make regular payouts via PayPal or Wise. If you have any questions, feel free to email us at commercial@blazorise.com. - - + + - - + + Is there a minimum payment threshold? - - + + a. The minimum payment threshold for all payment methods is €100. b. If you have any questions, feel free to email us at commercial@blazorise.com. - - + + - - + + Have more questions? - - + + Send an email to commercial@blazorise.com, and we will assist you. - - + + diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Accordions/AccordionPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Accordions/AccordionPage.razor index fb41502a2b..f04c3194ba 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Accordions/AccordionPage.razor +++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Accordions/AccordionPage.razor @@ -79,15 +79,15 @@ - Please note the changes starting from 1.5 versions: + Please note the changes starting from version 2.0: - Button is obsolete: Placing a regular Button component inside of Accordion is no longer recommended and should be replaced with new AccordionToggle component. + Support removed in version 2.0: Placing a regular Button component inside of Accordion is no longer supported as of version 2.0. It should be replaced with the new AccordionToggle component. - Collapse is obsolete: Placing a regular Collapse component inside of Accordion is no longer recommended and should be replaced with the new AccordionHeader, and AccordionBody, AccordionItem components. + Support removed in version 2.0: Placing a regular Collapse component inside of Accordion is no longer supported as of version 2.0. It should be replaced with the new AccordionHeader, AccordionBody, and AccordionItem components. diff --git a/Documentation/Blazorise.Docs/Pages/News/2025-05-01-release-notes-200.razor b/Documentation/Blazorise.Docs/Pages/News/2025-05-01-release-notes-200.razor index a25f862da2..58c5ef0148 100644 --- a/Documentation/Blazorise.Docs/Pages/News/2025-05-01-release-notes-200.razor +++ b/Documentation/Blazorise.Docs/Pages/News/2025-05-01-release-notes-200.razor @@ -65,10 +65,13 @@ + Support for using Collapse inside an Accordion has been removed. + Since version 1.5, placing a Collapse inside an Accordion is not recommended. + Accordion now works as expected only with accordion components such as AccordionItem, AccordionBody and AccordionHeader. diff --git a/Source/Blazorise.AntDesign/Providers/AntDesignClassProvider.cs b/Source/Blazorise.AntDesign/Providers/AntDesignClassProvider.cs index efbd768b95..e66e901105 100644 --- a/Source/Blazorise.AntDesign/Providers/AntDesignClassProvider.cs +++ b/Source/Blazorise.AntDesign/Providers/AntDesignClassProvider.cs @@ -752,17 +752,17 @@ public override string BarToggler( BarMode mode, BarTogglerMode togglerMode ) => #region Collapse - public override string Collapse( bool accordion ) => "ant-collapse-item"; + public override string Collapse() => "ant-collapse-item"; - public override string CollapseActive( bool accordion, bool active ) => active ? "ant-collapse-item-active" : null; + public override string CollapseActive( bool active ) => active ? "ant-collapse-item-active" : null; - public override string CollapseHeader( bool accordion ) => "ant-collapse-header"; + public override string CollapseHeader() => "ant-collapse-header"; - public override string CollapseBody( bool accordion ) => "ant-collapse-content"; + public override string CollapseBody() => "ant-collapse-content"; - public override string CollapseBodyActive( bool accordion, bool active ) => active ? "ant-collapse-content-active" : "ant-collapse-content-inactive"; + public override string CollapseBodyActive( bool active ) => active ? "ant-collapse-content-active" : "ant-collapse-content-inactive"; - public override string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) => "ant-collapse-content-box"; + public override string CollapseBodyContent() => "ant-collapse-content-box"; #endregion diff --git a/Source/Blazorise.Bootstrap/Providers/BootstrapClassProvider.cs b/Source/Blazorise.Bootstrap/Providers/BootstrapClassProvider.cs index 6a12e41b6d..ae5b79c74a 100644 --- a/Source/Blazorise.Bootstrap/Providers/BootstrapClassProvider.cs +++ b/Source/Blazorise.Bootstrap/Providers/BootstrapClassProvider.cs @@ -771,17 +771,17 @@ public override string BarDropdownToggleDisabled( BarMode mode, bool isBarDropDo #region Collapse - public override string Collapse( bool accordion ) => "card"; + public override string Collapse() => "card"; - public override string CollapseActive( bool accordion, bool active ) => null; + public override string CollapseActive( bool active ) => null; - public override string CollapseHeader( bool accordion ) => "card-header"; + public override string CollapseHeader() => "card-header"; - public override string CollapseBody( bool accordion ) => "collapse"; + public override string CollapseBody() => "collapse"; - public override string CollapseBodyActive( bool accordion, bool active ) => active ? Show() : null; + public override string CollapseBodyActive( bool active ) => active ? Show() : null; - public override string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) => "card-body"; + public override string CollapseBodyContent() => "card-body"; #endregion diff --git a/Source/Blazorise.Bootstrap5/Components/Button.cs b/Source/Blazorise.Bootstrap5/Components/Button.cs index 7f6056b0f3..8be19cd992 100644 --- a/Source/Blazorise.Bootstrap5/Components/Button.cs +++ b/Source/Blazorise.Bootstrap5/Components/Button.cs @@ -1,6 +1,5 @@ #region Using directives using Blazorise.Extensions; -using Blazorise.Utilities; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Web; @@ -10,28 +9,8 @@ namespace Blazorise.Bootstrap5.Components; public class Button : Blazorise.Button { - #region Members - - bool collapseVisible; - - #endregion - #region Methods - protected override void BuildClasses( ClassBuilder builder ) - { - if ( ParentCollapseHeader?.ParentCollapse != null ) - { - if ( ParentCollapseHeader.ParentCollapse.InsideAccordion ) - builder.Append( "accordion-button" ); - - if ( !CollapseVisible ) - builder.Append( "collapsed" ); - } - - base.BuildClasses( builder ); - } - protected override void BuildRenderTree( RenderTreeBuilder builder ) { builder @@ -59,11 +38,6 @@ protected override void BuildRenderTree( RenderTreeBuilder builder ) } } - if ( ParentCollapseHeader?.ParentCollapse != null ) - { - builder.AriaExpanded( ParentCollapseHeader.ParentCollapse.Visible.ToString().ToLowerInvariant() ); - } - builder.OnClick( this, EventCallback.Factory.Create( this, ClickHandler ) ); builder.OnClickPreventDefault( Type == ButtonType.Link && To != null && To.StartsWith( "#" ) ); @@ -98,28 +72,4 @@ protected override RenderFragment ProvideDefaultLoadingTemplate() } #endregion - - #region Properties - - /// - /// Gets or sets the content visibility. - /// - [CascadingParameter( Name = "CollapseVisible" )] - public bool CollapseVisible - { - get => collapseVisible; - set - { - collapseVisible = value; - - DirtyClasses(); - } - } - - /// - /// Gets or sets the cascaded parent collapse header component. - /// - [CascadingParameter] protected CollapseHeader ParentCollapseHeader { get; set; } - - #endregion } \ No newline at end of file diff --git a/Source/Blazorise.Bootstrap5/Providers/Bootstrap5ClassProvider.cs b/Source/Blazorise.Bootstrap5/Providers/Bootstrap5ClassProvider.cs index cca623dbc4..dc218babcf 100644 --- a/Source/Blazorise.Bootstrap5/Providers/Bootstrap5ClassProvider.cs +++ b/Source/Blazorise.Bootstrap5/Providers/Bootstrap5ClassProvider.cs @@ -766,17 +766,17 @@ public override string BarDropdownToggleDisabled( BarMode mode, bool isBarDropDo #region Collapse - public override string Collapse( bool accordion ) => accordion ? "accordion-item" : "card"; + public override string Collapse() => "card"; - public override string CollapseActive( bool accordion, bool active ) => null; + public override string CollapseActive( bool active ) => null; - public override string CollapseHeader( bool accordion ) => accordion ? "accordion-header" : "card-header"; + public override string CollapseHeader() => "card-header"; - public override string CollapseBody( bool accordion ) => accordion ? "accordion-collapse collapse" : "collapse"; + public override string CollapseBody() => "collapse"; - public override string CollapseBodyActive( bool accordion, bool active ) => active ? Show() : null; + public override string CollapseBodyActive( bool active ) => active ? Show() : null; - public override string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) => accordion ? "accordion-body" : "card-body"; + public override string CollapseBodyContent() => "card-body"; #endregion diff --git a/Source/Blazorise.Bulma/Providers/BulmaClassProvider.cs b/Source/Blazorise.Bulma/Providers/BulmaClassProvider.cs index 3fe3ab432f..86029b93a8 100644 --- a/Source/Blazorise.Bulma/Providers/BulmaClassProvider.cs +++ b/Source/Blazorise.Bulma/Providers/BulmaClassProvider.cs @@ -735,7 +735,6 @@ public override string BarDropdownToggleDisabled( BarMode mode, bool isBarDropDo public override string BarLabel( BarMode mode ) => "b-bar-label"; - #endregion #region Accordion @@ -762,17 +761,17 @@ public override string BarDropdownToggleDisabled( BarMode mode, bool isBarDropDo #region Collapse - public override string Collapse( bool accordion ) => "card"; + public override string Collapse() => "card"; - public override string CollapseActive( bool accordion, bool active ) => null; + public override string CollapseActive( bool active ) => null; - public override string CollapseHeader( bool accordion ) => "card-header"; + public override string CollapseHeader() => "card-header"; - public override string CollapseBody( bool accordion ) => "collapse"; + public override string CollapseBody() => "collapse"; - public override string CollapseBodyActive( bool accordion, bool active ) => active ? Show() : null; + public override string CollapseBodyActive( bool active ) => active ? Show() : null; - public override string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) => "card-content"; + public override string CollapseBodyContent() => "card-content"; #endregion @@ -822,7 +821,7 @@ public override string Column( bool grid, ColumnWidth columnWidth, Breakpoint br } public override string Column( bool grid, IEnumerable columnDefinitions ) - => string.Join( ' ', columnDefinitions.Select( x => Column( grid, x.ColumnWidth, x.Breakpoint, x.Offset ) ) ); + => string.Join( ' ', columnDefinitions.Select( x => Column( grid, x.ColumnWidth, x.Breakpoint, x.Offset ) ) ); #endregion diff --git a/Source/Blazorise.FluentUI2/Providers/FluentUI2ClassProvider.cs b/Source/Blazorise.FluentUI2/Providers/FluentUI2ClassProvider.cs index cae3322373..34e9532ef9 100644 --- a/Source/Blazorise.FluentUI2/Providers/FluentUI2ClassProvider.cs +++ b/Source/Blazorise.FluentUI2/Providers/FluentUI2ClassProvider.cs @@ -911,17 +911,17 @@ public override string BarDropdownMenuContainer( BarMode mode ) => mode == Blazo #region Collapse - public override string Collapse( bool accordion ) => "fui-AccordionItem"; + public override string Collapse() => "fui-AccordionItem"; - public override string CollapseActive( bool accordion, bool active ) => active ? "fui-AccordionItem-active" : null; + public override string CollapseActive( bool active ) => active ? "fui-AccordionItem-active" : null; - public override string CollapseHeader( bool accordion ) => "fui-AccordionHeader"; + public override string CollapseHeader() => "fui-AccordionHeader"; - public override string CollapseBody( bool accordion ) => "fui-AccordionPanel"; + public override string CollapseBody() => "fui-AccordionPanel"; - public override string CollapseBodyActive( bool accordion, bool active ) => active ? "fui-AccordionPanel-show" : null; + public override string CollapseBodyActive( bool active ) => active ? "fui-AccordionPanel-show" : null; - public override string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) => "card-body"; + public override string CollapseBodyContent() => "card-body"; #endregion diff --git a/Source/Blazorise.Tailwind/Components/Button.cs b/Source/Blazorise.Tailwind/Components/Button.cs index 0e84eeba37..c9bc5bff81 100644 --- a/Source/Blazorise.Tailwind/Components/Button.cs +++ b/Source/Blazorise.Tailwind/Components/Button.cs @@ -10,11 +10,6 @@ namespace Blazorise.Tailwind.Components; public class Button : Blazorise.Button { - #region Members - - bool collapseVisible; - - #endregion #region Methods @@ -24,18 +19,6 @@ protected override void BuildClasses( ClassBuilder builder ) { builder.Append( "rounded-none first:rounded-l-lg last:rounded-r-lg" ); } - else if ( ParentCollapseHeader?.ParentCollapse != null ) - { - // TODO v2: Obsolete, remove this in v2! We have introduced AccordionToggle instead of using regular Button for toggle of collapse in the accordion. - if ( ParentCollapseHeader.ParentCollapse.InsideAccordion ) - { - builder.Append( ClassProvider.AccordionToggle() ); - } - - builder.Append( ClassProvider.AccordionToggleCollapsed( CollapseVisible ) ); - - return; - } else { builder.Append( "rounded-lg" ); @@ -71,11 +54,6 @@ protected override void BuildRenderTree( RenderTreeBuilder builder ) } } - if ( ParentCollapseHeader?.ParentCollapse != null ) - { - builder.AriaExpanded( ParentCollapseHeader.ParentCollapse.Visible.ToString().ToLowerInvariant() ); - } - builder.OnClick( this, EventCallback.Factory.Create( this, ClickHandler ) ); builder.OnClickPreventDefault( Type == ButtonType.Link && To != null && To.StartsWith( "#" ) ); @@ -91,30 +69,6 @@ protected override void BuildRenderTree( RenderTreeBuilder builder ) builder.Content( ChildContent ); } - if ( ParentCollapseHeader?.ParentCollapse != null ) - { - builder.OpenElement( "svg" ); - - builder.Attribute( "data-accordion-icon", null ); - - builder.Class( CollapseVisible - ? "w-6 h-6 shrink-0 rotate-180" - : "w-6 h-6 shrink-0" ); - - builder.Attribute( "fill", "currentColor" ); - builder.Attribute( "viewBox", "0 0 20 20" ); - builder.Attribute( "xmlns", "http://www.w3.org/2000/svg" ); - - builder - .OpenElement( "path" ) - .Attribute( "fill-rule", "evenodd" ) - .Attribute( "d", "M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" ) - .Attribute( "clip-rule", "evenodd" ); - builder.CloseElement(); - - builder.CloseElement(); - } - builder.CloseElement(); } @@ -166,28 +120,4 @@ private static string GetFillName( Color color ) } #endregion - - #region Properties - - /// - /// Gets or sets the content visibility. - /// - [CascadingParameter( Name = "CollapseVisible" )] - public bool CollapseVisible - { - get => collapseVisible; - set - { - collapseVisible = value; - - DirtyClasses(); - } - } - - /// - /// Gets or sets the cascaded parent collapse header component. - /// - [CascadingParameter] protected CollapseHeader ParentCollapseHeader { get; set; } - - #endregion } \ No newline at end of file diff --git a/Source/Blazorise.Tailwind/Providers/TailwindClassProvider.cs b/Source/Blazorise.Tailwind/Providers/TailwindClassProvider.cs index 0799357321..3f3c5d9bca 100644 --- a/Source/Blazorise.Tailwind/Providers/TailwindClassProvider.cs +++ b/Source/Blazorise.Tailwind/Providers/TailwindClassProvider.cs @@ -1141,20 +1141,18 @@ public override string AccordionBodyContent( bool firstInAccordion, bool lastInA #region Collapse - public override string Collapse( bool accordion ) => "b-collapse"; + public override string Collapse() => "b-collapse"; - public override string CollapseActive( bool accordion, bool active ) => "b-collapse-active"; + public override string CollapseActive( bool active ) => "b-collapse-active"; - public override string CollapseHeader( bool accordion ) => "b-collapse-header"; + public override string CollapseHeader() => "b-collapse-header"; - public override string CollapseBody( bool accordion ) => "b-collapse-body"; + public override string CollapseBody() => "b-collapse-body"; - public override string CollapseBodyActive( bool accordion, bool active ) => active ? null : "hidden"; + public override string CollapseBodyActive( bool active ) => active ? null : "hidden"; - public override string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) - => lastInAccordion - ? "p-5 font-light border border-gray-200 dark:border-gray-700 dark:bg-gray-900" - : "p-5 font-light border border-b-0 border-gray-200 dark:border-gray-700 dark:bg-gray-900"; + public override string CollapseBodyContent() + => "p-5 font-light border border-b-0 border-gray-200 dark:border-gray-700 dark:bg-gray-900"; #endregion diff --git a/Source/Blazorise/Components/Accordion/Accordion.razor.cs b/Source/Blazorise/Components/Accordion/Accordion.razor.cs index b8f77f71d8..ebe4cfa6dd 100644 --- a/Source/Blazorise/Components/Accordion/Accordion.razor.cs +++ b/Source/Blazorise/Components/Accordion/Accordion.razor.cs @@ -13,8 +13,6 @@ public partial class Accordion : BaseComponent { #region Members - private List collapses; - private List accordionItems; #endregion @@ -29,35 +27,10 @@ protected override void BuildClasses( ClassBuilder builder ) base.BuildClasses( builder ); } - internal void NotifyCollapseInitialized( Collapse collapse ) - { - collapses ??= new(); - - collapses.Add( collapse ); - } - - internal void NotifyCollapseRemoved( Collapse collapse ) - { - if ( collapses is not null && collapses.Contains( collapse ) ) - collapses.Remove( collapse ); - } - - internal bool IsFirstInAccordion( Collapse collapse ) - { - if ( collapses is not null && collapses.IndexOf( collapse ) == 0 ) - return true; - - return false; - } - - internal bool IsLastInAccordion( Collapse collapse ) - { - if ( collapses is not null && collapses.IndexOf( collapse ) == collapses.Count - 1 ) - return true; - - return false; - } - + /// + /// Notifies the that the specified has been initialized. + /// + /// The that has been initialized. internal void NotifyAccordionItemInitialized( AccordionItem accordionItem ) { accordionItems ??= new(); @@ -65,12 +38,23 @@ internal void NotifyAccordionItemInitialized( AccordionItem accordionItem ) accordionItems.Add( accordionItem ); } + /// + /// Notifies the that the specified has been removed. + /// + /// The that has been removed. internal void NotifyAccordionItemRemoved( AccordionItem accordionItem ) { if ( accordionItems is not null && accordionItems.Contains( accordionItem ) ) accordionItems.Remove( accordionItem ); } + /// + /// Determines if the specified is the first item in the . + /// + /// The to check. + /// + /// A value indicating if the specified is the first item in the . + /// internal bool IsFirstInAccordion( AccordionItem accordionItem ) { if ( accordionItems is not null && accordionItems.IndexOf( accordionItem ) == 0 ) @@ -79,6 +63,13 @@ internal bool IsFirstInAccordion( AccordionItem accordionItem ) return false; } + /// + /// Determines if the specified is the last item in the . + /// + /// The to check. + /// + /// A value indicating if the specified is the last item in the . + /// internal bool IsLastInAccordion( AccordionItem accordionItem ) { if ( accordionItems is not null && accordionItems.IndexOf( accordionItem ) == accordionItems.Count - 1 ) diff --git a/Source/Blazorise/Components/Accordion/AccordionToggle.razor.cs b/Source/Blazorise/Components/Accordion/AccordionToggle.razor.cs index a28c5c57c3..e29adc6dc3 100644 --- a/Source/Blazorise/Components/Accordion/AccordionToggle.razor.cs +++ b/Source/Blazorise/Components/Accordion/AccordionToggle.razor.cs @@ -38,11 +38,7 @@ protected override void BuildClasses( ClassBuilder builder ) /// A task that represents the asynchronous operation. protected async Task ClickHandler( MouseEventArgs eventArgs ) { - if ( ParentCollapse is not null ) - { - await ParentCollapse.Toggle(); - } - else if ( ParentAccordionItem is not null ) + if ( ParentAccordionItem is not null ) { await ParentAccordionItem.Toggle(); } @@ -59,11 +55,6 @@ protected async Task ClickHandler( MouseEventArgs eventArgs ) /// [CascadingParameter] protected Accordion ParentAccordion { get; set; } - /// - /// Gets or sets the cascaded parent collapse component. - /// - [CascadingParameter] protected Collapse ParentCollapse { get; set; } - /// /// Gets or sets the cascaded parent accordion item component. /// diff --git a/Source/Blazorise/Components/Collapse/Collapse.razor.cs b/Source/Blazorise/Components/Collapse/Collapse.razor.cs index a8fb8ecd96..7acc01b01d 100644 --- a/Source/Blazorise/Components/Collapse/Collapse.razor.cs +++ b/Source/Blazorise/Components/Collapse/Collapse.razor.cs @@ -20,30 +20,11 @@ public partial class Collapse : BaseComponent, IDisposable #region Methods - /// - protected override void OnInitialized() - { - ParentAccordion?.NotifyCollapseInitialized( this ); - - base.OnInitialized(); - } - - /// - protected override void Dispose( bool disposing ) - { - if ( disposing ) - { - ParentAccordion?.NotifyCollapseRemoved( this ); - } - - base.Dispose( disposing ); - } - /// protected override void BuildClasses( ClassBuilder builder ) { - builder.Append( ClassProvider.Collapse( InsideAccordion ) ); - builder.Append( ClassProvider.CollapseActive( InsideAccordion, Visible ) ); + builder.Append( ClassProvider.Collapse() ); + builder.Append( ClassProvider.CollapseActive( Visible ) ); base.BuildClasses( builder ); } @@ -81,21 +62,6 @@ private void RaiseEvents( bool visible ) #region Properties - /// - /// Determines if the collapse is placed inside of accordion component. - /// - public bool InsideAccordion => ParentAccordion is not null; - - /// - /// Determines if the collapse is placed inside of accordion component as the first item. - /// - public bool FirstInAccordion => ParentAccordion?.IsFirstInAccordion( this ) == true; - - /// - /// Determines if the collapse is placed inside of accordion component as the last item. - /// - public bool LastInAccordion => ParentAccordion?.IsLastInAccordion( this ) == true; - /// /// Gets or sets the collapse visibility state. /// diff --git a/Source/Blazorise/Components/Collapse/CollapseBody.razor.cs b/Source/Blazorise/Components/Collapse/CollapseBody.razor.cs index ac8efa6c8c..d32c1aa017 100644 --- a/Source/Blazorise/Components/Collapse/CollapseBody.razor.cs +++ b/Source/Blazorise/Components/Collapse/CollapseBody.razor.cs @@ -33,8 +33,7 @@ public CollapseBody() /// protected override void BuildClasses( ClassBuilder builder ) { - builder.Append( ClassProvider.CollapseBody( ParentCollapse?.InsideAccordion == true ) ); - builder.Append( ClassProvider.CollapseBodyActive( ParentCollapse?.InsideAccordion == true, Visible ) ); + builder.Append( ClassProvider.CollapseBodyActive( Visible ) ); base.BuildClasses( builder ); } @@ -45,7 +44,7 @@ protected override void BuildClasses( ClassBuilder builder ) /// Class builder used to append the classnames. private void BuildBodyClasses( ClassBuilder builder ) { - builder.Append( ClassProvider.CollapseBodyContent( ParentCollapse?.InsideAccordion == true, ParentCollapse?.FirstInAccordion == true, ParentCollapse?.LastInAccordion == true ) ); + builder.Append( ClassProvider.CollapseBodyContent() ); } /// diff --git a/Source/Blazorise/Components/Collapse/CollapseHeader.razor.cs b/Source/Blazorise/Components/Collapse/CollapseHeader.razor.cs index 63fc6ab6c1..45d9c46393 100644 --- a/Source/Blazorise/Components/Collapse/CollapseHeader.razor.cs +++ b/Source/Blazorise/Components/Collapse/CollapseHeader.razor.cs @@ -21,7 +21,7 @@ public partial class CollapseHeader : BaseComponent /// protected override void BuildClasses( ClassBuilder builder ) { - builder.Append( ClassProvider.CollapseHeader( ParentCollapse?.InsideAccordion == true ) ); + builder.Append( ClassProvider.CollapseHeader() ); base.BuildClasses( builder ); } diff --git a/Source/Blazorise/Interfaces/IClassProvider.cs b/Source/Blazorise/Interfaces/IClassProvider.cs index b279920b42..c6345883ee 100644 --- a/Source/Blazorise/Interfaces/IClassProvider.cs +++ b/Source/Blazorise/Interfaces/IClassProvider.cs @@ -730,17 +730,17 @@ public interface IClassProvider #region Collapse - string Collapse( bool accordion ); + string Collapse(); - string CollapseActive( bool accordion, bool active ); + string CollapseActive( bool active ); - string CollapseHeader( bool accordion ); + string CollapseHeader(); - string CollapseBody( bool accordion ); + string CollapseBody(); - string CollapseBodyActive( bool accordion, bool active ); + string CollapseBodyActive( bool active ); - string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ); + string CollapseBodyContent(); #endregion @@ -1320,7 +1320,7 @@ public interface IClassProvider #region Enums - /* + /* * These methods are named with "To" prefix to indicate they're used only to convert en enum to the equivalent * keyword in the implementation class provider. */ diff --git a/Source/Blazorise/Providers/ClassProvider.cs b/Source/Blazorise/Providers/ClassProvider.cs index c4d099819c..04117973c3 100644 --- a/Source/Blazorise/Providers/ClassProvider.cs +++ b/Source/Blazorise/Providers/ClassProvider.cs @@ -731,17 +731,17 @@ public abstract class ClassProvider : IClassProvider #region Collapse - public abstract string Collapse( bool accordion ); + public abstract string Collapse(); - public abstract string CollapseActive( bool accordion, bool active ); + public abstract string CollapseActive( bool active ); - public abstract string CollapseHeader( bool accordion ); + public abstract string CollapseHeader(); - public abstract string CollapseBody( bool accordion ); + public abstract string CollapseBody(); - public abstract string CollapseBodyActive( bool accordion, bool active ); + public abstract string CollapseBodyActive( bool active ); - public abstract string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ); + public abstract string CollapseBodyContent(); #endregion diff --git a/Source/Blazorise/Providers/EmptyClassProvider.cs b/Source/Blazorise/Providers/EmptyClassProvider.cs index e4e4206b4b..1394455f02 100644 --- a/Source/Blazorise/Providers/EmptyClassProvider.cs +++ b/Source/Blazorise/Providers/EmptyClassProvider.cs @@ -735,17 +735,17 @@ class EmptyClassProvider : IClassProvider #region Collapse - public string Collapse( bool accordion ) => null; + public string Collapse() => null; - public string CollapseActive( bool accordion, bool active ) => null; + public string CollapseActive( bool active ) => null; - public string CollapseHeader( bool accordion ) => null; + public string CollapseHeader() => null; - public string CollapseBody( bool accordion ) => null; + public string CollapseBody() => null; - public string CollapseBodyActive( bool accordion, bool active ) => null; + public string CollapseBodyActive( bool active ) => null; - public string CollapseBodyContent( bool accordion, bool firstInAccordion, bool lastInAccordion ) => null; + public string CollapseBodyContent() => null; #endregion