feat(virtual): improve behavior with cssMode

nolimits4web · Sep 30, 2021 · b478058 · b478058
1 parent ef228e6
commit b478058
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/core/slide/slideTo.js b/src/core/slide/slideTo.js
@@ -143,11 +143,13 @@ export default function slideTo(
       const isVirtual = swiper.virtual && swiper.params.virtual.enabled;
       if (isVirtual) {
         swiper.wrapperEl.style.scrollSnapType = 'none';
+        swiper._immediateVirtual = true;
       }
       wrapperEl[isH ? 'scrollLeft' : 'scrollTop'] = t;
       if (isVirtual) {
         requestAnimationFrame(() => {
           swiper.wrapperEl.style.scrollSnapType = '';
+          swiper._swiperImmediateVirtual = false;
         });
       }
     } else {

diff --git a/src/modules/virtual/virtual.js b/src/modules/virtual/virtual.js
@@ -15,6 +15,8 @@ export default function Virtual({ swiper, extendParams, on }) {
     },
   });
 
+  let cssModeTimeout;
+
   swiper.virtual = {
     cache: {},
     from: undefined,
@@ -49,7 +51,10 @@ export default function Virtual({ swiper, extendParams, on }) {
       slidesGrid: previousSlidesGrid,
       offset: previousOffset,
     } = swiper.virtual;
-    swiper.updateActiveIndex();
+    if (!swiper.params.cssMode) {
+      swiper.updateActiveIndex();
+    }
+
     const activeIndex = swiper.activeIndex || 0;
 
     let offsetProp;
@@ -176,7 +181,10 @@ export default function Virtual({ swiper, extendParams, on }) {
         const $cachedEl = cache[cachedIndex];
         const cachedElIndex = $cachedEl.attr('data-swiper-slide-index');
         if (cachedElIndex) {
-          $cachedEl.attr('data-swiper-slide-index', parseInt(cachedElIndex, 10) + 1);
+          $cachedEl.attr(
+            'data-swiper-slide-index',
+            parseInt(cachedElIndex, 10) + numberOfNewSlides,
+          );
         }
         newCache[parseInt(cachedIndex, 10) + numberOfNewSlides] = $cachedEl;
       });
@@ -231,7 +239,14 @@ export default function Virtual({ swiper, extendParams, on }) {
   });
   on('setTranslate', () => {
     if (!swiper.params.virtual.enabled) return;
-    update();
+    if (swiper.params.cssMode && !swiper._immediateVirtual) {
+      clearTimeout(cssModeTimeout);
+      cssModeTimeout = setTimeout(() => {
+        update();
+      }, 100);
+    } else {
+      update();
+    }
   });
   on('init update resize', () => {
     if (!swiper.params.virtual.enabled) return;