From 74af00b7734a712460ed3367f7cdbfb1e5036581 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@gmail.com>
Date: Thu, 2 Jul 2026 17:22:12 +0300
Subject: [PATCH] DataGrid: escape popup id in setPopupAriaExpanded selector to
 fix querySelector error with dynamic columns

---
 Radzen.Blazor/wwwroot/Radzen.Blazor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Radzen.Blazor/wwwroot/Radzen.Blazor.js b/Radzen.Blazor/wwwroot/Radzen.Blazor.js
index 2c6d68182..70967da85 100644
--- a/Radzen.Blazor/wwwroot/Radzen.Blazor.js
+++ b/Radzen.Blazor/wwwroot/Radzen.Blazor.js
@@ -2052,7 +2052,7 @@ window.Radzen = {
     if (parent.getAttribute && parent.getAttribute('aria-controls') === id) {
       control = parent;
     } else if (parent.querySelector) {
-      control = parent.querySelector('[aria-controls="' + id + '"]');
+      control = parent.querySelector('[aria-controls="' + (window.CSS && CSS.escape ? CSS.escape(id) : id) + '"]');
     }
     if (!control && parent.getAttribute && parent.getAttribute('role') === 'combobox') {
       control = parent;