diff options
author | Artur <artur@vaadin.com> | 2018-01-05 15:13:55 +0200 |
---|---|---|
committer | Olli Tietäväinen <ollit@vaadin.com> | 2018-01-05 15:13:55 +0200 |
commit | f1039e892ca4d40e7ed441264f1d35b30733d679 (patch) | |
tree | a8a7853a28d6bcf25192a5c1c18392f5fa79a673 /uitest | |
parent | 900463c44acdef7ad5acec4de5203b6fd37fd4f3 (diff) | |
download | vaadin-framework-f1039e892ca4d40e7ed441264f1d35b30733d679.tar.gz vaadin-framework-f1039e892ca4d40e7ed441264f1d35b30733d679.zip |
Fix scrolling problem in table in Chrome 56+ (#10492)
* Fix scrolling problem in table in Chrome 56+
Fixes #8707
* Remove commented code
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnRefresh.java | 75 | ||||
-rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnRefreshTest.java | 48 |
2 files changed, 123 insertions, 0 deletions
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<TableItem> container = new BeanItemContainer<TableItem>( + 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<TableItem> items = new ArrayList<TableItem>(); + 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<WebElement> cells = table + .findElements(By.className("v-table-cell-content")); + for (WebElement cell : cells) { + if (cell.getLocation().getY() > tableBodyTop) { + return cell; + } + } + return null; + } +} |