Don’t access undefined _lastFocusedCell

vaadin · Mar 8, 2017 · 98840f3 · 98840f3
1 parent 6ba5cfa
commit 98840f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/test/keyboard-navigation.html b/test/keyboard-navigation.html
@@ -1174,6 +1174,14 @@
             expect(row.hasAttribute('focused')).to.eql.true;
             expect(container.hasAttribute('focused')).to.eql.true;
           });
+
+          it('should not throw on focus change', function() {
+            expect(function() {
+              clickItem(1);
+              getRowCells(getRows(grid.$.scroller.$.header)[0])[0].click();
+              clickItem(0);
+            }).to.not.throw(Error);
+          });
         });
 
         describe('interaction mode', function() {

diff --git a/vaadin-grid-focusable-cell-container-behavior.html b/vaadin-grid-focusable-cell-container-behavior.html
@@ -49,7 +49,7 @@
       // for the virtual focus. This helps cell contents to detect if the cell
       // has focus, which is useful for the accessibility reasons. Used by
       // <vaadin-grid-sorter>.
-      if (this._lastFocusedCell || !focused) {
+      if (this._lastFocusedCell) {
         this._lastFocusedCell._cellContent.dispatchEvent(new CustomEvent('cell-focusout'));
         this._lastFocusedCell = undefined;
       }