@netless/app-slide 0.0.43 → 0.0.44

package/dist/main.es.js

@@ -30293,33 +30293,33 @@ void main() {
   };
   class RE {
     constructor(t3, e3, n2, i2, r3) {
-      this.taskId = t3, this.slideIndex = e3, this.microTaskManager = n2, this.renderer = i2, this.cache = r3, this.idToHashMap = Object.create(null), this.textures = Object.create(null), this.graphics = [], this.hashToIdMap = Object.create(null);
+      this.taskId = t3, this.slideIndex = e3, this.microTaskManager = n2, this.renderer = i2, this.cache = r3, this.imgElements = [], this.svgElements = [], this.idToHashMap = Object.create(null), this.textures = Object.create(null), this.graphics = [], this.hashToIdMap = Object.create(null);
     }
     setCacheLength(t3) {
       return this.cache ? this.cache.setItem(this.slideIndex + "-length", t3) : Promise.resolve(0);
     }
-    render(t3, e3) {
-      const { items: n2, width: i2, height: r3 } = t3, o3 = EE.getObject("foo"), s3 = new ey(o3, { width: i2, height: r3, resolution: 1 }), a2 = TE.getObject("foo");
-      a2.setAttribute("viewBox", `0 0 ${i2} ${r3}`), a2.setAttribute("width", "" + i2), a2.setAttribute("height", "" + r3);
-      const u2 = {}, h2 = {};
-      n2.forEach((t4) => {
+    render(t3, e3, n2) {
+      const { items: i2, width: r3, height: o3 } = t3, s3 = EE.getObject(n2), a2 = new ey(s3, { width: r3, height: o3, resolution: 1 }), u2 = TE.getObject(n2);
+      this.imgElements.push(s3), this.svgElements.push(u2), u2.setAttribute("viewBox", `0 0 ${r3} ${o3}`), u2.setAttribute("width", "" + r3), u2.setAttribute("height", "" + o3);
+      const h2 = {}, c2 = {};
+      i2.forEach((t4) => {
         const { item: e4, x: n3, y: i3 } = t4, r4 = n3 + 2, o4 = i3 + 2;
         e4.pathsData.forEach((t5) => {
           let e5 = "";
           t5.cmds.forEach(([n4, i4]) => {
             e5 += n4 + " ", e5 += i4.map((e6) => (Object(l.isNumber)(e6) || (e6.x = Math.round(e6.x + t5.offset.x + r4), e6.y = Math.round(e6.y + t5.offset.y + o4)), e6)).reduce((t6, e6) => (Object(l.isNumber)(e6) ? t6 += e6 + " " : t6 += `${e6.x} ${e6.y} `, t6), ""), e5 += " ";
-          }), t5.pathElement.setAttribute("d", e5), a2.appendChild(t5.pathElement);
+          }), t5.pathElement.setAttribute("d", e5), u2.appendChild(t5.pathElement);
         });
-        const c3 = e4.width - 4 - 2 * e4.padding, d3 = e4.height - 4 - 2 * e4.padding;
-        this.textures[e4.hash] = { texture: new _y(s3, new h_(r4 + 2, o4 + 2, c3, d3)), pivot: e4.pivot }, u2[e4.hash] = { x: r4 + 2, y: o4 + 2, w: c3, h: d3, pivot: e4.pivot }, h2[e4.hash] = this.hashToIdMap[e4.hash];
+        const s4 = e4.width - 4 - 2 * e4.padding, d3 = e4.height - 4 - 2 * e4.padding;
+        this.textures[e4.hash] = { texture: new _y(a2, new h_(r4 + 2, o4 + 2, s4, d3)), pivot: e4.pivot }, h2[e4.hash] = { x: r4 + 2, y: o4 + 2, w: s4, h: d3, pivot: e4.pivot }, c2[e4.hash] = this.hashToIdMap[e4.hash];
       });
-      const c2 = (d2 = '<?xml version="1.0" encoding="utf-8"?>' + a2.outerHTML, "data:image/svg+xml," + encodeURIComponent(d2).replace(/'/g, "%27").replace(/"/g, "%22"));
-      var d2;
-      if (o3.src = c2, this.cache) {
+      const d2 = (p2 = '<?xml version="1.0" encoding="utf-8"?>' + u2.outerHTML, "data:image/svg+xml," + encodeURIComponent(p2).replace(/'/g, "%27").replace(/"/g, "%22"));
+      var p2;
+      if (s3.src = d2, this.cache) {
         const t4 = new CE();
         t4.addMTask(() => PE(this, void 0, void 0, function* () {
           var t5, n3, i3;
-          this.graphics.length > 0 && (yield (t5 = this.cache) === null || t5 === void 0 ? void 0 : t5.setItem(`${this.slideIndex}-texture-${e3}`, c2), yield (n3 = this.cache) === null || n3 === void 0 ? void 0 : n3.setItem(`${this.slideIndex}-json-${e3}`, u2), yield (i3 = this.cache) === null || i3 === void 0 ? void 0 : i3.setItem(`${this.slideIndex}-map-${e3}`, h2));
+          this.graphics.length > 0 && (yield (t5 = this.cache) === null || t5 === void 0 ? void 0 : t5.setItem(`${this.slideIndex}-texture-${e3}`, d2), yield (n3 = this.cache) === null || n3 === void 0 ? void 0 : n3.setItem(`${this.slideIndex}-json-${e3}`, h2), yield (i3 = this.cache) === null || i3 === void 0 ? void 0 : i3.setItem(`${this.slideIndex}-map-${e3}`, c2));
         })), this.microTaskManager.addTask(t4);
       }
     }
@@ -30420,7 +30420,7 @@ void main() {
       Object.keys(this.textures).forEach((t3) => {
         var e3;
         (e3 = this.textures[t3]) === null || e3 === void 0 || e3.texture.destroy(true);
-      }), this.textures = Object.create(null), this.graphics = [];
+      }), this.textures = Object.create(null), this.imgElements.forEach((t3) => EE.collectObject(t3)), this.svgElements.forEach((t3) => TE.collectObject(t3)), this.graphics = [];
     }
   }
   const IE = 134217729;
@@ -33306,7 +33306,7 @@ void main(void){
     }
     destroy() {
       var t3;
-      (t3 = this.tmRoot) === null || t3 === void 0 || t3.commonTimeNode.destroy();
+      this.globalEventHub.removeAllListeners(), (t3 = this.tmRoot) === null || t3 === void 0 || t3.commonTimeNode.destroy();
     }
     hasMainSeq() {
       return !!this.mainSeq && this.mainSeq.commonTimeNode.children.length > 0;
@@ -33416,8 +33416,8 @@ void main(void){
       return !!this.timing;
     }
     clearOnSlideChange() {
-      var t3, e3, n2;
-      this.ctx.eventHub.removeAllListeners(), this.globalEventHub.removeAllListeners(), (t3 = this.timing) === null || t3 === void 0 || t3.setMainSeqStep(0, "start"), (e3 = this.timing) === null || e3 === void 0 || e3.resetAllInteractiveSeq(), (n2 = this.timing) === null || n2 === void 0 || n2.destroy(), this.timing = void 0, super.clearOnSlideChange();
+      var t3, e3;
+      this.ctx.eventHub.removeAllListeners(), this.globalEventHub.removeAllListeners(), (t3 = this.timing) === null || t3 === void 0 || t3.resetAllInteractiveSeq(), (e3 = this.timing) === null || e3 === void 0 || e3.destroy(), this.timing = void 0, super.clearOnSlideChange();
     }
     destroy() {
       var t3, e3;
@@ -33713,7 +33713,7 @@ void main(void){
         }
         const i2 = n2.graphicsTexture.pack();
         yield n2.graphicsTexture.setCacheLength(i2.length);
-        const r3 = i2.map((t4, e4) => () => (n2.graphicsTexture.render(t4, e4), Promise.resolve()));
+        const r3 = i2.map((t4, e4) => () => (n2.graphicsTexture.render(t4, e4, this.objPoolGroup), Promise.resolve()));
         e3.addSubMTask(r3);
       }));
     }
@@ -33881,7 +33881,7 @@ void main(void){
         const r3 = yield this.stagePool.getStage(t3);
         this.translateEvent(r3.ctx.eventHub, [hC.mainSeqStepChange, hC.mainSeqStateChange, hC.hyperlinkTrigger, hC.interactiveSeqAction, hC.mainSeqStepStart, hC.mainSeqStepEnd, hC.animateStart, hC.animateEnd, hC.mediaPlay, hC.mediaPause, hC.mediaSeek, hC.requestGotoSlide, hC.requestNextSlide, hC.requestPrevSlide, hC.interactiveSeqStateChange]), this.currentIndex = Number(t3);
         const { width: o3, height: s3, slideCount: a2 } = r3.json;
-        this.slideCount = a2, this.designWidth = o3, this.designHeight = s3, (n2 = this.currentStage) === null || n2 === void 0 || n2.clearOnSlideChange();
+        this.slideCount = a2, this.designWidth = o3, this.designHeight = s3, r3.json.transition && r3.json.transition.type && !this.prevSlideBase64 && this.currentStage && (this.prevSlideBase64 = this.getBase64(this.currentStage)), (n2 = this.currentStage) === null || n2 === void 0 || n2.clearOnSlideChange();
         const l2 = this.currentStage;
         this.currentStage = r3, r3.initOnReuse(), r3.createTiming(), r3.container.visible = true, r3.collectMainSeqStartValue(), this.isForward ? r3.setMainSeqStep(0, "start") : r3.setMainSeqStep(-1, "end");
         let u2 = null;
@@ -35540,7 +35540,7 @@ void main(void){
   }
   var xR = { syncDispatch: "syncDispatch", syncReceive: "syncReceive", renderStart: "renderStart", renderEnd: "renderEnd", renderError: "renderError", slideChange: "slideChange", mainSeqStepStart: "mainSeqStepStart", mainSeqStepEnd: "mainSeqStepEnd", animateStart: "animateStart", animateEnd: "animateEnd", stateChange: "stateChange" }, bR = { taskId: "", url: "", currentSlideIndex: -1, mainSeqStep: -1, mainSeqState: null, mediaState: Object.create(null), interactiveSeqState: Object.create(null) }, wR = "";
   try {
-    wR = "0.1.46";
+    wR = "0.1.47";
   } catch (t3) {
     wR = "dev";
   }
@@ -35786,7 +35786,7 @@ void main(void){
         return mR(this, function(i2) {
           switch (i2.label) {
             case 0:
-              return this.iosResetCache.indexOf(t4) < 0 && this.iosResetCache.push(t4), this.isLoading = true, [4, (e4 = this.player) === null || e4 === void 0 ? void 0 : e4.renderSlide(t4)];
+              return this.player && t4 === this.player.currentIndex ? [2] : (this.iosResetCache.indexOf(t4) < 0 && this.iosResetCache.push(t4), this.isLoading = true, [4, (e4 = this.player) === null || e4 === void 0 ? void 0 : e4.renderSlide(t4)]);
             case 1:
               return i2.sent(), this.__slideState.currentSlideIndex = t4, this.isLoading = false, this.resizeView(), this.emitStateChange(), setTimeout(function() {
                 var t5, e5;
@@ -35812,7 +35812,7 @@ void main(void){
         return Promise.resolve();
       if (this.iosNewPlayer) {
         var r3 = this.player.getSnapshot();
-        this.cacheImage.src = r3, this.frame.appendChild(this.cacheImage), this.player.destroy(), this.player = this.iosNewPlayer, this.iosNewPlayer = void 0, this.needClearCacheImage = true, ((n2 = this.player) === null || n2 === void 0 ? void 0 : n2.view) && (this.player.view.style.visibility = "hidden", this.frame.appendChild(this.player.view));
+        this.cacheImage.src = r3, this.frame.appendChild(this.cacheImage), this.player.destroy(), this.player = this.iosNewPlayer, this.iosNewPlayer = void 0, this.needClearCacheImage = true, ((n2 = this == null ? void 0 : this.player) === null || n2 === void 0 ? void 0 : n2.view) && (this.player.view.style.visibility = "hidden", this.frame.appendChild(this.player.view));
       }
       var o3 = Math.random().toString(32).substr(2);
       return this.player.isForward = e4, this.renderingTaskManager.addTask(function() {
@@ -35892,7 +35892,7 @@ void main(void){
                 return [2, yR(function() {
                   return !o3.isReleasing;
                 }, 6e4)];
-              for (n2 in this.isReleasing = true, this.initPlayer(this.config), this.player.view && (this.player.view.style.visibility = "hidden"), e4 = this.__slideState, this.__slideState = Object(l.cloneDeep)(bR), e4.mediaState)
+              for (n2 in this.isReleasing = true, this.player = this.initPlayer(this.config), this.player.view && (this.frame.appendChild(this.player.view), this.player.view.style.visibility = "hidden"), e4 = this.__slideState, this.__slideState = Object(l.cloneDeep)(bR), e4.mediaState)
                 (i2 = e4.mediaState[n2]).type === "play" && (r3 = Math.max((t4 = i2.frozenTime) !== null && t4 !== void 0 ? t4 : 0, i2.time), i2.time = this.timestamp() - (r3 - i2.time), i2.frozenTime = void 0);
               return [4, this.setSlideState(e4)];
             case 1:
@@ -37926,7 +37926,7 @@ class SlidePreviewer {
     return `${this.namespace}-${className}`;
   }
 }
-const version = "0.0.43";
+const version = "0.0.44";
 const SlideApp = {
   kind: "Slide",
   setup(context) {