Skip to content

fix(timepicker): allowing better scroll on touchpads #6292 - 19.2 #15639

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

Open
wants to merge 5 commits into
base: 19.2.x
Choose a base branch
from
Open

fix(timepicker): allowing better scroll on touchpads #6292 - 19.2 #15639

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
064f4da
fix(timepicker): allowing better scroll on touchpads #6292
ChronosSF Apr 1, 2025
81d24d1
Merge branch 'master' into sstoychev/touch-scroll-time-picker
kdinev Apr 2, 2025
7f60979
Merge branch 'master' into sstoychev/touch-scroll-time-picker
ChronosSF Apr 8, 2025
2145e22
Merge branch 'master' into sstoychev/touch-scroll-time-picker
ChronosSF Apr 10, 2025
4211a3d
Merge branch 'master' into sstoychev/touch-scroll-time-picker
ChronosSF Apr 15, 2025
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
31 changes: 25 additions & 6 deletions projects/igniteui-angular/src/lib/time-picker/time-picker.directives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ export class IgxItemListDirective implements OnInit, OnDestroy {

public isActive: boolean;

private readonly SCROLL_THRESHOLD = 15;
private readonly PAN_THRESHOLD = 10;

/**
* accumulates wheel scrolls and triggers a change action above SCROLL_THRESHOLD
*/
private scrollAccumulator = 0;

constructor(
@Inject(IGX_TIME_PICKER_COMPONENT) public timePicker: IgxTimePickerBase,
private elementRef: ElementRef,
Expand Down Expand Up @@ -170,24 +178,35 @@ export class IgxItemListDirective implements OnInit, OnDestroy {
event.preventDefault();
event.stopPropagation();

const delta = event.deltaY;
if (delta !== 0) {
this.nextItem(delta);
this.scrollAccumulator += event.deltaY;
if (Math.abs(this.scrollAccumulator) > this.SCROLL_THRESHOLD) {
this.nextItem(this.scrollAccumulator);
this.scrollAccumulator = 0;
}
}

/**
* @hidden @internal
*/
public ngOnInit() {
const hammerOptions: HammerOptions = { recognizers: [[HammerGesturesManager.Hammer?.Pan, { direction: HammerGesturesManager.Hammer?.DIRECTION_VERTICAL, threshold: 10 }]] };
const hammerOptions: HammerOptions = {
recognizers: [
[
HammerGesturesManager.Hammer?.Pan,
{
direction: HammerGesturesManager.Hammer?.DIRECTION_VERTICAL,
threshold: this.PAN_THRESHOLD
}
]
]
};
this.touchManager.addEventListener(this.elementRef.nativeElement, 'pan', this.onPanMove, hammerOptions);
}

/**
* @hidden @internal
*/
public ngOnDestroy() {
public ngOnDestroy() {
this.touchManager.destroy();
}

Expand Down Expand Up @@ -355,7 +374,7 @@ export class IgxTimeItemDirective {
private getHourPart(date: Date): string {
const inputDateParts = DateTimeUtil.parseDateTimeFormat(this.timePicker.appliedFormat);
const hourPart = inputDateParts.find(element => element.type === 'hours');
const ampmPart = inputDateParts.find(element =>element.format.indexOf('a') !== -1 || element.format === 'tt');
const ampmPart = inputDateParts.find(element => element.format.indexOf('a') !== -1 || element.format === 'tt');
const hour = DateTimeUtil.getPartValue(date, hourPart, hourPart.format.length);
if (ampmPart) {
const ampm = DateTimeUtil.getPartValue(date, ampmPart, ampmPart.format.length);
Expand Down
Loading