From 3e3cf552c9ea33cda5504bd2a8bdb44cf28bc657 Mon Sep 17 00:00:00 2001
From: Dong Bin <14807942+rabbitism@users.noreply.github.com>
Date: Sun, 21 Apr 2024 18:26:18 +0800
Subject: [PATCH] Add more overloads for AddHandler/SetValue

---
 .../Helpers/AvaloniaPropertyExtension.cs      |  28 +-
 .../Helpers/RoutedEventExtension.cs           | 158 +++++++++-
 .../Helpers/AvaloniaPropertyExtensionTest.cs  |  12 +-
 .../Helpers/RoutedEventExtensionTest.cs       | 274 +++++++++++++++++-
 4 files changed, 457 insertions(+), 15 deletions(-)

diff --git a/src/Irihi.Avalonia.Shared.Public/Helpers/AvaloniaPropertyExtension.cs b/src/Irihi.Avalonia.Shared.Public/Helpers/AvaloniaPropertyExtension.cs
index 7b02340..e18b1d6 100644
--- a/src/Irihi.Avalonia.Shared.Public/Helpers/AvaloniaPropertyExtension.cs
+++ b/src/Irihi.Avalonia.Shared.Public/Helpers/AvaloniaPropertyExtension.cs
@@ -6,7 +6,10 @@ namespace Irihi.Avalonia.Shared.Helpers;
 
 public static class AvaloniaPropertyExtension
 {
-    public static void SetValue<T>(this AvaloniaProperty<T> property, T value, params AvaloniaObject?[] objects)
+    public static void SetValue<T>(
+        this AvaloniaProperty<T> property, 
+        T value, 
+        params AvaloniaObject?[] objects)
     {
         foreach (var obj in objects)
         {
@@ -14,21 +17,32 @@ public static void SetValue<T>(this AvaloniaProperty<T> property, T value, param
         }
     }
 
-    public static void SetValue<TValue, TItem>(this AvaloniaProperty<TValue> property, TValue value, params TItem?[] objects) where TItem: AvaloniaObject
+    public static void SetValue<T, TControl>(
+        this AvaloniaProperty<T> property, 
+        T value, 
+        IEnumerable<TControl?> objects) 
+        where TControl: AvaloniaObject
     {
         foreach (var obj in objects)
         {
             obj?.SetValue(property, value);
-        }
+        }        
     }
     
-    public static void AffectsPseudoClass<TControl>(this AvaloniaProperty<bool> property, string pseudoClass, RoutedEvent<RoutedEventArgs>? routedEvent = null) 
+    public static void AffectsPseudoClass<TControl>(
+        this AvaloniaProperty<bool> property, 
+        string pseudoClass, 
+        RoutedEvent<RoutedEventArgs>? routedEvent = null) 
         where TControl: Control
     {
         property.Changed.AddClassHandler<TControl, bool>((control, args) => {OnPropertyChanged(control, args, pseudoClass, routedEvent); });
     }
 
-    private static void OnPropertyChanged<TControl, TArgs>(TControl control, AvaloniaPropertyChangedEventArgs<bool> args, string pseudoClass, RoutedEvent<TArgs>? routedEvent) 
+    private static void OnPropertyChanged<TControl, TArgs>(
+        TControl control, 
+        AvaloniaPropertyChangedEventArgs<bool> args, 
+        string pseudoClass, 
+        RoutedEvent<TArgs>? routedEvent) 
         where TControl: Control
         where TArgs: RoutedEventArgs, new()
     {
@@ -39,7 +53,9 @@ private static void OnPropertyChanged<TControl, TArgs>(TControl control, Avaloni
         }
     }
 
-    public static void AffectsPseudoClass<TControl, TArgs>(this AvaloniaProperty<bool> property, string pseudoClass,
+    public static void AffectsPseudoClass<TControl, TArgs>(
+        this AvaloniaProperty<bool> property, 
+        string pseudoClass,
         RoutedEvent<TArgs>? routedEvent = null)
         where TControl: Control
         where TArgs: RoutedEventArgs, new()
diff --git a/src/Irihi.Avalonia.Shared.Public/Helpers/RoutedEventExtension.cs b/src/Irihi.Avalonia.Shared.Public/Helpers/RoutedEventExtension.cs
index 627e139..fc222c4 100644
--- a/src/Irihi.Avalonia.Shared.Public/Helpers/RoutedEventExtension.cs
+++ b/src/Irihi.Avalonia.Shared.Public/Helpers/RoutedEventExtension.cs
@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Irihi.Avalonia.Shared.Reactive;
 
@@ -6,7 +5,23 @@ namespace Irihi.Avalonia.Shared.Helpers;
 
 public static class RoutedEventExtension
 {
-    public static void AddHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, EventHandler<TArgs> handler, params Interactive?[] controls)
+    public static void AddHandler<TArgs>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        params Interactive?[] controls)
+        where TArgs : RoutedEventArgs
+    {
+        foreach (var t in controls)
+        {
+            t?.AddHandler(routedEvent, handler);
+        }
+    }
+    
+    public static void AddHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        params TControl?[] controls) 
+        where TControl: Interactive
         where TArgs : RoutedEventArgs
     {
         foreach (var t in controls)
@@ -15,7 +30,8 @@ public static void AddHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, EventH
         }
     }
     
