Optimize Expander (MaterialDesignInXAML#2579)

Change visibility depending on expander state to improve loading times
StefanoRivolta-Previero · Feb 18, 2022 · 0c87790 · 0c87790
1 parent 04d718d
commit 0c87790
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
@@ -189,6 +189,11 @@
                                                     <CubicEase EasingMode="EaseInOut"/>
                                                 </DoubleAnimation.EasingFunction>
                                             </DoubleAnimation>
+                                            <ObjectAnimationUsingKeyFrames Duration="0:0:0"
+                                                                           Storyboard.TargetName="PART_Content"
+                                                                           Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0%" Value="{x:Static Visibility.Visible}"/>
+                                            </ObjectAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualTransition>
 
@@ -206,6 +211,11 @@
                                                     <CubicEase EasingMode="EaseInOut"/>
                                                 </DoubleAnimation.EasingFunction>
                                             </DoubleAnimation>
+                                            <ObjectAnimationUsingKeyFrames Duration="{DynamicResource CollapseDuration}" 
+                                                                           Storyboard.TargetName="PART_Content" 
+                                                                           Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="100%" Value="{x:Static Visibility.Collapsed}"/>
+                                            </ObjectAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualTransition>
                                 </VisualStateGroup.Transitions>
@@ -220,6 +230,11 @@
                                                          Storyboard.TargetProperty="(ScaleTransform.ScaleY)" 
                                                          To="1" 
                                                          Duration="0" />
+                                        <ObjectAnimationUsingKeyFrames Duration="0"
+                                                                       Storyboard.TargetName="PART_Content"
+                                                                       Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0%" Value="{x:Static Visibility.Visible}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
@@ -233,6 +248,11 @@
                                                          Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
                                                          To="0"
                                                          Duration="0" />
+                                        <ObjectAnimationUsingKeyFrames Duration="0" 
+                                                                       Storyboard.TargetName="PART_Content" 
+                                                                       Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="100%" Value="{x:Static Visibility.Collapsed}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
@@ -271,18 +291,19 @@
                                     <Grid.LayoutTransform>
                                         <RotateTransform Angle="{Binding Path=ExpandDirection, RelativeSource={RelativeSource AncestorType=Expander}, Converter={StaticResource ExpanderRotateAngleConverter}, ConverterParameter=-1}"/>
                                     </Grid.LayoutTransform>
-                                    
+
                                     <ContentPresenter Name="PART_Content" Focusable="False"
+                                                      Visibility="Collapsed"
                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
 
                                 </Grid>
                             </Border>
-
                         </DockPanel>
                     </Border>
                     <ControlTemplate.Triggers>
+
                         <Trigger Property="ExpandDirection" Value="Right">
                             <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
                             <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignVerticalHeaderStyle}"/>