Merge pull request #830 from realwagyu/master

[Feat]: Add robust pinch zoom support
davidjerleke · Apr 29, 2024 · 197399d · 197399d
2 parents 5ae8348 + fd29bde
commit 197399d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/embla-carousel-docs/src/components/Examples/examplesCarouselStyles.ts b/packages/embla-carousel-docs/src/components/Examples/examplesCarouselStyles.ts
@@ -635,7 +635,7 @@ export const examplesCarouselDefaultStyles = (
   const horizontal = axis === 'x'
   const flexDirection = horizontal ? '' : 'flex-direction: column;'
   const spacingDirection = horizontal ? 'left' : 'top'
-  const panDirection = `pan-${horizontal ? 'y' : 'x'}`
+  const panDirection = `pan-${horizontal ? 'y' : 'x'} pinch-zoom`
   const sizeDimention = horizontal ? 'width' : 'height'
   const slideHeight = horizontal ? 'var(--slide-height)' : '100%'
   const containerHeight = horizontal

diff --git a/packages/embla-carousel/src/components/DragHandler.ts b/packages/embla-carousel/src/components/DragHandler.ts
@@ -147,6 +147,8 @@ export function DragHandler(
   }
 
   function move(evt: PointerEventType): void {
+    const isTouchEvt = !isMouseEvent(evt, ownerWindow)
+    if (isTouchEvt && evt.touches.length >= 2) return up(evt)
     const lastScroll = dragTracker.readPoint(evt)
     const lastCross = dragTracker.readPoint(evt, crossAxis)
     const diffScroll = deltaAbs(lastScroll, startScroll)