Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ui5-daterange-picker): initial implementation #1785

Merged
merged 11 commits into from
Jun 30, 2020
Merged

feat(ui5-daterange-picker): initial implementation #1785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eee1e5d
feat(ui5-daterangepicker): initial implementation
tsanislavgatev Jun 12, 2020
3dfe84a
remove redundant code
tsanislavgatev Jun 12, 2020
9281b6d
lint fixes
tsanislavgatev Jun 12, 2020
9f0f0d6
Merge branch 'master' of github.com:SAP/ui5-webcomponents into datera…
tsanislavgatev Jun 15, 2020
f9ae006
tests and review fixes
tsanislavgatev Jun 15, 2020
3d9fdd3
Added marks from comments
tsanislavgatev Jun 16, 2020
51e2029
added placeholder
tsanislavgatev Jun 17, 2020
c01bfff
comments response, test added, bug fixed
tsanislavgatev Jun 19, 2020
22fcbf5
test fixed
tsanislavgatev Jun 19, 2020
c14cfc0
added min width to the input field
tsanislavgatev Jun 19, 2020
3d6cd41
new test and change event fix
tsanislavgatev Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/main/bundle.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import Carousel from "./dist/Carousel.js";
import CheckBox from "./dist/CheckBox.js";
import ComboBox from "./dist/ComboBox.js";
import DatePicker from "./dist/DatePicker.js";
import DateRangePicker from "./dist/DateRangePicker.js";
import DateTimePicker from "./dist/DateTimePicker.js";
import DurationPicker from "./dist/DurationPicker.js";
import Dialog from "./dist/Dialog.js";
Expand Down
13 changes: 8 additions & 5 deletions packages/main/src/DatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ class DatePicker extends UI5Element {
this.maxDate = null;
console.warn(`In order for the "maxDate" property to have effect, you should enter valid date format`); // eslint-disable-line
}
if (this.isValid(this.value) && this.isInValidRange(this._getTimeStampFromString(this.value))) {
if (this._checkValueValidity(this.value)) {
this._changeCalendarSelection();
} else {
this._calendar.selectedDates = [];
Expand Down Expand Up @@ -461,10 +461,9 @@ class DatePicker extends UI5Element {
_handleInputChange() {
let nextValue = this._getInput().getInputValue();
const emptyValue = nextValue === "";
const isValid = emptyValue || this.isValid(nextValue);
const isInValidRange = this.isInValidRange(this._getTimeStampFromString(nextValue));
const isValid = emptyValue || this._checkValueValidity(nextValue);

if (isValid && isInValidRange) {
if (isValid) {
nextValue = this.normalizeValue(nextValue);
this.valueState = ValueState.None;
} else {
Expand All @@ -481,12 +480,16 @@ class DatePicker extends UI5Element {
_handleInputLiveChange() {
const nextValue = this._getInput().getInputValue();
const emptyValue = nextValue === "";
const isValid = emptyValue || (this.isValid(nextValue) && this.isInValidRange(this._getTimeStampFromString(nextValue)));
const isValid = emptyValue || this._checkValueValidity(nextValue);

this.value = nextValue;
this.fireEvent("input", { value: nextValue, valid: isValid });
}

_checkValueValidity(value) {
return this.isValid(value) && this.isInValidRange(this._getTimeStampFromString(value));
}

_click(event) {
if (isPhone()) {
this.responsivePopover.open(this);
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/DateRangePicker.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{>include "./DatePicker.hbs"}}
Loading