@micromag/core 0.3.204 → 0.3.207

package/es/hooks.js

@@ -1489,16 +1489,17 @@ function useMediaProgress(media) {
   var _useState = useState(!disabled),
       _useState2 = _slicedToArray(_useState, 2),
       playing = _useState2[0],
-      setPlaying = _useState2[1];
+      setPlaying = _useState2[1]; // const currentTime = useMediaCurrentTime(media, {
+  //     disabled: disabled || !playing,
+  //     ...props,
+  // });
+
 
-  var currentTime = useMediaCurrentTime(media, _objectSpread({
-    disabled: disabled || !playing
-  }, props));
   var duration = useMediaDuration(media, _objectSpread({
     disabled: disabled || !playing
   }, props));
 
-  var _useState3 = useState(currentTime > 0 && duration > 0 ? currentTime / duration : 0),
+  var _useState3 = useState(media !== null && (media.currentTime || 0) > 0 && duration > 0 ? media.currentTime / duration : 0),
       _useState4 = _slicedToArray(_useState3, 2),
       progress = _useState4[0],
       setProgress = _useState4[1];
@@ -1516,18 +1517,25 @@ function useMediaProgress(media) {
     }
 
     function onResume() {
-      setPlaying(true);
+      if (!playing) {
+        setPlaying(true);
+      }
+
       updateProgress(media.currentTime / media.duration);
     }
 
     function onPause() {
-      setPlaying(false);
+      if (playing) {
+        setPlaying(false);
+      }
+
       updateProgress(media.currentTime / media.duration);
     }
 
     media.addEventListener('play', onResume);
     media.addEventListener('seeked', onResume);
-    media.addEventListener('playing', onResume);
+    media.addEventListener('playing', onResume); // media.addEventListener('timeupdate', onResume);
+
     media.addEventListener('pause', onPause);
     media.addEventListener('ended', onPause);
     media.addEventListener('waiting', onPause);
@@ -1542,20 +1550,17 @@ function useMediaProgress(media) {
     return function () {
       media.removeEventListener('play', onResume);
       media.removeEventListener('seeked', onResume);
-      media.removeEventListener('playing', onResume);
+      media.removeEventListener('playing', onResume); // media.removeEventListener('timeupdate', onResume);
+
       media.removeEventListener('pause', onPause);
       media.removeEventListener('ended', onPause);
       media.removeEventListener('waiting', onPause);
       media.removeEventListener('stalled', onPause);
       media.removeEventListener('seeking', onPause); // media.removeEventListener('suspend', onPause);
     };
-  }, [media, updateProgress]);
+  }, [media, updateProgress, setPlaying, playing]);
   useEffect(function () {
-    if (media === null) {
-      return function () {};
-    }
-
-    if (!playing || disabled) {
+    if (media === null || !playing || disabled) {
       return function () {};
     }
 

package/lib/hooks.js

@@ -1527,16 +1527,17 @@ function useMediaProgress(media) {
   var _useState = react.useState(!disabled),
       _useState2 = _slicedToArray__default["default"](_useState, 2),
       playing = _useState2[0],
-      setPlaying = _useState2[1];
+      setPlaying = _useState2[1]; // const currentTime = useMediaCurrentTime(media, {
+  //     disabled: disabled || !playing,
+  //     ...props,
+  // });
+
 
-  var currentTime = useMediaCurrentTime(media, _objectSpread__default["default"]({
-    disabled: disabled || !playing
-  }, props));
   var duration = useMediaDuration(media, _objectSpread__default["default"]({
     disabled: disabled || !playing
   }, props));
 
-  var _useState3 = react.useState(currentTime > 0 && duration > 0 ? currentTime / duration : 0),
+  var _useState3 = react.useState(media !== null && (media.currentTime || 0) > 0 && duration > 0 ? media.currentTime / duration : 0),
       _useState4 = _slicedToArray__default["default"](_useState3, 2),
       progress = _useState4[0],
       setProgress = _useState4[1];
@@ -1554,18 +1555,25 @@ function useMediaProgress(media) {
     }
 
     function onResume() {
-      setPlaying(true);
+      if (!playing) {
+        setPlaying(true);
+      }
+
       updateProgress(media.currentTime / media.duration);
     }
 
     function onPause() {
-      setPlaying(false);
+      if (playing) {
+        setPlaying(false);
+      }
+
       updateProgress(media.currentTime / media.duration);
     }
 
     media.addEventListener('play', onResume);
     media.addEventListener('seeked', onResume);
-    media.addEventListener('playing', onResume);
+    media.addEventListener('playing', onResume); // media.addEventListener('timeupdate', onResume);
+
     media.addEventListener('pause', onPause);
     media.addEventListener('ended', onPause);
     media.addEventListener('waiting', onPause);
@@ -1580,20 +1588,17 @@ function useMediaProgress(media) {
     return function () {
       media.removeEventListener('play', onResume);
       media.removeEventListener('seeked', onResume);
-      media.removeEventListener('playing', onResume);
+      media.removeEventListener('playing', onResume); // media.removeEventListener('timeupdate', onResume);
+
       media.removeEventListener('pause', onPause);
       media.removeEventListener('ended', onPause);
       media.removeEventListener('waiting', onPause);
       media.removeEventListener('stalled', onPause);
       media.removeEventListener('seeking', onPause); // media.removeEventListener('suspend', onPause);
     };
-  }, [media, updateProgress]);
+  }, [media, updateProgress, setPlaying, playing]);
   react.useEffect(function () {
-    if (media === null) {
-      return function () {};
-    }
-
-    if (!playing || disabled) {
+    if (media === null || !playing || disabled) {
       return function () {};
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.204",
+    "version": "0.3.207",
     "description": "",
     "keywords": [
         "javascript"
@@ -133,5 +133,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3760b85f2b98c900c8ab9470c5d303074985cb4f"
+    "gitHead": "e7e2958bb7e9e222cc8621b44a90f1e974dd93b6"
 }