From 56709c9982d78063984c4865278a7afd913e571b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 29 Aug 2021 14:59:29 -0400
Subject: [PATCH 1/2] Add text box clipboard events

---
 src/Avalonia.Controls/TextBox.cs              | 47 +++++++++++++++----
 .../TextBoxClipboardEventArgs.cs              | 18 +++++++
 2 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 src/Avalonia.Controls/TextBoxClipboardEventArgs.cs

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 0eade8d6df..657d8fae8f 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -500,6 +500,10 @@ namespace Avalonia.Controls
             }
         }
 
+        public event EventHandler<TextBoxClipboardEventArgs> CopyingToClipboard;
+        public event EventHandler<TextBoxClipboardEventArgs> CuttingToClipboard;
+        public event EventHandler<TextBoxClipboardEventArgs> PastingFromClipboard;
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
@@ -638,27 +642,54 @@ namespace Avalonia.Controls
         public async void Cut()
         {
             var text = GetSelection();
-            if (text is null) return;
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
 
-            SnapshotUndoRedo();
-            Copy();
-            DeleteSelection();
+            var eventArgs = new TextBoxClipboardEventArgs();
+            CuttingToClipboard?.Invoke(this, eventArgs);
+            if (!eventArgs.Handled)
+            {
+                SnapshotUndoRedo();
+                await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
+                    .SetTextAsync(text);
+                DeleteSelection();
+            }
         }
 
         public async void Copy()
         {
             var text = GetSelection();
-            if (text is null) return;
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
 
-            await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
-                .SetTextAsync(text);
+            var eventArgs = new TextBoxClipboardEventArgs();
+            CopyingToClipboard?.Invoke(this, eventArgs);
+            if (!eventArgs.Handled)
+            {
+                await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
+                    .SetTextAsync(text);
+            }
         }
 
         public async void Paste()
         {
+            var eventArgs = new TextBoxClipboardEventArgs();
+            PastingFromClipboard?.Invoke(this, eventArgs);
+            if (eventArgs.Handled)
+            {
+                return;
+            }
+
             var text = await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard))).GetTextAsync();
 
-            if (text is null) return;
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
 
             SnapshotUndoRedo();
             HandleTextInput(text);
diff --git a/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs b/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
new file mode 100644
index 0000000000..0fe4cadf39
--- /dev/null
+++ b/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Provides event data for the <see cref="TextBox.CuttingToClipboard"/>, <see cref="TextBox.CopyingToClipboard"/> and <see cref="TextBox.PasteFromClipboard"/> events.
+    /// </summary>
+    /// <remarks>
+    /// If you perform any action in the handler for a clipboard event, set the Handled property to true; otherwise, the default action is performed.
+    /// </remarks>
+    public class TextBoxClipboardEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets a value that marks the event as handled. A true value for Handled prevents most handlers along the event from handling the same event again.
+        /// </summary>
+        public bool Handled { get; set; }
+    }
+}

From 825ddc9ccaa2e3d7e002564f96f22c3b1d23a2d8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 29 Aug 2021 18:29:56 -0400
Subject: [PATCH 2/2] Use routed events

---
 src/Avalonia.Controls/TextBox.cs              | 44 +++++++++++++++----
 .../TextBoxClipboardEventArgs.cs              | 18 --------
 2 files changed, 35 insertions(+), 27 deletions(-)
 delete mode 100644 src/Avalonia.Controls/TextBoxClipboardEventArgs.cs

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 657d8fae8f..9eae928eeb 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -145,6 +145,18 @@ namespace Avalonia.Controls
                 (o, v) => o.UndoLimit = v,
                 unsetValue: -1);
 
+        public static readonly RoutedEvent<RoutedEventArgs> CopyingToClipboardEvent =
+            RoutedEvent.Register<TextBox, RoutedEventArgs>(
+                "CopyingToClipboard", RoutingStrategies.Bubble);
+
+        public static readonly RoutedEvent<RoutedEventArgs> CuttingToClipboardEvent =
+            RoutedEvent.Register<TextBox, RoutedEventArgs>(
+                "CuttingToClipboard", RoutingStrategies.Bubble);
+
+        public static readonly RoutedEvent<RoutedEventArgs> PastingFromClipboardEvent =
+            RoutedEvent.Register<TextBox, RoutedEventArgs>(
+                "PastingFromClipboard", RoutingStrategies.Bubble);
+
         readonly struct UndoRedoState : IEquatable<UndoRedoState>
         {
             public string Text { get; }
@@ -500,9 +512,23 @@ namespace Avalonia.Controls
             }
         }
 
-        public event EventHandler<TextBoxClipboardEventArgs> CopyingToClipboard;
-        public event EventHandler<TextBoxClipboardEventArgs> CuttingToClipboard;
-        public event EventHandler<TextBoxClipboardEventArgs> PastingFromClipboard;
+        public event EventHandler<RoutedEventArgs> CopyingToClipboard
+        {
+            add => AddHandler(CopyingToClipboardEvent, value);
+            remove => RemoveHandler(CopyingToClipboardEvent, value);
+        }
+
+        public event EventHandler<RoutedEventArgs> CuttingToClipboard
+        {
+            add => AddHandler(CuttingToClipboardEvent, value);
+            remove => RemoveHandler(CuttingToClipboardEvent, value);
+        }
+
+        public event EventHandler<RoutedEventArgs> PastingFromClipboard
+        {
+            add => AddHandler(PastingFromClipboardEvent, value);
+            remove => RemoveHandler(PastingFromClipboardEvent, value);
+        }
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
@@ -647,8 +673,8 @@ namespace Avalonia.Controls
                 return;
             }
 
-            var eventArgs = new TextBoxClipboardEventArgs();
-            CuttingToClipboard?.Invoke(this, eventArgs);
+            var eventArgs = new RoutedEventArgs(CuttingToClipboardEvent);
+            RaiseEvent(eventArgs);
             if (!eventArgs.Handled)
             {
                 SnapshotUndoRedo();
@@ -666,8 +692,8 @@ namespace Avalonia.Controls
                 return;
             }
 
-            var eventArgs = new TextBoxClipboardEventArgs();
-            CopyingToClipboard?.Invoke(this, eventArgs);
+            var eventArgs = new RoutedEventArgs(CopyingToClipboardEvent);
+            RaiseEvent(eventArgs);
             if (!eventArgs.Handled)
             {
                 await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
@@ -677,8 +703,8 @@ namespace Avalonia.Controls
 
         public async void Paste()
         {
-            var eventArgs = new TextBoxClipboardEventArgs();
-            PastingFromClipboard?.Invoke(this, eventArgs);
+            var eventArgs = new RoutedEventArgs(PastingFromClipboardEvent);
+            RaiseEvent(eventArgs);
             if (eventArgs.Handled)
             {
                 return;
diff --git a/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs b/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
deleted file mode 100644
index 0fe4cadf39..0000000000
--- a/src/Avalonia.Controls/TextBoxClipboardEventArgs.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Avalonia.Controls
-{
-    /// <summary>
-    /// Provides event data for the <see cref="TextBox.CuttingToClipboard"/>, <see cref="TextBox.CopyingToClipboard"/> and <see cref="TextBox.PasteFromClipboard"/> events.
-    /// </summary>
-    /// <remarks>
-    /// If you perform any action in the handler for a clipboard event, set the Handled property to true; otherwise, the default action is performed.
-    /// </remarks>
-    public class TextBoxClipboardEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets a value that marks the event as handled. A true value for Handled prevents most handlers along the event from handling the same event again.
-        /// </summary>
-        public bool Handled { get; set; }
-    }
-}