Avoid notifyResize calls when overlay is closed

vaadin · Aug 14, 2018 · 9c1054a · 9c1054a
1 parent f8c1a11
commit 9c1054a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 12 deletions.
diff --git a/src/vaadin-combo-box-dropdown-wrapper.html b/src/vaadin-combo-box-dropdown-wrapper.html
@@ -190,7 +190,7 @@
       }
 
       _setOverlayHeight() {
-        if (!this.positionTarget || !this._selector) {
+        if (!this.opened || !this.positionTarget || !this._selector) {
           return;
         }
 

diff --git a/src/vaadin-combo-box-mixin.html b/src/vaadin-combo-box-mixin.html
@@ -484,7 +484,7 @@
       // Ensure metrics are up-to-date
       this.$.overlay.updateViewportBoundaries();
       Polymer.Async.microTask.run(() => this.$.overlay.adjustScrollPosition());
-      setTimeout(() => this.$.overlay.$.dropdown.notifyResize(), 1);
+      setTimeout(() => this._resizeDropdown(), 1);
 
 
       // _detectAndDispatchChange() should not consider value changes done before opening
@@ -595,6 +595,10 @@
       }
     }
 
+    _resizeDropdown() {
+      this.$.overlay.$.dropdown.notifyResize();
+    }
+
     _updateHasValue(hasValue) {
       if (hasValue) {
         this.setAttribute('has-value', '');
@@ -695,15 +699,9 @@
           this.$.overlay.indexOfLabel(this.filter) :
           this._indexOfValue(this.value, this.filteredItems);
 
-        // async needed to reposition correctly after filtering
-        // (especially when aligned on top of input)
-        setTimeout(() => {
-          this.$.overlay.$.dropdown.notifyResize();
-          this.$.overlay.updateViewportBoundaries();
-          this.$.overlay.ensureItemsRendered();
-          this.$.overlay._selector.notifyResize();
-          Polymer.flush && Polymer.flush();
-        }, 1);
+        if (this.opened) {
+          this._repositionOverlay();
+        }
       }
     }
 
@@ -722,7 +720,21 @@
     _setOverlayItems(items) {
       this.$.overlay.set('_items', items);
 
-      this.$.overlay.$.dropdown.notifyResize();
+      if (this.opened) {
+        this._resizeDropdown();
+      }
+    }
+
+    _repositionOverlay() {
+      // async needed to reposition correctly after filtering
+      // (especially when aligned on top of input)
+      setTimeout(() => {
+        this._resizeDropdown();
+        this.$.overlay.updateViewportBoundaries();
+        this.$.overlay.ensureItemsRendered();
+        this.$.overlay._selector.notifyResize();
+        Polymer.flush && Polymer.flush();
+      }, 1);
     }
 
     _indexOfValue(value, items) {

diff --git a/test/filtering.html b/test/filtering.html
@@ -345,6 +345,20 @@
         comboBox = fixture('configured');
         expect(comboBox._focusedIndex).to.eql(1);
       });
+
+      it('should not notify resize the dropdown if not opened', () => {
+        const resizeSpy = sinon.spy(comboBox.$.overlay.$.dropdown, 'notifyResize');
+        comboBox.filteredItems = ['foo', 'bar', 'baz'];
+
+        expect(resizeSpy).to.not.have.been.called;
+      });
+
+      it('should not re-position the overlay if not opened', () => {
+        const repositionSpy = sinon.spy(comboBox, '_repositionOverlay');
+        comboBox.filteredItems = ['foo', 'bar', 'baz'];
+
+        expect(repositionSpy).to.not.have.been.called;
+      });
     });
 
     describe('setting items when opened', () => {

diff --git a/test/overlay-position.html b/test/overlay-position.html
@@ -141,12 +141,20 @@
       });
 
       it('should notify resize on items change', () => {
+        comboBox.opened = true;
         const spy = sinon.spy();
         comboBox.$.overlay.$.dropdown.notifyResize = spy;
         comboBox.items = [1, 2, 3];
         expect(spy.called).to.be.true;
       });
 
+      it('should not notify resize when not opened', () => {
+        const spy = sinon.spy();
+        comboBox.$.overlay.$.dropdown.notifyResize = spy;
+        comboBox.items = [1, 2, 3];
+        expect(spy.called).to.be.false;
+      });
+
       it('should reposition on scroll', () => {
         comboBox.opened = true;
         comboBox.$.overlay.updateViewportBoundaries = sinon.spy();