Skip to content

Commit f0f85cf

Browse files
committed
TestCase Changes
1 parent d84bc55 commit f0f85cf

File tree

3 files changed

+15
-24
lines changed

3 files changed

+15
-24
lines changed

maui/src/Accordion/AccordionItem.cs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public Color HeaderIconColor
324324
/// <summary>
325325
/// Gets or sets the instance of the accordion.
326326
/// </summary>
327-
SfAccordion? _accordion { get; set; }
327+
public SfAccordion? _accordion { get; set; }
328328

329329
#endregion
330330

@@ -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._accordion.IsViewLoaded && accordionItem._accordionItemView != null && accordionItem._accordionItemView.IsExpanded != accordionItem.IsExpanded)
471466
{
472467
accordionItem.OnIsExpandedChanging((bool)newValue);
@@ -499,21 +494,14 @@ static void OnHeaderPropertyChanged(BindableObject bindable, object oldValue, ob
499494
static void OnContentPropertyChanged(BindableObject bindable, object oldValue, object newValue)
500495
{
501496
// When the Content is changed at runtime, need to update its visibility based on IsExpanded property.
502-
var content = newValue as View;
503-
if (bindable is AccordionItem accordionItem)
497+
if (bindable is AccordionItem accordionItem && newValue is View content && accordionItem._accordion != null && accordionItem._accordion.IsViewLoaded)
504498
{
505-
if (accordionItem._accordion != null && accordionItem._accordion.IsViewLoaded)
499+
content.IsVisible = accordionItem.IsExpanded;
500+
if (accordionItem._accordionItemView != null)
506501
{
507-
if (content != null)
508-
{
509-
content.IsVisible = accordionItem.IsExpanded;
510-
}
511-
512-
if (accordionItem._accordionItemView != null)
513-
{
514-
accordionItem._accordionItemView.Content = content;
515-
}
502+
accordionItem._accordionItemView.Content = content;
516503
}
504+
517505
}
518506
}
519507

maui/src/Expander/SfExpander.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ static void OnHeaderIconColorPropertyChanged(BindableObject bindable, object old
17771777
private static void OnAnimationDurationPropertyChanged(BindableObject bindable, object oldValue, object newValue)
17781778
{
17791779
var expander = bindable as SfExpander;
1780-
if (expander != null && (double)newValue == 0 && expander._expanderAnimation != null)
1780+
if (expander != null && (double)newValue == 0 && expander._expanderAnimation != null && expander.IsViewLoaded)
17811781
{
17821782
var animation = expander._expanderAnimation;
17831783
if (animation.AnimationManager != null)

maui/tests/Syncfusion.Maui.Toolkit.UnitTest/Layout/SfAccordionUnitTests.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,6 @@ public void UpdateAccordionItems_SingleExpandMode_ExpandsFirstItem(bool initialS
843843
ExpandMode = AccordionExpandMode.Single
844844
};
845845

846-
var accordionItem = new AccordionItem();
847846
accordion.IsViewLoaded = true;
848847
accordion.UpdateAccordionItemsBasedOnExpandModes(false);
849848
Assert.Equal(expectedState, accordion.Items[0]._accordionItemView?.IsExpanded);
@@ -1188,7 +1187,8 @@ public void OnHeaderPropertyChanged_SetsAccordionItemViewHeader_WhenHeaderIsNotN
11881187
{
11891188
var accordionItem = new AccordionItem();
11901189
var accordion = new SfAccordion();
1191-
accordion.IsViewLoaded = true;
1190+
accordionItem._accordion = accordion;
1191+
accordionItem._accordion.IsViewLoaded = true;
11921192
var contentView = new ContentView();
11931193
var accordionItemView = new AccordionItemView();
11941194
accordionItem._accordionItemView = accordionItemView;
@@ -1214,7 +1214,8 @@ public void OnContentPropertyChanged_SetsContentVisibilityAndViewContent_WhenCon
12141214
IsExpanded = true
12151215
};
12161216
var accordion = new SfAccordion();
1217-
accordion.IsViewLoaded = true;
1217+
accordionItem._accordion = accordion;
1218+
accordionItem._accordion.IsViewLoaded = true;
12181219
var contentView = new ContentView();
12191220
var accordionItemView = new AccordionItemView();
12201221
accordionItem._accordionItemView = accordionItemView;
@@ -1233,7 +1234,8 @@ public void OnContentPropertyChanged_SetsContentVisibilityAndViewContent_WhenCon
12331234
};
12341235

12351236
var accordion = new SfAccordion();
1236-
accordion.IsViewLoaded = true;
1237+
accordionItem._accordion = accordion;
1238+
accordionItem._accordion.IsViewLoaded = true;
12371239
// Create a new AccordionItemView and set it to _accordionItemView
12381240
var accordionItemView = new AccordionItemView();
12391241
accordionItem._accordionItemView = accordionItemView;
@@ -1280,7 +1282,8 @@ public void OnHeaderIconColorPropertyChanged_UpdatesHeaderIconColor(string color
12801282
{
12811283
var accordionItem = new AccordionItem();
12821284
var accordion = new SfAccordion();
1283-
accordion.IsViewLoaded = true;
1285+
accordionItem._accordion = accordion;
1286+
accordionItem._accordion.IsViewLoaded = true;
12841287
var accordionItemView = new AccordionItemView();
12851288
accordionItem._accordionItemView = accordionItemView;
12861289
var newColor = Color.FromArgb(colorHex);

0 commit comments

Comments
 (0)