@tarojs/components 3.5.10 → 3.5.12

package/dist/cjs/taro-swiper-core_2.cjs.entry.js

@@ -9922,12 +9922,12 @@ let Swiper = class {
      */
     this.zoom = false;
     this.handleSwiperLoopListen = () => {
-      var _a, _b;
+      var _a, _b, _c;
       ((_a = this.observerFirst) === null || _a === void 0 ? void 0 : _a.disconnect) && this.observerFirst.disconnect();
       ((_b = this.observerLast) === null || _b === void 0 ? void 0 : _b.disconnect) && this.observerLast.disconnect();
       this.observerFirst = new MutationObserver(this.handleSwiperLoop);
       this.observerLast = new MutationObserver(this.handleSwiperLoop);
-      const wrapper = this.swiper.$wrapperEl[0];
+      const wrapper = (_c = this.swiper.$wrapperEl) === null || _c === void 0 ? void 0 : _c[0];
       const list = wrapper.querySelectorAll('taro-swiper-item-core:not(.swiper-slide-duplicate)');
       if (list.length >= 1) {
         this.observerFirst.observe(list[0], {
@@ -9943,11 +9943,9 @@ let Swiper = class {
     this.handleSwiperLoop = index$2.debounce(() => {
       if (this.swiper && this.circular) {
         // @ts-ignore
-        this.swiper.loopDestroy();
-        // @ts-ignore
-        this.swiper.loopCreate();
+        this.swiper.loopFix();
       }
-    }, 500);
+    }, 50);
     this.handleSwiperSize = index$2.debounce(() => {
       if (this.swiper && !this.circular) {
         this.swiper.updateSlides();
@@ -9972,19 +9970,22 @@ let Swiper = class {
   watchAutoplay(newVal) {
     if (!this.isWillLoadCalled || !this.swiper)
       return;
-    if (this.swiper.autoplay.running === newVal)
-      return;
-    if (newVal) {
-      if (this.swiper.params && typeof this.swiper.params.autoplay === 'object') {
-        if (this.swiper.params.autoplay.disableOnInteraction === true) {
-          this.swiper.params.autoplay.disableOnInteraction = false;
+    const swiperAutoplay = this.swiper.autoplay;
+    if (swiperAutoplay) {
+      if (swiperAutoplay.running === newVal)
+        return;
+      if (newVal) {
+        if (this.swiper.params && typeof this.swiper.params.autoplay === 'object') {
+          if (this.swiper.params.autoplay.disableOnInteraction === true) {
+            this.swiper.params.autoplay.disableOnInteraction = false;
+          }
+          this.swiper.params.autoplay.delay = this.interval;
         }
-        this.swiper.params.autoplay.delay = this.interval;
+        swiperAutoplay.start();
+      }
+      else {
+        swiperAutoplay.stop();
       }
-      this.swiper.autoplay.start();
-    }
-    else {
-      this.swiper.autoplay.stop();
     }
   }
   watchDuration(newVal) {
@@ -10029,20 +10030,22 @@ let Swiper = class {
     this.isWillLoadCalled = true;
   }
   componentDidLoad() {
+    var _a;
     this.handleInit();
     if (!this.swiper || !this.circular)
       return;
-    const wrapper = this.swiper.$wrapperEl[0];
+    const wrapper = (_a = this.swiper.$wrapperEl) === null || _a === void 0 ? void 0 : _a[0];
     this.observer = new MutationObserver(this.handleSwiperLoopListen);
     this.observer.observe(wrapper, {
       childList: true
     });
   }
   componentWillUpdate() {
+    var _a, _b;
     if (!this.swiper)
       return;
-    if (this.autoplay && !this.swiper.autoplay.running) {
-      this.swiper.autoplay.start();
+    if (this.autoplay && !((_a = this.swiper.autoplay) === null || _a === void 0 ? void 0 : _a.running)) {
+      (_b = this.swiper.autoplay) === null || _b === void 0 ? void 0 : _b.start();
     }
     this.swiper.update(); // 更新子元素
   }
@@ -10079,7 +10082,7 @@ let Swiper = class {
         slideChangeTransitionStart(_swiper) {
           if (that.circular) {
             if (_swiper.isBeginning || _swiper.isEnd) {
-              _swiper.slideToLoop(this.realIndex, 0); // 更新下标
+              // _swiper.slideToLoop(this.realIndex, 0, false) // 更新下标
               return;
             }
           }
@@ -10160,13 +10163,49 @@ let Swiper = class {
 };
 Swiper.style = indexCss;
 
+function isEqualTag(a, b) {
+  return typeof a.tagName === 'undefined' ? a.nodeType === b.nodeType : a.tagName === b.tagName;
+}
+function parseChildNodes(items, targets) {
+  const list = Array.from(targets.values());
+  for (let i = 0, j = 0; i < list.length; i++, j++) {
+    const target = list[i];
+    let item = items.item(j);
+    while (item && !isEqualTag(item, target)) {
+      item.remove();
+      j++;
+      item = items.item(j);
+    }
+    if (item && !item.isEqualNode(target)) {
+      parseChildNodes(item.childNodes, target.childNodes);
+    }
+    while (i === list.length - 1 && j < items.length) {
+      j++;
+      item = items.item(j);
+      item === null || item === void 0 ? void 0 : item.remove();
+    }
+  }
+}
 let SwiperItem = class {
   constructor(hostRef) {
     index$1.registerInstance(this, hostRef);
   }
+  componentDidRender() {
+    var _a, _b, _c;
+    const el = this.el;
+    if (el.classList.contains('swiper-slide-duplicate')) {
+      const list = Array
+        .from(((_b = (_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.childNodes) === null || _b === void 0 ? void 0 : _b.values()) || [])
+        .filter((e) => e.tagName === 'TARO-SWIPER-ITEM-CORE');
+      if (list.length > 0) {
+        parseChildNodes(el.childNodes, (_c = list[list.indexOf(el) === 0 ? list.length - 2 : 1]) === null || _c === void 0 ? void 0 : _c.childNodes);
+      }
+    }
+  }
   render() {
     return (index$1.h(index$1.Host, { class: 'swiper-slide', "item-id": this.itemId }));
   }
+  get el() { return index$1.getElement(this); }
 };
 
 exports.taro_swiper_core = Swiper;

package/dist/collection/components/swiper/swiper-item.js

@@ -1,6 +1,40 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { Component, h, Prop, Host } from '@stencil/core';
+import { Component, Element, Host, h, Prop } from '@stencil/core';
+function isEqualTag(a, b) {
+  return typeof a.tagName === 'undefined' ? a.nodeType === b.nodeType : a.tagName === b.tagName;
+}
+function parseChildNodes(items, targets) {
+  const list = Array.from(targets.values());
+  for (let i = 0, j = 0; i < list.length; i++, j++) {
+    const target = list[i];
+    let item = items.item(j);
+    while (item && !isEqualTag(item, target)) {
+      item.remove();
+      j++;
+      item = items.item(j);
+    }
+    if (item && !item.isEqualNode(target)) {
+      parseChildNodes(item.childNodes, target.childNodes);
+    }
+    while (i === list.length - 1 && j < items.length) {
+      j++;
+      item = items.item(j);
+      item === null || item === void 0 ? void 0 : item.remove();
+    }
+  }
+}
 export class SwiperItem {
+  componentDidRender() {
+    var _a, _b, _c;
+    const el = this.el;
+    if (el.classList.contains('swiper-slide-duplicate')) {
+      const list = Array
+        .from(((_b = (_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.childNodes) === null || _b === void 0 ? void 0 : _b.values()) || [])
+        .filter((e) => e.tagName === 'TARO-SWIPER-ITEM-CORE');
+      if (list.length > 0) {
+        parseChildNodes(el.childNodes, (_c = list[list.indexOf(el) === 0 ? list.length - 2 : 1]) === null || _c === void 0 ? void 0 : _c.childNodes);
+      }
+    }
+  }
   render() {
     return (h(Host, { class: 'swiper-slide', "item-id": this.itemId }));
   }
@@ -24,4 +58,5 @@ export class SwiperItem {
       "reflect": false
     }
   }; }
+  static get elementRef() { return "el"; }
 }

package/dist/collection/components/swiper/swiper.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Component, h, Prop, Event, Watch, Host, Element, State } from '@stencil/core';
 import classNames from 'classnames';
 import SwiperJS from 'swiper/swiper-bundle.esm.js';
@@ -65,12 +64,12 @@ export class Swiper {
      */
     this.zoom = false;
     this.handleSwiperLoopListen = () => {
-      var _a, _b;
+      var _a, _b, _c;
       ((_a = this.observerFirst) === null || _a === void 0 ? void 0 : _a.disconnect) && this.observerFirst.disconnect();
       ((_b = this.observerLast) === null || _b === void 0 ? void 0 : _b.disconnect) && this.observerLast.disconnect();
       this.observerFirst = new MutationObserver(this.handleSwiperLoop);
       this.observerLast = new MutationObserver(this.handleSwiperLoop);
-      const wrapper = this.swiper.$wrapperEl[0];
+      const wrapper = (_c = this.swiper.$wrapperEl) === null || _c === void 0 ? void 0 : _c[0];
       const list = wrapper.querySelectorAll('taro-swiper-item-core:not(.swiper-slide-duplicate)');
       if (list.length >= 1) {
         this.observerFirst.observe(list[0], {
@@ -86,11 +85,9 @@ export class Swiper {
     this.handleSwiperLoop = debounce(() => {
       if (this.swiper && this.circular) {
         // @ts-ignore
-        this.swiper.loopDestroy();
-        // @ts-ignore
-        this.swiper.loopCreate();
+        this.swiper.loopFix();
       }
-    }, 500);
+    }, 50);
     this.handleSwiperSize = debounce(() => {
       if (this.swiper && !this.circular) {
         this.swiper.updateSlides();
@@ -115,19 +112,22 @@ export class Swiper {
   watchAutoplay(newVal) {
     if (!this.isWillLoadCalled || !this.swiper)
       return;
-    if (this.swiper.autoplay.running === newVal)
-      return;
-    if (newVal) {
-      if (this.swiper.params && typeof this.swiper.params.autoplay === 'object') {
-        if (this.swiper.params.autoplay.disableOnInteraction === true) {
-          this.swiper.params.autoplay.disableOnInteraction = false;
+    const swiperAutoplay = this.swiper.autoplay;
+    if (swiperAutoplay) {
+      if (swiperAutoplay.running === newVal)
+        return;
+      if (newVal) {
+        if (this.swiper.params && typeof this.swiper.params.autoplay === 'object') {
+          if (this.swiper.params.autoplay.disableOnInteraction === true) {
+            this.swiper.params.autoplay.disableOnInteraction = false;
+          }
+          this.swiper.params.autoplay.delay = this.interval;
         }
-        this.swiper.params.autoplay.delay = this.interval;
+        swiperAutoplay.start();
+      }
+      else {
+        swiperAutoplay.stop();
       }
-      this.swiper.autoplay.start();
-    }
-    else {
-      this.swiper.autoplay.stop();
     }
   }
   watchDuration(newVal) {
@@ -172,20 +172,22 @@ export class Swiper {
     this.isWillLoadCalled = true;
   }
   componentDidLoad() {
+    var _a;
     this.handleInit();
     if (!this.swiper || !this.circular)
       return;
-    const wrapper = this.swiper.$wrapperEl[0];
+    const wrapper = (_a = this.swiper.$wrapperEl) === null || _a === void 0 ? void 0 : _a[0];
     this.observer = new MutationObserver(this.handleSwiperLoopListen);
     this.observer.observe(wrapper, {
       childList: true
     });
   }
   componentWillUpdate() {
+    var _a, _b;
     if (!this.swiper)
       return;
-    if (this.autoplay && !this.swiper.autoplay.running) {
-      this.swiper.autoplay.start();
+    if (this.autoplay && !((_a = this.swiper.autoplay) === null || _a === void 0 ? void 0 : _a.running)) {
+      (_b = this.swiper.autoplay) === null || _b === void 0 ? void 0 : _b.start();
     }
     this.swiper.update(); // 更新子元素
   }
@@ -222,7 +224,7 @@ export class Swiper {
         slideChangeTransitionStart(_swiper) {
           if (that.circular) {
             if (_swiper.isBeginning || _swiper.isEnd) {
-              _swiper.slideToLoop(this.realIndex, 0); // 更新下标
+              // _swiper.slideToLoop(this.realIndex, 0, false) // 更新下标
               return;
             }
           }

package/dist/esm/taro-swiper-core_2.entry.js

@@ -9918,12 +9918,12 @@ let Swiper = class {
      */
     this.zoom = false;
     this.handleSwiperLoopListen = () => {
-      var _a, _b;
+      var _a, _b, _c;
       ((_a = this.observerFirst) === null || _a === void 0 ? void 0 : _a.disconnect) && this.observerFirst.disconnect();
       ((_b = this.observerLast) === null || _b === void 0 ? void 0 : _b.disconnect) && this.observerLast.disconnect();
       this.observerFirst = new MutationObserver(this.handleSwiperLoop);
       this.observerLast = new MutationObserver(this.handleSwiperLoop);
-      const wrapper = this.swiper.$wrapperEl[0];
+      const wrapper = (_c = this.swiper.$wrapperEl) === null || _c === void 0 ? void 0 : _c[0];
       const list = wrapper.querySelectorAll('taro-swiper-item-core:not(.swiper-slide-duplicate)');
       if (list.length >= 1) {
         this.observerFirst.observe(list[0], {
@@ -9939,11 +9939,9 @@ let Swiper = class {
     this.handleSwiperLoop = debounce(() => {
       if (this.swiper && this.circular) {
         // @ts-ignore
-        this.swiper.loopDestroy();
-        // @ts-ignore
-        this.swiper.loopCreate();
+        this.swiper.loopFix();
       }
-    }, 500);
+    }, 50);
     this.handleSwiperSize = debounce(() => {
       if (this.swiper && !this.circular) {
         this.swiper.updateSlides();
@@ -9968,19 +9966,22 @@ let Swiper = class {
   watchAutoplay(newVal) {
     if (!this.isWillLoadCalled || !this.swiper)
       return;
-    if (this.swiper.autoplay.running === newVal)
-      return;
-    if (newVal) {
-      if (this.swiper.params && typeof this.swiper.params.autoplay === 'object') {
-        if (this.swiper.params.autoplay.disableOnInteraction === true) {
-          this.swiper.params.autoplay.disableOnInteraction = false;
+    const swiperAutoplay = this.swiper.autoplay;
+    if (swiperAutoplay) {
+      if (swiperAutoplay.running === newVal)
+        return;
+      if (newVal) {
+        if (this.swiper.params && typeof this.swiper.params.autoplay === 'object') {
+          if (this.swiper.params.autoplay.disableOnInteraction === true) {
+            this.swiper.params.autoplay.disableOnInteraction = false;
+          }
+          this.swiper.params.autoplay.delay = this.interval;
         }
-        this.swiper.params.autoplay.delay = this.interval;
+        swiperAutoplay.start();
+      }
+      else {
+        swiperAutoplay.stop();
       }
-      this.swiper.autoplay.start();
-    }
-    else {
-      this.swiper.autoplay.stop();
     }
   }
   watchDuration(newVal) {
@@ -10025,20 +10026,22 @@ let Swiper = class {
     this.isWillLoadCalled = true;
   }
   componentDidLoad() {
+    var _a;
     this.handleInit();
     if (!this.swiper || !this.circular)
       return;
-    const wrapper = this.swiper.$wrapperEl[0];
+    const wrapper = (_a = this.swiper.$wrapperEl) === null || _a === void 0 ? void 0 : _a[0];
     this.observer = new MutationObserver(this.handleSwiperLoopListen);
     this.observer.observe(wrapper, {
       childList: true
     });
   }
   componentWillUpdate() {
+    var _a, _b;
     if (!this.swiper)
       return;
-    if (this.autoplay && !this.swiper.autoplay.running) {
-      this.swiper.autoplay.start();
+    if (this.autoplay && !((_a = this.swiper.autoplay) === null || _a === void 0 ? void 0 : _a.running)) {
+      (_b = this.swiper.autoplay) === null || _b === void 0 ? void 0 : _b.start();
     }
     this.swiper.update(); // 更新子元素
   }
@@ -10075,7 +10078,7 @@ let Swiper = class {
         slideChangeTransitionStart(_swiper) {
           if (that.circular) {
             if (_swiper.isBeginning || _swiper.isEnd) {
-              _swiper.slideToLoop(this.realIndex, 0); // 更新下标
+              // _swiper.slideToLoop(this.realIndex, 0, false) // 更新下标
               return;
             }
           }
@@ -10156,13 +10159,49 @@ let Swiper = class {
 };
 Swiper.style = indexCss;
 
+function isEqualTag(a, b) {
+  return typeof a.tagName === 'undefined' ? a.nodeType === b.nodeType : a.tagName === b.tagName;
+}
+function parseChildNodes(items, targets) {
+  const list = Array.from(targets.values());
+  for (let i = 0, j = 0; i < list.length; i++, j++) {
+    const target = list[i];
+    let item = items.item(j);
+    while (item && !isEqualTag(item, target)) {
+      item.remove();
+      j++;
+      item = items.item(j);
+    }
+    if (item && !item.isEqualNode(target)) {
+      parseChildNodes(item.childNodes, target.childNodes);
+    }
+    while (i === list.length - 1 && j < items.length) {
+      j++;
+      item = items.item(j);
+      item === null || item === void 0 ? void 0 : item.remove();
+    }
+  }
+}
 let SwiperItem = class {
   constructor(hostRef) {
     registerInstance(this, hostRef);
   }
+  componentDidRender() {
+    var _a, _b, _c;
+    const el = this.el;
+    if (el.classList.contains('swiper-slide-duplicate')) {
+      const list = Array
+        .from(((_b = (_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.childNodes) === null || _b === void 0 ? void 0 : _b.values()) || [])
+        .filter((e) => e.tagName === 'TARO-SWIPER-ITEM-CORE');
+      if (list.length > 0) {
+        parseChildNodes(el.childNodes, (_c = list[list.indexOf(el) === 0 ? list.length - 2 : 1]) === null || _c === void 0 ? void 0 : _c.childNodes);
+      }
+    }
+  }
   render() {
     return (h(Host, { class: 'swiper-slide', "item-id": this.itemId }));
   }
+  get el() { return getElement(this); }
 };
 
 export { Swiper as taro_swiper_core, SwiperItem as taro_swiper_item_core };