Update selection of multi-selectable on dom change

Fixes #69
PolymerElements · Oct 16, 2015 · 9333486 · 9333486 · sklobovskaya · Oct 21, 2015
1 parent 88658f2
commit 9333486
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/iron-multi-selectable.html b/iron-multi-selectable.html
@@ -72,6 +72,11 @@
       this._selection.multi = multi;
     },
 
+    get _shouldUpdateSelection() {
+      return this.selected != null ||
+        (this.selectedValues != null &&  && this.selectedValues.length);
+    },
+
     _updateSelected: function() {
       if (this.multi) {
         this._selectMulti(this.selectedValues);

diff --git a/iron-selectable.html b/iron-selectable.html
@@ -200,6 +200,10 @@
       this.selected = this._indexToValue(index);
     },
 
+    get _shouldUpdateSelection() {
+      return this.selected != null;
+    },
+
     _addListener: function(eventName) {
       this.listen(this, eventName, '_activateHandler');
     },
@@ -289,10 +293,10 @@
 
         this._updateItems();
 
-        if (this.selected != null) {
+        if (this._shouldUpdateSelection) {
           this._updateSelected();
         }
-      }.bind(this));
+      });
     },
 
     _activateHandler: function(e) {

diff --git a/test/multi.html b/test/multi.html
@@ -66,6 +66,7 @@
 
       setup(function () {
         s = fixture('test');
+        t = Polymer.dom(s).querySelector('[is="dom-repeat"]');
       });
 
       test('honors the multi attribute', function() {
@@ -163,6 +164,29 @@
         });
       });
 
+      test('updates selection when dom changes', function(done) {
+        var selectEventCounter = 0;
+
+        s = document.querySelector('#repeatedItems');
+
+        Polymer.Base.async(function() {
+          var firstChild = Polymer.dom(s).querySelector(':first-child');
+          var lastChild = Polymer.dom(s).querySelector(':last-child');
+
+          MockInteractions.tap(firstChild);
+          MockInteractions.tap(lastChild);
+
+          expect(s.selectedItems.length).to.be.equal(2);
+
+          t.pop('items');
+
+          Polymer.Base.async(function() {
+            expect(s.selectedItems.length).to.be.equal(1);
+          }, 1);
+        });
+
+      });
+
       /* test('toggle multi from true to false', function() {
         // set selected
         s.selected = [0, 2];