From 72670d7bef87e607eb3515199fbd1cd3b8e495ff Mon Sep 17 00:00:00 2001 From: Marcos Santos Date: Thu, 8 Jul 2021 09:27:23 -0300 Subject: [PATCH 1/4] Fix wrong animation for slickGoTo --- src/utils/innerSliderUtils.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/utils/innerSliderUtils.js b/src/utils/innerSliderUtils.js index c06029d0a..3ae34e7cd 100644 --- a/src/utils/innerSliderUtils.js +++ b/src/utils/innerSliderUtils.js @@ -6,10 +6,10 @@ export function clamp(number, lowerBound, upperBound) { export const safePreventDefault = event => { const passiveEvents = ["onTouchStart", "onTouchMove", "onWheel"]; - if(!passiveEvents.includes(event._reactName)) { + if (!passiveEvents.includes(event._reactName)) { event.preventDefault(); } -} +}; export const getOnDemandLazySlides = spec => { let onDemandSlides = []; @@ -297,7 +297,13 @@ export const changeSlide = (spec, options) => { } } else if (options.message === "dots") { // Click on dots - targetSlide = options.index * options.slidesToScroll; + if (options.index === currentSlide) { + targetSlide = options.index; + } else if (slideCount === options.index + 1 && currentSlide === 0) { + targetSlide = -1; + } else { + targetSlide = options.index * options.slidesToScroll || slideCount; + } } else if (options.message === "children") { // Click on the slides targetSlide = options.index; @@ -386,9 +392,12 @@ export const swipeMove = (e, spec) => { let touchSwipeLength = touchObject.swipeLength; if (!infinite) { if ( - (currentSlide === 0 && (swipeDirection === "right" || swipeDirection === "down")) || - (currentSlide + 1 >= dotCount && (swipeDirection === "left" || swipeDirection === "up")) || - (!canGoNext(spec) && (swipeDirection === "left" || swipeDirection === "up")) + (currentSlide === 0 && + (swipeDirection === "right" || swipeDirection === "down")) || + (currentSlide + 1 >= dotCount && + (swipeDirection === "left" || swipeDirection === "up")) || + (!canGoNext(spec) && + (swipeDirection === "left" || swipeDirection === "up")) ) { touchSwipeLength = touchObject.swipeLength * edgeFriction; if (edgeDragged === false && onEdge) { From 266168d24428d2df19bd055590dad9e3ba610463 Mon Sep 17 00:00:00 2001 From: Marcos Santos Date: Thu, 15 Jul 2021 20:20:27 -0300 Subject: [PATCH 2/4] Swap prevArrow position to avoid overlaping on other components --- src/inner-slider.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/inner-slider.js b/src/inner-slider.js index 7cbdb27ad..8f0ffe914 100644 --- a/src/inner-slider.js +++ b/src/inner-slider.js @@ -304,7 +304,8 @@ export class InnerSlider extends React.Component { }; checkImagesLoad = () => { let images = - (this.list && this.list.querySelectorAll && + (this.list && + this.list.querySelectorAll && this.list.querySelectorAll(".slick-slide img")) || []; let imagesCount = images.length, @@ -751,12 +752,12 @@ export class InnerSlider extends React.Component { } return (
- {!this.props.unslick ? prevArrow : ""}
{this.props.children}
+ {!this.props.unslick ? prevArrow : ""} {!this.props.unslick ? nextArrow : ""} {!this.props.unslick ? dots : ""}
From a12d812c76b3347bdd8b0583ec04ce59dcafcfa0 Mon Sep 17 00:00:00 2001 From: Marcos Santos Date: Thu, 15 Jul 2021 20:29:14 -0300 Subject: [PATCH 3/4] lint From 0103d32633496360b415104f9895b1bad08baf07 Mon Sep 17 00:00:00 2001 From: Marcos Santos Date: Thu, 15 Jul 2021 20:32:34 -0300 Subject: [PATCH 4/4] revert alterations --- src/inner-slider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inner-slider.js b/src/inner-slider.js index 8f0ffe914..9ed348239 100644 --- a/src/inner-slider.js +++ b/src/inner-slider.js @@ -752,12 +752,12 @@ export class InnerSlider extends React.Component { } return (
+ {!this.props.unslick ? prevArrow : ""}
{this.props.children}
- {!this.props.unslick ? prevArrow : ""} {!this.props.unslick ? nextArrow : ""} {!this.props.unslick ? dots : ""}