@micromag/core 0.4.69 → 0.4.71

package/es/contexts.js

@@ -1072,10 +1072,9 @@ var usePlaybackMediaRef = function usePlaybackMediaRef() {
 
   // Play early in the process
   var currentMedia = mediaRef.current;
-  var forcePlayingRef = useRef(false);
-  var shouldForcePlaying = active && currentMedia !== null && playing && !forcePlayingRef.current && !mediaElementIsPlaying(currentMedia);
+  var shouldForcePlaying = active && currentMedia !== null && playing && currentMedia.dataset.forcePlaying !== 'true' && !mediaElementIsPlaying(currentMedia);
   if (shouldForcePlaying) {
-    forcePlayingRef.current = true;
+    currentMedia.dataset.forcePlaying = 'true';
     currentMedia.play();
   }
 
@@ -1089,7 +1088,7 @@ var usePlaybackMediaRef = function usePlaybackMediaRef() {
   }, [active, background, media, updateKey, setMedia, setIsBackground, isBackground]);
   return {
     ref: mediaRef,
-    isCurrent: mediaRef.current === media
+    isCurrent: active || mediaRef.current === media
   };
 };
 function PlaybackProvider(_ref) {

package/es/hooks.d.ts

@@ -336,7 +336,7 @@ declare const useThemeParser: () => (story: any) => any;
 
 declare const useTrackScreenView: () => (screen?: any, index?: any) => void;
 declare const useTrackScreenEvent: (type?: any) => (action?: any, label?: any, opts?: any) => void;
-declare const useTrackScreenMedia: (type?: any) => (media?: any, action?: any, opts?: any) => void;
+declare const useTrackScreenMedia: (type?: string | null) => (media?: any, action?: any, opts?: any) => void;
 declare const useTrackEvent: () => (category?: any, action?: any, label?: any, opts?: any) => void;
 declare const useTrackMedia: (type?: any) => (media?: any, action?: any, opts?: any) => void;
 

package/es/hooks.js

@@ -2398,20 +2398,20 @@ var getScreenOptions = function getScreenOptions(screenContext, opts) {
   };
 };
 var hasTracking = function hasTracking(tracking) {
-  return typeof tracking !== 'undefined';
+  return typeof tracking !== 'undefined' && tracking !== null;
 };
 var useTrackScreenView = function useTrackScreenView() {
   var tracking = useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   return useCallback(function () {
     var screen = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    if (!hasTracking(tracking)) {
+      return;
+    }
     if (screen !== null && index !== null) {
       tracking.trackScreenView(screen, index);
     }
-  }, []);
+  }, [tracking]);
 };
 var useTrackScreenEvent = function useTrackScreenEvent() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
