Merge pull request #61 from yifaneye/dev

yifaneye · web-flow · commit 205bc3ac23a5 · 2021-12-05T15:31:34.000+11:00
v0.2.6
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,6 @@
 build/
 dist/
 node_modules/
+public/
 .snapshots/
-*.min.js
+*.min.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 [![NPM](https://img.shields.io/npm/v/react-gallery-carousel.svg)](https://www.npmjs.com/package/react-gallery-carousel)
 
+## v0.2.6 (2021-12-06)
+
+### Enhancements
+
+- Fix swiping stuck after zoom issue.
+  ([Issue #44](https://github.com/yifaneye/react-gallery-carousel/issues/44))
+
+- Remove title for icons.
+  ([Issue #60](https://github.com/yifaneye/react-gallery-carousel/issues/60))
+
 ## v0.2.5 (2021-10-30)
 
 ### Enhancements
diff --git a/example/src/components/Footer.js b/example/src/components/Footer.js
@@ -5,7 +5,7 @@ const Footer = () => {
   return (
     <footer className='section'>
       <div className='action-container'>
-        <strong>react-gallery-carousel (v0.2.5)</strong>
+        <strong>react-gallery-carousel (v0.2.6)</strong>
         <div className='star-button-container'>
           <GitHubButton
             href='https://github.com/yifaneye/react-gallery-carousel'
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-gallery-carousel",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Mobile-friendly Carousel with batteries included (supporting touch, mouse emulation, lazy loading, thumbnails, fullscreen, RTL, keyboard navigation and customisations).",
   "author": "yifaneye",
   "license": "MIT",
diff --git a/src/components/Carousel/Carousel.module.css b/src/components/Carousel/Carousel.module.css
@@ -42,7 +42,6 @@
   display: flex;
   justify-content: flex-start;
   align-items: flex-start;
-  touch-action: auto;
   flex: 0 1 auto;
 }
 
diff --git a/src/components/Carousel/__snapshots__/Carousel.test.js.snap b/src/components/Carousel/__snapshots__/Carousel.test.js.snap
@@ -262,9 +262,6 @@ Array [
               width="30"
               xmlns="http://www.w3.org/2000/svg"
             >
-              <title>
-                Play
-              </title>
               <path
                 d="m1 1v28l28-14z"
               />
@@ -306,9 +303,6 @@ Array [
               width="30"
               xmlns="http://www.w3.org/2000/svg"
             >
-              <title>
-                Minimize
-              </title>
               <path
                 d="m6 1v5h-5v5h10v-10zm13 0v10h10v-5h-5v-5zm-18 18v5h5v5h5v-10zm18 0v10h5v-5h5v-5z"
               />
@@ -338,9 +332,6 @@ Array [
               width="20"
               xmlns="http://www.w3.org/2000/svg"
             >
-              <title>
-                Left
-              </title>
               <path
                 d="m19 1v37l-18-20z"
               />
@@ -370,9 +361,6 @@ Array [
               width="20"
               xmlns="http://www.w3.org/2000/svg"
             >
-              <title>
-                Right
-              </title>
               <path
                 d="m1 1v38l18-19z"
               />
@@ -747,9 +735,6 @@ exports[`Carousel renders the same as snapshot 1`] = `
             width="30"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <title>
-              Play
-            </title>
             <path
               d="m1 1v28l28-14z"
             />
@@ -791,9 +776,6 @@ exports[`Carousel renders the same as snapshot 1`] = `
             width="30"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <title>
-              Maximize
-            </title>
             <path
               d="m1 1v10h5v-5h5v-5zm18 0v5h5v5h5v-10zm-18 18v10h10v-5h-5v-5zm18 5v5h10v-10h-5v5z"
             />
@@ -823,9 +805,6 @@ exports[`Carousel renders the same as snapshot 1`] = `
             width="20"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <title>
-              Left
-            </title>
             <path
               d="m19 1v37l-18-20z"
             />
@@ -855,9 +834,6 @@ exports[`Carousel renders the same as snapshot 1`] = `
             width="20"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <title>
-              Right
-            </title>
             <path
               d="m1 1v38l18-19z"
             />
diff --git a/src/components/IconButton/IconButton.js b/src/components/IconButton/IconButton.js
@@ -15,7 +15,6 @@ const icons = {
         width='20'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Left</title>
         <path d='m19 1v37l-18-20z' />
       </svg>
     </div>
@@ -31,7 +30,6 @@ const icons = {
         width='20'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Right</title>
         <path d='m1 1v38l18-19z' />
       </svg>
     </div>
@@ -47,7 +45,6 @@ const icons = {
         width='30'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Play</title>
         <path d='m1 1v28l28-14z' />
       </svg>
     </div>
@@ -63,7 +60,6 @@ const icons = {
         width='30'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Pause</title>
         <path d='m1 1v28h9v-28zm19 0v28h9v-28z' />
       </svg>
     </div>
@@ -79,7 +75,6 @@ const icons = {
         width='30'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Maximize</title>
         <path d='m1 1v10h5v-5h5v-5zm18 0v5h5v5h5v-10zm-18 18v10h10v-5h-5v-5zm18 5v5h10v-10h-5v5z' />
       </svg>
     </div>
@@ -95,7 +90,6 @@ const icons = {
         width='30'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Minimize</title>
         <path d='m6 1v5h-5v5h10v-10zm13 0v10h10v-5h-5v-5zm-18 18v5h5v5h5v-10zm18 0v10h5v-5h5v-5z' />
       </svg>
     </div>
@@ -111,7 +105,6 @@ const icons = {
         width='10'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Stay</title>
         <circle cx='5' cy='5' r='4' fill='#888' />
       </svg>
     </div>
@@ -127,7 +120,6 @@ const icons = {
         width='10'
         xmlns='http://www.w3.org/2000/svg'
       >
-        <title>Go</title>
         <circle cx='5' cy='5' r='4' />
       </svg>
     </div>
diff --git a/src/utils/useTouch.js b/src/utils/useTouch.js
@@ -50,19 +50,8 @@ const useTouch = (elementRef, { onTouchMove, onTouchEnd, onTap }) => {
       event.preventDefault();
   };
 
-  const shouldOmitEvent = (event, displacementX = 0) => {
-    if (touchDistinguisher.isPinch(event)) return true;
-
-    // window.visualViewport is not yet supported on IE
-    if (!('visualViewport' in window)) return false;
-
-    const { scale, offsetLeft, width } = window.visualViewport;
-    if (scale <= 1) return false;
-    // pan right at or beyond the left edge
-    if (offsetLeft <= 0 && displacementX > 0) return false;
-    // pan left at or beyond the right edge
-    if (offsetLeft + width >= width * scale && displacementX < 0) return false;
-    return true;
+  const shouldOmitEvent = (event) => {
+    return !!touchDistinguisher.isPinch(event);
   };
 
   const handleTouchStart = (event) => {
@@ -78,7 +67,7 @@ const useTouch = (elementRef, { onTouchMove, onTouchEnd, onTap }) => {
     event.stopPropagation();
     if (!isTouchStarted) return;
     const displacementX = event.changedTouches[0].clientX - touchStartX;
-    if (shouldOmitEvent(event, displacementX)) return;
+    if (shouldOmitEvent(event)) return;
     const displacementY = event.changedTouches[0].clientY - touchStartY;
     handleVerticalMovement(event, displacementX, displacementY);
     onTouchMove(displacementX, displacementY);
@@ -94,7 +83,7 @@ const useTouch = (elementRef, { onTouchMove, onTouchEnd, onTap }) => {
     event.stopPropagation();
     if (!isTouchStarted) return;
     const displacementX = event.changedTouches[0].clientX - touchStartX;
-    if (shouldOmitEvent(event, displacementX)) {
+    if (shouldOmitEvent(event)) {
       onTouchEnd(0, 0, 0);
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-gallery-carousel",`
`3`		`- "version": "0.2.5",`
	`3`	`+ "version": "0.2.6",`
`4`	`4`	`"description": "Mobile-friendly Carousel with batteries included (supporting touch, mouse emulation, lazy loading, thumbnails, fullscreen, RTL, keyboard navigation and customisations).",`
`5`	`5`	`"author": "yifaneye",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@`
`42`	`42`	`display: flex;`
`43`	`43`	`justify-content: flex-start;`
`44`	`44`	`align-items: flex-start;`
`45`		`- touch-action: auto;`
`46`	`45`	`flex: 0 1 auto;`
`47`	`46`	`}`
`48`	`47`