fix: #66

dohooo · Mar 30, 2022 · 54e74d2 · 54e74d2
1 parent c508ba1
commit 54e74d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Carousel.tsx b/src/Carousel.tsx
@@ -46,9 +46,10 @@ const Carousel = React.forwardRef<ICarouselInstance, TCarouselProps<any>>(
 
         const commonVariables = useCommonVariables(props);
         const { size, handlerOffsetX } = commonVariables;
+        const dataLength = data.length;
 
         const offsetX = useDerivedValue(() => {
-            const totalSize = size * data.length;
+            const totalSize = size * dataLength;
             const x = handlerOffsetX.value % totalSize;
 
             if (!loop) {

diff --git a/src/hooks/useOnProgressChange.ts b/src/hooks/useOnProgressChange.ts
@@ -13,23 +13,24 @@ export function useOnProgressChange(
     } & Pick<TCarouselProps, 'onProgressChange'>
 ) {
     const { offsetX, rawData, size, onProgressChange } = opts;
+    const rawDataLength = rawData.length;
     useAnimatedReaction(
         () => offsetX.value,
         (_value) => {
             let value = _value;
 
-            if (rawData.length === DATA_LENGTH.SINGLE_ITEM) {
+            if (rawDataLength === DATA_LENGTH.SINGLE_ITEM) {
                 value = value % size;
             }
 
-            if (rawData.length === DATA_LENGTH.DOUBLE_ITEM) {
+            if (rawDataLength === DATA_LENGTH.DOUBLE_ITEM) {
                 value = value % (size * 2);
             }
 
             let absoluteProgress = Math.abs(value / size);
 
             if (value > 0) {
-                absoluteProgress = rawData.length - absoluteProgress;
+                absoluteProgress = rawDataLength - absoluteProgress;
             }
 
             !!onProgressChange &&