Skip to content

Commit a2c539a

Browse files
committed
Fix for GlobalStyles
1 parent da41cba commit a2c539a

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

maui/src/Accordion/AccordionItem.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,6 @@ static void OnIsExpandedPropertyChanged(BindableObject bindable, object oldValue
462462
// Content does not get collapsed when item is being collapsed in PCL view.
463463
if (bindable is AccordionItem accordionItem)
464464
{
465-
if (accordionItem.Content != null && (bool)newValue && accordionItem.Content.IsVisible)
466-
{
467-
accordionItem.Content.IsVisible = true;
468-
}
469-
470465
if (accordionItem._accordion != null && accordionItem._accordionItemView != null && accordionItem._accordionItemView.IsExpanded != accordionItem.IsExpanded)
471466
{
472467
accordionItem.OnIsExpandedChanging((bool)newValue);

maui/src/Accordion/SfAccordion.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ internal override Size LayoutMeasure(double widthConstraint, double heightConstr
13921392
/// <param name="newValue">The new value of expand mode property. </param>
13931393
static void OnExpandModePropertyChanged(BindableObject bindable, object oldValue, object newValue)
13941394
{
1395-
if (bindable is SfAccordion accordion)
1395+
if (bindable is SfAccordion accordion && accordion.IsViewLoaded)
13961396
{
13971397
accordion.UpdateAccordionItemsBasedOnExpandModes(true);
13981398
}
@@ -1406,7 +1406,7 @@ static void OnExpandModePropertyChanged(BindableObject bindable, object oldValue
14061406
/// <param name="newValue">The new value of item spacing property. </param>
14071407
static void OnItemSpacingPropertyChanged(BindableObject bindable, object oldValue, object newValue)
14081408
{
1409-
if (bindable is SfAccordion accordion)
1409+
if (bindable is SfAccordion accordion && accordion.IsViewLoaded)
14101410
{
14111411
foreach (var item in accordion.Items)
14121412
{
@@ -1427,7 +1427,7 @@ static void OnItemSpacingPropertyChanged(BindableObject bindable, object oldValu
14271427
/// <param name="newValue">The new value of animation duration property. </param>
14281428
static void OnAnimationDurationPropertyChanged(BindableObject bindable, object oldValue, object newValue)
14291429
{
1430-
if (bindable is SfAccordion accordion)
1430+
if (bindable is SfAccordion accordion && accordion.IsViewLoaded)
14311431
{
14321432
foreach (AccordionItem item in accordion.Items)
14331433
{
@@ -1447,7 +1447,7 @@ static void OnAnimationDurationPropertyChanged(BindableObject bindable, object o
14471447
/// <param name="newValue">The new value of animation easing property. </param>
14481448
static void OnAnimationEasingPropertyChanged(BindableObject bindable, object oldValue, object newValue)
14491449
{
1450-
if (bindable is SfAccordion accordion)
1450+
if (bindable is SfAccordion accordion && accordion.IsViewLoaded)
14511451
{
14521452
foreach (AccordionItem item in accordion.Items)
14531453
{
@@ -1467,7 +1467,7 @@ static void OnAnimationEasingPropertyChanged(BindableObject bindable, object old
14671467
/// <param name="newValue">The new value of header icon position property. </param>
14681468
static void OnHeaderIconPositionPropertyChanged(BindableObject bindable, object oldValue, object newValue)
14691469
{
1470-
if (bindable is SfAccordion accordion)
1470+
if (bindable is SfAccordion accordion && accordion.IsViewLoaded)
14711471
{
14721472
foreach (AccordionItem item in accordion.Items)
14731473
{
@@ -1487,7 +1487,7 @@ static void OnHeaderIconPositionPropertyChanged(BindableObject bindable, object
14871487
/// <param name="newValue">The new value of items property. </param>
14881488
static void OnItemsPropertyChanged(BindableObject bindable, object oldValue, object newValue)
14891489
{
1490-
if (bindable is SfAccordion accordion)
1490+
if (bindable is SfAccordion accordion && accordion.IsViewLoaded)
14911491
{
14921492
ObservableCollection<AccordionItem> oldItems = (ObservableCollection<AccordionItem>)oldValue;
14931493
ObservableCollection<AccordionItem> newItems = (ObservableCollection<AccordionItem>)newValue;

0 commit comments

Comments
 (0)