Add findWidget() method to accept non exact matches.
}
}-*/;
+ /**
+ * Helper method to find first instance of any Widget found by traversing
+ * DOM upwards from given element.
+ * <p>
+ * <strong>Note:</strong> If {@code element} is inside some widget {@code W}
+ * , <em>and</em> {@code W} in turn is wrapped in a {@link Composite}
+ * {@code C}, this method will not find {@code W} but returns {@code C}.
+ * This may also be the case with other Composite-like classes that hijack
+ * the event handling of their child widget(s).
+ *
+ * @param element
+ * the element where to start seeking of Widget
+ * @since 7.7.11
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T findWidget(Element element) {
+ return findWidget(element, null);
+ }
+
/**
* Helper method to find first instance of given Widget type found by
* traversing DOM upwards from given element.
* {@code C} or null, depending on whether the class parameter matches. This
* may also be the case with other Composite-like classes that hijack the
* event handling of their child widget(s).
+ * <p>
+ * Only accepts the exact class {@code class1} if not null.
*
* @param element
* the element where to start seeking of Widget
* @param class1
- * the Widget type to seek for
+ * the Widget type to seek for, null for any
*/
@SuppressWarnings("unchecked")
public static <T> T findWidget(Element element,
Class<? extends Widget> class1) {
+ return findWidget(element, class1, true);
+ }
+
+ /**
+ * Helper method to find first instance of given Widget type found by
+ * traversing DOM upwards from given element.
+ * <p>
+ * <strong>Note:</strong> If {@code element} is inside some widget {@code W}
+ * , <em>and</em> {@code W} in turn is wrapped in a {@link Composite} {@code
+ * C}, this method will not find {@code W}. It returns either {@code C} or
+ * null, depending on whether the class parameter matches. This may also be
+ * the case with other Composite-like classes that hijack the event handling
+ * of their child widget(s).
+ *
+ * @param element
+ * the element where to start seeking of Widget
+ * @param class1
+ * the Widget type to seek for
+ * @param exactMatch
+ * true to only accept class1, false to also accept its
+ * superclasses
+ * @since 7.7.11
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T findWidget(Element element,
+ Class<? extends Widget> class1, boolean exactMatch) {
if (element != null) {
/* First seek for the first EventListener (~Widget) from dom */
EventListener eventListener = null;
* hierarchy
*/
Widget w = (Widget) eventListener;
+ if (class1 == null && w != null) {
+ return (T) w;
+ }
while (w != null) {
- if (class1 == null || w.getClass() == class1) {
- return (T) w;
+ Class<?> widgetClass = w.getClass();
+ while (widgetClass != null) {
+ if (widgetClass == class1) {
+ return (T) w;
+ }
+ // terminate after first check if looking for exact
+ // match
+ widgetClass = exactMatch ? null
+ : widgetClass.getSuperclass();
}
w = w.getParent();
}
* Fixes infocusable form fields in Safari of iOS 5.x and some Android
* browsers.
*/
- Widget targetWidget = findWidget(target, null);
+ Widget targetWidget = findWidget(target);
if (targetWidget instanceof com.google.gwt.user.client.ui.Focusable) {
final com.google.gwt.user.client.ui.Focusable toBeFocusedWidget = (com.google.gwt.user.client.ui.Focusable) targetWidget;
toBeFocusedWidget.setFocus(true);
// widget to which the path is relative. Otherwise, the current
// implementation simply interprets the path as if baseElement was
// null.
- Widget baseWidget = WidgetUtil.findWidget(baseElement, null);
+ Widget baseWidget = WidgetUtil.findWidget(baseElement);
Widget w = getWidgetFromPath(widgetPath, baseWidget);
if (w == null || !WidgetUtil.isAttachedAndDisplayed(w)) {
String childIndexString = part.substring("domChild[".length(),
part.length() - 1);
- if (WidgetUtil.findWidget(baseElement,
- null) instanceof VAbstractOrderedLayout) {
+ if (WidgetUtil.findWidget(baseElement)
+ instanceof VAbstractOrderedLayout) {
if (element.hasChildNodes()) {
Element e = element.getFirstChildElement().cast();
String cn = e.getClassName();
* @return the parent grid or null if none found.
*/
private static Grid<?> findClosestParentGrid(Element e) {
- Widget w = WidgetUtil.findWidget(e, null);
+ Widget w = WidgetUtil.findWidget(e);
while (w != null && !(w instanceof Grid)) {
w = w.getParent();
private Element getElementTdOrTr(Element element) {
- Widget widget = WidgetUtil.findWidget(element, null);
+ Widget widget = WidgetUtil.findWidget(element);
if (widget != this) {
/*
@Override
public String getSubPartName(
com.google.gwt.user.client.Element subElement) {
- Widget widget = WidgetUtil.findWidget(subElement, null);
+ Widget widget = WidgetUtil.findWidget(subElement);
if (widget instanceof HeaderCell) {
return SUBPART_HEADER + "[" + tHead.visibleCells.indexOf(widget)
+ "]";
if (!DOM.isOrHasChild(getTopmostWindow().getElement(), target)) {
// not within the modal window, but let's see if it's in the
// debug window
- Widget w = WidgetUtil.findWidget(target, null);
+ Widget w = WidgetUtil.findWidget(target);
while (w != null) {
if (w instanceof VDebugWindow) {
return true; // allow debug-window clicks
public TooltipInfo getTooltipInfo(
com.google.gwt.dom.client.Element element) {
TooltipInfo tooltipInfo = null;
- Widget w = WidgetUtil.findWidget(element, null);
+ Widget w = WidgetUtil.findWidget(element);
if (w instanceof HasTooltipKey) {
tooltipInfo = GWT.create(TooltipInfo.class);
String title = tooltips.get(((HasTooltipKey) w).getTooltipKey());
*/
protected VDropHandler findDragTarget(Element element) {
try {
- Widget w = WidgetUtil.findWidget(element, null);
+ Widget w = WidgetUtil.findWidget(element);
if (w == null) {
return null;
}
@SuppressWarnings("deprecation")
com.google.gwt.user.client.Element castElement = (com.google.gwt.user.client.Element) possibleWidgetNode
.cast();
- Widget w = WidgetUtil.findWidget(castElement, null);
+ Widget w = WidgetUtil.findWidget(castElement);
// Ensure findWidget did not traverse past the cell element in the
// DOM hierarchy
if (!Element.is(target)) {
return null;
}
- return WidgetUtil.findWidget(Element.as(target), Grid.class);
+ return WidgetUtil.findWidget(Element.as(target), Grid.class, false);
}
/**
if (!Element.is(target)) {
return null;
}
- return WidgetUtil.findWidget(Element.as(target), Grid.class);
+ return WidgetUtil.findWidget(Element.as(target), Grid.class, false);
}
/**
if (renderer instanceof WidgetRenderer) {
try {
Widget w = WidgetUtil.findWidget(
- cell.getElement().getFirstChildElement(), null);
+ cell.getElement().getFirstChildElement());
if (w != null) {
// Logical detach
}
private boolean isElementInChildWidget(Element e) {
- Widget w = WidgetUtil.findWidget(e, null);
+ Widget w = WidgetUtil.findWidget(e);
if (w == this) {
return false;
--- /dev/null
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.ui.Grid;
+
+public class GridSubclass extends Grid {
+
+ public GridSubclass(Indexed dataSource) {
+ super(dataSource);
+ }
+}
--- /dev/null
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.util.PersonContainer;
+import com.vaadin.tests.widgetset.TestingWidgetSet;
+
+@Widgetset(TestingWidgetSet.NAME)
+public class GridSubclassMouseEvent extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ PersonContainer container = PersonContainer.createWithTestData();
+ GridSubclass grid = new GridSubclass(container);
+ addComponent(grid);
+ }
+}
--- /dev/null
+package com.vaadin.tests.widgetset.client.grid;
+
+import com.vaadin.client.connectors.GridConnector;
+import com.vaadin.client.widgets.Grid;
+import com.vaadin.shared.ui.Connect;
+import com.vaadin.tests.components.grid.GridSubclass;
+
+import elemental.json.JsonObject;
+
+@Connect(GridSubclass.class)
+public class GridSubclassConnector extends GridConnector {
+
+ public static class GridSubclass extends Grid<JsonObject> {
+
+ }
+
+ @Override
+ public GridSubclass getWidget() {
+ return (GridSubclass) super.getWidget();
+ }
+}
--- /dev/null
+package com.vaadin.tests.components.grid;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.testbench.elements.GridElement.GridRowElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class GridSubclassMouseEventTest extends SingleBrowserTest {
+
+ @Test
+ public void selectRowWithMouseClick() {
+ openTestURL();
+
+ GridElement grid = $(GridElement.class).first();
+
+ GridRowElement row = grid.getRow(0);
+ Assert.assertTrue("Row should not be selected", !row.isSelected());
+ grid.getCell(0, 0).click();
+ Assert.assertTrue("Row should be selected", row.isSelected());
+ }
+}
projects / vaadin-framework.git / commitdiff