diff options
author | Olli Tietäväinen <ollit@vaadin.com> | 2017-03-09 12:49:07 +0200 |
---|---|---|
committer | Henri Sara <henri.sara@gmail.com> | 2017-03-09 12:49:07 +0200 |
commit | 520f2e9f21367799f000911159f2ea5d9bf9e0f2 (patch) | |
tree | 995f70207c6ed1907320915e0c21f8330c295205 | |
parent | 31bbf226160ca5e7007d714696a9209308bc7cf5 (diff) | |
download | vaadin-framework-520f2e9f21367799f000911159f2ea5d9bf9e0f2.tar.gz vaadin-framework-520f2e9f21367799f000911159f2ea5d9bf9e0f2.zip |
Fix Panel.setScrollTop() for large values (#8563)
Fixes #1149
3 files changed, 110 insertions, 0 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java b/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java index 5766851bba..9cf90b6254 100644 --- a/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java @@ -226,7 +226,14 @@ public class PanelConnector extends AbstractSingleComponentContainerConnector public void postLayout() { VPanel panel = getWidget(); if (uidlScrollTop != null) { + // IE / Safari fix for when scroll top is set to greater than panel + // height + int maxScroll = panel.getWidget().getOffsetHeight(); + if (uidlScrollTop > maxScroll) { + uidlScrollTop = maxScroll; + } panel.contentNode.setScrollTop(uidlScrollTop.intValue()); + // Read actual value back to ensure update logic is correct // TODO Does this trigger reflows? panel.scrollTop = panel.contentNode.getScrollTop(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelSetScrollTopWithLargeNumber.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelSetScrollTopWithLargeNumber.java new file mode 100755 index 0000000000..7d58b676f2 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelSetScrollTopWithLargeNumber.java @@ -0,0 +1,56 @@ +/* + * Copyright 2000-2017 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.panel; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.shared.ui.label.ContentMode; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; +import com.vaadin.ui.VerticalLayout; + +public class PanelSetScrollTopWithLargeNumber extends AbstractTestUI { + + Panel panel = new Panel(); + + @Override + public String getDescription() { + return "Click the button to scroll down " + Integer.MAX_VALUE + + " pixels"; + } + + @Override + protected Integer getTicketNumber() { + return 1149; + } + + @Override + protected void setup(VaadinRequest request) { + final VerticalLayout layout = new VerticalLayout(); + layout.setSizeUndefined(); + panel.setHeight("500px"); + String s = ""; + for (int i = 0; i < 10000; i++) { + s += i + "<br />"; + } + Label label = new Label(s, ContentMode.HTML); + layout.addComponent(label); + panel.setContent(layout); + panel.setScrollTop(Integer.MAX_VALUE); + addComponent(panel); + } + +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelSetScrollTopWithLargeNumberTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelSetScrollTopWithLargeNumberTest.java new file mode 100755 index 0000000000..9ddaf71596 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelSetScrollTopWithLargeNumberTest.java @@ -0,0 +1,47 @@ +/* + * Copyright 2000-2017 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.panel; + +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.elements.PanelElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class PanelSetScrollTopWithLargeNumberTest extends MultiBrowserTest { + private PanelElement panel; + + @Override + public void setup() throws Exception { + super.setup(); + openTestURL(); + waitForElementPresent(By.className("v-panel")); + panel = $(PanelElement.class).first(); + } + + @Test + public void testSetScrollTopWithLargeNumber() { + WebElement contentNode = panel + .findElement(By.className("v-panel-content")); + int panelContentScrollTop = ((Number) executeScript( + "return arguments[0].scrollTop", contentNode)).intValue(); + assertGreater( + "Panel should scroll when scrollTop is set to a number larger than panel height", + panelContentScrollTop, 0); + } + +} |