From dab32635691cb52ddb0a52a7a80c0aa7c7140c4a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 2 Jun 2023 08:58:32 +0100
Subject: [PATCH] Fix losing cell focus when another user makes changes while
 you're adding a row

---
 packages/frontend-core/src/components/grid/stores/rows.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index c731d4ec44..198c05025c 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -436,6 +436,9 @@ export const deriveStores = context => {
 
   // Checks if we have a row with a certain ID
   const hasRow = id => {
+    if (id === NewRowID) {
+      return true
+    }
     return get(rowLookupMap)[id] != null
   }