Skip to content

Commit 4b81873

Browse files
authored
fix: check if element exists before initializing connector (#8162)
1 parent ecbb3b8 commit 4b81873

6 files changed

Lines changed: 46 additions & 6 deletions

File tree

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/it/DetachReattachPage.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,19 @@ public DetachReattachPage() {
138138
});
139139
btnDetachAndReattach.setId("detach-and-reattach-button");
140140

141+
NativeButton attachAndDetach = new NativeButton("attach and detach",
142+
e -> {
143+
add(grid);
144+
remove(grid);
145+
});
146+
attachAndDetach.setId("attach-and-detach-button");
147+
141148
add(btnAttach, btnDetach, btnDisallowDeselect, addItemDetailsButton,
142149
toggleDetailsVisibleOnClick, resetSortingButton,
143150
selectAndDetachButton, selectMultipleItems,
144151
setPageSizeAndDetachButton, setSelectionModeAndDetachButton,
145152
sortAndDetachButton, btnHideGrid, btnSelectionModeNone,
146-
btnSelectionModeMulti, btnDetachAndReattach, btnShowGrid, grid);
153+
btnSelectionModeMulti, btnDetachAndReattach, btnShowGrid,
154+
attachAndDetach, grid);
147155
}
148156
}

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/treegrid/it/TreeGridDetachAttachPage.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,21 @@ public TreeGridDetachAttachPage() {
4444
toggleAttached.setId("toggle-attached");
4545
add(toggleAttached);
4646

47+
NativeButton attachAndDetach = new NativeButton("attach and detach",
48+
e -> {
49+
add(grid);
50+
grid.setUniqueKeyDataGenerator("key", null);
51+
remove(grid);
52+
});
53+
attachAndDetach.setId("attach-and-detach-button");
54+
4755
NativeButton useAutoWidthColumn = new NativeButton(
4856
"use auto-width column", e -> {
4957
grid.removeAllColumns();
5058
grid.addHierarchyColumn(HierarchicalTestBean::toString)
5159
.setAutoWidth(true).setFlexGrow(0);
5260
});
5361
useAutoWidthColumn.setId("use-auto-width-column");
54-
add(useAutoWidthColumn);
62+
add(useAutoWidthColumn, attachAndDetach);
5563
}
5664
}

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/DetachReattachIT.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,4 +220,17 @@ public void sort_detachAndAttach_sortDirectionPreserved() {
220220
sorter = grid.getHeaderCell(0).$("vaadin-grid-sorter").first();
221221
Assert.assertEquals(direction, sorter.getProperty("direction"));
222222
}
223+
224+
@Test
225+
public void detach_attachAndDetach_noClientErrors() {
226+
open();
227+
228+
// Detach
229+
$("button").id("detach-button").click();
230+
231+
// Attach and detach in the same round trip
232+
$("button").id("attach-and-detach-button").click();
233+
234+
checkLogsForErrors();
235+
}
223236
}

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/treegrid/it/TreeGridDetachAttachIT.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,15 @@ public void useAutoWidthColumn_detach_attach_shouldHaveProperColumnWidth() {
9090
Assert.assertEquals(columnOffsetWidth,
9191
grid.getCell(0, 0).getPropertyInteger("offsetWidth"));
9292
}
93+
94+
@Test
95+
public void detach_attachAndDetach_noClientErrors() {
96+
// Detach
97+
$("button").id("toggle-attached").click();
98+
99+
// Attach and detach in the same round trip
100+
$("button").id("attach-and-detach-button").click();
101+
102+
checkLogsForErrors();
103+
}
93104
}

‎vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1746,8 +1746,8 @@ private void handleDataChange(DataChangeEvent<T> dataChangeEvent) {
17461746
protected void initConnector() {
17471747
getUI().orElseThrow(() -> new IllegalStateException(
17481748
"Connector can only be initialized for an attached Grid"))
1749-
.getPage()
1750-
.executeJs("window.Vaadin.Flow.gridConnector.initLazy($0)",
1749+
.getPage().executeJs(
1750+
"if ($0) window.Vaadin.Flow.gridConnector.initLazy($0)",
17511751
getElement());
17521752
}
17531753

‎vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/treegrid/TreeGrid.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ protected TreeGrid(int pageSize,
109109
protected void initConnector() {
110110
getUI().orElseThrow(() -> new IllegalStateException(
111111
"Connector can only be initialized for an attached Grid"))
112-
.getPage()
113-
.executeJs("window.Vaadin.Flow.treeGridConnector.initLazy($0)",
112+
.getPage().executeJs(
113+
"if ($0) window.Vaadin.Flow.treeGridConnector.initLazy($0)",
114114
getElement());
115115
}
116116

0 commit comments

Comments
 (0)