Merge pull request #1863 from akiran/final-aug11

fix to swipe issues

Author: akiran

package.json

@@ -10,8 +10,10 @@
   "scripts": {
     "start": "gulp server",
     "demo": "SINGLE_DEMO=true gulp server",
-    "build": "gulp clean && gulp sass && gulp copy && webpack",
-    "prepublish": "babel ./src --out-dir ./lib && gulp dist",
+    "build-dev": "gulp clean && gulp sass && gulp copy && webpack",
+    "lib": "babel ./src --out-dir ./lib",
+    "build": "npm run lib && gulp dist",
+    "prepublish": "npm run build",
     "test": "npm run lint && jest",
     "test:watch": "jest --watch",
     "lint": "eslint src",

src/inner-slider.js

@@ -387,7 +387,11 @@ export class InnerSlider extends React.Component {
       clearTimeout(this.animationEndCallback);
     }
     this.setState(state, () => {
-      asNavFor && asNavFor.innerSlider.slideHandler(index);
+      // asNavForIndex check is to avoid recursive calls of slideHandler in waitForAnimate=false mode
+      if (asNavFor && this.asNavForIndex !== index) {
+        this.asNavForIndex = index;
+        asNavFor.innerSlider.slideHandler(index);
+      }
       if (!nextState) return;
       this.animationEndCallback = setTimeout(() => {
         const { animating, ...firstBatch } = nextState;
@@ -472,6 +476,7 @@ export class InnerSlider extends React.Component {
     this.setState(state);
     if (triggerSlideHandler === undefined) return;
     this.slideHandler(triggerSlideHandler);
+    this.clickable = true;
     if (this.props.verticalSwiping) {
       this.enableBodyScroll();
     }
@@ -618,7 +623,8 @@ export class InnerSlider extends React.Component {
       onMouseEnter: pauseOnHover ? this.onTrackOver : null,
       onMouseLeave: pauseOnHover ? this.onTrackLeave : null,
       onMouseOver: pauseOnHover ? this.onTrackOver : null,
-      focusOnSelect: this.props.focusOnSelect ? this.selectHandler : null
+      focusOnSelect:
+        this.props.focusOnSelect && this.clickable ? this.selectHandler : null
     };
 
     var dots;

src/utils/innerSliderUtils.js

@@ -176,7 +176,7 @@ export const slideHandler = spec => {
     finalLeft;
   let state = {},
     nextState = {};
-  const targetSlide = infinite ? index : clamp(index, 0, slideCount);
+  const targetSlide = infinite ? index : clamp(index, 0, slideCount - 1);
   if (fade) {
     if (!infinite && (index < 0 || index >= slideCount)) return {};
     if (index < 0) {
@@ -426,10 +426,12 @@ export const swipeEnd = (e, spec) => {
     touchThreshold,
     verticalSwiping,
     listHeight,
-    currentSlide,
     swipeToSlide,
     scrolling,
-    onSwipe
+    onSwipe,
+    targetSlide,
+    currentSlide,
+    infinite
   } = spec;
   if (!dragging) {
     if (swipe) e.preventDefault();
@@ -461,21 +463,22 @@ export const swipeEnd = (e, spec) => {
       onSwipe(swipeDirection);
     }
     let slideCount, newSlide;
+    let activeSlide = infinite ? currentSlide : targetSlide;
     switch (swipeDirection) {
       case "left":
       case "up":
-        newSlide = currentSlide + getSlideCount(spec);
+        newSlide = activeSlide + getSlideCount(spec);
         slideCount = swipeToSlide ? checkNavigable(spec, newSlide) : newSlide;
         state["currentDirection"] = 0;
         break;
       case "right":
       case "down":
-        newSlide = currentSlide - getSlideCount(spec);
+        newSlide = activeSlide - getSlideCount(spec);
         slideCount = swipeToSlide ? checkNavigable(spec, newSlide) : newSlide;
         state["currentDirection"] = 1;
         break;
       default:
-        slideCount = currentSlide;
+        slideCount = activeSlide;
     }
     state["triggerSlideHandler"] = slideCount;
   } else {