Merge pull request #510 from PolymerElements/dont-blur

Only blur activeElement if it is a descendant of the list (#505, #507)

Author: keanulee

iron-list.html

@@ -1091,6 +1091,9 @@
       } else if (change.path === 'items.splices') {
         this._adjustVirtualIndex(change.value.indexSplices);
         this._virtualCount = this.items ? this.items.length : 0;
+        // Only blur activeElement if it is a descendant of the list (#505, #507).
+        var activeElement = this._getActiveElement();
+        if (this.contains(activeElement)) activeElement.blur();
         // Render only if the affected index is rendered.
         var affectedIndexRendered = change.value.indexSplices.some(function(splice) {
           return splice.index + splice.addedCount >= this._virtualStart &&
@@ -1170,7 +1173,6 @@
       // remove the current focused item
       if (this._focusedItem && this.modelForElement(this._focusedItem)[this.as] === item) {
         this._removeFocusedItem();
-        document.activeElement && document.activeElement.blur && document.activeElement.blur();
       }
     },
 
@@ -1608,8 +1610,7 @@
       }
       var modelTabIndex, activeElTabIndex;
       var target = Polymer.dom(e).path[0];
-      var itemsHost = this._itemsParent.node.domHost;
-      var activeEl = Polymer.dom(itemsHost ? itemsHost.root : document).activeElement;
+      var activeEl = this._getActiveElement();
       var physicalItem = this._physicalItems[this._getPhysicalIndex(model[this.indexAs])];
       // Safari does not focus certain form controls via mouse
       // https://bugs.webkit.org/show_bug.cgi?id=118043
@@ -1938,6 +1939,12 @@
             this.modelForElement(item)[prop] = value;
           }
         }, this);
+    },
+
+    /* Gets the activeElement of the shadow root/host that contains the list. */
+    _getActiveElement: function() {
+      var itemsHost = this._itemsParent.node.domHost;
+      return Polymer.dom(itemsHost ? itemsHost.root : document).activeElement;
     }
 
   });

test/focus.html

@@ -116,7 +116,6 @@
         var button = document.createElement('button');
         list.parentNode.appendChild(button);
         button.focus();
-        // getFirstItemFromList(list).focus();
 
         assert.notEqual(document.activeElement, document.body);
 
@@ -127,6 +126,23 @@
       });
     });
 
+    test('don\'t blur when activeElement is not a descendant of the list (#505, #507)', function(done) {
+      list.items = buildDataSet(100);
+
+      flush(function() {
+        var button = document.createElement('button');
+        list.parentNode.appendChild(button);
+        button.focus();
+
+        assert.notEqual(document.activeElement, document.body);
+
+        list.splice('items', 0, 1);
+
+        assert.notEqual(document.activeElement, document.body);
+        done();
+      });
+    });
+
     test('focusItem()', function(done) {
       list.items = buildDataSet(100);
 

test/mutations.html

@@ -179,7 +179,11 @@
         list.scrollToIndex(45);
         PolymerFlush();
         assert.equal(getFirstItemFromList(list).textContent, '45');
-        var spliceItems = new Array(50).fill(buildItem(phrase));
+        var spliceItems = new Array(50);
+        var item = buildItem(phrase);
+        for (var i = 0; i < 50; ++i) {
+          spliceItems[i] = item;
+        }
         list.splice.apply(list, ['items', 0, 50].concat(spliceItems));
         PolymerFlush();
         assert.equal(getFirstItemFromList(list).textContent, phrase);