* <p>
* If a spacer is already registered with the given row index, that
* spacer will be updated with the given height.
+ * <p>
+ * <em>Note:</em> The row index for a spacer will change if rows are
+ * inserted or removed above the current position. Spacers will also be
+ * removed alongside their associated rows
*
* @param rowIndex
* the row index for the spacer to modify. The affected
* negative, the affected spacer (if exists) will be removed
* @throws IllegalArgumentException
* if {@code rowIndex} is not a valid row index
+ * @see #insertRows(int, int)
+ * @see #removeRows(int, int)
*/
void setSpacer(int rowIndex, double height)
throws IllegalArgumentException;
*/
SpacerUpdater getSpacerUpdater();
+ /**
+ * {@inheritDoc}
+ * <p>
+ * Any spacers underneath {@code index} will be offset and "pushed"
+ * down. This also modifies the row index they are associated with.
+ */
+ @Override
+ public void insertRows(int index, int numberOfRows)
+ throws IndexOutOfBoundsException, IllegalArgumentException;
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * Any spacers underneath {@code index} will be offset and "pulled" up.
+ * This also modifies the row index they are associated with. Any
+ * spacers in the removed range will also be closed and removed.
+ */
+ @Override
+ public void removeRows(int index, int numberOfRows)
+ throws IndexOutOfBoundsException, IllegalArgumentException;
}
/**
/*
* Removing spacers as the very first step will correct the
* scrollbars and row offsets right away.
+ *
+ * TODO: actually, it kinda sounds like a Grid feature that a spacer
+ * would be associated with a particular row. Maybe it would be
+ * better to have a spacer separate from rows, and simply collapse
+ * them if they happen to end up on top of each other. This would
+ * probably make supporting the -1 row pretty easy, too.
*/
spacerContainer.paintRemoveSpacers(removedRowsRange);
// TODO
getLogger().warning(
- "[[spacers]] removing rows while shrinking the body "
+ "[[spacers]] removing spacers while shrinking the body "
+ "section");
final ListIterator<TableRowElement> iter = visualRowOrder
SpacerImpl spacer = rowIndexToSpacer.remove(this.rowIndex);
assert this == spacer : "trying to move an unexpected spacer.";
this.rowIndex = rowIndex;
+ root.setPropertyInt(SPACER_LOGICAL_ROW_PROPERTY, rowIndex);
rowIndexToSpacer.put(this.rowIndex, this);
}
}
protected static final String COLSPAN_NONE = "Apply no colspan";
protected static final String SPACERS = "Spacers";
protected static final String ROW_1 = "Row 1";
+ protected static final String ROW_99 = "Row 99";
protected static final String SET_100PX = "Set 100px";
protected static final String REMOVE = "Remove";
getVerticalScrollbar().scroll(px);
}
+ protected long getScrollTop() {
+ return ((Long) executeScript("return arguments[0].scrollTop;",
+ getVerticalScrollbar())).longValue();
+ }
+
private TestBenchElement getVerticalScrollbar() {
return (TestBenchElement) getEscalator().findElement(
By.className("v-escalator-scroller-vertical"));
getHorizontalScrollbar().scrollLeft(px);
}
+ private long getScrollLeft() {
+ return ((Long) executeScript("return arguments[0].scrollLeft;",
+ getHorizontalScrollbar())).longValue();
+ }
+
private TestBenchElement getHorizontalScrollbar() {
return (TestBenchElement) getEscalator().findElement(
By.className("v-escalator-scroller-horizontal"));
return getEscalator().findElements(By.className("v-escalator-spacer"));
}
+ protected boolean spacersAreFoundInDom() {
+ List<WebElement> spacers = getSpacers();
+ return spacers != null && !spacers.isEmpty();
+ }
+
@SuppressWarnings("boxing")
protected WebElement getSpacer(int logicalRowIndex) {
List<WebElement> spacers = getSpacers();
package com.vaadin.tests.components.grid.basicfeatures.escalator;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.openqa.selenium.WebElement;
import com.vaadin.client.WidgetUtil;
+import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
@SuppressWarnings("boxing")
@Test
public void openVisibleSpacer() {
- assertNull("No spacers should be shown at the start", getSpacer(1));
+ assertFalse("No spacers should be shown at the start",
+ spacersAreFoundInDom());
selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
assertNotNull("Spacer should be shown after setting it", getSpacer(1));
}
selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
double oldTop = getElementTop(getSpacer(1));
selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS, ADD_ONE_ROW_TO_BEGINNING);
- double newTop = getElementTop(getSpacer(1));
+ double newTop = getElementTop(getSpacer(2));
assertGreater("Spacer should've been pushed down", newTop, oldTop);
}
spacerTop + 100, rowTop, WidgetUtil.PIXEL_EPSILON);
}
+ @Test
+ public void addSpacerAtBottomThenScrollThere() {
+ selectMenuPath(FEATURES, SPACERS, ROW_99, SET_100PX);
+ scrollVerticallyTo(999999);
+
+ assertFalse("Did not expect a notification",
+ $(NotificationElement.class).exists());
+ }
+
+ @Test
+ public void scrollToBottomThenAddSpacerThere() {
+ scrollVerticallyTo(999999);
+ long oldBottomScrollTop = getScrollTop();
+ selectMenuPath(FEATURES, SPACERS, ROW_99, SET_100PX);
+
+ assertEquals("Adding a spacer underneath the current viewport should "
+ + "not scroll anywhere", oldBottomScrollTop, getScrollTop());
+ assertFalse("Got an unexpected notification",
+ $(NotificationElement.class).exists());
+
+ scrollVerticallyTo(999999);
+
+ assertFalse("Got an unexpected notification",
+ $(NotificationElement.class).exists());
+ assertGreater("Adding a spacer should've made the scrollbar scroll "
+ + "further", getScrollTop(), oldBottomScrollTop);
+ }
+
+ @Test
+ public void removingRowAboveSpacerMovesSpacerUp() {
+ selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
+ WebElement spacer = getSpacer(1);
+ double originalElementTop = getElementTop(spacer);
+
+ selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS,
+ REMOVE_ONE_ROW_FROM_BEGINNING);
+ assertLessThan("spacer should've moved up", getElementTop(spacer),
+ originalElementTop);
+ assertNull("No spacer for row 1 should be found after removing the "
+ + "top row", getSpacer(1));
+ }
+
+ @Test
+ public void removingSpacedRowRemovesSpacer() {
+ selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX);
+ assertTrue("Spacer should've been found in the DOM",
+ spacersAreFoundInDom());
+
+ selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS,
+ REMOVE_ONE_ROW_FROM_BEGINNING);
+ selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS,
+ REMOVE_ONE_ROW_FROM_BEGINNING);
+
+ assertFalse("No spacers should be in the DOM after removing "
+ + "associated spacer", spacersAreFoundInDom());
+
+ }
+
private static double getElementTop(WebElement element) {
/*
* we need to parse the style attribute, since using getCssValue gets a
projects / vaadin-framework.git / commitdiff