Add SourceControl property

wieslawsoltes · Sep 9, 2024 · 4b6976d · 4b6976d
1 parent 697cbe0
commit 4b6976d
Show file tree

Hide file tree

Showing 28 changed files with 70 additions and 28 deletions.
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnActivatedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnActivatedBehavior.cs
@@ -1,6 +1,7 @@
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Xaml.Interactions.Custom;
@@ -18,7 +19,7 @@ protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
         if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
         {
-            var mainWindow = lifetime.MainWindow;
+            var mainWindow = SourceControl as Window ?? lifetime.MainWindow;
 
             if (mainWindow is not null)
             {

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnDoubleTappedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnDoubleTappedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnDoubleTappedBehavior : ExecuteCommandRoutedEventBeh
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.DoubleTappedEvent,
                 OnDoubleTapped,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnGotFocusBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnGotFocusBehavior.cs
@@ -9,13 +9,21 @@ namespace Avalonia.Xaml.Interactions.Custom;
 /// </summary>
 public class ExecuteCommandOnGotFocusBehavior : ExecuteCommandRoutedEventBehaviorBase
 {
+    static ExecuteCommandOnGotFocusBehavior()
+    {
+        EventRoutingStrategyProperty.OverrideMetadata<ExecuteCommandOnGotFocusBehavior>(
+            new StyledPropertyMetadata<RoutingStrategies>(
+                defaultValue: RoutingStrategies.Tunnel | RoutingStrategies.Bubble));
+    }
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.GotFocusEvent,
                 OnGotFocus,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnHoldingBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnHoldingBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnHoldingBehavior : ExecuteCommandRoutedEventBehavior
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.HoldingEvent,
                 OnHolding,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnKeyDownBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnKeyDownBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnKeyDownBehavior : ExecuteCommandOnKeyBehaviorBase
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.KeyDownEvent,
                 OnKeyDown,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnKeyUpBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnKeyUpBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnKeyUpBehavior : ExecuteCommandOnKeyBehaviorBase
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.KeyUpEvent,
                 OnKeyUp,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnLostFocusBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnLostFocusBehavior.cs
@@ -9,13 +9,21 @@ namespace Avalonia.Xaml.Interactions.Custom;
 /// </summary>
 public class ExecuteCommandOnLostFocusBehavior : ExecuteCommandRoutedEventBehaviorBase
 {
+    static ExecuteCommandOnLostFocusBehavior()
+    {
+        EventRoutingStrategyProperty.OverrideMetadata<ExecuteCommandOnLostFocusBehavior>(
+            new StyledPropertyMetadata<RoutingStrategies>(
+                defaultValue: RoutingStrategies.Tunnel | RoutingStrategies.Bubble));
+    }
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.LostFocusEvent,
                 OnLostFocus,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPinchBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPinchBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPinchBehavior : ExecuteCommandRoutedEventBehaviorBa
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PinchEvent,
                 OnPinch,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPinchEndedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPinchEndedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPinchEndedBehavior : ExecuteCommandRoutedEventBehav
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PinchEndedEvent,
                 OnPinchEnded,

diff --git a/...nia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerCaptureLostBehavior.cs b/...nia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerCaptureLostBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerCaptureLostBehavior : ExecuteCommandRoutedEv
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerCaptureLostEvent,
                 OnPointerCaptureLost,

diff --git a/...valonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerEnteredBehavior.cs b/...valonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerEnteredBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerEnteredBehavior : ExecuteCommandRoutedEventB
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerEnteredEvent,
                 OnPointerEntered,

diff --git a/...Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerExitedBehavior.cs b/...Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerExitedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerExitedBehavior : ExecuteCommandRoutedEventBe
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerExitedEvent,
                 OnPointerExited,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerMovedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerMovedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerMovedBehavior : ExecuteCommandRoutedEventBeh
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerMovedEvent,
                 OnPointerMoved,

diff --git a/...valonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerPressedBehavior.cs b/...valonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerPressedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerPressedBehavior : ExecuteCommandRoutedEventB
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerPressedEvent,
                 OnPointerPressed,

diff --git a/...alonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerReleasedBehavior.cs b/...alonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerReleasedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerReleasedBehavior : ExecuteCommandRoutedEvent
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerReleasedEvent,
                 OnPointerReleased,

diff --git a/...teractions.Custom/ExecuteCommand/ExecuteCommandOnPointerTouchPadGestureMagnifyBehavior.cs b/...teractions.Custom/ExecuteCommand/ExecuteCommandOnPointerTouchPadGestureMagnifyBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerTouchPadGestureMagnifyBehavior : ExecuteComm
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PointerTouchPadGestureMagnifyEvent,
                 OnPointerTouchPadGestureMagnify,

diff --git a/...nteractions.Custom/ExecuteCommand/ExecuteCommandOnPointerTouchPadGestureRotateBehavior.cs b/...nteractions.Custom/ExecuteCommand/ExecuteCommandOnPointerTouchPadGestureRotateBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerTouchPadGestureRotateBehavior : ExecuteComma
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PointerTouchPadGestureRotateEvent,
                 OnPointerTouchPadGestureRotate,

diff --git a/...Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerTouchPadGestureSwipeBehavior.cs b/...Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerTouchPadGestureSwipeBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerTouchPadGestureSwipeBehavior : ExecuteComman
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PointerTouchPadGestureSwipeEvent,
                 OnPointerTouchPadGestureSwipe,

diff --git a/...ia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerWheelChangedBehavior.cs b/...ia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPointerWheelChangedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPointerWheelChangedBehavior : ExecuteCommandRoutedE
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.PointerWheelChangedEvent,
                 OnPointerWheelChanged,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPullGestureBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPullGestureBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPullGestureBehavior : ExecuteCommandRoutedEventBeha
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PullGestureEvent,
                 OnPullGesture,

diff --git a/...lonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPullGestureEndedBehavior.cs b/...lonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnPullGestureEndedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnPullGestureEndedBehavior : ExecuteCommandRoutedEven
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.PullGestureEndedEvent,
                 OnPullGestureEnded,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnRightTappedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnRightTappedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnRightTappedBehavior : ExecuteCommandRoutedEventBeha
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.RightTappedEvent,
                 OnRightTapped,

diff --git a/...Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnScrollGestureBehavior.cs b/...Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnScrollGestureBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnScrollGestureBehavior : ExecuteCommandRoutedEventBe
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.ScrollGestureEvent,
                 OnScrollGesture,

diff --git a/...nia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnScrollGestureEndedBehavior.cs b/...nia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnScrollGestureEndedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnScrollGestureEndedBehavior : ExecuteCommandRoutedEv
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.ScrollGestureEndedEvent,
                 OnScrollGestureEnded,

diff --git a/...nteractions.Custom/ExecuteCommand/ExecuteCommandOnScrollGestureInertiaStartingBehavior.cs b/...nteractions.Custom/ExecuteCommand/ExecuteCommandOnScrollGestureInertiaStartingBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnScrollGestureInertiaStartingBehavior : ExecuteComma
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.ScrollGestureInertiaStartingEvent,
                 OnScrollGestureInertiaStarting,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnTappedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnTappedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnTappedBehavior : ExecuteCommandRoutedEventBehaviorB
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 Gestures.TappedEvent,
                 OnTapped,

diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnTextInputBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/ExecuteCommandOnTextInputBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnTextInputBehavior : ExecuteCommandRoutedEventBehavi
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.TextInputEvent,
                 OnTextInput,

diff --git a/...eractions.Custom/ExecuteCommand/ExecuteCommandOnTextInputMethodClientRequestedBehavior.cs b/...eractions.Custom/ExecuteCommand/ExecuteCommandOnTextInputMethodClientRequestedBehavior.cs
@@ -15,7 +15,8 @@ public class ExecuteCommandOnTextInputMethodClientRequestedBehavior : ExecuteCom
     /// <param name="disposable"></param>
     protected override void OnAttachedToVisualTree(CompositeDisposable disposable)
     {
-        var dispose = AssociatedObject?
+        var control = SourceControl ?? AssociatedObject;
+        var dispose = control?
             .AddDisposableHandler(
                 InputElement.TextInputMethodClientRequestedEvent,
                 OnTextInputMethodClientRequested,