Merge pull request #327 from PolymerElements/upstream-326093618

Upstream cl/326093618: Fix incorrect height on deselection.
PolymerElements · Mar 5, 2021 · 929c875 · 929c875
2 parents 711ba23 + f8e9796
commit 929c875
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/paper-dropdown-menu-light.js b/paper-dropdown-menu-light.js
@@ -586,5 +586,11 @@ Polymer({
       this.$.input.textContent = this.value;
     }
     this._setHasContent(!!this.value);
+    if (!this.hasContent) {
+      // If there is no content then reset to '&nbsp', which is required
+      // for the input height to be correct. Uses 'xa0' instead of '&nbsp' to
+      // avoid innerHTML.
+      this.$.input.textContent = '\xa0';
+    }
   }
 });
diff --git a/test/paper-dropdown-menu-light.html b/test/paper-dropdown-menu-light.html
@@ -153,6 +153,16 @@
           content.selected = null;
           expect(dropdownMenu.selectedItem).to.be.equal(null);
         });
+
+        test('maintains its size', function() {
+          const initialRect = dropdownMenu.getBoundingClientRect();
+
+          content.selected = null;
+
+          const deselectedRect = dropdownMenu.getBoundingClientRect();
+          expect(deselectedRect.width).closeTo(initialRect.width, 1);
+          expect(deselectedRect.height).closeTo(initialRect.height, 1);
+        });
       });
 
       suite('validation', function() {
@@ -236,4 +246,4 @@
   </script>
 
 </body>
-</html>
+</html>
diff --git a/test/paper-dropdown-menu.html b/test/paper-dropdown-menu.html
@@ -175,6 +175,16 @@
           content.selected = null;
           expect(dropdownMenu.selectedItem).to.be.equal(null);
         });
+
+        test('maintains its size', function() {
+          const initialRect = dropdownMenu.getBoundingClientRect();
+
+          content.selected = null;
+
+          const deselectedRect = dropdownMenu.getBoundingClientRect();
+          expect(deselectedRect.width).closeTo(initialRect.width, 1);
+          expect(deselectedRect.height).closeTo(initialRect.height, 1);
+        });
       });
 
       suite('validation', function() {