-    public static void AddHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, 
+    public static void AddHandler<TArgs>(
+        this RoutedEvent<TArgs> routedEvent, 
         EventHandler<TArgs> handler, 
         RoutingStrategies strategies = RoutingStrategies.Bubble | RoutingStrategies.Direct, 
         bool handledEventsToo = false, 
@@ -28,7 +44,40 @@ public static void AddHandler<TArgs>(this RoutedEvent<TArgs> routedEvent,
         }
     }
     
-    public static void RemoveHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, EventHandler<TArgs> handler, params Interactive?[] controls)
+    public static void AddHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        RoutingStrategies strategies = RoutingStrategies.Bubble | RoutingStrategies.Direct, 
+        bool handledEventsToo = false, 
+        params TControl?[] controls)
+        where TArgs : RoutedEventArgs
+        where TControl: Interactive
+    {
+        foreach (var t in controls)
+        {
+            t?.AddHandler(routedEvent, handler, strategies, handledEventsToo);
+        }
+    }
+    
+    public static void AddHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        IEnumerable<TControl?> controls, 
+        RoutingStrategies strategies = RoutingStrategies.Bubble | RoutingStrategies.Direct, 
+        bool handledEventsToo = false)
+        where TArgs : RoutedEventArgs
+        where TControl: Interactive
+    {
+        foreach (var t in controls)
+        {
+            t?.AddHandler(routedEvent, handler, strategies, handledEventsToo);
+        }
+    }
+    
+    public static void RemoveHandler<TArgs>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        params Interactive?[] controls)
         where TArgs : RoutedEventArgs
     {
         foreach (var t in controls)
@@ -36,9 +85,58 @@ public static void RemoveHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, Eve
             t?.RemoveHandler(routedEvent, handler);
         }
     }
-
-    public static IDisposable AddDisposableHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, EventHandler<TArgs> handler, params Interactive?[] controls)
+    
+    public static void RemoveHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        params TControl?[] controls)
+        where TArgs : RoutedEventArgs
+        where TControl: Interactive
+    {
+        foreach (var t in controls)
+        {
+            t?.RemoveHandler(routedEvent, handler);
+        }
+    }
+    
+    public static void RemoveHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        IEnumerable<TControl?> controls)
         where TArgs : RoutedEventArgs
