Dropdown close cancellation fixed for wrapped date picker

vaadin · May 9, 2016 · 75f300c · 75f300c
1 parent 0240e19
commit 75f300c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 7 deletions.
diff --git a/test/dropdown.html b/test/dropdown.html
@@ -4,9 +4,16 @@
 <head>
   <meta charset="utf-8">
   <script src="../../web-component-tester/browser.js"></script>
-
+  <script src="../../iron-test-helpers/mock-interactions.js"></script>
   <link rel="import" href="../vaadin-date-picker.html">
   <script src="common.js"></script>
+  <script>
+    HTMLImports.whenReady(function() {
+      Polymer({
+        is: 'vaadin-date-picker-wrapper'
+      });
+    });
+  </script>
 </head>
 
 <body>
@@ -17,6 +24,18 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="datepicker-wrapped">
+    <template>
+      <vaadin-date-picker-wrapper></vaadin-date-picker-wrapper>
+    </template>
+  </test-fixture>
+
+  <dom-module id="vaadin-date-picker-wrapper">
+    <template>
+      <vaadin-date-picker id="datepicker" label="foo"></vaadin-date-picker>
+    </template>
+  </dom-module>
+
   <script>
     describe('Dropdown', function() {
       var datepicker;
@@ -31,12 +50,9 @@
         datepicker.async(done, 1);
       });
 
-      it('should not close on calendar icon mousedown', function(done) {
+      it('should not close on calendar icon down', function(done) {
         datepicker.addEventListener('iron-overlay-opened', function() {
-          Polymer.Base.fire('mousedown', {}, {
-            bubbles: true,
-            node: datepicker.$.calendar
-          });
+          MockInteractions.down(datepicker.$.calendar);
           expect(datepicker.$.dropdown.opened).to.be.true;
 
           done();
@@ -119,6 +135,29 @@
 
       });
     });
+
+    describe('Dropdown-wrapped', function() {
+      var datepicker;
+
+      beforeEach(function() {
+        datepicker = fixture('datepicker-wrapped').$.datepicker;
+      });
+
+      afterEach(function(done) {
+        datepicker.async(done, 1);
+      });
+
+      it('should not close on calendar icon down', function(done) {
+        datepicker.addEventListener('iron-overlay-opened', function() {
+          MockInteractions.down(datepicker.$.calendar);
+          expect(datepicker.$.dropdown.opened).to.be.true;
+
+          done();
+        });
+        datepicker.open();
+      });
+
+    });
   </script>
 
 </body>

diff --git a/vaadin-date-picker.html b/vaadin-date-picker.html
@@ -497,7 +497,8 @@
       },
 
       _preventCancelOnComponentAccess: function(e) {
-        if (/tap|mousedown|touchstart/.test(e.detail.type) && this.contains(e.detail.target)) {
+        var event = Polymer.dom(e.detail);
+        if (/tap|mousedown|touchstart/.test(e.detail.type) && event.path.indexOf(this) > -1) {
           e.preventDefault();
         }
       },