From 0142cc7c8a91ee9533dc048b28511f319ad0899e Mon Sep 17 00:00:00 2001 From: Manolo Carrasco Date: Mon, 23 Jul 2018 13:21:17 +0200 Subject: [PATCH 1/2] Add test to check that overlay is not opened when low resolution --- test/keyboard-navigation.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/keyboard-navigation.html b/test/keyboard-navigation.html index 6a0f1bb..d7df2eb 100644 --- a/test/keyboard-navigation.html +++ b/test/keyboard-navigation.html @@ -195,6 +195,11 @@ arrowUp(); expect(spy.callCount).to.eql(0); }); + + it('should open the overlay on arrow up', () => { + arrowUp(); + expect(document.querySelector('vaadin-combo-box-overlay')).to.be.ok; + }); }); describe('with millisecond step', () => { @@ -217,6 +222,12 @@ arrowUp(); expect(timePicker.__inputElement.value).to.be.equal('00:02:00.000'); }); + + it('should not open the overlay on arrow up', () => { + timePicker.step = 0.5; + arrowUp(); + expect(document.querySelector('vaadin-combo-box-overlay')).not.to.be.ok; + }); }); }); From 0f59197edd80e9eb91482ae5112990c670d99849 Mon Sep 17 00:00:00 2001 From: Manolo Carrasco Date: Thu, 26 Jul 2018 18:41:52 +0200 Subject: [PATCH 2/2] Update bower.main with MD, and bump vaadin dependencies --- bower.json | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index 911a982..d0c5b33 100644 --- a/bower.json +++ b/bower.json @@ -5,7 +5,10 @@ "Vaadin Ltd" ], "description": "vaadin-time-picker", - "main": "vaadin-time-picker.html", + "main": [ + "vaadin-time-picker.html", + "theme/material/vaadin-time-picker.html" + ], "keywords": [ "Vaadin", "vaadin-time-picker", @@ -26,13 +29,13 @@ "polymer": "^2.0.0", "iron-a11y-keys-behavior": "^2.0.0", "iron-test-helpers": "^2.0.0", - "vaadin-themable-mixin": "vaadin/vaadin-themable-mixin#^1.2.0", - "vaadin-element-mixin": "vaadin/vaadin-element-mixin#^1.1.0", - "vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.1.0", - "vaadin-material-styles": "vaadin/vaadin-material-styles#^1.1.0-alpha2", - "vaadin-text-field": "vaadin/vaadin-text-field#^2.1.0", - "vaadin-combo-box": "vaadin/vaadin-combo-box#^4.1.0", - "vaadin-control-state-mixin": "vaadin/vaadin-control-state-mixin#^2.1.0" + "vaadin-themable-mixin": "vaadin/vaadin-themable-mixin#^1.2.1", + "vaadin-element-mixin": "vaadin/vaadin-element-mixin#^1.1.2", + "vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.1.0-beta1", + "vaadin-material-styles": "vaadin/vaadin-material-styles#^1.1.0-beta1", + "vaadin-text-field": "vaadin/vaadin-text-field#^2.1.0-beta2", + "vaadin-combo-box": "vaadin/vaadin-combo-box#^4.1.0-beta2", + "vaadin-control-state-mixin": "vaadin/vaadin-control-state-mixin#^2.1.1" }, "devDependencies": { "iron-component-page": "^3.0.0", @@ -40,7 +43,7 @@ "webcomponentsjs": "^1.0.0", "web-component-tester": "^6.1.5", "test-fixture": "^3.0.0", - "vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#^2.0.0", + "vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#^2.0.1", "iron-form": "^2.3.0" } }