+        where TControl: Interactive
+    {
+        foreach (var t in controls)
+        {
+            t?.RemoveHandler(routedEvent, handler);
+        }
+    }
+    
+    public static IDisposable AddDisposableHandler<TArgs>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        params Interactive?[] controls)
+        where TArgs : RoutedEventArgs
+    {
+        var list = new List<IDisposable?>(controls.Length);
+        foreach (var t in controls)
+        {
+            var disposable = t?.AddDisposableHandler(routedEvent, handler);
+            if (disposable != null)
+            {
+                list.Add(disposable);
+            }
+        }
+        var result = new ReadonlyDisposableCollection(list);
+        return result;
+    }
+    
+    public static IDisposable AddDisposableHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        params TControl?[] controls)
+        where TArgs : RoutedEventArgs
+        where TControl: Interactive
     {
         List<IDisposable?> list = new List<IDisposable?>(controls.Length);
         foreach (var t in controls)
@@ -53,7 +151,8 @@ public static IDisposable AddDisposableHandler<TArgs>(this RoutedEvent<TArgs> ro
         return result;
     }
     
-    public static IDisposable AddDisposableHandler<TArgs>(this RoutedEvent<TArgs> routedEvent, 
+    public static IDisposable AddDisposableHandler<TArgs>(
+        this RoutedEvent<TArgs> routedEvent, 
         EventHandler<TArgs> handler, 
         RoutingStrategies strategies = RoutingStrategies.Bubble | RoutingStrategies.Direct, 
         bool handledEventsToo = false, 
@@ -72,4 +171,49 @@ public static IDisposable AddDisposableHandler<TArgs>(this RoutedEvent<TArgs> ro
         var result = new ReadonlyDisposableCollection(list);
         return result;
     }
+    
+    public static IDisposable AddDisposableHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        RoutingStrategies strategies = RoutingStrategies.Bubble | RoutingStrategies.Direct, 
+        bool handledEventsToo = false, 
+        params TControl?[] controls)
+        where TArgs : RoutedEventArgs
+        where TControl: Interactive
+    {
+        List<IDisposable?> list = new List<IDisposable?>(controls.Length);
+        foreach (var t in controls)
+        {
+            var disposable = t?.AddDisposableHandler(routedEvent, handler, strategies, handledEventsToo);
+            if (disposable != null)
+            {
+                list.Add(disposable);
+            }
+        }
+        var result = new ReadonlyDisposableCollection(list);
+        return result;
+    }
+    
+    public static IDisposable AddDisposableHandler<TArgs, TControl>(
+        this RoutedEvent<TArgs> routedEvent, 
+        EventHandler<TArgs> handler, 
+        IEnumerable<TControl> controls, 
+        RoutingStrategies strategies = RoutingStrategies.Bubble | RoutingStrategies.Direct, 
+        bool handledEventsToo = false)
+        where TArgs : RoutedEventArgs
+        where TControl: Interactive
+    {
+        // list is not initialized with controls.Count() to avoid multiple enumeration
+        var list = new List<IDisposable?>();
+        foreach (var t in controls)
+        {
+            var disposable = t?.AddDisposableHandler(routedEvent, handler, strategies, handledEventsToo);
+            if (disposable != null)
+            {
+                list.Add(disposable);
+            }
+        }
+        var result = new ReadonlyDisposableCollection(list);
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/AvaloniaPropertyExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/AvaloniaPropertyExtensionTest.cs
index 8e78b2e..3549ca4 100644
--- a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/AvaloniaPropertyExtensionTest.cs
+++ b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/AvaloniaPropertyExtensionTest.cs
@@ -40,7 +40,17 @@ public void Property_MultipleObject_InArray()
         Button b1 = new Button();
         Button b2 = new Button();
         Button[] buttons = {b1, b2};
-        Visual.IsVisibleProperty.SetValue(true, buttons);
+        Visual.IsVisibleProperty.SetValue<bool, Button>(true, buttons);
+        Assert.True(b1.IsVisible);
+        Assert.True(b2.IsVisible);
+    }
+    
+    [Fact]
+    public void Property_MultipleObject_InList()
+    {
+        Button b1 = new Button();
+        Button b2 = new Button();
+        Visual.IsVisibleProperty.SetValue(true, new List<Button> { b1, b2 });
         Assert.True(b1.IsVisible);
         Assert.True(b2.IsVisible);
     }
diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs
index 86d9bc8..807f9f4 100644
--- a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs
+++ b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Irihi.Avalonia.Shared.Helpers;
 
@@ -30,6 +32,7 @@ void Handler(object? sender, RoutedEventArgs args)
             count++;
         }
         Button.ClickEvent.AddHandler(Handler, button, null);
+        Button.ClickEvent.AddHandler(Handler, null, null);
         button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
         Assert.Equal(1, count);
     }
