boolean offsetSizeBecomesGreaterThanScrollSize = showsScrollHandle()
&& newOffsetSizeIsGreaterThanScrollSize;
if (offsetSizeBecomesGreaterThanScrollSize && getScrollPos() != 0) {
+ if (offsetSizeTemporaryScrollHandler != null) {
+ offsetSizeTemporaryScrollHandler.removeHandler();
+ }
// must be a field because Java insists.
offsetSizeTemporaryScrollHandler = addScrollHandler(
new ScrollHandler() {
boolean delayedSizeSet = !BrowserInfo.get().isFirefox();
// must be a field because Java insists.
if (delayedSizeSet) {
+ if (scrollSizeTemporaryScrollHandler != null) {
+ scrollSizeTemporaryScrollHandler.removeHandler();
+ }
scrollSizeTemporaryScrollHandler = addScrollHandler(
new ScrollHandler() {
@Override
--- /dev/null
+/*
+ * Copyright 2000-2016 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.grid;
+
+import java.util.Arrays;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Grid;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+public class HorizontalScrollAfterResize extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final Grid grid = new Grid();
+ grid.setWidth("100%");
+ grid.setHeight("350px");
+ grid.setCaption("My Grid");
+
+ for (int i = 0; i < 10; i++) {
+ char ch = (char) ('a' + i);
+ grid.addColumn(ch, String.class);
+ }
+ for (int i = 0; i < 100; i++) {
+ String[] row = new String[10];
+ Arrays.fill(row, "test");
+ grid.addRow(row);
+ }
+
+ addComponents(grid);
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Don't add more than one scroll handler";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 19189; // also 20254, 19622
+ }
+
+}
--- /dev/null
+/*
+ * Copyright 2000-2016 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.grid;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.Point;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+public class HorizontalScrollAfterResizeTest extends GridBasicFeaturesTest {
+
+ /**
+ * The behavior without the fix differs across different browsers but
+ * scenario should work everywhere.
+ */
+ @Test
+ public void scrollAfterResize() {
+ getDriver().manage().window().setSize(new Dimension(600, 400));
+ openTestURL();
+ getDriver().manage().window().setSize(new Dimension(200, 400));
+
+ // First scroll to the right
+ scrollGridHorizontallyTo(600);
+ Point locationAfterFirstScroll = $(GridElement.class).first()
+ .getCell(0, 9).getLocation();
+
+ // resize back
+ getDriver().manage().window().setSize(new Dimension(600, 400));
+ // shrink again
+ getDriver().manage().window().setSize(new Dimension(200, 400));
+
+ // second scroll to the right
+ scrollGridHorizontallyTo(600);
+
+ Point lolocationAfterSecondScrollcation = $(GridElement.class).first()
+ .getCell(0, 9).getLocation();
+
+ // With the bug scrolling doesn't happen. Location should be the same as
+ // first time
+ Assert.assertEquals(locationAfterFirstScroll,
+ lolocationAfterSecondScrollcation);
+ }
+
+ @Override
+ protected Class<?> getUIClass() {
+ return HorizontalScrollAfterResize.class;
+ }
+}