Merge pull request #22189 from ramezgerges/textblock_selection_showing

fix(textblock): selection should only show when focused

Author: ramezgerges

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBlock.cs

@@ -1749,6 +1749,35 @@ public async Task When_IsTextSelectionEnabled_TouchScroll_Then_DoesNotAlterSelec
 			}
 			Assert.AreEqual(selectedText, sut.SelectedText);
 		}
+
+#if HAS_UNO
+		[TestMethod]
+		public async Task When_Focus_Changes_Selection_Is_Not_Shown()
+		{
+			if (!ApiInformation.IsTypePresent("Microsoft.UI.Xaml.Media.Imaging.RenderTargetBitmap, Uno.UI"))
+			{
+				Assert.Inconclusive("RenderTargetBitmap is not supported on this platform");
+			}
+
+			var SUT = new TextBlock { Text = "Some text", IsTextSelectionEnabled = true };
+			var focusBtn = new Button();
+			await UITestHelper.Load(new StackPanel { Children = { SUT, focusBtn } });
+
+			SUT.Focus(FocusState.Programmatic);
+			SUT.SelectAll();
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForRender();
+			var screenshot = await UITestHelper.ScreenShot(SUT);
+			ImageAssert.HasColorInRectangle(screenshot, new Rectangle(0, 0, screenshot.Width, screenshot.Height), ((SolidColorBrush)Uno.UI.Xaml.Media.DefaultBrushes.SelectionHighlightColor).Color);
+
+			focusBtn.Focus(FocusState.Programmatic);
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForRender();
+			var screenshot2 = await UITestHelper.ScreenShot(SUT);
+			ImageAssert.DoesNotHaveColorInRectangle(screenshot2, new Rectangle(0, 0, screenshot2.Width, screenshot2.Height), ((SolidColorBrush)Uno.UI.Xaml.Media.DefaultBrushes.SelectionHighlightColor).Color);
+		}
+#endif
+
 		#endregion
 #endif
 

src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.skia.cs

@@ -119,7 +119,13 @@ partial void OnIsTextSelectionEnabledChangedPartial()
 			UpdateSelectionRendering();
 		}
 
-		private void UpdateSelectionRendering() => RenderSelection = IsTextSelectionEnabled && (IsFocused || (_contextMenu?.IsOpen ?? false));
+		private void UpdateSelectionRendering()
+		{
+			if (!IsTextBoxDisplay) // TextBox managed RenderSelection itself
+			{
+				RenderSelection = IsTextSelectionEnabled && (IsFocused || (_contextMenu?.IsOpen ?? false));
+			}
+		}
 
 		protected override Size ArrangeOverride(Size finalSize)
 		{
@@ -173,10 +179,11 @@ internal void Draw(in Visual.PaintingSession session)
 		{
 			session.Canvas.Save();
 			session.Canvas.Translate((float)Padding.Left, (float)Padding.Top);
+			var selection = (Math.Min(Selection.start, Selection.end), Math.Max(Selection.start, Selection.end), SelectionHighlightColor.GetOrCreateCompositionBrush(Compositor.GetSharedCompositor()), DefaultBrushes.SelectedTextForegroundColor);
 			ParsedText.Draw(
 				session,
-				(_caretPaint is { } c ? (c.index, c.brush, CaretThickness) : null),
-				(Math.Min(Selection.start, Selection.end), Math.Max(Selection.start, Selection.end), SelectionHighlightColor.GetOrCreateCompositionBrush(Compositor.GetSharedCompositor()), DefaultBrushes.SelectedTextForegroundColor));
+				_caretPaint is { } c ? (c.index, c.brush, CaretThickness) : null,
+				_renderSelection ? selection : null);
 			session.Canvas.Restore();
 			DrawingFinished?.Invoke();
 		}