From 74d1d398f4cdacf0076b8e01f0e91f34e8724577 Mon Sep 17 00:00:00 2001
From: Lubomir Tetak <50887170+ltetak@users.noreply.github.com>
Date: Thu, 7 Mar 2024 21:58:59 +0100
Subject: [PATCH] Fix DataGrid TextBox Cursor blinking (#14866)

---
 src/Avalonia.Controls/Presenters/TextPresenter.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index fc7e1db1df..9aba966629 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -461,6 +461,7 @@ namespace Avalonia.Controls.Presenters
 
         public void ShowCaret()
         {
+            EnsureCaretTimer();
             _caretBlink = true;
             _caretTimer?.Start();
             InvalidateVisual();
@@ -484,6 +485,8 @@ namespace Avalonia.Controls.Presenters
                 return;
             }
 
+            EnsureCaretTimer();
+
             if (_caretTimer?.IsEnabled ?? false)
             {
                 _caretBlink = true;
@@ -728,6 +731,14 @@ namespace Avalonia.Controls.Presenters
 
             CaretChanged();
         }
+        
+        private void EnsureCaretTimer()
+        {
+            if (_caretTimer == null)
+            {
+                ResetCaretTimer();
+            }
+        }
 
         private void ResetCaretTimer()
         {