From 3b4afeb3e83b91b4d29c7012a31a1c0d3eec5ff9 Mon Sep 17 00:00:00 2001
From: Samuel Reichert <samuelreichertt@gmail.com>
Date: Thu, 30 Oct 2025 14:32:14 +0100
Subject: [PATCH 1/2] fix(datagrid-web): update selection properties to include
 'keepSelection' in hide logic

---
 .../datagrid-web/src/Datagrid.editorConfig.ts       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/pluggableWidgets/datagrid-web/src/Datagrid.editorConfig.ts b/packages/pluggableWidgets/datagrid-web/src/Datagrid.editorConfig.ts
index abd7f1cfb2..9e7639298b 100644
--- a/packages/pluggableWidgets/datagrid-web/src/Datagrid.editorConfig.ts
+++ b/packages/pluggableWidgets/datagrid-web/src/Datagrid.editorConfig.ts
@@ -158,7 +158,12 @@ function hideSelectionProperties(defaultProperties: Properties, values: Datagrid
     const { itemSelection, itemSelectionMethod } = values;
 
     if (itemSelection === "None") {
-        hidePropertiesIn(defaultProperties, values, ["itemSelectionMethod", "itemSelectionMode", "onSelectionChange"]);
+        hidePropertiesIn(defaultProperties, values, [
+            "itemSelectionMethod",
+            "itemSelectionMode",
+            "onSelectionChange",
+            "keepSelection"
+        ]);
     }
 
     if (itemSelectionMethod === "checkbox") {
@@ -170,11 +175,7 @@ function hideSelectionProperties(defaultProperties: Properties, values: Datagrid
     }
 
     if (itemSelection !== "Multi") {
-        hidePropertiesIn(defaultProperties, values, [
-            "keepSelection",
-            "selectionCountPosition",
-            "clearSelectionButtonLabel"
-        ]);
+        hidePropertiesIn(defaultProperties, values, ["selectionCountPosition", "clearSelectionButtonLabel"]);
     }
 }
 

From 4a0afd44e247124c596c914093b07ec9c6e8f13c Mon Sep 17 00:00:00 2001
From: Samuel Reichert <samuelreichertt@gmail.com>
Date: Thu, 30 Oct 2025 14:32:47 +0100
Subject: [PATCH 2/2] chore(datagrid-web): add changelog entry

---
 packages/pluggableWidgets/datagrid-web/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/pluggableWidgets/datagrid-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-web/CHANGELOG.md
index fbe7db8aa7..816ed5929f 100644
--- a/packages/pluggableWidgets/datagrid-web/CHANGELOG.md
+++ b/packages/pluggableWidgets/datagrid-web/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - We added configurable selection count visibility and clear selection button label template for improved row selection management.
 
+### Fixed
+
+- The property panel now shows keep selection property when datagrid is set to single selection.
+
 - We fixed an issue where missing consistency checks for the captions were causing runtime errors instead of in Studio Pro
 
 ## [3.6.1] - 2025-10-14