Merge pull request #350 from snappmarket/fix/kito/slider

Fix slider showing next and prev near end and start
snappmarket · Nov 30, 2020 · 407a6a1 · 407a6a1
2 parents 7609df1 + 3645f33
commit 407a6a1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/packages/ui/packages/Carousel/src/core/core.js b/packages/ui/packages/Carousel/src/core/core.js
@@ -211,7 +211,7 @@ class SliderCore {
     // ----------- start init variables  -----
     this.setSlider(slider);
 
-    const sliderClienWidth = this.getSlider().clientWidth;
+    const sliderClienWidth = this.getSlider().getBoundingClientRect().width;
     this.setSliderMainWidth(sliderClienWidth);
 
     const sliderSlidesSelector = childFider({

diff --git a/packages/ui/packages/Carousel/src/core/utils.js b/packages/ui/packages/Carousel/src/core/utils.js
@@ -351,30 +351,28 @@ export const transitionendWatcher = params => {
     const finalConst = Math.abs(Math.trunc(calcFinalItemPosition(finalPos)));
     const firstConst = Math.abs(Math.trunc(calcFirstItemPosition(finalPos)));
     const translate3dConst = Math.abs(Math.trunc(getTranslate3d(sliderItems)));
-    if (finalConst === translate3dConst) {
-      prevBlock(slider);
-      nextNone(slider);
+    let showNext = true;
+    let showPrev = true;
+    if (finalConst <= translate3dConst + 50) {
+      showNext = false;
     }
     if (!autoWidth) {
-      if (index >= 0 && finalConst > translate3dConst) {
-        nextBlock(slider);
-      }
       if (index === 0) {
-        prevNone(slider);
-        nextBlock(slider);
-      }
-      if (index !== 0) {
-        prevBlock(slider);
+        showPrev = false;
       }
     }
-    if (firstConst === translate3dConst) {
-      prevNone(slider);
+    if (firstConst >= translate3dConst - 50) {
+      showPrev = false;
     }
-    if (autoWidth) {
-      if (firstConst < translate3dConst && finalConst !== translate3dConst) {
-        nextBlock(slider);
-        prevBlock(slider);
-      }
+    if (showNext) {
+      nextBlock(slider);
+    } else {
+      nextNone(slider);
+    }
+    if (showPrev) {
+      prevBlock(slider);
+    } else {
+      prevNone(slider);
     }
   }