javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: implementation issues

Browse Source
This commit is contained in:
Sean Perkins
2024-01-07 16:35:59 -05:00
parent 6295e12543
commit dd5fe792c7
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/components/datetime/datetime.tsx
View File

@@ -659,9 +659,9 @@ export class Datetime implements ComponentInterface {
// we are setting. We can do this by comparing if the validatedParts is before or after
// the first active part. Users can select the same day as the start or end of the range.
const [start, end] = this.activeParts;
if (isBefore(validatedParts, start)) {
if (start !== undefined && isBefore(validatedParts, start)) {
this.activeParts = [validatedParts, end];
} else if (isAfter(validatedParts, end)) {
} else if (end !== undefined && isAfter(validatedParts, end)) {
this.activeParts = [start, validatedParts];
} else {
this.activeParts = [validatedParts, validatedParts];

7
core/src/components/datetime/test/range/index.html
View File

@@ -258,12 +258,7 @@
<div class="grid">
<div class="grid-item">
<h2>Date Range</h2>
<ion-datetime
value="2020-03-14T14:23:00.000Z"
presentation="date"
id="date-range"
range="true"
></ion-datetime>
<ion-datetime presentation="date" id="date-range" range="true"></ion-datetime>
</div>
</div>
</ion-content>

8
core/src/components/datetime/utils/state.ts
View File

@@ -231,7 +231,7 @@ export const getHighlightStyles = (
export const isDateRangeStart = (referenceParts: DatetimeParts, activeParts: DatetimeParts | DatetimeParts[]) => {
if (activeParts !== undefined && Array.isArray(activeParts)) {
const startDate = activeParts[0];
return isSameDay(referenceParts, startDate);
return startDate !== undefined && isSameDay(referenceParts, startDate);
}
return false;
}
@@ -239,7 +239,7 @@ export const isDateRangeStart = (referenceParts: DatetimeParts, activeParts: Dat
export const isDateRangeEnd = (referenceParts: DatetimeParts, activeParts: DatetimeParts | DatetimeParts[]) => {
if (activeParts !== undefined && Array.isArray(activeParts)) {
const endDate = activeParts[1];
return isSameDay(referenceParts, endDate);
return endDate !== undefined && isSameDay(referenceParts, endDate);
}
return false;
}
@@ -248,8 +248,8 @@ export const isDateInRange = (referenceParts: DatetimeParts, activeParts: Dateti
if (activeParts !== undefined && Array.isArray(activeParts)) {
const startDate = activeParts[0];
const endDate = activeParts[1];
const isAfterStart = isAfter(referenceParts, startDate) || isSameDay(referenceParts, startDate);
const isBeforeEnd = isBefore(referenceParts, endDate) || isSameDay(referenceParts, endDate);
const isAfterStart = startDate !== undefined && (isAfter(referenceParts, startDate) || isSameDay(referenceParts, startDate));
const isBeforeEnd = endDate !== undefined && (isBefore(referenceParts, endDate) || isSameDay(referenceParts, endDate));
return isAfterStart && isBeforeEnd;
}
return false;