chore: more Virtual loop

nolimits4web · Dec 6, 2022 · d23e809 · d23e809
1 parent c7d1a50
commit d23e809
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 16 deletions.
diff --git a/src/core/core.js b/src/core/core.js
@@ -529,7 +529,17 @@ class Swiper {
     }
 
     // Slide To Initial Slide
-    swiper.slideTo(swiper.params.initialSlide, 0, swiper.params.runCallbacksOnInit, false, true);
+    if (swiper.params.loop && swiper.virtual && swiper.params.virtual.enabled) {
+      swiper.slideTo(
+        swiper.params.initialSlide + swiper.virtual.slidesBefore,
+        0,
+        swiper.params.runCallbacksOnInit,
+        false,
+        true,
+      );
+    } else {
+      swiper.slideTo(swiper.params.initialSlide, 0, swiper.params.runCallbacksOnInit, false, true);
+    }
 
     // Create loop
     if (swiper.params.loop) {

diff --git a/src/core/events/onResize.js b/src/core/events/onResize.js
@@ -14,6 +14,8 @@ export default function onResize() {
   // Save locks
   const { allowSlideNext, allowSlidePrev, snapGrid } = swiper;
 
+  const isVirtual = swiper.virtual && swiper.params.virtual.enabled;
+
   // Disable locks on resize
   swiper.allowSlideNext = true;
   swiper.allowSlidePrev = true;
@@ -30,7 +32,7 @@ export default function onResize() {
   ) {
     swiper.slideTo(swiper.slides.length - 1, 0, false, true);
   } else {
-    if (swiper.params.loop) {
+    if (swiper.params.loop && !isVirtual) {
       swiper.slideToLoop(swiper.realIndex, 0, false, true);
     } else {
       swiper.slideTo(swiper.activeIndex, 0, false, true);

diff --git a/src/core/loop/loopFix.js b/src/core/loop/loopFix.js
@@ -13,7 +13,7 @@ export default function loopFix(slideRealIndex, slideTo = true) {
       if (swiper.snapIndex === 0) {
         swiper.slideTo(swiper.virtual.slides.length, 0, false, true);
       } else if (swiper.snapIndex === swiper.snapGrid.length - 1) {
-        swiper.slideTo(0, 0, false, true);
+        swiper.slideTo(swiper.virtual.slidesBefore, 0, false, true);
       }
     }
     swiper.allowSlidePrev = allowSlidePrev;

diff --git a/src/core/update/updateActiveIndex.js b/src/core/update/updateActiveIndex.js
@@ -34,6 +34,14 @@ export default function updateActiveIndex(newActiveIndex) {
   } = swiper;
   let activeIndex = newActiveIndex;
   let snapIndex;
+
+  const getVirtualRealIndex = (aIndex) => {
+    let realIndex = aIndex - swiper.virtual.slidesBefore;
+    if (realIndex < 0) {
+      realIndex = swiper.virtual.slides.length - 1;
+    }
+    return realIndex;
+  };
   if (typeof activeIndex === 'undefined') {
     activeIndex = getActiveIndexByTranslate(swiper);
   }
@@ -50,21 +58,20 @@ export default function updateActiveIndex(newActiveIndex) {
       swiper.emit('snapIndexChange');
     }
     if (swiper.params.loop && swiper.virtual && swiper.params.virtual.enabled) {
-      const realIndex = parseInt(
-        swiper.slides.eq(activeIndex).attr('data-swiper-slide-index') || activeIndex,
-        10,
-      );
-      Object.assign(swiper, {
-        realIndex,
-      });
+      swiper.realIndex = getVirtualRealIndex(activeIndex);
     }
     return;
   }
   // Get real index
-  const realIndex = parseInt(
-    swiper.slides.eq(activeIndex).attr('data-swiper-slide-index') || activeIndex,
-    10,
-  );
+  let realIndex;
+  if (swiper.virtual && params.virtual.enabled && params.loop) {
+    realIndex = getVirtualRealIndex(activeIndex);
+  } else {
+    realIndex = parseInt(
+      swiper.slides.eq(activeIndex).attr('data-swiper-slide-index') || activeIndex,
+      10,
+    );
+  }
 
   Object.assign(swiper, {
     snapIndex,

diff --git a/src/core/update/updateSlides.js b/src/core/update/updateSlides.js
@@ -210,7 +210,11 @@ export default function updateSlides() {
     }
   }
   if (isVirtual && params.loop) {
-    snapGrid.push(snapGrid[snapGrid.length - 1] + swiperSize);
+    snapGrid.push(
+      snapGrid[snapGrid.length - 1] + slidesSizesGrid[0] + spaceBetween,
+      snapGrid[snapGrid.length - 1] + (slidesSizesGrid[0] + spaceBetween) * 2,
+    );
+    slidesGrid.push(slidesGrid[slidesGrid.length - 1] + slidesSizesGrid[0] + spaceBetween);
   }
   if (snapGrid.length === 0) snapGrid = [0];
 

diff --git a/src/core/update/updateSlidesClasses.js b/src/core/update/updateSlidesClasses.js
@@ -14,7 +14,13 @@ export default function updateSlidesClasses() {
 
   let activeSlide;
   if (isVirtual) {
-    activeSlide = getFilteredSlides(`[data-swiper-slide-index="${activeIndex}"]`);
+    if (params.loop) {
+      activeSlide = getFilteredSlides(
+        `[data-swiper-slide-index="${activeIndex - swiper.virtual.slidesBefore}"]`,
+      );
+    } else {
+      activeSlide = getFilteredSlides(`[data-swiper-slide-index="${activeIndex}"]`);
+    }
   } else {
     activeSlide = slides.eq(activeIndex);
   }