summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorAnna Koskinen <Ansku@users.noreply.github.com>2018-04-13 18:10:39 +0300
committerIlia Motornyi <elmot@vaadin.com>2018-04-13 18:10:39 +0300
commit206a4d3146594a1ac1dd84be543e4c1089056560 (patch)
tree101d98cbaaca9859e032a18d4004059834384d71 /client
parent1719e35ae9377075f26f0daab6e7e2c789186ac0 (diff)
downloadvaadin-framework-206a4d3146594a1ac1dd84be543e4c1089056560.tar.gz
vaadin-framework-206a4d3146594a1ac1dd84be543e4c1089056560.zip
Add null check to Grid's DnD focus handling (#10822)
Fixes #10699
Diffstat (limited to 'client')
-rwxr-xr-xclient/src/main/java/com/vaadin/client/widgets/Grid.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 1f75801c27..12bb50de0f 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -4597,7 +4597,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
private void transferCellFocusOnDrop() {
final Cell focusedCell = cellFocusHandler.getFocusedCell();
- if (focusedCell != null) {
+ if (focusedCell != null && focusedCell.getElement() != null) {
final int focusedColumnIndexDOM = focusedCell.getColumn();
final int focusedRowIndex = focusedCell.getRow();
final int draggedColumnIndex = eventCell.getColumnIndex();