@@ -116,6 +119,40 @@ void Handler(object? sender, RoutedEventArgs args)
         Assert.Equal(2, count);
     }
     
+    [Fact]
+    public void EventHandler_AddDisposable_Null_Success()
+    {
+        var button = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        var _ = Button.ClickEvent.AddDisposableHandler(Handler, null, null);
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(0, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddDisposable_Multiple_Success()
+    {
+        var button = new Button();
+        var button2 = new Button();
+        var button3 = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        var result = Button.ClickEvent.AddDisposableHandler(Handler, button, button2, button3);
+        result.Dispose();
+        ;
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(0, count);
+    }
+    
     [Fact]
     public void EventHandler_AddDisposable_Dispose_Success()
     {
@@ -140,7 +177,7 @@ void Handler(object? sender, RoutedEventArgs args)
     public void EventHandler_AddDisposable_With_Strategy_Success()
     {
         var button = new Button();
-        var button2 = new Button();
+        var button2 = new Panel();
         int count = 0;
         void Handler(object? sender, RoutedEventArgs args)
         {
@@ -155,4 +192,239 @@ void Handler(object? sender, RoutedEventArgs args)
         button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
         Assert.Equal(2, count);
     }
+    
+    [Fact]
+    public void EventHandler_AddHandler_AddList_Success()
+    {
+        var button = new Button();
+        var button2 = new Button();
+        var button3 = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        Button.ClickEvent.AddHandler(Handler, new List<Button>{button, button2, button3});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+        
+        Button.ClickEvent.RemoveHandler(Handler, new List<Button>{button, button2, button3});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_AddArray_Success()
+    {
+        var button = new Button();
+        var button2 = new Button();
+        var button3 = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        Button.ClickEvent.AddHandler(Handler, new Button[]{button, button2, button3});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+        
+        Button.ClickEvent.RemoveHandler(Handler, new Button[]{button, button2, button3});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_AddArray_Null_Success()
+    {
+        var button = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        Button.ClickEvent.AddHandler(Handler, new Button?[]{button, null});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(1, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_AddList_Null_Success()
+    {
+        var button = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        Button.ClickEvent.AddHandler(Handler, new List<Button?>{button, null});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(1, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_With_Strategy_AddList_Success()
+    {
+        var button = new Button();
+        var button2 = new Button();
+        var button3 = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        Button.ClickEvent.AddHandler(Handler, new List<Button>{button, button2, button3}, RoutingStrategies.Bubble, true);
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+        
+        Button.ClickEvent.RemoveHandler(Handler, new List<Button>{button, button2, button3});
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddDisposableHandler_With_Strategy_AddList_Success()
+    {
+        var button = new Button();
+        var button2 = new Button();
+        var button3 = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        var disposables = Button.ClickEvent.AddDisposableHandler(Handler, new Button[]{button, button2, button3}, RoutingStrategies.Bubble, true);
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+        
+        disposables.Dispose();
+        
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
+        button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
+        Assert.Equal(3, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_Multi_Type_Success()
+    {
+        var button = new Button();
+        var panel = new Panel();
+        int count = 0;
+        void Handler(object? sender, GotFocusEventArgs args)
+        {
+            count++;
+        }
+        InputElement.GotFocusEvent.AddHandler(Handler, button, panel);
+        button.RaiseEvent(new GotFocusEventArgs(){ Source = button, RoutedEvent = InputElement.GotFocusEvent});
+        panel.RaiseEvent(new GotFocusEventArgs(){ Source = panel, RoutedEvent = InputElement.GotFocusEvent});
+        
+        Assert.Equal(2, count);
+        
+        InputElement.GotFocusEvent.RemoveHandler(Handler, button, panel);
+        button.RaiseEvent(new GotFocusEventArgs(){ Source = button, RoutedEvent = InputElement.GotFocusEvent});
+        panel.RaiseEvent(new GotFocusEventArgs(){ Source = panel, RoutedEvent = InputElement.GotFocusEvent});
+        
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    public void EventHandler_AddDisposableHandler_Multi_Type_Success()
+    {
+        var button = new Button();
+        var panel = new Panel();
+        int count = 0;
+        void Handler(object? sender, GotFocusEventArgs args)
+        {
+            count++;
+        }
+        var disposable = InputElement.GotFocusEvent.AddDisposableHandler(Handler, button, panel);
+        button.RaiseEvent(new GotFocusEventArgs(){ Source = button, RoutedEvent = InputElement.GotFocusEvent});
+        panel.RaiseEvent(new GotFocusEventArgs(){ Source = panel, RoutedEvent = InputElement.GotFocusEvent});
+        
+        Assert.Equal(2, count);
+        
+        disposable.Dispose();
+        
+        Assert.Equal(2, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_Multi_With_Strategy_Type_Success()
+    {
+        var button = new Button();
+        var panel = new Panel();
+        int count = 0;
+        void Handler(object? sender, GotFocusEventArgs args)
+        {
+            count++;
+        }
+        InputElement.GotFocusEvent.AddHandler(Handler, RoutingStrategies.Bubble, false, button, panel);
+        button.RaiseEvent(new GotFocusEventArgs(){ Source = button, RoutedEvent = InputElement.GotFocusEvent});
+        panel.RaiseEvent(new GotFocusEventArgs(){ Source = panel, RoutedEvent = InputElement.GotFocusEvent});
+        
+        Assert.Equal(2, count);
+        
+        InputElement.GotFocusEvent.RemoveHandler(Handler, button, panel);
+        button.RaiseEvent(new GotFocusEventArgs(){ Source = button, RoutedEvent = InputElement.GotFocusEvent});
+        panel.RaiseEvent(new GotFocusEventArgs(){ Source = panel, RoutedEvent = InputElement.GotFocusEvent});
+        
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    public void EventHandler_AddDisposableHandler_With_Strategy_Multi_Type_Success()
+    {
+        var button = new Button();
+        var panel = new Panel();
+        int count = 0;
+        void Handler(object? sender, GotFocusEventArgs args)
+        {
+            count++;
+        }
+        var disposable = InputElement.GotFocusEvent.AddDisposableHandler(Handler, RoutingStrategies.Bubble, false, button, panel);
+        button.RaiseEvent(new GotFocusEventArgs(){ Source = button, RoutedEvent = InputElement.GotFocusEvent});
+        panel.RaiseEvent(new GotFocusEventArgs(){ Source = panel, RoutedEvent = InputElement.GotFocusEvent});
+        
+        Assert.Equal(2, count);
+        
+        disposable.Dispose();
+        
+        Assert.Equal(2, count);
+    }
+    
+    [Fact]
+    public void EventHandler_AddHandler_Multi_Type_List_Success()
+    {
+        var button = new Button();
+        var panel = new Panel();
+        var button2 = new Button();
+        int count = 0;
+        void Handler(object? sender, RoutedEventArgs args)
+        {
+            count++;
+        }
+        Button.ClickEvent.AddDisposableHandler<RoutedEventArgs, Button>(Handler, RoutingStrategies.Bubble, false, button, button2);
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        
+        Assert.Equal(1, count);
+        
+        Button.ClickEvent.RemoveHandler(Handler, button, button2);
+        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        
+        Assert.Equal(1, count);
+    }
 }
\ No newline at end of file