Skip to content

Better Unzoom on drag controls. #472

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
rpearce merged 9 commits into from
Apr 6, 2024
Merged

Better Unzoom on drag controls. #472

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
010bc20
Initial commit
tshmieldev Mar 19, 2024
bf8dc74
corrected lint errors
tshmieldev Mar 21, 2024
f2ef88d
Fixed lint error on line 564...
tshmieldev Mar 21, 2024
85a9f01
Renamed variables
tshmieldev Mar 26, 2024
5ffbcfb
resolved merge conflict
tshmieldev Mar 26, 2024
9dfa507
fixed missing end of block
tshmieldev Mar 26, 2024
7cb7d70
fixed a lint error
tshmieldev Mar 26, 2024
7c77c15
Merge branch 'main' into dragUnZoomControl
tshmieldev Apr 1, 2024
af2af39
Added requested changes @ line ~558
tshmieldev Apr 1, 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
14 changes: 12 additions & 2 deletions source/Controlled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export interface ControlledProps {
IconZoom?: React.ElementType
isZoomed: boolean
onZoomChange?: (value: boolean) => void
canSwipeToUnzoom?: boolean
swipeToUnzoomThreshold?: number
wrapElement?: 'div' | 'span'
ZoomContent?: (data: {
img: React.ReactElement | null
Expand All @@ -79,6 +81,8 @@ export function Controlled (props: ControlledProps) {
interface ControlledDefaultProps {
a11yNameButtonUnzoom: string
a11yNameButtonZoom: string
canSwipeToUnzoom: boolean
swipeToUnzoomThreshold: number
IconUnzoom: React.ElementType
IconZoom: React.ElementType
wrapElement: 'div' | 'span'
Expand All @@ -101,6 +105,8 @@ class ControlledBase extends React.Component<ControlledPropsWithDefaults, Contro
a11yNameButtonZoom: 'Expand image',
IconUnzoom: ICompress,
IconZoom: IEnlarge,
canSwipeToUnzoom: true,
swipeToUnzoomThreshold: 10,
wrapElement: 'div',
zoomMargin: 0,
}
Expand Down Expand Up @@ -543,6 +549,10 @@ class ControlledBase extends React.Component<ControlledPropsWithDefaults, Contro
* and unzoom if we detect a swipe
*/
handleTouchMove = (e: TouchEvent) => {
if (!this.props.canSwipeToUnzoom) {
return
}

const browserScale = window.visualViewport?.scale ?? 1

if (!this.isScaling && browserScale <= 1 && this.touchYStart != null && e.changedTouches[0]) {
Expand All @@ -551,9 +561,9 @@ class ControlledBase extends React.Component<ControlledPropsWithDefaults, Contro
const max = Math.max(this.touchYStart, this.touchYEnd)
const min = Math.min(this.touchYStart, this.touchYEnd)
const delta = Math.abs(max - min)
const threshold = 10
const { swipeToUnzoomThreshold } = this.props

if (delta > threshold) {
if (delta > swipeToUnzoomThreshold) {
this.touchYStart = undefined
this.touchYEnd = undefined
this.handleUnzoom()
Expand Down