mirror of
https://github.com/GoogleChromeLabs/squoosh.git
synced 2025-11-15 01:59:57 +00:00
Fix pinch zoom on iOS (#1133)
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import PointerTracker, { Pointer } from 'pointer-tracker';
|
||||
import 'add-css:./styles.css';
|
||||
import { isSafari } from 'client/lazy-app/util';
|
||||
|
||||
interface Point {
|
||||
clientX: number;
|
||||
@@ -105,14 +106,23 @@ export default class PinchZoom extends HTMLElement {
|
||||
const pointerTracker: PointerTracker = new PointerTracker(this, {
|
||||
start: (pointer, event) => {
|
||||
// We only want to track 2 pointers at most
|
||||
if (pointerTracker.currentPointers.length === 2 || !this._positioningEl)
|
||||
if (
|
||||
pointerTracker.currentPointers.length === 2 ||
|
||||
!this._positioningEl
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
event.preventDefault();
|
||||
return true;
|
||||
},
|
||||
move: (previousPointers) => {
|
||||
this._onPointerMove(previousPointers, pointerTracker.currentPointers);
|
||||
},
|
||||
// Unfortunately Safari on iOS has a bug where pointer event capturing
|
||||
// doesn't work in some cases, and we hit those cases due to our event
|
||||
// retargeting in pinch-zoom.
|
||||
// https://bugs.webkit.org/show_bug.cgi?id=220196
|
||||
avoidPointerEvents: isSafari,
|
||||
});
|
||||
|
||||
this.addEventListener('wheel', (event) => this._onWheel(event));
|
||||
|
||||
@@ -5,7 +5,7 @@ import './custom-els/PinchZoom';
|
||||
import './custom-els/TwoUp';
|
||||
import * as style from './style.css';
|
||||
import 'add-css:./style.css';
|
||||
import { shallowEqual } from '../../util';
|
||||
import { isSafari, shallowEqual } from '../../util';
|
||||
import {
|
||||
ToggleBackgroundIcon,
|
||||
AddIcon,
|
||||
@@ -19,7 +19,6 @@ import { cleanSet } from '../../util/clean-modify';
|
||||
import type { SourceImage } from '../../Compress';
|
||||
import { linkRef } from 'shared/prerendered-app/util';
|
||||
import { drawDataToCanvas } from 'client/lazy-app/util/canvas';
|
||||
|
||||
interface Props {
|
||||
source?: SourceImage;
|
||||
preprocessorState?: PreprocessorState;
|
||||
@@ -275,7 +274,11 @@ export default class Output extends Component<Props, State> {
|
||||
onTouchStartCapture={this.onRetargetableEvent}
|
||||
onTouchEndCapture={this.onRetargetableEvent}
|
||||
onTouchMoveCapture={this.onRetargetableEvent}
|
||||
onPointerDownCapture={this.onRetargetableEvent}
|
||||
onPointerDownCapture={
|
||||
// We avoid pointer events in our PinchZoom due to a Safari bug.
|
||||
// That means we also need to avoid them here too, else we end up preventing the fallback mouse events.
|
||||
isSafari ? undefined : this.onRetargetableEvent
|
||||
}
|
||||
onMouseDownCapture={this.onRetargetableEvent}
|
||||
onWheelCapture={this.onRetargetableEvent}
|
||||
>
|
||||
|
||||
@@ -295,3 +295,7 @@ export async function abortable<T>(
|
||||
}),
|
||||
]);
|
||||
}
|
||||
|
||||
export const isSafari =
|
||||
/Safari\//.test(navigator.userAgent) &&
|
||||
!/Chrom(e|ium)\//.test(navigator.userAgent);
|
||||
|
||||
Reference in New Issue
Block a user