fix(standard): player not becoming active

vime-js · Apr 10, 2020 · 0c8817c · 0c8817c
1 parent fc724c4
commit 0c8817c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/vime-standard/src/StandardPlayer.svelte b/packages/vime-standard/src/StandardPlayer.svelte
@@ -41,8 +41,15 @@
   let self = get_current_component();
 
   // eslint-disable-next-line no-underscore-dangle
-  export let _standardStore = buildStandardStore(self);
-  const { store, resetStore, onPropsChange } = _standardStore;
+  export let _standardStore = null;
+
+  let onPropsChange = noop;
+  if (is_null(_standardStore)) {
+    _standardStore = buildStandardStore(self);
+    ({ onPropsChange } = _standardStore);
+  }
+
+  const { store, resetStore } = _standardStore;
   $: onPropsChange($$props);
 
   const {
@@ -57,7 +64,7 @@
     currentTrackIndex, provider, rebuilding,
     isVideoReady, canInteract, isFullscreenActive,
     useNativeView, useNativeControls, useNativeCaptions,
-    duration, Provider,
+    duration, Provider, isPlayerActive,
   } = store;
 
   const {
@@ -86,7 +93,8 @@
     self = null;
   });
 
-  $: if (!$currentPlayer) $currentPlayer = self;
+  if (is_null(currentPlayer)) currentPlayer.set(self);
+  $: $isPlayerActive = ($currentPlayer === self);
 
   // --------------------------------------------------------------
   // Provider Events

diff --git a/packages/vime-standard/src/standardStore.js b/packages/vime-standard/src/standardStore.js
@@ -1,5 +1,4 @@
 import { writable, derived } from 'svelte/store';
-import { currentPlayer } from './sharedStore';
 import PlayerState from './PlayerState';
 import MediaType from './MediaType';
 import VideoQuality from './VideoQuality';
@@ -187,7 +186,7 @@ export const buildStandardStore = (player) => {
   store.playbackEnded = private_writable(defaults.playbackEnded);
   store.playbackStarted = private_writable(defaults.playbackStarted);
   store.seeking = private_writable(defaults.seeking);
-  store.isPlayerActive = derived(currentPlayer, ($currentPlayer) => $currentPlayer === player);
+  store.isPlayerActive = private_writable(false);
 
   store.state = derived(
     [