Skip to content

Commit b397862

Browse files
fix(ui5-daterange-picker): working with format pattern containing the delimiter (#2873)
1 parent 569685f commit b397862

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

packages/main/src/DateRangePicker.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,13 @@ class DateRangePicker extends DatePicker {
249249
}
250250

251251
_splitValueByDelimiter(value) {
252-
return value.split(this._effectiveDelimiter).map(date => date.trim()); // just split by delimiter and trim spaces
252+
let valuesArray = [];
253+
const partsArray = value.split(this._effectiveDelimiter);
254+
255+
valuesArray[0] = partsArray.slice(0, partsArray.length / 2).join(this._effectiveDelimiter);
256+
valuesArray[1] = partsArray.slice(partsArray.length / 2).join(this._effectiveDelimiter);
257+
258+
return valuesArray;
253259
}
254260

255261
/**

packages/main/test/pages/DateRangePicker.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ <h3>daterange-picker in Compact</h3>
4747
<ui5-daterange-picker id="daterange-picker5" delimiter="@"></ui5-daterange-picker>
4848
</div>
4949
</section>
50-
50+
<h3>daterange-picker with format pattern yyyy-MM-ddy</h3>
51+
<ui5-daterange-picker id="daterange-picker6" format-pattern="yyyy-MM-dd"></ui5-daterange-picker>
5152
<h3>DateRange Picker with one date selected as first & last</h3>
52-
<ui5-daterange-picker id="daterange-picker5" value="Aug 20, 2020 - Aug 20, 2020"></ui5-daterange-picker>
53+
<ui5-daterange-picker id="daterange-picker7" value="Aug 20, 2020 - Aug 20, 2020"></ui5-daterange-picker>
54+
5355
</div>
5456
<script>
5557
document.getElementById('daterange-picker1').addEventListener('ui5-change', function(e) {

packages/main/test/specs/DateRangePicker.spec.js

+11
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,15 @@ describe("DateRangePicker general interaction", () => {
169169
assert.strictEqual(dateRangePicker.getAttribute("value"), "Jul 16, 2020 @ Jul 17, 2020");
170170
});
171171

172+
it("Delimiter is part of the format pattern", () => {
173+
browser.url("http://localhost:8080/test-resources/pages/DateRangePicker.html");
174+
const daterangepicker = browser.$("#daterange-picker6");
175+
176+
daterangepicker.click();
177+
daterangepicker.keys("2020-09-09 - 2020-10-10");
178+
daterangepicker.keys("Enter");
179+
180+
assert.strictEqual(daterangepicker.shadow$("ui5-input").getProperty("valueState"), "None", "The value state is on none");
181+
});
182+
172183
});

0 commit comments

Comments
 (0)