@@ -2435,47 +2435,44 @@ var useTrackScreenEvent = function useTrackScreenEvent() {
 var useTrackScreenMedia = function useTrackScreenMedia() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var tracking = useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   var screenContext = useScreen();
-  if (screenContext.renderContext !== 'view') {
-    return function () {};
-  }
   return useCallback(function () {
     var media = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    if (!hasTracking(tracking) || screenContext.renderContext !== 'view') {
+      return;
+    }
     if (type !== null && media !== null && action !== null) {
       tracking.trackMedia("screen_".concat(type), media, action, _objectSpread(_objectSpread({}, opts), getScreenOptions(screenContext, opts)));
     }
-  }, [screenContext]);
+  }, [tracking, screenContext, type]);
 };
 var useTrackEvent = function useTrackEvent() {
   var tracking = useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   return useCallback(function () {
     var category = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    if (!hasTracking(tracking)) {
+      return;
+    }
     if (category !== null && action !== null) {
       tracking.trackEvent(category, action, label, opts);
     }
-  }, []);
+  }, [tracking]);
 };
 var useTrackMedia = function useTrackMedia() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var tracking = useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   return useCallback(function () {
     var media = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    if (!hasTracking(tracking)) {
+      return;
+    }
     if (type !== null && media !== null && action !== null) {
       tracking.trackMedia(type, media, action, opts);
     }

package/es/utils.d.ts

@@ -1,5 +1,5 @@
 export { camelCase, pascalCase, snakeCase } from 'change-case';
-import { ComponentType } from 'react';
+import { ComponentType, ForwardedRef } from 'react';
 
 declare function addNonBreakingSpaces(text: any): any;
 
@@ -213,6 +213,8 @@ declare const isTextFilled: (text: any) => boolean;
 
 declare const isValidUrl: (string: any) => boolean;
 
+declare function mergeRefs<T>(...refs: Array<ForwardedRef<T> | null | undefined>): (value: T | null) => void;
+
 declare const schemaId: (str: any) => string;
 
 declare const setValue: (value: any, keyParts: any, fieldValue: any) => any;
@@ -225,4 +227,4 @@ declare const validateFields: (fields: any, value: any) => any;
 
 declare const getContrastingColor: (backgroundColor: any) => any;
 
-export { addNonBreakingSpaces, convertStyleToString, copyToClipboard, createNullableOnChange, createUseEvent, cssEscape, easings, getColorAsString, getComponentFromName, getContrastingColor, getDeviceScreens, getDisplayName, getFieldByName, getFieldFromPath, getFileName, getFontFamily as getFontFamilyFromFont, getFooterProps, getGridLayoutName, largestRemainderRound as getLargestRemainderRound, getLayersFromBackground, getLayoutParts, getMediaFilesAsArray, getOptimalImageUrl, getScreenExtraField, getScreenFieldsWithStates, getSecondsFromTime, getShadowCoords, getStyleFromAlignment, getStyleFromBorder, getStyleFromBox, getStyleFromColor, getStyleFromContainer, getStyleFromHighlight, getStyleFromImage, getStyleFromLink, getStyleFromMargin, getStyleFromText, getVideoSupportedMimes, isFooterFilled, isHeaderFilled, isImageFilled, isIos, isTextFilled$1 as isLabelFilled, isMessage, isTextFilled, isValidUrl, schemaId, setValue as setFieldValue, slug, unique, validateFields };
+export { addNonBreakingSpaces, convertStyleToString, copyToClipboard, createNullableOnChange, createUseEvent, cssEscape, easings, getColorAsString, getComponentFromName, getContrastingColor, getDeviceScreens, getDisplayName, getFieldByName, getFieldFromPath, getFileName, getFontFamily as getFontFamilyFromFont, getFooterProps, getGridLayoutName, largestRemainderRound as getLargestRemainderRound, getLayersFromBackground, getLayoutParts, getMediaFilesAsArray, getOptimalImageUrl, getScreenExtraField, getScreenFieldsWithStates, getSecondsFromTime, getShadowCoords, getStyleFromAlignment, getStyleFromBorder, getStyleFromBox, getStyleFromColor, getStyleFromContainer, getStyleFromHighlight, getStyleFromImage, getStyleFromLink, getStyleFromMargin, getStyleFromText, getVideoSupportedMimes, isFooterFilled, isHeaderFilled, isImageFilled, isIos, isTextFilled$1 as isLabelFilled, isMessage, isTextFilled, isValidUrl, mergeRefs, schemaId, setValue as setFieldValue, slug, unique, validateFields };

package/es/utils.js

@@ -1134,6 +1134,21 @@ var isValidUrl = function isValidUrl(string) {
   return url.protocol === 'http:' || url.protocol === 'https:';
 };
 
+function mergeRefs() {
+  for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
+    refs[_key] = arguments[_key];
+  }
+  return function (value) {
+    refs.forEach(function (ref) {
+      if (typeof ref === 'function') {
+        ref(value);
+      } else if (ref != null) {
+        ref.current = value;
+      }
+    });
+  };
+}
+
 var createSchemaId = function createSchemaId(id) {
   return "https://schemas.micromag.ca/0.1/".concat(id, ".json");
 };
@@ -1218,4 +1233,4 @@ var getContrastingColor = function getContrastingColor(backgroundColor) {
   return tinycolor(color).spin(30).toString();
 };
 
-export { addNonBreakingSpaces, convertStyleToString, copyToClipboard, createNullableOnChange, createUseEvent, cssEscape, easings, getColorAsString, getComponentFromName, getContrastingColor, getDeviceScreens, getDisplayName, _getFieldByName as getFieldByName, getFieldFromPath, getFileName, getFontFamily as getFontFamilyFromFont, getFooterProps, getGridLayoutName, largestRemainderRound as getLargestRemainderRound, getLayersFromBackground, getLayoutParts, getMediaFilesAsArray, getOptimalImageUrl, getScreenExtraField, getScreenFieldsWithStates, getSecondsFromTime, getShadowCoords, getStyleFromAlignment, getStyleFromBorder, getStyleFromBox, getStyleFromColor, getStyleFromContainer, getStyleFromHighlight, getStyleFromImage, getStyleFromLink, getStyleFromMargin, getStyleFromText, getVideoSupportedMimes, isFooterFilled, isHeaderFilled, isImageFilled, isIos, isTextFilled$1 as isLabelFilled, isMessage, isTextFilled, isValidUrl, schemaId, _setValue as setFieldValue, slug, unique, _validateFields as validateFields };
+export { addNonBreakingSpaces, convertStyleToString, copyToClipboard, createNullableOnChange, createUseEvent, cssEscape, easings, getColorAsString, getComponentFromName, getContrastingColor, getDeviceScreens, getDisplayName, _getFieldByName as getFieldByName, getFieldFromPath, getFileName, getFontFamily as getFontFamilyFromFont, getFooterProps, getGridLayoutName, largestRemainderRound as getLargestRemainderRound, getLayersFromBackground, getLayoutParts, getMediaFilesAsArray, getOptimalImageUrl, getScreenExtraField, getScreenFieldsWithStates, getSecondsFromTime, getShadowCoords, getStyleFromAlignment, getStyleFromBorder, getStyleFromBox, getStyleFromColor, getStyleFromContainer, getStyleFromHighlight, getStyleFromImage, getStyleFromLink, getStyleFromMargin, getStyleFromText, getVideoSupportedMimes, isFooterFilled, isHeaderFilled, isImageFilled, isIos, isTextFilled$1 as isLabelFilled, isMessage, isTextFilled, isValidUrl, mergeRefs, schemaId, _setValue as setFieldValue, slug, unique, _validateFields as validateFields };

package/lib/contexts.js

@@ -1072,10 +1072,9 @@ var usePlaybackMediaRef = function usePlaybackMediaRef() {
 
   // Play early in the process
   var currentMedia = mediaRef.current;
-  var forcePlayingRef = React.useRef(false);
-  var shouldForcePlaying = active && currentMedia !== null && playing && !forcePlayingRef.current && !mediaElementIsPlaying(currentMedia);
+  var shouldForcePlaying = active && currentMedia !== null && playing && currentMedia.dataset.forcePlaying !== 'true' && !mediaElementIsPlaying(currentMedia);
   if (shouldForcePlaying) {
-    forcePlayingRef.current = true;
+    currentMedia.dataset.forcePlaying = 'true';
     currentMedia.play();
   }
 
@@ -1089,7 +1088,7 @@ var usePlaybackMediaRef = function usePlaybackMediaRef() {
   }, [active, background, media, updateKey, setMedia, setIsBackground, isBackground]);
   return {
     ref: mediaRef,
-    isCurrent: mediaRef.current === media
+    isCurrent: active || mediaRef.current === media
   };
 };
 function PlaybackProvider(_ref) {

package/lib/hooks.js

@@ -2400,20 +2400,20 @@ var getScreenOptions = function getScreenOptions(screenContext, opts) {
   };
 };
 var hasTracking = function hasTracking(tracking) {
-  return typeof tracking !== 'undefined';
+  return typeof tracking !== 'undefined' && tracking !== null;
 };
 var useTrackScreenView = function useTrackScreenView() {
   var tracking = contexts.useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   return react.useCallback(function () {
     var screen = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    if (!hasTracking(tracking)) {
+      return;
+    }
     if (screen !== null && index !== null) {
       tracking.trackScreenView(screen, index);
     }
-  }, []);
+  }, [tracking]);
 };
 var useTrackScreenEvent = function useTrackScreenEvent() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
