fix: sliding error with no loop

Fixes #24
dohooo · Nov 27, 2021 · 955b5ed · 955b5ed
1 parent 094f3af
commit 955b5ed
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Carousel.tsx b/src/Carousel.tsx
@@ -248,8 +248,12 @@ function Carousel<T extends unknown = any>(
 
     const offsetX = useDerivedValue(() => {
         const x = handlerOffsetX.value % computedAnimResult.TOTAL_WIDTH;
+
+        if (!loop) {
+            return handlerOffsetX.value;
+        }
         return isNaN(x) ? 0 : x;
-    }, [computedAnimResult]);
+    }, [computedAnimResult, loop]);
 
     useAnimatedReaction(
         () => offsetX.value,
@@ -323,14 +327,23 @@ function Carousel<T extends unknown = any>(
                     }
 
                     const page = Math.round(handlerOffsetX.value / width);
+
                     const velocityPage = Math.round(
                         (handlerOffsetX.value + e.velocityX) / width
                     );
-                    const pageWithVelocity = Math.min(
+
+                    let pageWithVelocity = Math.min(
                         page + 1,
                         Math.max(page - 1, velocityPage)
                     );
 
+                    if (!loop) {
+                        pageWithVelocity = Math.max(
+                            -(data.length - 1),
+                            Math.min(0, pageWithVelocity)
+                        );
+                    }
+
                     if (loop) {
                         handlerOffsetX.value = _withAnimationCallback(
                             pageWithVelocity * width

diff --git a/src/utils/log.ts b/src/utils/log.ts
@@ -0,0 +1,7 @@
+/**
+ * In worklet
+ * e.g. runOnJS(lop)(...);
+ */
+export function log(msg: any) {
+    console.log(msg);
+}