Bug Fix: The page index was incorrect in the loop mode (#482).

Splidejs · Nov 4, 2021 · da8452a · da8452a
1 parent 5351ec3
commit da8452a
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 25 deletions.
diff --git a/dist/js/splide-renderer.min.js b/dist/js/splide-renderer.min.js
diff --git a/dist/js/splide.cjs.js b/dist/js/splide.cjs.js
@@ -1,6 +1,6 @@
 /*!
  * Splide.js
- * Version  : 3.2.4
+ * Version  : 3.2.5
  * License  : MIT
  * Copyright: 2021 Naotoshi Fujita
  */
@@ -1392,7 +1392,7 @@ function Controller(Splide2, Components2, options) {
           }
         }
       } else {
-        if (!isLoop && !incremental && dest !== from) {
+        if (!incremental && dest !== from) {
           dest = perMove ? dest : toIndex(toPage(from) + (dest < from ? -1 : 1));
         }
       }

diff --git a/dist/js/splide.esm.js b/dist/js/splide.esm.js
@@ -1,6 +1,6 @@
 /*!
  * Splide.js
- * Version  : 3.2.4
+ * Version  : 3.2.5
  * License  : MIT
  * Copyright: 2021 Naotoshi Fujita
  */
@@ -1388,7 +1388,7 @@ function Controller(Splide2, Components2, options) {
           }
         }
       } else {
-        if (!isLoop && !incremental && dest !== from) {
+        if (!incremental && dest !== from) {
           dest = perMove ? dest : toIndex(toPage(from) + (dest < from ? -1 : 1));
         }
       }

diff --git a/dist/js/splide.js b/dist/js/splide.js
diff --git a/dist/js/splide.js.map b/dist/js/splide.js.map
diff --git a/dist/js/splide.min.js b/dist/js/splide.min.js
diff --git a/dist/js/splide.min.js.gz b/dist/js/splide.min.js.gz
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@splidejs/splide",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Splide is a lightweight, flexible and accessible slider/carousel. No dependencies, no Lighthouse errors.",
   "author": "Naotoshi Fujita",
   "license": "MIT",

diff --git a/src/js/components/Controller/Controller.ts b/src/js/components/Controller/Controller.ts
@@ -243,7 +243,7 @@ export function Controller( Splide: Splide, Components: Components, options: Opt
           }
         }
       } else {
-        if ( ! isLoop && ! incremental && dest !== from ) {
+        if ( ! incremental && dest !== from ) {
           dest = perMove ? dest : toIndex( toPage( from ) + ( dest < from ? -1 : 1 ) );
         }
       }

diff --git a/src/js/components/Controller/test/loop.test.ts b/src/js/components/Controller/test/loop.test.ts
@@ -18,12 +18,18 @@ describe( 'Controller#go()', () => {
     expect( splide.index ).toBe( 0 );
   } );
 
-  test( 'can loop the slider, using the end index.', () => {
-    // The end index is 1.
-    const splide = init( { rewind: true, perPage: 3, speed: 0 }, { length: 4 } );
+  test( 'can loop the slider, using the index of the last page.', () => {
+    // The length is 10 and the last page only contains the slide 9.
+    const splide = init( { type: 'loop', perPage: 3, speed: 0 } );
 
     splide.go( '<' );
-    expect( splide.index ).toBe( 1 );
+    expect( splide.index ).toBe( 9 ); // 9, 0, 1
+
+    splide.go( '<' );
+    expect( splide.index ).toBe( 6 ); // 6, 7, 8
+
+    splide.go( '>' );
+    expect( splide.index ).toBe( 7 ); // 7, 8, 9
 
     splide.go( '>' );
     expect( splide.index ).toBe( 0 );

diff --git a/src/js/test/php/examples/default.php b/src/js/test/php/examples/default.php
@@ -19,14 +19,14 @@
   <script>
     document.addEventListener( 'DOMContentLoaded', function () {
       var splide = new Splide( '#splide01', {
-        type   : 'slide',
-        perPage: 3,
-        perMove: 2,
+        type   : 'loop',
+        perPage: 5,
+        // perMove: 2,
         rewind: true,
-        padding: {
-          right: 0,
-          left: 40,
-        },
+        // padding: {
+        //   right: 0,
+        //   left: 40,
+        // },
         noDrag: 'button',
       } );
 
@@ -58,7 +58,7 @@
 </head>
 <body>
 
-<?php render(); ?>
+<?php render( 'splide01', 12, true ); ?>
 
 <pre></pre>