@@ -2437,47 +2437,44 @@ var useTrackScreenEvent = function useTrackScreenEvent() {
 var useTrackScreenMedia = function useTrackScreenMedia() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var tracking = contexts.useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   var screenContext = contexts.useScreen();
-  if (screenContext.renderContext !== 'view') {
-    return function () {};
-  }
   return react.useCallback(function () {
     var media = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    if (!hasTracking(tracking) || screenContext.renderContext !== 'view') {
+      return;
+    }
     if (type !== null && media !== null && action !== null) {
       tracking.trackMedia("screen_".concat(type), media, action, _objectSpread(_objectSpread({}, opts), getScreenOptions(screenContext, opts)));
     }
-  }, [screenContext]);
+  }, [tracking, screenContext, type]);
 };
 var useTrackEvent = function useTrackEvent() {
   var tracking = contexts.useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   return react.useCallback(function () {
     var category = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    if (!hasTracking(tracking)) {
+      return;
+    }
     if (category !== null && action !== null) {
       tracking.trackEvent(category, action, label, opts);
     }
-  }, []);
+  }, [tracking]);
 };
 var useTrackMedia = function useTrackMedia() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var tracking = contexts.useTracking();
-  if (!hasTracking(tracking)) {
-    return function () {};
-  }
   return react.useCallback(function () {
     var media = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    if (!hasTracking(tracking)) {
+      return;
+    }
     if (type !== null && media !== null && action !== null) {
       tracking.trackMedia(type, media, action, opts);
     }

package/lib/utils.js

@@ -1135,6 +1135,21 @@ var isValidUrl = function isValidUrl(string) {
   return url.protocol === 'http:' || url.protocol === 'https:';
 };
 
+function mergeRefs() {
+  for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
+    refs[_key] = arguments[_key];
+  }
+  return function (value) {
+    refs.forEach(function (ref) {
+      if (typeof ref === 'function') {
+        ref(value);
+      } else if (ref != null) {
+        ref.current = value;
+      }
+    });
+  };
+}
+
 var createSchemaId = function createSchemaId(id) {
   return "https://schemas.micromag.ca/0.1/".concat(id, ".json");
 };
@@ -1277,6 +1292,7 @@ exports.isLabelFilled = isTextFilled$1;
 exports.isMessage = isMessage;
 exports.isTextFilled = isTextFilled;
 exports.isValidUrl = isValidUrl;
+exports.mergeRefs = mergeRefs;
 exports.schemaId = schemaId;
 exports.setFieldValue = _setValue;
 exports.slug = slug;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.4.69",
+    "version": "0.4.71",
     "private": false,
     "description": "",
     "keywords": [
@@ -161,6 +161,6 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "509e113dc06022d6092e4aac9f47ccd5facfd59d",
+    "gitHead": "9101554bc5761e32b4a002a10d26800608c69773",
     "types": "es/index.d.ts"
 }