@micromag/core 0.3.203 → 0.3.206

package/es/hooks.js

@@ -216,25 +216,16 @@ function useSpringValue(wantedProgress, immediate, params) {
   var onChange = useCallback(function (spring) {
     return setProgress(getValueFromSpring(spring));
   }, [setProgress]);
+  useSpring(_objectSpread({
+    progress: wantedProgress,
+    onChange: onChange,
+    immediate: immediate
+  }, params)); // useEffect(() => {
+  //     if (wantedProgress !== null) {
+  //         api.start({ progress: wantedProgress, immediate, ...params });
+  //     }
+  // }, [wantedProgress, immediate, params, api]);
 
-  var _useSpring = useSpring(function () {
-    return _objectSpread({
-      progress: wantedProgress,
-      onChange: onChange,
-      immediate: immediate
-    }, params);
-  }),
-      _useSpring2 = _slicedToArray(_useSpring, 2),
-      api = _useSpring2[1];
-
-  useEffect(function () {
-    if (wantedProgress !== null) {
-      api.start(_objectSpread({
-        progress: wantedProgress,
-        immediate: immediate
-      }, params));
-    }
-  }, [wantedProgress, immediate, params, api]);
   return immediate ? wantedProgress : progress;
 }
 
@@ -252,7 +243,12 @@ function useDragProgress() {
       _ref$onProgress = _ref.onProgress,
       onProgress = _ref$onProgress === void 0 ? null : _ref$onProgress,
       _ref$springParams = _ref.springParams,
-      springParams = _ref$springParams === void 0 ? undefined : _ref$springParams;
+      springParams = _ref$springParams === void 0 ? undefined : _ref$springParams,
+      _ref$dragOptions = _ref.dragOptions,
+      dragOptions = _ref$dragOptions === void 0 ? {
+    filterTaps: true,
+    preventDefault: true
+  } : _ref$dragOptions;
 
   var refDragging = useRef(false);
 
@@ -266,7 +262,7 @@ function useDragProgress() {
       progress = _useState2$.progress,
       setDragState = _useState2[1];
 
-  var onDragContent = useCallback(function (gestureState) {
+  var onDrag = useCallback(function (gestureState) {
     if (disabled) {
       return;
     }
@@ -294,10 +290,7 @@ function useDragProgress() {
       onProgress(newProgress, gestureState);
     }
   }, [setDragState, disabled, onTap, computeProgress, setDragState, onProgress]);
-  var bind = useDrag(onDragContent, {
-    filterTaps: true,
-    preventDefault: true
-  });
+  var bind = useDrag(onDrag, dragOptions);
   var springedProgress = useSpringValue(progress, dragging || disabled, springParams);
   useEffect(function () {
     if (wantedProgress !== progress && !refDragging.current) {
@@ -1523,18 +1516,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('timeupdate', onResume);
     media.addEventListener('pause', onPause);
     media.addEventListener('ended', onPause);
     media.addEventListener('waiting', onPause);
@@ -1550,13 +1550,14 @@ function useMediaProgress(media) {
       media.removeEventListener('play', onResume);
       media.removeEventListener('seeked', 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 () {};

package/lib/hooks.js

@@ -254,25 +254,16 @@ function useSpringValue(wantedProgress, immediate, params) {
   var onChange = react.useCallback(function (spring) {
     return setProgress(getValueFromSpring(spring));
   }, [setProgress]);
+  core$1.useSpring(_objectSpread__default["default"]({
+    progress: wantedProgress,
+    onChange: onChange,
+    immediate: immediate
+  }, params)); // useEffect(() => {
+  //     if (wantedProgress !== null) {
+  //         api.start({ progress: wantedProgress, immediate, ...params });
+  //     }
+  // }, [wantedProgress, immediate, params, api]);
 
-  var _useSpring = core$1.useSpring(function () {
-    return _objectSpread__default["default"]({
-      progress: wantedProgress,
-      onChange: onChange,
-      immediate: immediate
-    }, params);
-  }),
-      _useSpring2 = _slicedToArray__default["default"](_useSpring, 2),
-      api = _useSpring2[1];
-
-  react.useEffect(function () {
-    if (wantedProgress !== null) {
-      api.start(_objectSpread__default["default"]({
-        progress: wantedProgress,
-        immediate: immediate
-      }, params));
-    }
-  }, [wantedProgress, immediate, params, api]);
   return immediate ? wantedProgress : progress;
 }
 
@@ -290,7 +281,12 @@ function useDragProgress() {
       _ref$onProgress = _ref.onProgress,
       onProgress = _ref$onProgress === void 0 ? null : _ref$onProgress,
       _ref$springParams = _ref.springParams,
-      springParams = _ref$springParams === void 0 ? undefined : _ref$springParams;
+      springParams = _ref$springParams === void 0 ? undefined : _ref$springParams,
+      _ref$dragOptions = _ref.dragOptions,
+      dragOptions = _ref$dragOptions === void 0 ? {
+    filterTaps: true,
+    preventDefault: true
+  } : _ref$dragOptions;
 
   var refDragging = react.useRef(false);
 
@@ -304,7 +300,7 @@ function useDragProgress() {
       progress = _useState2$.progress,
       setDragState = _useState2[1];
 
-  var onDragContent = react.useCallback(function (gestureState) {
+  var onDrag = react.useCallback(function (gestureState) {
     if (disabled) {
       return;
     }
@@ -332,10 +328,7 @@ function useDragProgress() {
       onProgress(newProgress, gestureState);
     }
   }, [setDragState, disabled, onTap, computeProgress, setDragState, onProgress]);
-  var bind = react$1.useDrag(onDragContent, {
-    filterTaps: true,
-    preventDefault: true
-  });
+  var bind = react$1.useDrag(onDrag, dragOptions);
   var springedProgress = useSpringValue(progress, dragging || disabled, springParams);
   react.useEffect(function () {
     if (wantedProgress !== progress && !refDragging.current) {
@@ -1561,18 +1554,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('timeupdate', onResume);
     media.addEventListener('pause', onPause);
     media.addEventListener('ended', onPause);
     media.addEventListener('waiting', onPause);
@@ -1588,13 +1588,14 @@ function useMediaProgress(media) {
       media.removeEventListener('play', onResume);
       media.removeEventListener('seeked', 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 () {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.203",
+    "version": "0.3.206",
     "description": "",
     "keywords": [
         "javascript"
@@ -133,5 +133,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b297ceba08e2590bf75836ede1154bef06829ee5"
+    "gitHead": "ed021987825fdacbf30fa486cc4f9f55b414ae47"
 }