r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix iOS Safari context menu

Browse Source
This commit is contained in:
Eduard Kuzmenko 2020-11-21 10:35:10 +02:00
parent 717710c5de
commit 062645a05e
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/components/misc.ts
View File

@ -3,7 +3,7 @@ import { cancelEvent } from "../helpers/dom";
import mediaSizes from "../helpers/mediaSizes"; import mediaSizes from "../helpers/mediaSizes";
import { clamp } from "../helpers/number"; import { clamp } from "../helpers/number";
import { isTouchSupported } from "../helpers/touchSupport"; import { isTouchSupported } from "../helpers/touchSupport";
import { isApple } from "../helpers/userAgent"; import { isApple, isSafari } from "../helpers/userAgent";
export const loadedURLs: {[url: string]: boolean} = {}; export const loadedURLs: {[url: string]: boolean} = {};
const set = (elem: HTMLElement | HTMLImageElement | SVGImageElement | HTMLVideoElement, url: string) => { const set = (elem: HTMLElement | HTMLImageElement | SVGImageElement | HTMLVideoElement, url: string) => {
@ -118,6 +118,7 @@ let onMouseMove = (e: MouseEvent) => {
}; };
const onClick = (e: MouseEvent | TouchEvent) => { const onClick = (e: MouseEvent | TouchEvent) => {
//cancelEvent(e);
closeBtnMenu(); closeBtnMenu();
}; };
@ -141,15 +142,13 @@ export const closeBtnMenu = () => {
openedMenuOnClose = null; openedMenuOnClose = null;
} }
if(isTouchSupported) { if(!isTouchSupported) {
window.removeEventListener('touchmove', onClick);
} else {
window.removeEventListener('mousemove', onMouseMove); window.removeEventListener('mousemove', onMouseMove);
window.removeEventListener('keydown', onKeyDown, {capture: true});
window.removeEventListener('contextmenu', onClick);
} }
window.removeEventListener('keydown', onKeyDown, {capture: true}); document.removeEventListener('click', onClick);
window.removeEventListener('click', onClick);
window.removeEventListener('contextmenu', onClick);
}; };
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
@ -180,15 +179,14 @@ export function openBtnMenu(menuElement: HTMLElement, onClose?: () => void) {
openedMenuOnClose = onClose; openedMenuOnClose = onClose;
if(isTouchSupported) { if(!isTouchSupported) {
window.addEventListener('touchmove', onClick, {once: true});
} else {
window.addEventListener('mousemove', onMouseMove); window.addEventListener('mousemove', onMouseMove);
window.addEventListener('keydown', onKeyDown, {capture: true});
window.addEventListener('contextmenu', onClick, {once: true});
} }
window.addEventListener('keydown', onKeyDown, {capture: true}); // ! safari iOS doesn't handle window click event on overlay, idk why
window.addEventListener('click', onClick, {once: true}); document.addEventListener('click', onClick);
window.addEventListener('contextmenu', onClick, {once: true});
} }
const PADDING_TOP = 8; const PADDING_TOP = 8;
@ -263,34 +261,17 @@ export function attachContextMenuListener(element: HTMLElement, callback: (e: To
element.addEventListener('touchstart', (e) => { element.addEventListener('touchstart', (e) => {
if(e.touches.length > 1) { if(e.touches.length > 1) {
clearTimeout(timeout); onCancel();
return; return;
} }
element.addEventListener('touchmove', onCancel, {once: true}); element.addEventListener('touchmove', onCancel);
element.addEventListener('touchend', onCancel, {once: true}); element.addEventListener('touchend', onCancel);
element.addEventListener('touchcancel', onCancel, {once: true}); element.addEventListener('touchcancel', onCancel);
/* let eee = (e: TouchEvent) => {
const target = findUpClassName(e.target, 'btn-menu');
if(!target) {
closeBtnMenu();
window.addEventListener('touchend', (e) => {
return cancelEvent(e);
}, {once: true});
}
}; */
timeout = window.setTimeout(() => { timeout = window.setTimeout(() => {
callback(e.touches[0]); callback(e.touches[0]);
onCancel(); onCancel();
/* window.requestAnimationFrame(() => {
window.addEventListener('touchstart', eee);
window.addEventListener('touchend', (e) => {
window.removeEventListener('touchstart', eee);
}, {once: true});
}); */
}, .4e3); }, .4e3);
}); });
} else { } else {