@micromag/core 0.3.122 → 0.3.135

package/es/hooks.js

@@ -736,6 +736,8 @@ var useMediaApi = function useMediaApi() {
       onEnded = _ref$onEnded === void 0 ? null : _ref$onEnded,
       _ref$onSeeked = _ref.onSeeked,
       onSeeked = _ref$onSeeked === void 0 ? null : _ref$onSeeked,
+      _ref$onSuspended = _ref.onSuspended,
+      onSuspended = _ref$onSuspended === void 0 ? null : _ref$onSuspended,
       _ref$onLoadStart = _ref.onLoadStart,
       onLoadStart = _ref$onLoadStart === void 0 ? null : _ref$onLoadStart,
       _ref$onCanPlayThough = _ref.onCanPlayThough,
@@ -784,6 +786,11 @@ var useMediaApi = function useMediaApi() {
       initialPlay = _useState14[0],
       setInitialPlay = _useState14[1];
 
+  var _useState15 = useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      suspended = _useState16[0],
+      setSuspended = _useState16[1];
+
   var progressStepsReached = useRef({});
   var paused = !playing; // Exposed methods
 
@@ -959,44 +966,102 @@ var useMediaApi = function useMediaApi() {
       onLoadedData();
     }
   }, [setDataReady, onLoadedData]);
