Skip to content

fix(tap-click): instant activate does not use a setTimeout #26748

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 3 commits into from
Feb 9, 2023
Merged

fix(tap-click): instant activate does not use a setTimeout #26748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
819639e
fix(tap-click): instant activate does not use a setTimeout
liamdebeasi Feb 7, 2023
0d56458
Merge branch 'main' into FW-3010
liamdebeasi Feb 8, 2023
2e36337
Merge branch 'main' into FW-3010
liamdebeasi Feb 9, 2023
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
11 changes: 8 additions & 3 deletions core/src/utils/tap-click/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,17 @@ export const startTapClick = (config: Config) => {
clearDefers.delete(el);
}

const delay = isInstant(el) ? 0 : ADD_ACTIVATED_DEFERS;
el.classList.remove(ACTIVATED);
activeDefer = setTimeout(() => {
const callback = () => {
addActivated(el, x, y);
activeDefer = undefined;
}, delay);
};

if (isInstant(el)) {
callback();
} else {
activeDefer = setTimeout(callback, ADD_ACTIVATED_DEFERS);
}
}
activatableEle = el;
};
Expand Down
5 changes: 2 additions & 3 deletions core/src/utils/tap-click/test/tap-click.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { expect } from '@playwright/test';
import { test } from '@utils/test/playwright';

// TODO FW-3010
test.describe.skip('tap click utility', () => {
test.describe('tap click utility', () => {
test.beforeEach(({ skip }) => {
skip.rtl();
skip.mode('ios');
});
test('it should apply activated class when clicking element', async ({ page }) => {
await page.setContent(`
<ion-app>
<button class="ion-activatable">Click Me</button>
<button class="ion-activatable ion-activatable-instant">Click Me</button>
</ion-app>
`);

Expand Down