Add keyboard navigation events to a queue if waiting for potential content changes from the server #7028

svn changeset:21109/svn branch:6.7

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java
index 42c56bac6e..aa72793636 100644
--- a/src/com/vaadin/ui/TreeTable.java
+++ b/src/com/vaadin/ui/TreeTable.java
@@ -314,6 +314,7 @@ public class TreeTable extends Table implements Hierarchical {
     private Object hierarchyColumnId;
     private Object toggledItemId;
     private boolean animationsEnabled;
+    private boolean clearFocusedRowPending;
 
     private ContainerStrategy getContainerStrategy() {
         if (cStrategy == null) {
@@ -403,6 +404,11 @@ public class TreeTable extends Table implements Hierarchical {
 
     private void setFocusedRow(Object itemId) {
         focusedRowId = itemId;
+        if (focusedRowId == null) {
+            // Must still inform the client that the focusParent request has
+            // been processed
+            clearFocusedRowPending = true;
+        }
         requestRepaint();
     }
 
@@ -411,6 +417,11 @@ public class TreeTable extends Table implements Hierarchical {
         if (focusedRowId != null) {
             target.addAttribute("focusedRow", itemIdMapper.key(focusedRowId));
             focusedRowId = null;
+        } else if (clearFocusedRowPending) {
+            // Must still inform the client that the focusParent request has
+            // been processed
+            target.addAttribute("clearFocusPending", true);
+            clearFocusedRowPending = false;
         }
         target.addAttribute("animate", animationsEnabled);
         if (hierarchyColumnId != null) {