Merge pull request #26 from wieslawsoltes/TopLevelAttachedToVisualLog…

…icalTree Top level attached to visual logical tree
wieslawsoltes · Jan 3, 2025 · ce8cd3c · ce8cd3c
2 parents 0addf1c + be2b19f
commit ce8cd3c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/samples/BehaviorsTestApplication/Views/MainWindow.axaml b/samples/BehaviorsTestApplication/Views/MainWindow.axaml
@@ -4,12 +4,18 @@
         xmlns:vm="using:BehaviorsTestApplication.ViewModels"
         xmlns:views="using:BehaviorsTestApplication.Views"
         Title="XamlBehaviors Test Application" Width="1000" Height="700"
-        x:DataType="vm:MainWindowViewModel"
-        x:CompileBindings="False">
+        x:DataType="vm:MainWindowViewModel">
   <Interaction.Behaviors>
+    <!-- TopLevel Logical tree special case -->
+    <!--
     <EventTriggerBehavior EventName="Opened">
       <InvokeCommandAction Command="{Binding InitializeCommand, Mode=OneTime}" />
     </EventTriggerBehavior>
+    -->
+    <!-- TopLevel attached to visual tree special case -->
+    <RoutedEventTriggerBehavior RoutedEvent="{x:Static Control.LoadedEvent}">
+      <InvokeCommandAction Command="{Binding InitializeCommand, Mode=OneTime}" />
+    </RoutedEventTriggerBehavior>
   </Interaction.Behaviors>
   <views:MainView />
 </Window>
diff --git a/src/Avalonia.Xaml.Interactivity/Interaction.cs b/src/Avalonia.Xaml.Interactivity/Interaction.cs
@@ -149,6 +149,13 @@ private static void SetVisualTreeEventHandlersFromGetter(AvaloniaObject obj)
         control.Loaded += Control_LoadedFromGetter;
         control.Unloaded -= Control_UnloadedFromGetter;
         control.Unloaded += Control_UnloadedFromGetter;
+
+        if (obj is TopLevel topLevel)
+        {
+            topLevel.Opened -= TopLevel_OpenedFromChangedEvent;
+            topLevel.Opened -= TopLevel_OpenedFromGetter;
+            topLevel.Opened += TopLevel_OpenedFromGetter;
+        }
     }
 
     private static void SetVisualTreeEventHandlersFromChangedEvent(AvaloniaObject obj)
@@ -184,6 +191,13 @@ private static void SetVisualTreeEventHandlersFromChangedEvent(AvaloniaObject ob
         control.Loaded += Control_LoadedFromChangedEvent;
         control.Unloaded -= Control_UnloadedFromChangedEvent;
         control.Unloaded += Control_UnloadedFromChangedEvent;
+
+        if (obj is TopLevel topLevel)
+        {
+            topLevel.Opened -= TopLevel_OpenedFromGetter;
+            topLevel.Opened -= TopLevel_OpenedFromChangedEvent;
+            topLevel.Opened += TopLevel_OpenedFromChangedEvent;
+        }
     }
 
     // AttachedToVisualTree / DetachedFromVisualTree
@@ -313,4 +327,29 @@ private static void Control_UnloadedFromChangedEvent(object? sender, RoutedEvent
 
         GetBehaviors(d).Unloaded();
     }
+
+    // TopLevel Opened
+
+    private static void TopLevel_OpenedFromGetter(object sender, EventArgs e)
+    {
+        if (sender is not AvaloniaObject d)
+        {
+            return;
+        }
+
+        GetBehaviors(d).Attach(d);
+        GetBehaviors(d).AttachedToVisualTree();
+        GetBehaviors(d).AttachedToLogicalTree();
+    }
+
+    private static void TopLevel_OpenedFromChangedEvent(object sender, EventArgs e)
+    {
+        if (sender is not AvaloniaObject d)
+        {
+            return;
+        }
+
+        GetBehaviors(d).AttachedToVisualTree();
+        GetBehaviors(d).AttachedToLogicalTree();
+    }
 }