From f1039e892ca4d40e7ed441264f1d35b30733d679 Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 5 Jan 2018 15:13:55 +0200 Subject: [PATCH] Fix scrolling problem in table in Chrome 56+ (#10492) * Fix scrolling problem in table in Chrome 56+ Fixes #8707 * Remove commented code --- .../VAADIN/themes/base/table/table.scss | 1 + .../VAADIN/themes/valo/components/_table.scss | 1 + .../table/TableScrollsOnRefresh.java | 75 +++++++++++++++++++ .../table/TableScrollsOnRefreshTest.java | 48 ++++++++++++ 4 files changed, 125 insertions(+) create mode 100644 uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnRefresh.java create mode 100644 uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnRefreshTest.java diff --git a/themes/src/main/themes/VAADIN/themes/base/table/table.scss b/themes/src/main/themes/VAADIN/themes/base/table/table.scss index 22ffdffa4d..64f700c882 100644 --- a/themes/src/main/themes/VAADIN/themes/base/table/table.scss +++ b/themes/src/main/themes/VAADIN/themes/base/table/table.scss @@ -137,6 +137,7 @@ } .#{$primaryStyleName}-body { border: 1px solid #aaa; + overflow-anchor: none; /* In Chrome 56+ */ } .#{$primaryStyleName}-row-spacer { height: 10px; diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss index 86efb96637..82435a4d41 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss @@ -279,6 +279,7 @@ $v-table-background-color: null !default; .#{$primary-stylename}-body { border: $v-table-border-width solid $border-color; + overflow-anchor: none; /* In Chrome 56+ */ @include user-select(text); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnRefresh.java new file mode 100644 index 0000000000..962f24f870 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnRefresh.java @@ -0,0 +1,75 @@ +package com.vaadin.tests.components.table; + +import java.util.ArrayList; +import java.util.List; + +import com.vaadin.data.util.BeanItemContainer; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.ui.Button; +import com.vaadin.ui.Table; +import com.vaadin.ui.VerticalLayout; + +public class TableScrollsOnRefresh extends AbstractTestUIWithLog { + private Table table = new Table( + "scroll down table, so it loads next page, and then click 'refresh' button"); + private Button refresh = new Button("refresh"); + private BeanItemContainer container = new BeanItemContainer( + TableItem.class); + + @Override + protected void setup(VaadinRequest request) { + refresh.addClickListener(new Button.ClickListener() { + + @Override + public void buttonClick(Button.ClickEvent event) { + table.refreshRowCache(); + } + }); + table.setSizeFull(); + VerticalLayout vl = new VerticalLayout(refresh, table); + vl.setExpandRatio(table, 1f); + vl.setSizeFull(); + setContent(vl); + table.setContainerDataSource(container); + populateContainer(); + } + + private void populateContainer() { + List items = new ArrayList(); + for (int i = 0; i < 1000; i++) { + items.add(new TableItem("Item " + Integer.toString(i), + "Item description " + Integer.toString(i))); + + } + container.addAll(items); + } + + public class TableItem { + + private String name; + private String description; + + public TableItem(String name, String description) { + this.name = name; + this.description = description; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + } +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnRefreshTest.java new file mode 100644 index 0000000000..b078d00162 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnRefreshTest.java @@ -0,0 +1,48 @@ +package com.vaadin.tests.components.table; + +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class TableScrollsOnRefreshTest extends MultiBrowserTest { + + @Test + public void ensureNoScrolling() throws InterruptedException { + openTestURL(); + TableElement table = $(TableElement.class).first(); + table.scroll(10000); + sleep(500); // wait for both data requests + String firstCellText = getFirstVisibleCell(table).getText(); + + ButtonElement refresh = $(ButtonElement.class).first(); + refresh.click(); + sleep(500); // wait for both data requests + Assert.assertEquals(firstCellText, + getFirstVisibleCell(table).getText()); + + refresh.click(); + sleep(500); // wait for both data requests + Assert.assertEquals(firstCellText, + getFirstVisibleCell(table).getText()); + } + + private WebElement getFirstVisibleCell(TableElement table) { + int tableBodyTop = table.findElement(By.className("v-table-body")) + .getLocation().getY(); + List cells = table + .findElements(By.className("v-table-cell-content")); + for (WebElement cell : cells) { + if (cell.getLocation().getY() > tableBodyTop) { + return cell; + } + } + return null; + } +} -- 2.39.5