@maas/vue-equipment 1.0.0-beta.12 → 1.0.0-beta.14

package/dist/plugins/MagicPlayer/src/components/MagicPlayerVideo.vue

@@ -1,8 +1,24 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-const _hoisted_1 = ["preload", "loop", "muted"];
-import { useTemplateRef, watch, onMounted, inject, onBeforeUnmount } from "vue";
+<template>
+  <video
+    ref="el"
+    class="magic-player-video"
+    playsinline
+    disablePictureInPicture
+    :preload="injectedOptions.preload"
+    :loop="injectedOptions.loop"
+    :muted="muted"
+  />
+</template>
+
+<script setup>
+import {
+  toRefs,
+  useTemplateRef,
+  watch,
+  onMounted,
+  inject,
+  onBeforeUnmount
+} from "vue";
 import {
   useElementVisibility,
   useEventListener,
@@ -11,75 +27,63 @@ import {
 import { usePlayerVideoApi } from "../composables/private/usePlayerVideoApi";
 import { usePlayerMediaApi } from "../composables/private/usePlayerMediaApi";
 import { usePlayerRuntime } from "../composables/private/usePlayerRuntime";
+import { usePlayerState } from "../composables/private/usePlayerState";
 import { MagicPlayerInstanceId, MagicPlayerOptionsKey } from "../symbols";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicPlayerVideo",
-  setup(__props) {
-    const injectedId = inject(MagicPlayerInstanceId, void 0);
-    const injectedOptions = inject(MagicPlayerOptionsKey, void 0);
-    if (!injectedId) {
-      throw new Error("MagicPlayerVideo must be used within a MagicPlayerProvider");
-    }
-    if (!injectedOptions) {
-      throw new Error("MagicPlayerVideo must be used within a MagicPlayerProvider");
-    }
-    const elRef = useTemplateRef("el");
-    const isVisible = useElementVisibility(elRef);
-    const { initialize, destroy } = usePlayerRuntime({
-      id: injectedId,
-      mediaRef: elRef,
-      src: injectedOptions.src,
-      srcType: injectedOptions.srcType
-    });
-    const { muted, playing } = usePlayerMediaApi({
-      id: injectedId,
-      mediaRef: elRef
-    });
-    const { play, pause } = usePlayerVideoApi({
-      id: injectedId,
-      videoRef: elRef
-    });
-    function onWindowFocus() {
-      if (isVisible.value && !playing.value && injectedOptions?.autoplay) {
-        play();
-      }
+const injectedInstanceId = inject(MagicPlayerInstanceId, void 0);
+const injectedOptions = inject(MagicPlayerOptionsKey, void 0);
+if (!injectedInstanceId) {
+  throw new Error("MagicPlayerVideo must be used within a MagicPlayerProvider");
+}
+if (!injectedOptions) {
+  throw new Error("MagicPlayerVideo must be used within a MagicPlayerProvider");
+}
+const elRef = useTemplateRef("el");
+const isVisible = useElementVisibility(elRef);
+const { initialize, destroy } = usePlayerRuntime({
+  id: injectedInstanceId,
+  mediaRef: elRef,
+  src: injectedOptions.src,
+  srcType: injectedOptions.srcType
+});
+const { initializeState } = usePlayerState(injectedInstanceId);
+const state = initializeState();
+const { muted, playing } = toRefs(state);
+usePlayerMediaApi({
+  id: injectedInstanceId,
+  mediaRef: elRef
+});
+const { play, pause } = usePlayerVideoApi({
+  id: injectedInstanceId,
+  videoRef: elRef
+});
+function onWindowFocus() {
+  if (isVisible.value && !playing.value && injectedOptions?.autoplay) {
+    play();
+  }
+}
+useEventListener(defaultWindow, "focus", onWindowFocus);
+watch(
+  isVisible,
+  (value) => {
+    if (value && !playing.value && injectedOptions.autoplay) {
+      play();
+    } else if (!value && playing.value) {
+      pause();
     }
-    useEventListener(defaultWindow, "focus", onWindowFocus);
-    watch(
-      isVisible,
-      (value) => {
-        if (value && !playing.value && injectedOptions.autoplay) {
-          play();
-        } else if (!value && playing.value) {
-          pause();
-        }
-      },
-      {
-        immediate: true
-      }
-    );
-    onMounted(() => {
-      initialize();
-      if (injectedOptions.autoplay) {
-        muted.value = true;
-      }
-    });
-    onBeforeUnmount(() => {
-      destroy();
-    });
-    return (_ctx, _cache) => {
-      return _openBlock(), _createElementBlock("video", {
-        ref: "el",
-        class: "magic-player-video",
-        playsinline: "",
-        disablePictureInPicture: "",
-        preload: _unref(injectedOptions).preload,
-        loop: _unref(injectedOptions).loop,
-        muted: _unref(muted)
-      }, null, 8, _hoisted_1);
-    };
+  },
+  {
+    immediate: true
+  }
+);
+onMounted(() => {
+  initialize();
+  if (injectedOptions.autoplay) {
+    muted.value = true;
   }
 });
+onBeforeUnmount(() => {
+  destroy();
+});
 </script>
 
 <style>

package/dist/plugins/MagicPlayer/src/components/MagicPlayerVideoControls.vue

@@ -1,221 +1,179 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, renderSlot as _renderSlot, vShow as _vShow, normalizeStyle as _normalizeStyle, withDirectives as _withDirectives, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createVNode as _createVNode, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, Transition as _Transition, withCtx as _withCtx } from "vue";
-const _hoisted_1 = ["data-fullscreen", "data-touched", "data-playing", "data-paused", "data-waiting", "data-muted", "data-idle", "data-hover", "data-standalone"];
-const _hoisted_2 = { class: "magic-player-video-controls__bar" };
-const _hoisted_3 = {
-  ref: "bar",
-  class: "magic-player-video-controls__bar--inner"
-};
-const _hoisted_4 = { class: "magic-player-video-controls__item -shrink-0" };
-const _hoisted_5 = { class: "magic-player-video-controls__item -grow" };
-const _hoisted_6 = {
-  ref: "track",
-  class: "magic-player-video-controls__timeline"
-};
-const _hoisted_7 = { class: "magic-player-video-controls__item -shrink-0" };
-const _hoisted_8 = { class: "magic-player-video-controls__item -shrink-0" };
-import { computed, inject, provide, useTemplateRef } from "vue";
-import { useIdle } from "@vueuse/core";
-import IconPlay from "./icons/Play.vue";
-import IconPause from "./icons/Pause.vue";
-import IconVolumeOn from "./icons/VolumeOn.vue";
-import IconVolumeOff from "./icons/VolumeOff.vue";
-import IconFullscreenEnter from "./icons/FullscreenEnter.vue";
-import IconFullscreenExit from "./icons/FullscreenExit.vue";
-import { usePlayerMediaApi } from "../composables/private/usePlayerMediaApi";
+<template>
+  <div
+    ref="el"
+    class="magic-player-video-controls"
+    :data-fullscreen="isFullscreen"
+    :data-touched="touched"
+    :data-playing="playing"
+    :data-paused="!playing"
+    :data-waiting="waiting"
+    :data-muted="muted"
+    :data-idle="idle"
+    :data-hover="controlsMouseEntered"
+    :data-standalone="standalone"
+    @mouseenter="onMouseenter"
+    @mouseleave="onMouseleave"
+  >
+    <transition :name="mappedTransition">
+      <div v-show="!hidden" class="magic-player-video-controls__bar">
+        <div
+          v-if="$slots.popover"
+          v-show="!!seekedTime && touched"
+          ref="popover"
+          class="magic-player-video-controls__popover"
+          :style="{ marginLeft: `${popoverOffsetX}%` }"
+        >
+          <slot name="popover" />
+        </div>
+        <div ref="bar" class="magic-player-video-controls__bar--inner">
+          <div class="magic-player-video-controls__item -shrink-0">
+            <button v-if="!playing" @click="play">
+              <slot name="playIcon">
+                <icon-play />
+              </slot>
+            </button>
+            <button v-else @click="pause">
+              <slot name="pauseIcon">
+                <icon-pause />
+              </slot>
+            </button>
+          </div>
+          <div class="magic-player-video-controls__item -grow">
+            <slot name="timelineBefore" />
+            <div ref="track" class="magic-player-video-controls__timeline">
+              <magic-player-timeline />
+            </div>
+            <slot name="timelineAfter" />
+          </div>
+          <div class="magic-player-video-controls__item -shrink-0">
+            <button v-if="muted" @click="unmute">
+              <slot name="volumeOffIcon">
+                <icon-volume-off />
+              </slot>
+            </button>
+            <button v-else @click="mute">
+              <slot name="volumeOnIcon">
+                <icon-volume-on />
+              </slot>
+            </button>
+          </div>
+          <div class="magic-player-video-controls__item -shrink-0">
+            <button v-if="isFullscreen" @click="exitFullscreen">
+              <slot name="fullscreenExitIcon">
+                <icon-fullscreen-exit />
+              </slot>
+            </button>
+            <button v-else @click="enterFullscreen">
+              <slot name="fullscreenEnterIcon">
+                <icon-fullscreen-enter />
+              </slot>
+            </button>
+          </div>
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script setup>
+import {
+  toRefs,
+  computed,
+  inject,
+  provide,
+  useTemplateRef,
+  onBeforeUnmount
+} from "vue";
+import { useElementVisibility, useIdle } from "@vueuse/core";
+import { usePlayerState } from "../composables/private/usePlayerState";
 import { usePlayerVideoApi } from "../composables/private/usePlayerVideoApi";
 import { usePlayerControlsApi } from "../composables/private/usePlayerControlsApi";
-import { MagicPlayerInstanceId, MagicPlayerOptionsKey } from "../symbols";
+import {
+  MagicPlayerInstanceId,
+  MagicPlayerOptionsKey,
+  MagicPlayerTrackRef,
+  MagicPlayerPopoverRef,
+  MagicPlayerBarRef
+} from "../symbols";
 import "@maas/vue-equipment/utils/css/animations/fade-up-in.css";
 import "@maas/vue-equipment/utils/css/animations/fade-up-out.css";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicPlayerVideoControls",
-  props: {
-    id: { type: String, required: false },
-    standalone: { type: Boolean, required: false, default: false },
-    transition: { type: String, required: false }
+const {
+  id,
+  standalone = false,
+  transition
+} = defineProps({
+  id: {
+    type: String,
+    required: false
   },
-  setup(__props) {
-    const instanceId = inject(MagicPlayerInstanceId, void 0);
-    const mappedId = computed(() => __props.id ?? instanceId);
-    if (!mappedId.value) {
-      throw new Error(
-        "MagicPlayerVideoControls must be nested inside MagicPlayerProvider or be passed an id as a prop."
-      );
-    }
-    const injectedOptions = inject(MagicPlayerOptionsKey, void 0);
-    const mappedTransition = computed(
-      () => __props.transition ?? injectedOptions?.transition?.videoControls
-    );
-    const barRef = useTemplateRef("bar");
-    const trackRef = useTemplateRef("track");
-    const popoverRef = useTemplateRef("popover");
-    const { playing, waiting, muted } = usePlayerMediaApi({
-      id: mappedId.value
-    });
-    const {
-      touched,
-      mouseEntered,
-      isFullscreen,
-      play,
-      pause,
-      mute,
-      unmute,
-      enterFullscreen,
-      exitFullscreen
-    } = usePlayerVideoApi({ id: mappedId.value });
-    const { popoverOffsetX, seekedTime } = usePlayerControlsApi({
-      id: mappedId.value,
-      barRef,
-      trackRef,
-      popoverRef
-    });
-    const { idle } = useIdle(3e3);
-    const hidden = computed(() => {
-      switch (true) {
-        case __props.standalone:
-          return false;
-        case (playing.value && idle.value):
-          return true;
-        case (playing.value && !mouseEntered.value):
-          return true;
-        case !touched.value:
-          return true;
-        default:
-          return false;
-      }
-    });
-    provide(MagicPlayerInstanceId, mappedId.value);
-    return (_ctx, _cache) => {
-      const _component_magic_player_timeline = _resolveComponent("magic-player-timeline");
-      return _openBlock(), _createElementBlock("div", {
-        class: "magic-player-video-controls",
-        "data-fullscreen": _unref(isFullscreen),
-        "data-touched": _unref(touched),
-        "data-playing": _unref(playing),
-        "data-paused": !_unref(playing),
-        "data-waiting": _unref(waiting),
-        "data-muted": _unref(muted),
-        "data-idle": _unref(idle),
-        "data-hover": _unref(mouseEntered),
-        "data-standalone": _ctx.standalone
-      }, [
-        _createVNode(_Transition, {
-          name: mappedTransition.value,
-          persisted: ""
-        }, {
-          default: _withCtx(() => [
-            _withDirectives(_createElementVNode(
-              "div",
-              _hoisted_2,
-              [
-                _ctx.$slots.popover ? _withDirectives((_openBlock(), _createElementBlock(
-                  "div",
-                  {
-                    key: 0,
-                    ref: "popover",
-                    class: "magic-player-video-controls__popover",
-                    style: _normalizeStyle({ marginLeft: `${_unref(popoverOffsetX)}%` })
-                  },
-                  [
-                    _renderSlot(_ctx.$slots, "popover")
-                  ],
-                  4
-                  /* STYLE */
-                )), [
-                  [_vShow, !!_unref(seekedTime) && _unref(touched)]
-                ]) : _createCommentVNode("v-if", true),
-                _createElementVNode(
-                  "div",
-                  _hoisted_3,
-                  [
-                    _createElementVNode("div", _hoisted_4, [
-                      !_unref(playing) ? (_openBlock(), _createElementBlock("button", {
-                        key: 0,
-                        onClick: _cache[0] || (_cache[0] = //@ts-ignore
-                        (...args) => _unref(play) && _unref(play)(...args))
-                      }, [
-                        _renderSlot(_ctx.$slots, "playIcon", {}, () => [
-                          _createVNode(IconPlay)
-                        ])
-                      ])) : (_openBlock(), _createElementBlock("button", {
-                        key: 1,
-                        onClick: _cache[1] || (_cache[1] = //@ts-ignore
-                        (...args) => _unref(pause) && _unref(pause)(...args))
-                      }, [
-                        _renderSlot(_ctx.$slots, "pauseIcon", {}, () => [
-                          _createVNode(IconPause)
-                        ])
-                      ]))
-                    ]),
-                    _createElementVNode("div", _hoisted_5, [
-                      _renderSlot(_ctx.$slots, "timelineBefore"),
-                      _createElementVNode(
-                        "div",
-                        _hoisted_6,
-                        [
-                          _createVNode(_component_magic_player_timeline)
-                        ],
-                        512
-                        /* NEED_PATCH */
-                      ),
-                      _renderSlot(_ctx.$slots, "timelineAfter")
-                    ]),
-                    _createElementVNode("div", _hoisted_7, [
-                      _unref(muted) ? (_openBlock(), _createElementBlock("button", {
-                        key: 0,
-                        onClick: _cache[2] || (_cache[2] = //@ts-ignore
-                        (...args) => _unref(unmute) && _unref(unmute)(...args))
-                      }, [
-                        _renderSlot(_ctx.$slots, "volumeOffIcon", {}, () => [
-                          _createVNode(IconVolumeOff)
-                        ])
-                      ])) : (_openBlock(), _createElementBlock("button", {
-                        key: 1,
-                        onClick: _cache[3] || (_cache[3] = //@ts-ignore
-                        (...args) => _unref(mute) && _unref(mute)(...args))
-                      }, [
-                        _renderSlot(_ctx.$slots, "volumeOnIcon", {}, () => [
-                          _createVNode(IconVolumeOn)
-                        ])
-                      ]))
-                    ]),
-                    _createElementVNode("div", _hoisted_8, [
-                      _unref(isFullscreen) ? (_openBlock(), _createElementBlock("button", {
-                        key: 0,
-                        onClick: _cache[4] || (_cache[4] = //@ts-ignore
-                        (...args) => _unref(exitFullscreen) && _unref(exitFullscreen)(...args))
-                      }, [
-                        _renderSlot(_ctx.$slots, "fullscreenExitIcon", {}, () => [
-                          _createVNode(IconFullscreenExit)
-                        ])
-                      ])) : (_openBlock(), _createElementBlock("button", {
-                        key: 1,
-                        onClick: _cache[5] || (_cache[5] = //@ts-ignore
-                        (...args) => _unref(enterFullscreen) && _unref(enterFullscreen)(...args))
-                      }, [
-                        _renderSlot(_ctx.$slots, "fullscreenEnterIcon", {}, () => [
-                          _createVNode(IconFullscreenEnter)
-                        ])
-                      ]))
-                    ])
-                  ],
-                  512
-                  /* NEED_PATCH */
-                )
-              ],
-              512
-              /* NEED_PATCH */
-            ), [
-              [_vShow, !hidden.value]
-            ])
-          ]),
-          _: 3
-          /* FORWARDED */
-        }, 8, ["name"])
-      ], 8, _hoisted_1);
-    };
+  standalone: {
+    type: Boolean,
+    required: false
+  },
+  transition: {
+    type: String,
+    required: false
   }
 });
+const injectedInstanceId = inject(MagicPlayerInstanceId, void 0);
+const mappedInstanceId = computed(() => id ?? injectedInstanceId);
+if (!mappedInstanceId.value) {
+  throw new Error(
+    "MagicPlayerVideoControls must be nested inside MagicPlayerProvider or be passed an id as a prop."
+  );
+}
+const injectedOptions = inject(MagicPlayerOptionsKey, void 0);
+const mappedTransition = computed(
+  () => transition ?? injectedOptions?.transition?.videoControls
+);
+const barRef = useTemplateRef("bar");
+const trackRef = useTemplateRef("track");
+const popoverRef = useTemplateRef("popover");
+const { initializeState } = usePlayerState(mappedInstanceId.value);
+const state = initializeState();
+const {
+  playing,
+  waiting,
+  muted,
+  touched,
+  mouseEntered,
+  controlsMouseEntered,
+  isFullscreen,
+  popoverOffsetX,
+  seekedTime
+} = toRefs(state);
+const { play, pause, mute, unmute, enterFullscreen, exitFullscreen } = usePlayerVideoApi({ id: mappedInstanceId.value });
+const { initialize, destroy, onMouseenter, onMouseleave } = usePlayerControlsApi({
+  id: mappedInstanceId.value,
+  barRef,
+  trackRef,
+  popoverRef
+});
+const elRef = useTemplateRef("el");
+const isVisible = useElementVisibility(elRef);
+const { idle } = useIdle(3e3);
+const hidden = computed(() => {
+  switch (true) {
+    case standalone:
+      return false;
+    case (playing.value && idle.value):
+      return true;
+    case (playing.value && !controlsMouseEntered.value && !mouseEntered.value):
+      return true;
+    case !isVisible.value:
+      return true;
+    case !touched.value:
+      return true;
+    default:
+      return false;
+  }
+});
+initialize();
+onBeforeUnmount(() => {
+  destroy();
+});
+provide(MagicPlayerInstanceId, mappedInstanceId.value);
+provide(MagicPlayerTrackRef, trackRef);
+provide(MagicPlayerPopoverRef, popoverRef);
+provide(MagicPlayerBarRef, barRef);
 </script>

package/dist/plugins/MagicPlayer/src/components/MagicPlayerVideoControls.vue.d.ts

@@ -12,9 +12,9 @@ interface MagicPlayerControlsProps {
     transition?: string;
 }
 declare const mappedTransition: import("vue").ComputedRef<string | undefined>;
-declare const playing: import("vue").ShallowRef<boolean, boolean>, waiting: import("vue").ShallowRef<boolean, boolean>, muted: import("vue").ShallowRef<boolean, boolean>;
-declare const touched: import("vue").ShallowRef<boolean, boolean>, mouseEntered: import("vue").ShallowRef<boolean, boolean>, isFullscreen: import("vue").Ref<boolean, boolean>, play: () => void, pause: () => void, mute: () => void, unmute: () => void, enterFullscreen: () => void, exitFullscreen: () => void;
-declare const popoverOffsetX: import("vue").ShallowRef<number, number>, seekedTime: import("vue").ShallowRef<number, number>;
+declare const playing: import("vue").Ref<boolean, boolean>, waiting: import("vue").Ref<boolean, boolean>, muted: import("vue").Ref<boolean, boolean>, touched: import("vue").Ref<boolean, boolean>, controlsMouseEntered: import("vue").Ref<boolean, boolean>, isFullscreen: import("vue").Ref<boolean, boolean>, popoverOffsetX: import("vue").Ref<number, number>, seekedTime: import("vue").Ref<number, number>;
+declare const play: () => void, pause: () => void, mute: () => void, unmute: () => void, enterFullscreen: () => void, exitFullscreen: () => void;
+declare const onMouseenter: () => void, onMouseleave: () => void;
 declare const idle: import("vue").Ref<boolean, boolean>;
 declare const hidden: import("vue").ComputedRef<boolean>;
 declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
@@ -50,16 +50,18 @@ declare const __VLS_self: import("vue").DefineComponent<MagicPlayerControlsProps
     waiting: typeof waiting;
     muted: typeof muted;
     touched: typeof touched;
-    mouseEntered: typeof mouseEntered;
+    controlsMouseEntered: typeof controlsMouseEntered;
     isFullscreen: typeof isFullscreen;
+    popoverOffsetX: typeof popoverOffsetX;
+    seekedTime: typeof seekedTime;
     play: typeof play;
     pause: typeof pause;
     mute: typeof mute;
     unmute: typeof unmute;
     enterFullscreen: typeof enterFullscreen;
     exitFullscreen: typeof exitFullscreen;
-    popoverOffsetX: typeof popoverOffsetX;
-    seekedTime: typeof seekedTime;
+    onMouseenter: typeof onMouseenter;
+    onMouseleave: typeof onMouseleave;
     idle: typeof idle;
     hidden: typeof hidden;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicPlayerControlsProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/plugins/MagicPlayer/src/composables/private/usePlayerAudioApi.d.ts

@@ -3,15 +3,11 @@ export type UsePlayerAudioApiArgs = {
     id: MaybeRef<string>;
 };
 export declare function usePlayerAudioApi(args: UsePlayerAudioApiArgs): {
-    mouseEntered: import("vue").ShallowRef<boolean, boolean>;
-    touched: import("vue").ShallowRef<boolean, boolean>;
     play: () => void;
     pause: () => void;
     togglePlay: () => void;
     seek: (time: number) => void;
     mute: () => void;
     unmute: () => void;
-    onMouseenter: () => void;
-    onMouseleave: () => void;
 };
 export type UsePlayerAudioApiReturn = ReturnType<typeof usePlayerAudioApi>;