From f7cd6d0c8e595ab70f56c3a17a805c453f0144de Mon Sep 17 00:00:00 2001
From: Ivan Minchev <IMinchev@infragistics.com>
Date: Fri, 31 Oct 2025 14:42:32 +0200
Subject: [PATCH 1/2] refactor(cell-merging): change data for hgrid custom
 strategy sample

---
 .../src/MultiColumnsExportData.json           | 97 ++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/MultiColumnsExportData.json b/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/MultiColumnsExportData.json
index 483f76e929..88d6830fb7 100644
--- a/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/MultiColumnsExportData.json
+++ b/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/MultiColumnsExportData.json
@@ -362,6 +362,101 @@
     "PostalCode": "10100",
     "Country": "Italy",
     "Phone": "011-4988260",
-    "Fax": "011-4988261"
+    "Fax": "011-4988261",
+    "ChildCompanies": [
+      {
+        "ID": "ITSR1",
+        "CompanyName": "Italia Sourcing",
+        "ContactName": "Luca Rossi",
+        "ContactTitle": "Sales Representative",
+        "Address": "Via Roma 1",
+        "City": "Rome",
+        "Region": "Lazio",
+        "PostalCode": "00100",
+        "Country": "Italy",
+        "Phone": "06-555-0101",
+        "Fax": "06-555-0102"
+      },
+      {
+        "ID": "ITSR2",
+        "CompanyName": "Roma Exports",
+        "ContactName": "Chiara Conti",
+        "ContactTitle": "Sales Representative",
+        "Address": "Piazza Navona 5",
+        "City": "Rome",
+        "Region": "Lazio",
+        "PostalCode": "00186",
+        "Country": "Italy",
+        "Phone": "06-555-0201",
+        "Fax": "06-555-0202"
+      },
+      {
+        "ID": "ITOWN1",
+        "CompanyName": "Milano Retail",
+        "ContactName": "Marco Neri",
+        "ContactTitle": "Owner",
+        "Address": "Corso Buenos Aires 12",
+        "City": "Milan",
+        "Region": "Lombardia",
+        "PostalCode": "20100",
+        "Country": "Italy",
+        "Phone": "02-555-0101",
+        "Fax": "02-555-0102"
+      }
+    ]
+  },
+  {
+    "ID": "FRNS2",
+    "CompanyName": "Franchi Logistics",
+    "ContactName": "Giulia Bianchi",
+    "ContactTitle": "Sales Representative",
+    "Address": "Via Po 12",
+    "City": "Torino",
+    "Region": "Torino",
+    "PostalCode": "10121",
+    "Country": "Italy",
+    "Phone": "011-4988262",
+    "Fax": "011-4988263",
+    "ChildCompanies": [
+      {
+        "ID": "ITSR3",
+        "CompanyName": "Torino Foods",
+        "ContactName": "Alessia Greco",
+        "ContactTitle": "Sales Representative",
+        "Address": "Via Garibaldi 3",
+        "City": "Torino",
+        "Region": "Piemonte",
+        "PostalCode": "10121",
+        "Country": "Italy",
+        "Phone": "011-555-0001",
+        "Fax": "011-555-0002"
+      },
+      {
+        "ID": "ITSR4",
+        "CompanyName": "Torino Traders",
+        "ContactName": "Fabio De Luca",
+        "ContactTitle": "Sales Representative",
+        "Address": "Via Roma 25",
+        "City": "Torino",
+        "Region": "Piemonte",
+        "PostalCode": "10123",
+        "Country": "Italy",
+        "Phone": "011-555-0003",
+        "Fax": "011-555-0004"
+      },
+      {
+        "ID": "ITSA1",
+        "CompanyName": "Liguria Supplies",
+        "ContactName": "Gianni Marino",
+        "ContactTitle": "Sales Agent",
+        "Address": "Via XX Settembre 15",
+        "City": "Genova",
+        "Region": "Liguria",
+        "PostalCode": "16121",
+        "Country": "Italy",
+        "Phone": "010-555-0101",
+        "Fax": "010-555-0102"
+      }
+    ]
   }
 ]

From 2db0e2485bee5f349e757c75e82a6389b62290ae Mon Sep 17 00:00:00 2001
From: Ivan Minchev <IMinchev@infragistics.com>
Date: Fri, 31 Oct 2025 14:43:33 +0200
Subject: [PATCH 2/2] fix(cell-merging): fix child grid not loading data in
 hgrid sample

---
 .../hierarchical-grid/cell-merge-custom-sample/src/index.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/index.tsx b/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/index.tsx
index 3dc44b74c4..d2e88a63d5 100644
--- a/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/index.tsx
+++ b/samples/grids/hierarchical-grid/cell-merge-custom-sample/src/index.tsx
@@ -33,6 +33,7 @@ export default function App() {
       <div className="container sample ig-typography">
         <div className="container fill">
           <IgrHierarchicalGrid
+            primaryKey="ID"
             data={MultiColumnsExportData}
             sortingExpressions={sortExpr}
             moving={true}
@@ -86,7 +87,7 @@ export default function App() {
             <IgrColumn field="Fax" sortable={true} resizable={true} />
 
             <IgrRowIsland
-              key="ChildCompanies"
+              childDataKey="ChildCompanies"
               moving={true}
               autoGenerate={false}
               sortingExpressions={sortExpr}