fix: copy cell keys to editor id map only if not null (#7857)

ugur-vaadin · web-flow · commit e64c0421939a · 2025-08-19T11:35:32.000+02:00
diff --git a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/Spreadsheet.java b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/Spreadsheet.java
@@ -3775,12 +3775,11 @@ protected void loadCustomEditorOnSelectedCell() {
             final short col = selectedCellReference.getCol();
             final int row = selectedCellReference.getRow();
             final String key = SpreadsheetUtil.toKey(col + 1, row + 1);
-            HashMap<String, String> cellKeysToEditorIdMap = new HashMap<>(
-                    getCellKeysToEditorIdMap());
-            if (cellKeysToEditorIdMap != null
-                    && cellKeysToEditorIdMap.containsKey(key)
+            var currentCellKeysToEditorIdMap = getCellKeysToEditorIdMap();
+            if (currentCellKeysToEditorIdMap != null
+                    && currentCellKeysToEditorIdMap.containsKey(key)
                     && customComponents != null) {
-                String componentId = cellKeysToEditorIdMap.get(key);
+                String componentId = currentCellKeysToEditorIdMap.get(key);
                 for (Component c : customComponents) {
                     if (getComponentNodeId(c).equals(componentId)) {
                         customComponentFactory.onCustomEditorDisplayed(
@@ -3790,7 +3789,8 @@ protected void loadCustomEditorOnSelectedCell() {
                     }
                 }
             }
-            setCellKeysToEditorIdMap(cellKeysToEditorIdMap);
+            setCellKeysToEditorIdMap(currentCellKeysToEditorIdMap == null ? null
+                    : new HashMap<>(currentCellKeysToEditorIdMap));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3775,12 +3775,11 @@ protected void loadCustomEditorOnSelectedCell() {`
`3775`	`3775`	`final short col = selectedCellReference.getCol();`
`3776`	`3776`	`final int row = selectedCellReference.getRow();`
`3777`	`3777`	`final String key = SpreadsheetUtil.toKey(col + 1, row + 1);`
`3778`		`- HashMap<String, String> cellKeysToEditorIdMap = new HashMap<>(`
`3779`		`- getCellKeysToEditorIdMap());`
`3780`		`- if (cellKeysToEditorIdMap != null`
`3781`		`- && cellKeysToEditorIdMap.containsKey(key)`
	`3778`	`+ var currentCellKeysToEditorIdMap = getCellKeysToEditorIdMap();`
	`3779`	`+ if (currentCellKeysToEditorIdMap != null`
	`3780`	`+ && currentCellKeysToEditorIdMap.containsKey(key)`
`3782`	`3781`	`&& customComponents != null) {`
`3783`		`- String componentId = cellKeysToEditorIdMap.get(key);`
	`3782`	`+ String componentId = currentCellKeysToEditorIdMap.get(key);`
`3784`	`3783`	`for (Component c : customComponents) {`
`3785`	`3784`	`if (getComponentNodeId(c).equals(componentId)) {`
`3786`	`3785`	`customComponentFactory.onCustomEditorDisplayed(`
`@@ -3790,7 +3789,8 @@ protected void loadCustomEditorOnSelectedCell() {`
`3790`	`3789`	`}`
`3791`	`3790`	`}`
`3792`	`3791`	`}`
`3793`		`- setCellKeysToEditorIdMap(cellKeysToEditorIdMap);`
	`3792`	`+ setCellKeysToEditorIdMap(currentCellKeysToEditorIdMap == null ? null`
	`3793`	`+ : new HashMap<>(currentCellKeysToEditorIdMap));`
`3794`	`3794`	`}`
`3795`	`3795`	`}`
`3796`	`3796`