Merge branch 'master' into gazeCS

michael-hawker · web-flow · commit 1a28ca7bc352 · 2020-10-06T14:33:33.000-07:00
diff --git 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;
@@ -327,6 +327,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve
                 if (string.IsNullOrEmpty(textbox.Text))
                 {
                     textbox.Text = displayText;
+                    return;
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve`
`300`	`300`	`// case adding data at the end of the textbox`
`301`	`301`	`if (oldSelectionStart >= oldText.Length && !isDeleteOrBackspace)`
`302`	`302`	`{`
`303`		`- textbox.Text = oldText;`
	`303`	`+ textbox.Text = textbox.Text.Substring(0, oldText.Length);`
`304`	`304`	`if (oldText.Length >= 0)`
`305`	`305`	`{`
`306`	`306`	`textbox.SelectionStart = oldText.Length;`
`@@ -327,6 +327,7 @@ private static void Textbox_TextChanging(TextBox textbox, TextBoxTextChangingEve`
`327`	`327`	`if (string.IsNullOrEmpty(textbox.Text))`
`328`	`328`	`{`
`329`	`329`	`textbox.Text = displayText;`
	`330`	`+ return;`
`330`	`331`	`}`
`331`	`332`	`else`
`332`	`333`	`{`