From f288704f77224dd8d427d7cb0a36c24d0909283b Mon Sep 17 00:00:00 2001 From: Riza Marhaban Date: Wed, 10 Jun 2020 07:54:40 +0800 Subject: [PATCH 1/4] fixes for case adding data at the end of the textbox --- Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs index aa06c2fd5da..046a6d68b7a 100644 --- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs +++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs @@ -300,7 +300,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve // case adding data at the end of the textbox if (oldSelectionStart >= oldText.Length && !isDeleteOrBackspace) { - textbox.Text = oldText; + textbox.Text = textbox.Text.Substring(0, oldText.Length); if (oldText.Length >= 0) { textbox.SelectionStart = oldText.Length; From d8511523ae43394ff944007a6be064c051f0070c Mon Sep 17 00:00:00 2001 From: Riza Marhaban Date: Mon, 29 Jun 2020 19:07:12 +0800 Subject: [PATCH 2/4] [UPDATE] fixing case change due to Text property is cleared by binding --- .../Extensions/TextBoxMask/TextBoxMask.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs index 046a6d68b7a..37a1b005215 100644 --- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs +++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; + using Windows.ApplicationModel.DataTransfer; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; @@ -295,6 +296,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve deleteBackspaceIndex++; } } + } // case adding data at the end of the textbox @@ -327,6 +329,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve if (string.IsNullOrEmpty(textbox.Text)) { textbox.Text = displayText; + return; } else { @@ -340,7 +343,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve if (!isDeleteOrBackspace) { - // Case change happended due to user input + // Case change happened due to user input var selectedChar = textbox.SelectionStart > 0 ? textbox.Text[textbox.SelectionStart - 1] : placeHolder; From b39fbc0475f68a3682e68321e034957d487bebe7 Mon Sep 17 00:00:00 2001 From: Riza Marhaban Date: Mon, 24 Aug 2020 07:56:00 +0800 Subject: [PATCH 3/4] Update Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs Removing extra line Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com> --- Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs index 37a1b005215..ee1c044876e 100644 --- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs +++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs @@ -296,7 +296,6 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve deleteBackspaceIndex++; } } - } // case adding data at the end of the textbox @@ -432,4 +431,4 @@ private static int GetSelectionStart(string mask, List escapedChars, int se return selectionIndex; } } -} \ No newline at end of file +} From a1e8dd66bf965207552aec844c21c4e93a6d9872 Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 6 Oct 2020 10:32:12 -0700 Subject: [PATCH 4/4] Update Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs Co-authored-by: Rosario Pulella --- Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs index 4fb8a1fc50d..aa326e6b33d 100644 --- a/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs +++ b/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask/TextBoxMask.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; - using Windows.ApplicationModel.DataTransfer; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls;