Skip to content

fix(material/datepicker): Update strategy to handle dragging across m… #26341

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

Merged
merged 1 commit into from
Jan 3, 2023
Merged

fix(material/datepicker): Update strategy to handle dragging across m… #26341

Show file tree
Hide file tree
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
100 changes: 100 additions & 0 deletions src/material/datepicker/date-range-selection-strategy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import {TestBed} from '@angular/core/testing';
import {MatNativeDateModule} from '@angular/material/core';

import {JAN, FEB, MAR} from '../testing';
import {
MAT_DATE_RANGE_SELECTION_STRATEGY,
DefaultMatCalendarRangeStrategy,
} from './date-range-selection-strategy';
import {DateRange} from './date-selection-model';

describe('DefaultMatCalendarRangeStrategy', () => {
let strategy: DefaultMatCalendarRangeStrategy<Date>;

beforeEach(() => {
TestBed.configureTestingModule({
imports: [MatNativeDateModule],
providers: [
{provide: MAT_DATE_RANGE_SELECTION_STRATEGY, useClass: DefaultMatCalendarRangeStrategy},
],
});

strategy = TestBed.inject(
MAT_DATE_RANGE_SELECTION_STRATEGY,
) as DefaultMatCalendarRangeStrategy<Date>;
});

describe('createDrag', () => {
const initialRange = new DateRange(new Date(2017, FEB, 10), new Date(2017, FEB, 13));

it('drags the range start', () => {
const rangeStart = new Date(2017, FEB, 10);

// Grow range.
expect(strategy.createDrag(rangeStart, initialRange, new Date(2017, FEB, 9))).toEqual(
new DateRange(new Date(2017, FEB, 9), new Date(2017, FEB, 13)),
);
expect(strategy.createDrag(rangeStart, initialRange, new Date(2016, JAN, 9))).toEqual(
new DateRange(new Date(2016, JAN, 9), new Date(2017, FEB, 13)),
);

// Shrink range.
expect(strategy.createDrag(rangeStart, initialRange, new Date(2017, FEB, 11))).toEqual(
new DateRange(new Date(2017, FEB, 11), new Date(2017, FEB, 13)),
);

// Move range after end.
expect(strategy.createDrag(rangeStart, initialRange, new Date(2017, FEB, 14))).toEqual(
new DateRange(new Date(2017, FEB, 14), new Date(2017, FEB, 17)),
);
expect(strategy.createDrag(rangeStart, initialRange, new Date(2018, MAR, 14))).toEqual(
new DateRange(new Date(2018, MAR, 14), new Date(2018, MAR, 17)),
);
});

it('drags the range end', () => {
const rangeEnd = new Date(2017, FEB, 13);

// Grow range.
expect(strategy.createDrag(rangeEnd, initialRange, new Date(2017, FEB, 14))).toEqual(
new DateRange(new Date(2017, FEB, 10), new Date(2017, FEB, 14)),
);
expect(strategy.createDrag(rangeEnd, initialRange, new Date(2018, MAR, 14))).toEqual(
new DateRange(new Date(2017, FEB, 10), new Date(2018, MAR, 14)),
);

// Shrink range.
expect(strategy.createDrag(rangeEnd, initialRange, new Date(2017, FEB, 12))).toEqual(
new DateRange(new Date(2017, FEB, 10), new Date(2017, FEB, 12)),
);

// Move range before start.
expect(strategy.createDrag(rangeEnd, initialRange, new Date(2017, FEB, 9))).toEqual(
new DateRange(new Date(2017, FEB, 6), new Date(2017, FEB, 9)),
);
expect(strategy.createDrag(rangeEnd, initialRange, new Date(2016, JAN, 9))).toEqual(
new DateRange(new Date(2016, JAN, 6), new Date(2016, JAN, 9)),
);
});

it('drags the range middle', () => {
const rangeMiddle = new Date(2017, FEB, 11);

// Move range earlier.
expect(strategy.createDrag(rangeMiddle, initialRange, new Date(2017, FEB, 7))).toEqual(
new DateRange(new Date(2017, FEB, 6), new Date(2017, FEB, 9)),
);
expect(strategy.createDrag(rangeMiddle, initialRange, new Date(2016, JAN, 7))).toEqual(
new DateRange(new Date(2016, JAN, 6), new Date(2016, JAN, 9)),
);

// Move range later.
expect(strategy.createDrag(rangeMiddle, initialRange, new Date(2017, FEB, 15))).toEqual(
new DateRange(new Date(2017, FEB, 14), new Date(2017, FEB, 17)),
);
expect(strategy.createDrag(rangeMiddle, initialRange, new Date(2018, MAR, 15))).toEqual(
new DateRange(new Date(2018, MAR, 14), new Date(2018, MAR, 17)),
);
});
});
});
32 changes: 22 additions & 10 deletions src/material/datepicker/date-range-selection-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,22 +97,34 @@ export class DefaultMatCalendarRangeStrategy<D> implements MatDateRangeSelection
return null;
}

const diff = this._dateAdapter.compareDate(newDate, dragOrigin);
const isRange = this._dateAdapter.compareDate(start, end) !== 0;
const adapter = this._dateAdapter;

if (isRange && this._dateAdapter.sameDate(dragOrigin, originalRange.start)) {
const isRange = adapter.compareDate(start, end) !== 0;
const diffYears = adapter.getYear(newDate) - adapter.getYear(dragOrigin);
const diffMonths = adapter.getMonth(newDate) - adapter.getMonth(dragOrigin);
const diffDays = adapter.getDate(newDate) - adapter.getDate(dragOrigin);

if (isRange && adapter.sameDate(dragOrigin, originalRange.start)) {
start = newDate;
if (this._dateAdapter.compareDate(newDate, end) > 0) {
end = this._dateAdapter.addCalendarDays(end, diff);
if (adapter.compareDate(newDate, end) > 0) {
end = adapter.addCalendarYears(end, diffYears);
end = adapter.addCalendarMonths(end, diffMonths);
end = adapter.addCalendarDays(end, diffDays);
}
} else if (isRange && this._dateAdapter.sameDate(dragOrigin, originalRange.end)) {
} else if (isRange && adapter.sameDate(dragOrigin, originalRange.end)) {
end = newDate;
if (this._dateAdapter.compareDate(newDate, start) < 0) {
start = this._dateAdapter.addCalendarDays(start, diff);
if (adapter.compareDate(newDate, start) < 0) {
start = adapter.addCalendarYears(start, diffYears);
start = adapter.addCalendarMonths(start, diffMonths);
start = adapter.addCalendarDays(start, diffDays);
}
} else {
start = this._dateAdapter.addCalendarDays(start, diff);
end = this._dateAdapter.addCalendarDays(end, diff);
start = adapter.addCalendarYears(start, diffYears);
start = adapter.addCalendarMonths(start, diffMonths);
start = adapter.addCalendarDays(start, diffDays);
end = adapter.addCalendarYears(end, diffYears);
end = adapter.addCalendarMonths(end, diffMonths);
end = adapter.addCalendarDays(end, diffDays);
}

return new DateRange<D>(start, end);
Expand Down