+  var onCustomSuspended = useCallback(function () {
+    setSuspended(true);
+
+    if (onSuspended !== null) {
+      onSuspended();
+    }
+  }, [setDataReady, onLoadedData]);
   useEffect(function () {
     var _ref$current = ref.current,
-        media = _ref$current === void 0 ? null : _ref$current;
+        media = _ref$current === void 0 ? null : _ref$current; // console.log('actions', url);
 
     if (media !== null) {
-      media.addEventListener('timeupdate', onCustomTimeUpdate);
-      media.addEventListener('durationchange', onCustomDurationChange);
       media.addEventListener('volumechange', onCustomVolumeChange);
       media.addEventListener('play', onCustomPlay);
       media.addEventListener('pause', onCustomPause);
       media.addEventListener('ended', onCustomEnded);
-      media.addEventListener('seeked', onCustomSeeked);
+      media.addEventListener('seeked', onCustomSeeked); // media.addEventListener('loadstart', onCustomLoadStart);
+      // media.addEventListener('canplaythrough', onCustomCanPlayThrough);
+      // media.addEventListener('canplay', onCustomCanPlay);
+      // media.addEventListener('loadedmetadata', onCustomLoadedMetadata);
+      // media.addEventListener('loadeddata', onCustomLoadedData);
+    }
+
+    return function () {
+      if (media !== null) {
+        media.removeEventListener('volumechange', onCustomVolumeChange);
+        media.removeEventListener('play', onCustomPlay);
+        media.removeEventListener('pause', onCustomPause);
+        media.removeEventListener('ended', onCustomEnded);
+        media.removeEventListener('seeked', onCustomSeeked); // media.removeEventListener('loadstart', onCustomLoadStart);
+        // media.removeEventListener('canplaythrough', onCustomCanPlayThrough);
+        // media.removeEventListener('canplay', onCustomCanPlay);
+        // media.removeEventListener('loadedmetadata', onCustomLoadedMetadata);
+      }
+    };
+  }, [url, onCustomVolumeChange, onCustomPlay, onCustomPause, onCustomEnded, onCustomSeeked, onCustomSuspended // onCustomLoadStart,
+  // onCustomCanPlayThrough,
+  // onCustomCanPlay,
+  // onCustomLoadedMetadata,
+  ]);
+  useEffect(function () {
+    var _ref$current2 = ref.current,
+        media = _ref$current2 === void 0 ? null : _ref$current2;
+
+    if (media !== null) {
       media.addEventListener('loadstart', onCustomLoadStart);
       media.addEventListener('canplaythrough', onCustomCanPlayThrough);
       media.addEventListener('canplay', onCustomCanPlay);
       media.addEventListener('loadedmetadata', onCustomLoadedMetadata);
       media.addEventListener('loadeddata', onCustomLoadedData);
+      media.addEventListener('suspend', onCustomSuspended);
     }
 
     return function () {
       if (media !== null) {
-        media.removeEventListener('timeupdate', onCustomTimeUpdate);
-        media.removeEventListener('durationchange', onCustomDurationChange);
-        media.removeEventListener('volumechange', onCustomVolumeChange);
-        media.removeEventListener('play', onCustomPlay);
-        media.removeEventListener('pause', onCustomPause);
-        media.removeEventListener('ended', onCustomEnded);
-        media.removeEventListener('seeked', onCustomSeeked);
         media.removeEventListener('loadstart', onCustomLoadStart);
         media.removeEventListener('canplaythrough', onCustomCanPlayThrough);
         media.removeEventListener('canplay', onCustomCanPlay);
         media.removeEventListener('loadedmetadata', onCustomLoadedMetadata);
+        media.removeEventListener('suspend', onCustomSuspended);
       }
     };
-  }, [url, onCustomTimeUpdate, onCustomDurationChange, onCustomVolumeChange, onCustomPlay, onCustomPause, onCustomEnded, onCustomSeeked, onCustomLoadStart, onCustomCanPlayThrough, onCustomCanPlay, onCustomLoadedMetadata]);
+  }, [url, onCustomLoadStart, onCustomCanPlayThrough, onCustomCanPlay, onCustomLoadedMetadata, onCustomSuspended]); // Duration
+
   useEffect(function () {
-    var _ref$current2 = ref.current,
-        media = _ref$current2 === void 0 ? null : _ref$current2;
+    var _ref$current3 = ref.current,
+        media = _ref$current3 === void 0 ? null : _ref$current3;
+
+    if (media !== null) {
+      media.addEventListener('durationchange', onCustomDurationChange);
+    }
+
+    return function () {
+      if (media !== null) {
+        media.removeEventListener('durationchange', onCustomDurationChange);
+      }
+    };
+  }, [url, onCustomDurationChange]); // Timeupdate
+
+  useEffect(function () {
+    var _ref$current4 = ref.current,
+        media = _ref$current4 === void 0 ? null : _ref$current4; // console.log('timeupdate', url);
+
+    if (media !== null) {
+      media.addEventListener('timeupdate', onCustomTimeUpdate);
+    }
+
+    return function () {
+      if (media !== null) {
+        media.removeEventListener('timeupdate', onCustomTimeUpdate);
+      }
+    };
+  }, [url, onCustomTimeUpdate, onCustomDurationChange]);
+  useEffect(function () {
+    var _ref$current5 = ref.current,
+        media = _ref$current5 === void 0 ? null : _ref$current5;
 
     if (media !== null && media.readyState > 1) {
       setDataReady(true);
@@ -1026,7 +1091,8 @@ var useMediaApi = function useMediaApi() {
     playing: playing,
     paused: paused,
     ready: ready,
-    dataReady: dataReady
+    dataReady: dataReady,
+    suspended: suspended
   };
 };
 

package/es/utils.js

@@ -928,8 +928,22 @@ var setValue = function setValue(value, keyParts, fieldValue) {
     if (isArray) {
       var index = parseInt(key, 10); // TODO: fix this with an explicit delete
       // instead on splicing out the element on null fieldValue
-
-      var newArrayValue = fieldValue !== null ? [].concat(_toConsumableArray(value.slice(0, index)), [keyParts.length > 0 ? setValue(value !== null ? value[index] || null : null, keyParts, fieldValue) : fieldValue], _toConsumableArray(value.slice(index + 1))) : [].concat(_toConsumableArray(value.slice(0, index)), _toConsumableArray(value.slice(index + 1)));
+      // const newArrayValue =
+      //     fieldValue !== null
+      //         ? [
+      //               ...value.slice(0, index),
+      //               keyParts.length > 0
+      //                   ? setValue(
+      //                         value !== null ? value[index] || null : null,
+      //                         keyParts,
+      //                         fieldValue,
+      //                     )
+      //                   : fieldValue,
+      //               ...value.slice(index + 1),
+      //           ]
+      //         : [...value.slice(0, index), ...value.slice(index + 1)];
+
+      var newArrayValue = [].concat(_toConsumableArray(value.slice(0, index)), [keyParts.length > 0 ? setValue(value !== null ? value[index] || null : null, keyParts, fieldValue) : fieldValue], _toConsumableArray(value.slice(index + 1)));
       return newArrayValue.length > 0 ? newArrayValue : null;
     }
 

package/lib/hooks.js

@@ -772,6 +772,8 @@ var useMediaApi = function useMediaApi() {
       onEnded = _ref$onEnded === void 0 ? null : _ref$onEnded,
       _ref$onSeeked = _ref.onSeeked,
       onSeeked = _ref$onSeeked === void 0 ? null : _ref$onSeeked,
+      _ref$onSuspended = _ref.onSuspended,
+      onSuspended = _ref$onSuspended === void 0 ? null : _ref$onSuspended,
       _ref$onLoadStart = _ref.onLoadStart,
       onLoadStart = _ref$onLoadStart === void 0 ? null : _ref$onLoadStart,
       _ref$onCanPlayThough = _ref.onCanPlayThough,
@@ -820,6 +822,11 @@ var useMediaApi = function useMediaApi() {
       initialPlay = _useState14[0],
       setInitialPlay = _useState14[1];
 
+  var _useState15 = react.useState(false),
+      _useState16 = _slicedToArray__default["default"](_useState15, 2),
+      suspended = _useState16[0],
+      setSuspended = _useState16[1];
+
   var progressStepsReached = react.useRef({});
   var paused = !playing; // Exposed methods
 
@@ -995,44 +1002,102 @@ var useMediaApi = function useMediaApi() {
       onLoadedData();
     }
   }, [setDataReady, onLoadedData]);
+  var onCustomSuspended = react.useCallback(function () {
+    setSuspended(true);
+
+    if (onSuspended !== null) {
+      onSuspended();
+    }
+  }, [setDataReady, onLoadedData]);
   react.useEffect(function () {
     var _ref$current = ref.current,
-        media = _ref$current === void 0 ? null : _ref$current;
+        media = _ref$current === void 0 ? null : _ref$current; // console.log('actions', url);
 
     if (media !== null) {
-      media.addEventListener('timeupdate', onCustomTimeUpdate);
-      media.addEventListener('durationchange', onCustomDurationChange);
       media.addEventListener('volumechange', onCustomVolumeChange);
       media.addEventListener('play', onCustomPlay);
       media.addEventListener('pause', onCustomPause);
       media.addEventListener('ended', onCustomEnded);
-      media.addEventListener('seeked', onCustomSeeked);
+      media.addEventListener('seeked', onCustomSeeked); // media.addEventListener('loadstart', onCustomLoadStart);
+      // media.addEventListener('canplaythrough', onCustomCanPlayThrough);
+      // media.addEventListener('canplay', onCustomCanPlay);
+      // media.addEventListener('loadedmetadata', onCustomLoadedMetadata);
+      // media.addEventListener('loadeddata', onCustomLoadedData);
+    }
+
+    return function () {
+      if (media !== null) {
+        media.removeEventListener('volumechange', onCustomVolumeChange);
+        media.removeEventListener('play', onCustomPlay);
+        media.removeEventListener('pause', onCustomPause);
+        media.removeEventListener('ended', onCustomEnded);
+        media.removeEventListener('seeked', onCustomSeeked); // media.removeEventListener('loadstart', onCustomLoadStart);
+        // media.removeEventListener('canplaythrough', onCustomCanPlayThrough);
+        // media.removeEventListener('canplay', onCustomCanPlay);
+        // media.removeEventListener('loadedmetadata', onCustomLoadedMetadata);
+      }
+    };
+  }, [url, onCustomVolumeChange, onCustomPlay, onCustomPause, onCustomEnded, onCustomSeeked, onCustomSuspended // onCustomLoadStart,
+  // onCustomCanPlayThrough,
+  // onCustomCanPlay,
+  // onCustomLoadedMetadata,
+  ]);
+  react.useEffect(function () {
+    var _ref$current2 = ref.current,
+        media = _ref$current2 === void 0 ? null : _ref$current2;
+
+    if (media !== null) {
       media.addEventListener('loadstart', onCustomLoadStart);
       media.addEventListener('canplaythrough', onCustomCanPlayThrough);
       media.addEventListener('canplay', onCustomCanPlay);
       media.addEventListener('loadedmetadata', onCustomLoadedMetadata);
       media.addEventListener('loadeddata', onCustomLoadedData);
+      media.addEventListener('suspend', onCustomSuspended);
     }
 
     return function () {
       if (media !== null) {
-        media.removeEventListener('timeupdate', onCustomTimeUpdate);
-        media.removeEventListener('durationchange', onCustomDurationChange);
-        media.removeEventListener('volumechange', onCustomVolumeChange);
-        media.removeEventListener('play', onCustomPlay);
-        media.removeEventListener('pause', onCustomPause);
-        media.removeEventListener('ended', onCustomEnded);
-        media.removeEventListener('seeked', onCustomSeeked);
         media.removeEventListener('loadstart', onCustomLoadStart);
         media.removeEventListener('canplaythrough', onCustomCanPlayThrough);
         media.removeEventListener('canplay', onCustomCanPlay);
         media.removeEventListener('loadedmetadata', onCustomLoadedMetadata);
+        media.removeEventListener('suspend', onCustomSuspended);
       }
     };
-  }, [url, onCustomTimeUpdate, onCustomDurationChange, onCustomVolumeChange, onCustomPlay, onCustomPause, onCustomEnded, onCustomSeeked, onCustomLoadStart, onCustomCanPlayThrough, onCustomCanPlay, onCustomLoadedMetadata]);
+  }, [url, onCustomLoadStart, onCustomCanPlayThrough, onCustomCanPlay, onCustomLoadedMetadata, onCustomSuspended]); // Duration
+
   react.useEffect(function () {
-    var _ref$current2 = ref.current,
-        media = _ref$current2 === void 0 ? null : _ref$current2;
+    var _ref$current3 = ref.current,
+        media = _ref$current3 === void 0 ? null : _ref$current3;
+
+    if (media !== null) {
+      media.addEventListener('durationchange', onCustomDurationChange);
+    }
+
+    return function () {
+      if (media !== null) {
+        media.removeEventListener('durationchange', onCustomDurationChange);
+      }
+    };
+  }, [url, onCustomDurationChange]); // Timeupdate
+
+  react.useEffect(function () {
+    var _ref$current4 = ref.current,
+        media = _ref$current4 === void 0 ? null : _ref$current4; // console.log('timeupdate', url);
+
+    if (media !== null) {
+      media.addEventListener('timeupdate', onCustomTimeUpdate);
+    }
+
+    return function () {
+      if (media !== null) {
+        media.removeEventListener('timeupdate', onCustomTimeUpdate);
+      }
+    };
+  }, [url, onCustomTimeUpdate, onCustomDurationChange]);
+  react.useEffect(function () {
+    var _ref$current5 = ref.current,
+        media = _ref$current5 === void 0 ? null : _ref$current5;
 
     if (media !== null && media.readyState > 1) {
       setDataReady(true);
@@ -1062,7 +1127,8 @@ var useMediaApi = function useMediaApi() {
     playing: playing,
     paused: paused,
     ready: ready,
-    dataReady: dataReady
+    dataReady: dataReady,
+    suspended: suspended
   };
 };
 

package/lib/utils.js

@@ -947,8 +947,22 @@ var setValue = function setValue(value, keyParts, fieldValue) {
     if (isArray) {
       var index = parseInt(key, 10); // TODO: fix this with an explicit delete
       // instead on splicing out the element on null fieldValue
-
-      var newArrayValue = fieldValue !== null ? [].concat(_toConsumableArray__default["default"](value.slice(0, index)), [keyParts.length > 0 ? setValue(value !== null ? value[index] || null : null, keyParts, fieldValue) : fieldValue], _toConsumableArray__default["default"](value.slice(index + 1))) : [].concat(_toConsumableArray__default["default"](value.slice(0, index)), _toConsumableArray__default["default"](value.slice(index + 1)));
+      // const newArrayValue =
+      //     fieldValue !== null
+      //         ? [
+      //               ...value.slice(0, index),
+      //               keyParts.length > 0
+      //                   ? setValue(
+      //                         value !== null ? value[index] || null : null,
+      //                         keyParts,
+      //                         fieldValue,
+      //                     )
+      //                   : fieldValue,
+      //               ...value.slice(index + 1),
+      //           ]
+      //         : [...value.slice(0, index), ...value.slice(index + 1)];
+
+      var newArrayValue = [].concat(_toConsumableArray__default["default"](value.slice(0, index)), [keyParts.length > 0 ? setValue(value !== null ? value[index] || null : null, keyParts, fieldValue) : fieldValue], _toConsumableArray__default["default"](value.slice(index + 1)));
       return newArrayValue.length > 0 ? newArrayValue : null;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.122",
+    "version": "0.3.135",
     "description": "",
     "keywords": [
         "javascript"
@@ -132,5 +132,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "4fbee9b4305d9a4ae0e4532a1d8e143155499878"
+    "gitHead": "b9bd185aacc16b6fb5540aa113dc7872c822e279"
 }