Refactor base interface

wieslawsoltes · wieslawsoltes · commit 87cdaa1cb071 · 2024-10-25T13:36:02.000+02:00
diff --git a/src/Avalonia.Xaml.Interactivity/Behavior.cs b/src/Avalonia.Xaml.Interactivity/Behavior.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Xaml.Interactivity;
 /// <summary>
 /// A base class for behaviors, implementing the basic plumbing of <see cref="IBehavior"/>.
 /// </summary>
-public abstract class Behavior : AvaloniaObject, IBehavior, IInternalBehavior
+public abstract class Behavior : AvaloniaObject, IBehavior, IBehaviorEventsHandler
 {
     /// <summary>
     /// Identifies the <seealso cref="IsEnabled"/> avalonia property.
@@ -85,17 +85,17 @@ protected virtual void OnDetaching()
     {
     }
 
-    void IInternalBehavior.AttachedToVisualTreeImpl() => OnAttachedToVisualTree();
+    void IBehaviorEventsHandler.AttachedToVisualTreeEventHandler() => OnAttachedToVisualTree();
 
-    void IInternalBehavior.DetachedFromVisualTreeImpl() => OnDetachedFromVisualTree();
+    void IBehaviorEventsHandler.DetachedFromVisualTreeEventHandler() => OnDetachedFromVisualTree();
 
-    void IInternalBehavior.AttachedToLogicalTreeImpl() => OnAttachedToLogicalTree();
+    void IBehaviorEventsHandler.AttachedToLogicalTreeEventHandler() => OnAttachedToLogicalTree();
 
-    void IInternalBehavior.DetachedFromLogicalTreeImpl() => OnDetachedFromLogicalTree();
+    void IBehaviorEventsHandler.DetachedFromLogicalTreeEventHandler() => OnDetachedFromLogicalTree();
 
-    void IInternalBehavior.LoadedImpl() => OnLoaded();
+    void IBehaviorEventsHandler.LoadedEventHandler() => OnLoaded();
 
-    void IInternalBehavior.UnloadedImpl() => OnUnloaded();
+    void IBehaviorEventsHandler.UnloadedEventHandler() => OnUnloaded();
 
     /// <summary>
     /// Called after the <see cref="AssociatedObject"/> is attached to the visual tree.
diff --git a/src/Avalonia.Xaml.Interactivity/BehaviorCollection.cs b/src/Avalonia.Xaml.Interactivity/BehaviorCollection.cs
@@ -81,9 +81,9 @@ internal void AttachedToVisualTree()
     {
         foreach (var item in this)
         {
-            if (item is IInternalBehavior behavior)
+            if (item is IBehaviorEventsHandler behaviorEventsHandler)
             {
-                behavior.AttachedToVisualTreeImpl();
+                behaviorEventsHandler.AttachedToVisualTreeEventHandler();
             }
         }
     }
@@ -92,9 +92,9 @@ internal void DetachedFromVisualTree()
     {
         foreach (var item in this)
         {
-            if (item is IInternalBehavior behavior and IBehavior { AssociatedObject: not null})
+            if (item is IBehaviorEventsHandler behaviorEventsHandler and IBehavior { AssociatedObject: not null})
             {
-                behavior.DetachedFromVisualTreeImpl();
+                behaviorEventsHandler.DetachedFromVisualTreeEventHandler();
             }
         }
     }
@@ -103,9 +103,9 @@ internal void AttachedToLogicalTree()
     {
         foreach (var item in this)
         {
-            if (item is IInternalBehavior behavior)
+            if (item is IBehaviorEventsHandler behaviorEventsHandler)
             {
-                behavior.AttachedToLogicalTreeImpl();
+                behaviorEventsHandler.AttachedToLogicalTreeEventHandler();
             }
         }
     }
@@ -114,9 +114,9 @@ internal void DetachedFromLogicalTree()
     {
         foreach (var item in this)
         {
-            if (item is IInternalBehavior behavior and IBehavior { AssociatedObject: not null})
+            if (item is IBehaviorEventsHandler behaviorEventsHandler and IBehavior { AssociatedObject: not null})
             {
-                behavior.DetachedFromLogicalTreeImpl();
+                behaviorEventsHandler.DetachedFromLogicalTreeEventHandler();
             }
         }
     }
@@ -125,9 +125,9 @@ internal void Loaded()
     {
         foreach (var item in this)
         {
-            if (item is IInternalBehavior behavior)
+            if (item is IBehaviorEventsHandler behaviorEventsHandler)
             {
-                behavior.LoadedImpl();
+                behaviorEventsHandler.LoadedEventHandler();
             }
         }
     }
@@ -136,9 +136,9 @@ internal void Unloaded()
     {
         foreach (var item in this)
         {
-            if (item is IInternalBehavior behavior and IBehavior { AssociatedObject: not null})
+            if (item is IBehaviorEventsHandler behaviorEventsHandler and IBehavior { AssociatedObject: not null})
             {
-                behavior.UnloadedImpl();
+                behaviorEventsHandler.UnloadedEventHandler();
             }
         }
     }
diff --git a/src/Avalonia.Xaml.Interactivity/IBehaviorEventsHandler.cs b/src/Avalonia.Xaml.Interactivity/IBehaviorEventsHandler.cs
@@ -0,0 +1,37 @@
+namespace Avalonia.Xaml.Interactivity;
+
+/// <summary>
+/// Interface implemented by base behaviors.
+/// </summary>
+public interface IBehaviorEventsHandler
+{ 
+    /// <summary>
+    /// Called when element is attached to the visual tree.
+    /// </summary>
+    void AttachedToVisualTreeEventHandler();
+
+    /// <summary>
+    /// Called when element is detached from the visual tree.
+    /// </summary>
+    void DetachedFromVisualTreeEventHandler();
+
+    /// <summary>
+    /// Called when element is attached to the logical tree.
+    /// </summary>
+    void AttachedToLogicalTreeEventHandler();
+
+    /// <summary>
+    /// Called when element is detached from the logical tree.
+    /// </summary>
+    void DetachedFromLogicalTreeEventHandler();
+
+    /// <summary>
+    /// Called when element is loaded.
+    /// </summary>
+    void LoadedEventHandler();
+
+    /// <summary>
+    /// Called when element is unloaded.
+    /// </summary>
+    void UnloadedEventHandler();
+}
diff --git a/src/Avalonia.Xaml.Interactivity/IInternalBehavior.cs b/src/Avalonia.Xaml.Interactivity/IInternalBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactivity/StyledElementBehavior.cs b/src/Avalonia.Xaml.Interactivity/StyledElementBehavior.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Xaml.Interactivity;
 /// <summary>
 /// A base class for behaviors, implementing the basic plumbing of <see cref="IBehavior"/>.
 /// </summary>
-public abstract class StyledElementBehavior : StyledElement, IBehavior, IInternalBehavior
+public abstract class StyledElementBehavior : StyledElement, IBehavior, IBehaviorEventsHandler
 {
     private IDisposable? _dataContextDisposable;
 
@@ -95,25 +95,25 @@ protected virtual void OnDetaching()
     {
     }
 
-    void IInternalBehavior.AttachedToVisualTreeImpl() => OnAttachedToVisualTree();
+    void IBehaviorEventsHandler.AttachedToVisualTreeEventHandler() => OnAttachedToVisualTree();
 
-    void IInternalBehavior.DetachedFromVisualTreeImpl() => OnDetachedFromVisualTree();
+    void IBehaviorEventsHandler.DetachedFromVisualTreeEventHandler() => OnDetachedFromVisualTree();
 
-    void IInternalBehavior.AttachedToLogicalTreeImpl()
+    void IBehaviorEventsHandler.AttachedToLogicalTreeEventHandler()
     {
         AttachToLogicalTree();
         OnAttachedToLogicalTree();
     }
 
-    void IInternalBehavior.DetachedFromLogicalTreeImpl()
+    void IBehaviorEventsHandler.DetachedFromLogicalTreeEventHandler()
     {
         DetachFromLogicalTree();
         OnDetachedFromLogicalTree();
     }
 
-    void IInternalBehavior.LoadedImpl() => OnLoaded();
+    void IBehaviorEventsHandler.LoadedEventHandler() => OnLoaded();
 
-    void IInternalBehavior.UnloadedImpl() => OnUnloaded();
+    void IBehaviorEventsHandler.UnloadedEventHandler() => OnUnloaded();
 
     /// <summary>
     /// Called after the <see cref="AssociatedObject"/> is attached to the visual tree.

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,9 @@ internal void AttachedToVisualTree()`
`81`	`81`	`{`
`82`	`82`	`foreach (var item in this)`
`83`	`83`	`{`
`84`		`- if (item is IInternalBehavior behavior)`
	`84`	`+ if (item is IBehaviorEventsHandler behaviorEventsHandler)`
`85`	`85`	`{`
`86`		`- behavior.AttachedToVisualTreeImpl();`
	`86`	`+ behaviorEventsHandler.AttachedToVisualTreeEventHandler();`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
`@@ -92,9 +92,9 @@ internal void DetachedFromVisualTree()`
`92`	`92`	`{`
`93`	`93`	`foreach (var item in this)`
`94`	`94`	`{`
`95`		`- if (item is IInternalBehavior behavior and IBehavior { AssociatedObject: not null})`
	`95`	`+ if (item is IBehaviorEventsHandler behaviorEventsHandler and IBehavior { AssociatedObject: not null})`
`96`	`96`	`{`
`97`		`- behavior.DetachedFromVisualTreeImpl();`
	`97`	`+ behaviorEventsHandler.DetachedFromVisualTreeEventHandler();`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
`@@ -103,9 +103,9 @@ internal void AttachedToLogicalTree()`
`103`	`103`	`{`
`104`	`104`	`foreach (var item in this)`
`105`	`105`	`{`
`106`		`- if (item is IInternalBehavior behavior)`
	`106`	`+ if (item is IBehaviorEventsHandler behaviorEventsHandler)`
`107`	`107`	`{`
`108`		`- behavior.AttachedToLogicalTreeImpl();`
	`108`	`+ behaviorEventsHandler.AttachedToLogicalTreeEventHandler();`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`@@ -114,9 +114,9 @@ internal void DetachedFromLogicalTree()`
`114`	`114`	`{`
`115`	`115`	`foreach (var item in this)`
`116`	`116`	`{`
`117`		`- if (item is IInternalBehavior behavior and IBehavior { AssociatedObject: not null})`
	`117`	`+ if (item is IBehaviorEventsHandler behaviorEventsHandler and IBehavior { AssociatedObject: not null})`
`118`	`118`	`{`
`119`		`- behavior.DetachedFromLogicalTreeImpl();`
	`119`	`+ behaviorEventsHandler.DetachedFromLogicalTreeEventHandler();`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -125,9 +125,9 @@ internal void Loaded()`
`125`	`125`	`{`
`126`	`126`	`foreach (var item in this)`
`127`	`127`	`{`
`128`		`- if (item is IInternalBehavior behavior)`
	`128`	`+ if (item is IBehaviorEventsHandler behaviorEventsHandler)`
`129`	`129`	`{`
`130`		`- behavior.LoadedImpl();`
	`130`	`+ behaviorEventsHandler.LoadedEventHandler();`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -136,9 +136,9 @@ internal void Unloaded()`
`136`	`136`	`{`
`137`	`137`	`foreach (var item in this)`
`138`	`138`	`{`
`139`		`- if (item is IInternalBehavior behavior and IBehavior { AssociatedObject: not null})`
	`139`	`+ if (item is IBehaviorEventsHandler behaviorEventsHandler and IBehavior { AssociatedObject: not null})`
`140`	`140`	`{`
`141`		`- behavior.UnloadedImpl();`
	`141`	`+ behaviorEventsHandler.UnloadedEventHandler();`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Avalonia.Xaml.Interactivity;`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// A base class for behaviors, implementing the basic plumbing of <see cref="IBehavior"/>.`
`11`	`11`	`/// </summary>`
`12`		`-public abstract class StyledElementBehavior : StyledElement, IBehavior, IInternalBehavior`
	`12`	`+public abstract class StyledElementBehavior : StyledElement, IBehavior, IBehaviorEventsHandler`
`13`	`13`	`{`
`14`	`14`	`private IDisposable? _dataContextDisposable;`
`15`	`15`
`@@ -95,25 +95,25 @@ protected virtual void OnDetaching()`
`95`	`95`	`{`
`96`	`96`	`}`
`97`	`97`
`98`		`- void IInternalBehavior.AttachedToVisualTreeImpl() => OnAttachedToVisualTree();`
	`98`	`+ void IBehaviorEventsHandler.AttachedToVisualTreeEventHandler() => OnAttachedToVisualTree();`
`99`	`99`
`100`		`- void IInternalBehavior.DetachedFromVisualTreeImpl() => OnDetachedFromVisualTree();`
	`100`	`+ void IBehaviorEventsHandler.DetachedFromVisualTreeEventHandler() => OnDetachedFromVisualTree();`
`101`	`101`
`102`		`- void IInternalBehavior.AttachedToLogicalTreeImpl()`
	`102`	`+ void IBehaviorEventsHandler.AttachedToLogicalTreeEventHandler()`
`103`	`103`	`{`
`104`	`104`	`AttachToLogicalTree();`
`105`	`105`	`OnAttachedToLogicalTree();`
`106`	`106`	`}`
`107`	`107`
`108`		`- void IInternalBehavior.DetachedFromLogicalTreeImpl()`
	`108`	`+ void IBehaviorEventsHandler.DetachedFromLogicalTreeEventHandler()`
`109`	`109`	`{`
`110`	`110`	`DetachFromLogicalTree();`
`111`	`111`	`OnDetachedFromLogicalTree();`
`112`	`112`	`}`
`113`	`113`
`114`		`- void IInternalBehavior.LoadedImpl() => OnLoaded();`
	`114`	`+ void IBehaviorEventsHandler.LoadedEventHandler() => OnLoaded();`
`115`	`115`
`116`		`- void IInternalBehavior.UnloadedImpl() => OnUnloaded();`
	`116`	`+ void IBehaviorEventsHandler.UnloadedEventHandler() => OnUnloaded();`
`117`	`117`
`118`	`118`	`/// <summary>`
`119`	`119`	`/// Called after the <see cref="AssociatedObject"/> is attached to the visual tree.`