Skip to content

refactor(tap-click): use pointer events api #29192

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
liamdebeasi merged 2 commits into from
Mar 21, 2024
Merged

refactor(tap-click): use pointer events api #29192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
356dc34
refactor(tap-click): use pointer events api
liamdebeasi Mar 20, 2024
3e16637
Merge branch 'feature-8.0' into tap-click-pointer-event
liamdebeasi Mar 20, 2024
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
47 changes: 6 additions & 41 deletions core/src/utils/tap-click/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { doc } from '@utils/browser';

import type { Config } from '../../interface';
import { now, pointerCoord } from '../helpers';
import { pointerCoord } from '../helpers';

export const startTapClick = (config: Config) => {
if (doc === undefined) {
return;
}

let lastTouch = -MOUSE_WAIT * 10;
let lastActivated = 0;

let activatableEle: HTMLElement | undefined;
Expand All @@ -18,36 +17,6 @@ export const startTapClick = (config: Config) => {
const useRippleEffect = config.getBoolean('animated', true) && config.getBoolean('rippleEffect', true);
const clearDefers = new WeakMap<HTMLElement, any>();

// Touch Events
const onTouchStart = (ev: TouchEvent) => {
lastTouch = now(ev);
pointerDown(ev);
};

const onTouchEnd = (ev: TouchEvent) => {
lastTouch = now(ev);
pointerUp(ev);
};

const onMouseDown = (ev: MouseEvent) => {
// Ignore right clicks
if (ev.button === 2) {
return;
}

const t = now(ev) - MOUSE_WAIT;
if (lastTouch < t) {
pointerDown(ev);
}
};

const onMouseUp = (ev: MouseEvent) => {
const t = now(ev) - MOUSE_WAIT;
if (lastTouch < t) {
pointerUp(ev);
}
};

const cancelActive = () => {
if (activeDefer) clearTimeout(activeDefer);
activeDefer = undefined;
Expand All @@ -57,8 +26,9 @@ export const startTapClick = (config: Config) => {
}
};

const pointerDown = (ev: UIEvent) => {
if (activatableEle) {
const pointerDown = (ev: PointerEvent) => {
// Ignore right clicks
if (activatableEle || ev.button === 2) {
return;
}
setActivatedElement(getActivatableTarget(ev), ev);
Expand Down Expand Up @@ -151,9 +121,8 @@ export const startTapClick = (config: Config) => {

doc.addEventListener('ionGestureCaptured', cancelActive);

doc.addEventListener('touchstart', onTouchStart, true);
doc.addEventListener('touchcancel', onTouchEnd, true);
doc.addEventListener('touchend', onTouchEnd, true);
doc.addEventListener('pointerdown', pointerDown, true);
doc.addEventListener('pointerup', pointerUp, true);

/**
* Tap click effects such as the ripple effect should
Expand All @@ -168,9 +137,6 @@ export const startTapClick = (config: Config) => {
* ion-content's scroll events.
*/
doc.addEventListener('pointercancel', cancelActive, true);

doc.addEventListener('mousedown', onMouseDown, true);
doc.addEventListener('mouseup', onMouseUp, true);
};

// TODO(FW-2832): type
Expand Down Expand Up @@ -213,4 +179,3 @@ const getRippleEffect = (el: HTMLElement) => {
const ACTIVATED = 'ion-activated';
const ADD_ACTIVATED_DEFERS = 100;
const CLEAR_STATE_DEFERS = 150;
const MOUSE_WAIT = 2500;