@vunk/plus 1.4.6 → 1.5.0

package/components/WebGLRenderer.mjs

@@ -5,6 +5,7 @@ import 'vue';
 import '@vunk/shared/enum';
 import '@vunk/shared/promise';
 import './_commonjsHelpers.mjs';
+import '@vunk/core/composables';
 import './_plugin-vue_export-helper.mjs';
 
 class GlBatchAdaptor {

package/components/WebGPURenderer.mjs

@@ -5,6 +5,7 @@ import 'vue';
 import '@vunk/shared/enum';
 import '@vunk/shared/promise';
 import './_commonjsHelpers.mjs';
+import '@vunk/core/composables';
 import './_plugin-vue_export-helper.mjs';
 
 const tempState = State.for2d();

package/components/broadcasting-markdown/index.mjs

@@ -1,8 +1,8 @@
 import { VkTypingMarkdown } from '@vunk/plus/components/typing-markdown';
 import { setData } from '@vunk/core';
 import { useDeferred, useDataComputed } from '@vunk/core/composables';
-import { defineComponent, createElementBlock, openBlock, createElementVNode, Fragment, createVNode, unref, withCtx, shallowRef, computed, watch, onBeforeUnmount, watchEffect, onMounted, nextTick, renderSlot, createCommentVNode, ref, resolveComponent, renderList, createBlock } from 'vue';
 import { TickerStatus } from '@vunk/shared/enum';
+import { defineComponent, createElementBlock, openBlock, createElementVNode, Fragment, createVNode, unref, withCtx, shallowRef, computed, watch, onBeforeUnmount, watchEffect, onMounted, nextTick, renderSlot, createCommentVNode, ref, resolveComponent, createTextVNode, renderList, createBlock } from 'vue';
 import { noop } from '@vunk/shared/function';
 import { ElIcon } from 'element-plus';
 import { c as commonjsGlobal } from '../_commonjsHelpers.mjs';
@@ -81,6 +81,14 @@ const props = {
   processing: {
     type: Function,
     default: noop
+  },
+  status: {
+    type: String,
+    default: TickerStatus.pending
+  },
+  paragraphMinlength: {
+    type: Number,
+    default: 100
   }
 };
 const emits = {
@@ -89,6 +97,7 @@ const emits = {
   "update:broadcasting": (_) => true,
   "update:completed": (_) => true,
   "update:error": (_) => true,
+  "update:status": (_) => true,
   "paragraphLoad": (_) => true
 };
 const paragraphProps = {
@@ -3421,7 +3430,9 @@ const originalPlay = howler.Howl.prototype.play;
 howler.Howl.prototype.play = function(soundId) {
   const WeixinJSBridge = window.WeixinJSBridge;
   WeixinJSBridge && WeixinJSBridge.invoke("getNetworkType", {}, () => {
-    originalPlay.call(this, soundId);
+    if (!this.playing(soundId)) {
+      originalPlay.call(this, soundId);
+    }
   }, false);
   return originalPlay.call(this, soundId);
 };
@@ -3448,6 +3459,7 @@ function useHowlerParagraph(props, emit) {
           k: "broadcast",
           v: Broadcast.paused
         });
+        console.log("onpause", props.data);
       },
       onend: () => {
         emit("setData", {
@@ -3506,6 +3518,31 @@ function useHowlerParagraph(props, emit) {
       sound.value?.stop();
     }
   });
+  const handleVisibilityChange = () => {
+    if (document.hidden) {
+      if (broadcast.value === Broadcast.playing) {
+        emit("setData", {
+          k: "broadcast",
+          v: Broadcast.pause
+        });
+      }
+    } else {
+      setTimeout(() => {
+        if (broadcast.value === Broadcast.paused) {
+          emit("setData", {
+            k: "broadcast",
+            v: Broadcast.play
+          });
+        }
+      }, 400);
+    }
+  };
+  onMounted(() => {
+    document.addEventListener("visibilitychange", handleVisibilityChange);
+  });
+  onBeforeUnmount(() => {
+    document.removeEventListener("visibilitychange", handleVisibilityChange);
+  });
   return {
     url,
     broadcast,
@@ -4205,7 +4242,7 @@ var _sfc_main = defineComponent({
   },
   props,
   emits,
-  setup(props2, { emit, expose }) {
+  setup(props2, { emit, expose, slots }) {
     const [theData, handleSetData] = useDataComputed({
       default: []
     }, props2, emit);
@@ -4283,7 +4320,7 @@ var _sfc_main = defineComponent({
               );
               lastParagraph.separator = separator;
             }
-          } else {
+          } else if (value.length > props2.paragraphMinlength) {
             const paragraph = {
               start,
               separator,
@@ -4338,26 +4375,48 @@ var _sfc_main = defineComponent({
       });
       emit("interrupt");
     }
+    const currentParagraph = computed(() => {
+      return theData.value.find(
+        (item) => item.status === ParagraphStatus.pending
+      );
+    });
+    watchEffect(() => {
+      if (!currentParagraph.value) {
+        return;
+      }
+      if (currentParagraph.value.broadcast === props2.status) {
+        return;
+      }
+      props2.status === TickerStatus.play && (currentParagraph.value.broadcast = TickerStatus.play);
+      props2.status === TickerStatus.pause && (currentParagraph.value.broadcast = TickerStatus.pause);
+      props2.status === TickerStatus.stop && (currentParagraph.value.broadcast = TickerStatus.stop);
+    });
     const isPaused = computed(() => {
       return theData.value.some(
         (item) => item.status === ParagraphStatus.pending && item.broadcast === Broadcast.paused
       );
     });
+    watchEffect(() => {
+      isPaused.value && emit("update:status", TickerStatus.paused);
+    });
     const isBroadcasting = computed(() => {
       return theData.value.some(
         (item) => item.broadcast === Broadcast.playing
       );
     });
     watchEffect(() => {
-      emit("update:broadcasting", isBroadcasting.value);
+      isBroadcasting.value && emit("update:broadcasting", isBroadcasting.value);
+      emit("update:status", TickerStatus.playing);
     });
+    const isTypingFinished = ref(!!slots.paragraphs);
     const isCompleted = computed(() => {
-      return props2.keepRead === false && theData.value.every(
+      return isTypingFinished.value && props2.keepRead === false && theData.value.every(
         (item) => item.status === ParagraphStatus.fulfilled
       );
     });
     watchEffect(() => {
       emit("update:completed", isCompleted.value);
+      isCompleted.value && emit("update:status", TickerStatus.stopped);
     });
     const isError = computed(() => {
       return theData.value.some(
@@ -4389,13 +4448,16 @@ var _sfc_main = defineComponent({
       isInterrupted,
       setData,
       Broadcast,
-      isPaused
+      isPaused,
+      isTypingFinished,
+      currentParagraph
     };
   }
 });
 
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VkTypingMarkdown = resolveComponent("VkTypingMarkdown");
+  const _component_ElButton = resolveComponent("ElButton");
   const _component_HowlerSpeechView = resolveComponent("HowlerSpeechView");
   const _component_ParagraphView = resolveComponent("ParagraphView");
   return openBlock(), createElementBlock(
@@ -4404,10 +4466,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     [
       renderSlot(_ctx.$slots, "default", { paragraphs: _ctx.theData }, () => [
         createVNode(_component_VkTypingMarkdown, {
+          finished: _ctx.isTypingFinished,
+          "onUpdate:finished": _cache[0] || (_cache[0] = ($event) => _ctx.isTypingFinished = $event),
           source: _ctx.fulfilledTextValue,
           delay: 120,
           pause: _ctx.isInterrupted || _ctx.isPaused
-        }, null, 8, ["source", "pause"])
+        }, null, 8, ["finished", "source", "pause"]),
+        createVNode(_component_ElButton, {
+          onClick: _cache[1] || (_cache[1] = () => console.log(_ctx.currentParagraph))
+        }, {
+          default: withCtx(() => _cache[3] || (_cache[3] = [
+            createTextVNode(" log2 ")
+          ])),
+          _: 1
+          /* STABLE */
+        })
       ]),
       (openBlock(true), createElementBlock(
         Fragment,
@@ -4430,7 +4503,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   deferred,
                   data: item,
                   onSetData: ($event) => _ctx.setData(item, $event),
-                  onLoad: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("paragraphLoad", $event))
+                  onLoad: _cache[2] || (_cache[2] = ($event) => _ctx.$emit("paragraphLoad", $event))
                 }, null, 8, ["render", "deferred", "data", "onSetData"])
               ])
             ]),

package/components/browserAll.mjs

@@ -4,6 +4,7 @@ import 'vue';
 import '@vunk/shared/enum';
 import '@vunk/shared/promise';
 import './_commonjsHelpers.mjs';
+import '@vunk/core/composables';
 import './_plugin-vue_export-helper.mjs';
 import './colorToUniform.mjs';