Skip to content

Commit b315593

Browse files
authored
fix: check sub cache queue of a grid instance in connector (#2540)
1 parent f94d570 commit b315593

3 files changed

Lines changed: 28 additions & 1 deletion

File tree

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,14 @@ public TreeGridDetachAttachPage() {
4343
});
4444
toggleAttached.setId("toggle-attached");
4545
add(toggleAttached);
46+
47+
NativeButton useAutoWidthColumn = new NativeButton(
48+
"use auto-width column", e -> {
49+
grid.removeAllColumns();
50+
grid.addHierarchyColumn(HierarchicalTestBean::toString)
51+
.setAutoWidth(true).setFlexGrow(0);
52+
});
53+
useAutoWidthColumn.setId("use-auto-width-column");
54+
add(useAutoWidthColumn);
4655
}
4756
}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ public class TreeGridDetachAttachIT extends AbstractComponentIT {
2929

3030
private TreeGridElement grid;
3131
private TestBenchElement toggleAttachedButton;
32+
private TestBenchElement useAutoWidthColumnButton;
3233

3334
@Before
3435
public void before() {
3536
open();
3637
grid = $(TreeGridElement.class).first();
3738
toggleAttachedButton = $("button").id("toggle-attached");
39+
useAutoWidthColumnButton = $("button").id("use-auto-width-column");
3840
}
3941

4042
@Test
@@ -72,4 +74,20 @@ public void refreshViewWithPreserveOnRefresh_expandRow_shouldMaintainExpansionAf
7274
grid = $(TreeGridElement.class).first();
7375
Assert.assertTrue(grid.isRowExpanded(2, 0));
7476
}
77+
78+
@Test
79+
public void useAutoWidthColumn_detach_attach_shouldHaveProperColumnWidth() {
80+
grid.expandWithClick(0);
81+
useAutoWidthColumnButton.click();
82+
83+
Integer columnOffsetWidth = grid.getCell(0, 0)
84+
.getPropertyInteger("offsetWidth");
85+
86+
toggleAttachedButton.click();
87+
toggleAttachedButton.click();
88+
89+
grid = $(TreeGridElement.class).first();
90+
Assert.assertEquals(columnOffsetWidth,
91+
grid.getCell(0, 0).getPropertyInteger("offsetWidth"));
92+
}
7593
}

‎vaadin-grid-flow-parent/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import { isFocusable } from '@vaadin/grid/src/vaadin-grid-active-item-mixin.js';
3737
});
3838

3939
ItemCache.prototype.isLoading = tryCatchWrapper(function() {
40-
return Boolean(ensureSubCacheQueue.length || Object.keys(this.pendingRequests).length || Object.keys(this.itemCaches).filter(index => {
40+
return Boolean(this.grid.$connector.hasEnsureSubCacheQueue() || Object.keys(this.pendingRequests).length || Object.keys(this.itemCaches).filter(index => {
4141
return this.itemCaches[index].isLoading();
4242
})[0]);
4343
});

0 commit comments

Comments
 (0)