import com.vaadin.client.widget.escalator.EscalatorUpdater;
import com.vaadin.client.widget.escalator.Row;
import com.vaadin.client.widget.grid.events.BodyClickHandler;
+import com.vaadin.client.widget.grid.events.BodyDoubleClickHandler;
import com.vaadin.client.widget.treegrid.events.TreeGridClickEvent;
+import com.vaadin.client.widget.treegrid.events.TreeGridDoubleClickEvent;
import com.vaadin.client.widgets.Grid;
import com.vaadin.shared.data.HierarchicalDataCommunicatorConstants;
return addHandler(handler, TreeGridClickEvent.TYPE);
}
+ @Override
+ public HandlerRegistration addBodyDoubleClickHandler(
+ BodyDoubleClickHandler handler) {
+ return addHandler(handler, TreeGridDoubleClickEvent.TYPE);
+ }
+
@Override
protected EscalatorUpdater createBodyUpdater() {
return new BodyUpdater();
import com.google.gwt.dom.client.EventTarget;
import com.vaadin.client.WidgetUtil;
import com.vaadin.client.renderers.HierarchyRenderer;
-import com.vaadin.client.widget.escalator.RowContainer;
-import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler;
import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler.GridClickHandler;
import com.vaadin.client.widget.grid.events.GridClickEvent;
import com.vaadin.client.widget.treegrid.TreeGrid;
-import com.vaadin.shared.ui.grid.GridConstants;
+import com.vaadin.client.widgets.Grid;
/**
- * Class to set as value of {@link com.vaadin.client.widgets.Grid#clickEvent}.
- * <br/>
+ * Represents native mouse click event in TreeGrid.
+ * <p>
* Differs from {@link GridClickEvent} only in allowing events to originate form
* hierarchy widget.
*
}
@Override
- protected void dispatch(
- AbstractGridMouseEventHandler.GridClickHandler handler) {
- EventTarget target = getNativeEvent().getEventTarget();
- if (!Element.is(target)) {
- // Target is not an element
- return;
- }
-
- // Ignore event if originated from child widget
- // except when from hierarchy widget
- Element targetElement = Element.as(target);
- if (getGrid().isElementInChildWidget(targetElement)
- && !HierarchyRenderer
- .isElementInHierarchyWidget(targetElement)) {
- return;
- }
-
- final RowContainer container = getGrid().getEscalator()
- .findRowContainer(targetElement);
- if (container == null) {
- // No container for given element
- return;
- }
-
- GridConstants.Section section = GridConstants.Section.FOOTER;
- if (container == getGrid().getEscalator().getHeader()) {
- section = GridConstants.Section.HEADER;
- } else if (container == getGrid().getEscalator().getBody()) {
- section = GridConstants.Section.BODY;
- }
-
- doDispatch(handler, section);
+ protected boolean ignoreEventFromTarget(Grid<?> grid,
+ Element targetElement) {
+ // Do not ignore when element is in hierarchy renderer
+ return super.ignoreEventFromTarget(grid, targetElement)
+ && !HierarchyRenderer.isElementInHierarchyWidget(targetElement);
}
}
--- /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.client.widget.treegrid.events;
+
+import com.google.gwt.dom.client.BrowserEvents;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.EventTarget;
+import com.vaadin.client.WidgetUtil;
+import com.vaadin.client.renderers.HierarchyRenderer;
+import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler.GridDoubleClickHandler;
+import com.vaadin.client.widget.grid.events.GridDoubleClickEvent;
+import com.vaadin.client.widget.treegrid.TreeGrid;
+import com.vaadin.client.widgets.Grid;
+
+/**
+ * Represents native mouse double click event in TreeGrid.
+ * <p>
+ * Differs from {@link GridDoubleClickEvent} only in allowing events to
+ * originate form hierarchy widget.
+ *
+ * @author Vaadin Ltd
+ * @since
+ */
+public class TreeGridDoubleClickEvent extends GridDoubleClickEvent {
+
+ public static final Type<GridDoubleClickHandler> TYPE = new Type<>(
+ BrowserEvents.DBLCLICK, new TreeGridDoubleClickEvent());
+
+ @Override
+ public Type<GridDoubleClickHandler> getAssociatedType() {
+ return TYPE;
+ }
+
+ @Override
+ public TreeGrid getGrid() {
+ EventTarget target = getNativeEvent().getEventTarget();
+ if (!Element.is(target)) {
+ return null;
+ }
+ return WidgetUtil.findWidget(Element.as(target), TreeGrid.class, false);
+ }
+
+ @Override
+ protected boolean ignoreEventFromTarget(Grid<?> grid,
+ Element targetElement) {
+ // Do not ignore when element is in hierarchy renderer
+ return super.ignoreEventFromTarget(grid, targetElement)
+ && !HierarchyRenderer.isElementInHierarchyWidget(targetElement);
+ }
+}
}
Element targetElement = Element.as(target);
- if (grid.isElementInChildWidget(targetElement)) {
- // Target is some widget inside of Grid
+ if (ignoreEventFromTarget(grid, targetElement)) {
+ // Event on this target should be ignored
return;
}
doDispatch(handler, section);
}
+ /**
+ * Returns whether the mouse event on the target element should be
+ * ignored.
+ *
+ * @param grid
+ * the {@code Grid} instance from which the event originated
+ * @param targetElement
+ * the element from which the event originated
+ * @return {@code true} if the event should be ignored, {@code false} if
+ * it should be handled
+ * @since
+ */
+ protected boolean ignoreEventFromTarget(Grid<?> grid,
+ Element targetElement) {
+ // Target is some widget inside of Grid
+ return grid.isElementInChildWidget(targetElement);
+ }
+
protected abstract void doDispatch(HANDLER handler, Section section);
}
--- /dev/null
+package com.vaadin.tests.components.treegrid;
+
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.data.bean.HierarchicalTestBean;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.TreeGrid;
+
+@Widgetset("com.vaadin.DefaultWidgetSet")
+public class TreeGridDoubleClick extends AbstractTestUI {
+ @Override
+ protected void setup(VaadinRequest request) {
+ TreeGrid<HierarchicalTestBean> grid = new TreeGrid<>();
+ grid.addColumn(HierarchicalTestBean::toString).setCaption("String")
+ .setId("string");
+ grid.addColumn(HierarchicalTestBean::getDepth).setCaption("Depth")
+ .setId("depth");
+ grid.addColumn(HierarchicalTestBean::getIndex)
+ .setCaption("Index on this depth").setId("index");
+ grid.setHierarchyColumn("string");
+ grid.setDataProvider(new LazyHierarchicalDataProvider(3, 3));
+
+ grid.addItemClickListener(event -> {
+ if (event.getMouseEventDetails().isDoubleClick()) {
+ Notification.show("Double click");
+ }
+ });
+
+ addComponent(grid);
+ }
+}
--- /dev/null
+package com.vaadin.tests.components.treegrid;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.testbench.ElementQuery;
+import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.testbench.elements.TreeGridElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+import static org.junit.Assert.assertTrue;
+
+public class TreeGridDoubleClickTest extends SingleBrowserTest {
+
+ @Test
+ public void double_click_on_hierarchy_renderer() {
+ openTestURL();
+
+ TreeGridElement grid = $(TreeGridElement.class).first();
+ WebElement hierarchyCell = grid
+ .findElement(By.className("v-treegrid-node"));
+ new Actions(getDriver()).doubleClick(hierarchyCell).perform();
+
+ assertTrue("Double click is not handled",
+ isDoubleClickNotificationPresent());
+ }
+
+ private boolean isDoubleClickNotificationPresent() {
+ ElementQuery<NotificationElement> notification = $(
+ NotificationElement.class);
+ return notification.exists() && "Double click"
+ .equals(notification.first().getCaption());
+ }
+}
projects / vaadin-framework.git / commitdiff