Skip to content

Commit caf50a6

Browse files
fix: do not trigger item click listener for prevented click (#3242) (#3244)
Co-authored-by: Serhii Kulykov <iamkulykov@gmail.com>
1 parent 33e9af6 commit caf50a6

3 files changed

Lines changed: 30 additions & 0 deletions

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
import com.vaadin.flow.component.grid.Grid;
1919
import com.vaadin.flow.component.grid.Grid.SelectionMode;
2020
import com.vaadin.flow.component.html.Div;
21+
import com.vaadin.flow.component.html.Span;
2122
import com.vaadin.flow.data.bean.Person;
23+
import com.vaadin.flow.data.renderer.ComponentRenderer;
2224
import com.vaadin.flow.router.Route;
2325

2426
@Route("vaadin-grid-it-demo/click-listeners")
@@ -37,6 +39,12 @@ private void createClickListener() {
3739
grid.setItems(getItems());
3840
grid.addColumn(Person::getFirstName).setHeader("Name");
3941
grid.addColumn(Person::getAge).setHeader("Age");
42+
grid.addColumn(new ComponentRenderer<>(person -> {
43+
Span span = new Span("Action");
44+
span.getElement().executeJs(
45+
"$0.addEventListener('click', e => e.preventDefault())");
46+
return span;
47+
})).setHeader("Action");
4048

4149
// Disable selection: will receive only click events instead
4250
grid.setSelectionMode(SelectionMode.NONE);

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,23 @@ public void itemClickListener_singleClick_doubleClickFireClick() {
6060
Assert.assertEquals("", clickInfo.getText());
6161
}
6262

63+
@Test
64+
public void itemClickListener_singleClick_preventClickIgnored() {
65+
GridElement grid = $(GridElement.class).id("item-click-listener");
66+
scrollToElement(grid);
67+
waitUntil(driver -> grid.getRowCount() > 0);
68+
69+
GridTRElement row = grid.getRow(0);
70+
GridTHTDElement cell = row.getCell(grid.getColumn("Action"));
71+
72+
WebElement span = cell.getContext().findElement(By.tagName("span"));
73+
span.click();
74+
75+
WebElement clickInfo = findElement(By.id("clicked-item"));
76+
77+
Assert.assertEquals("", clickInfo.getText());
78+
}
79+
6380
@Test
6481
public void itemDoubleClickListener() {
6582
GridElement grid = $(GridElement.class).id("item-doubleclick-listener");

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,6 +1124,11 @@ import { isFocusable } from '@vaadin/grid/src/vaadin-grid-active-item-mixin.js';
11241124
);
11251125

11261126
function _fireClickEvent(event, eventName) {
1127+
// Click event was handled by the component inside grid, do nothing.
1128+
if (event.defaultPrevented) {
1129+
return;
1130+
}
1131+
11271132
const target = event.target;
11281133
const eventContext = grid.getEventContext(event);
11291134
const section = eventContext.section;

0 commit comments

Comments
 (0)