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

fix(kit): CalendarRange delete code for availableRange property #8677

Merged
merged 1 commit into from
Aug 26, 2024
Merged

fix(kit): CalendarRange delete code for availableRange property #8677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 2 additions & 57 deletions projects/kit/components/calendar-range/calendar-range.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export class TuiCalendarRangeComponent implements TuiWithOptionalMinMax<TuiDay>
@Output()
readonly itemChange = new EventEmitter<TuiDayRangePeriod | null>();

availableRange: TuiDayRange | null = null;
previousValue: TuiDayRange | null = null;

readonly maxLengthMapper = MAX_DAY_RANGE_LENGTH_MAPPER;
Expand Down Expand Up @@ -202,7 +201,6 @@ export class TuiCalendarRangeComponent implements TuiWithOptionalMinMax<TuiDay>

if (value === null || !value.isSingleDay) {
this.value = new TuiDayRange(day, day);
this.availableRange = this.findAvailableRange();
this.itemChange.emit(this.findItemByDayRange(this.value));

return;
Expand Down Expand Up @@ -260,7 +258,7 @@ export class TuiCalendarRangeComponent implements TuiWithOptionalMinMax<TuiDay>
): TuiBooleanHandler<TuiDay> {
return item => {
if (!value?.isSingleDay || !minLength) {
return this.isDisabledItem(disabledItemHandler, value, item);
return disabledItemHandler(item);
}

const negativeMinLength = tuiObjectFromEntries(
Expand All @@ -271,63 +269,10 @@ export class TuiCalendarRangeComponent implements TuiWithOptionalMinMax<TuiDay>
const inDisabledRange =
disabledBefore.dayBefore(item) && disabledAfter.dayAfter(item);

return (
inDisabledRange || this.isDisabledItem(disabledItemHandler, value, item)
);
return inDisabledRange || disabledItemHandler(item);
};
}

private isDisabledItem(
disabledItemHandler: TuiBooleanHandler<TuiDay>,
value: TuiDayRange | null,
item: TuiDay,
): boolean {
return (
disabledItemHandler(item) ||
(!!value?.isSingleDay && !this.availableRangeContainsItem(item))
);
}

private availableRangeContainsItem(item: TuiDay): boolean {
if (this.availableRange === null) {
return true;
}

const {from, to} = this.availableRange;

return from.daySameOrBefore(item) && to.daySameOrAfter(item);
}

private findAvailableRange(): TuiDayRange | null {
const {disabledItemHandler, value} = this;

if (!value?.isSingleDay || disabledItemHandler === ALWAYS_FALSE_HANDLER) {
return null;
}

let from = value.from;
let to = value.from;

let leftShift = true;
let rightShift = true;

while (leftShift || rightShift) {
leftShift = !disabledItemHandler(from.append({day: -1}));

if (leftShift) {
from = from.append({day: -1});
}

rightShift = !disabledItemHandler(to.append({day: 1}));

if (rightShift) {
to = to.append({day: 1});
}
}

return new TuiDayRange(from, to);
}

private findItemByDayRange(dayRange: TuiDayRange): TuiDayRangePeriod | null {
return this.items.find(item => dayRange.daySame(item.range)) ?? null;
}
Expand Down
Loading