diff options
| author | Anna Koskinen <Ansku@users.noreply.github.com> | 2018-04-13 18:10:39 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2018-04-20 15:19:23 +0300 |
| commit | 8e61228f214d12efb80acfc0336196c2272b84e5 (patch) | |
| tree | 5e2ea6a4956fdd05ce190a7ab02c8ef2ecb2618f /client | |
| parent | fe7ea3f36fb3c7a4e707a1163dcfdb38443e116b (diff) | |
| download | vaadin-framework-8e61228f214d12efb80acfc0336196c2272b84e5.tar.gz vaadin-framework-8e61228f214d12efb80acfc0336196c2272b84e5.zip | |
Add null check to Grid's DnD focus handling (#10822)
Fixes #10699
Diffstat (limited to 'client')
| -rwxr-xr-x | client/src/main/java/com/vaadin/client/widgets/Grid.java | 2 |
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(); |