@micromag/core 0.2.365 → 0.2.375

package/es/contexts.js

@@ -1030,7 +1030,6 @@ var ScreenSizeProvider = function ScreenSizeProvider(_ref) {
 ScreenSizeProvider.propTypes = propTypes$4;
 ScreenSizeProvider.defaultProps = defaultProps$4;
 
-/* eslint-disable react/jsx-props-no-spreading */
 var useTracking = function useTracking() {
   return useContext(TrackingContext);
 };
@@ -1046,13 +1045,8 @@ var TrackingProvider = function TrackingProvider(_ref) {
       children = _ref.children;
   var contextTracking = useTracking() || null;
   var tracking = useMemo(function () {
-    if (contextTracking !== null) {
-      contextTracking.setVariables(variables);
-      return contextTracking;
-    }
-
     return new Tracking({
-      variables: variables
+      variables: _objectSpread(_objectSpread({}, contextTracking !== null ? contextTracking.getVariables() : null), variables)
     });
   }, [contextTracking, variables]);
   return /*#__PURE__*/React.createElement(TrackingContainer, {

package/es/index.js

@@ -1798,7 +1798,7 @@ var StoryParser = /*#__PURE__*/function () {
 }();
 
 var _excluded = ["value"],
-    _excluded2 = ["value"];
+    _excluded2 = ["value", "currentTime"];
 
 var Tracking = /*#__PURE__*/function (_BaseTracking) {
   _inherits(Tracking, _BaseTracking);
@@ -1816,6 +1816,7 @@ var Tracking = /*#__PURE__*/function (_BaseTracking) {
     var _this$options$variabl = _this.options.variables,
         variables = _this$options$variabl === void 0 ? null : _this$options$variabl;
     _this.variables = null;
+    _this.screensViewed = [];
 
     if (variables !== null) {
       _this.setVariables(variables);
@@ -1841,27 +1842,44 @@ var Tracking = /*#__PURE__*/function (_BaseTracking) {
   }, {
     key: "trackScreenView",
     value: function trackScreenView(screen, screenIndex) {
-      var _ref = screen || {},
-          _ref$id = _ref.id,
-          screenId = _ref$id === void 0 ? null : _ref$id,
-          _ref$type = _ref.type,
-          screenType = _ref$type === void 0 ? null : _ref$type;
+      var _ref = this.variables || {},
+          _ref$screensCount = _ref.screensCount,
+          screensCount = _ref$screensCount === void 0 ? null : _ref$screensCount;
+
+      var _ref2 = screen || {},
+          _ref2$id = _ref2.id,
+          screenId = _ref2$id === void 0 ? null : _ref2$id,
+          _ref2$type = _ref2.type,
+          screenType = _ref2$type === void 0 ? null : _ref2$type,
+          _ref2$metadata = _ref2.metadata,
+          metadata = _ref2$metadata === void 0 ? {} : _ref2$metadata;
+
+      var _ref3 = metadata || {},
+          screenTitle = _ref3.title;
+
+      if (this.screensViewed.indexOf(screenId || index) !== -1) {
+        this.screensViewed = [].concat(_toConsumableArray(this.screensViewed), [screenId || index]);
+      }
 
       var data = {
         event: 'screenView',
         screenId: screenId,
         screenType: screenType,
-        screenIndex: screenIndex
+        screenIndex: screenIndex,
+        screenTitle: screenTitle,
+        screenProgress: screensCount !== null && screenIndex !== null ? (screenIndex + 1) / screensCount : null,
+        screensViewed: this.screensViewed,
+        screensViewedProgress: screensCount !== null ? this.screensViewed.length / screensCount : null
       };
       this.push(data);
     }
   }, {
     key: "trackEvent",
     value: function trackEvent(category, action, label) {
-      var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
-          _ref2$value = _ref2.value,
-          value = _ref2$value === void 0 ? null : _ref2$value,
-          opts = _objectWithoutProperties(_ref2, _excluded);
+      var _ref4 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
+          _ref4$value = _ref4.value,
+          value = _ref4$value === void 0 ? null : _ref4$value,
+          opts = _objectWithoutProperties(_ref4, _excluded);
 
       var data = _objectSpread(_objectSpread({}, opts), {}, {
         event: 'eventInteraction',
@@ -1876,20 +1894,28 @@ var Tracking = /*#__PURE__*/function (_BaseTracking) {
   }, {
     key: "trackMedia",
     value: function trackMedia(type, media, action) {
-      var _ref3 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
-          _ref3$value = _ref3.value,
-          value = _ref3$value === void 0 ? null : _ref3$value,
-          opts = _objectWithoutProperties(_ref3, _excluded2);
-
-      var _ref4 = media || {},
-          _ref4$id = _ref4.id,
-          mediaId = _ref4$id === void 0 ? null : _ref4$id,
-          _ref4$name = _ref4.name,
-          name = _ref4$name === void 0 ? null : _ref4$name,
-          _ref4$duration = _ref4.duration,
-          duration = _ref4$duration === void 0 ? null : _ref4$duration,
-          _ref4$currentTime = _ref4.currentTime,
-          currentTime = _ref4$currentTime === void 0 ? null : _ref4$currentTime;
+      var _ref5 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
+          _ref5$value = _ref5.value,
+          value = _ref5$value === void 0 ? null : _ref5$value,
+          _ref5$currentTime = _ref5.currentTime,
+          optsCurrentTime = _ref5$currentTime === void 0 ? null : _ref5$currentTime,
+          opts = _objectWithoutProperties(_ref5, _excluded2);
+
+      var _ref6 = media || {},
+          _ref6$id = _ref6.id,
+          mediaId = _ref6$id === void 0 ? null : _ref6$id,
+          _ref6$name = _ref6.name,
+          name = _ref6$name === void 0 ? null : _ref6$name,
+          _ref6$duration = _ref6.duration,
+          rootDuration = _ref6$duration === void 0 ? null : _ref6$duration,
+          _ref6$currentTime = _ref6.currentTime,
+          currentTime = _ref6$currentTime === void 0 ? optsCurrentTime : _ref6$currentTime,
+          _ref6$metadata = _ref6.metadata,
+          metadata = _ref6$metadata === void 0 ? {} : _ref6$metadata;
+
+      var _ref7 = metadata || {},
+          _ref7$duration = _ref7.duration,
+          duration = _ref7$duration === void 0 ? rootDuration : _ref7$duration;
 
       var label = name;
 

package/lib/contexts.js

@@ -1064,7 +1064,6 @@ var ScreenSizeProvider = function ScreenSizeProvider(_ref) {
 ScreenSizeProvider.propTypes = propTypes$4;
 ScreenSizeProvider.defaultProps = defaultProps$4;
 
-/* eslint-disable react/jsx-props-no-spreading */
 var useTracking = function useTracking() {
   return React.useContext(tracking.TrackingContext);
 };
@@ -1080,13 +1079,8 @@ var TrackingProvider = function TrackingProvider(_ref) {
       children = _ref.children;
   var contextTracking = useTracking() || null;
   var tracking$1 = React.useMemo(function () {
-    if (contextTracking !== null) {
-      contextTracking.setVariables(variables);
-      return contextTracking;
-    }
-
     return new core.Tracking({
-      variables: variables
+      variables: _objectSpread__default["default"](_objectSpread__default["default"]({}, contextTracking !== null ? contextTracking.getVariables() : null), variables)
     });
   }, [contextTracking, variables]);
   return /*#__PURE__*/React__default["default"].createElement(tracking.TrackingContainer, {

package/lib/index.js

@@ -1824,7 +1824,7 @@ var StoryParser = /*#__PURE__*/function () {
 }();
 
 var _excluded = ["value"],
-    _excluded2 = ["value"];
+    _excluded2 = ["value", "currentTime"];
 
 var Tracking = /*#__PURE__*/function (_BaseTracking) {
   _inherits__default["default"](Tracking, _BaseTracking);
@@ -1842,6 +1842,7 @@ var Tracking = /*#__PURE__*/function (_BaseTracking) {
     var _this$options$variabl = _this.options.variables,
         variables = _this$options$variabl === void 0 ? null : _this$options$variabl;
     _this.variables = null;
+    _this.screensViewed = [];
 
     if (variables !== null) {
       _this.setVariables(variables);
@@ -1867,27 +1868,44 @@ var Tracking = /*#__PURE__*/function (_BaseTracking) {
   }, {
     key: "trackScreenView",
     value: function trackScreenView(screen, screenIndex) {
-      var _ref = screen || {},
-          _ref$id = _ref.id,
-          screenId = _ref$id === void 0 ? null : _ref$id,
-          _ref$type = _ref.type,
-          screenType = _ref$type === void 0 ? null : _ref$type;
+      var _ref = this.variables || {},
+          _ref$screensCount = _ref.screensCount,
+          screensCount = _ref$screensCount === void 0 ? null : _ref$screensCount;
+
+      var _ref2 = screen || {},
+          _ref2$id = _ref2.id,
+          screenId = _ref2$id === void 0 ? null : _ref2$id,
+          _ref2$type = _ref2.type,
+          screenType = _ref2$type === void 0 ? null : _ref2$type,
+          _ref2$metadata = _ref2.metadata,
+          metadata = _ref2$metadata === void 0 ? {} : _ref2$metadata;
+
+      var _ref3 = metadata || {},
+          screenTitle = _ref3.title;
+
+      if (this.screensViewed.indexOf(screenId || index) !== -1) {
+        this.screensViewed = [].concat(_toConsumableArray__default["default"](this.screensViewed), [screenId || index]);
+      }
 
       var data = {
         event: 'screenView',
         screenId: screenId,
         screenType: screenType,
-        screenIndex: screenIndex
+        screenIndex: screenIndex,
+        screenTitle: screenTitle,
+        screenProgress: screensCount !== null && screenIndex !== null ? (screenIndex + 1) / screensCount : null,
+        screensViewed: this.screensViewed,
+        screensViewedProgress: screensCount !== null ? this.screensViewed.length / screensCount : null
       };
       this.push(data);
     }
   }, {
     key: "trackEvent",
     value: function trackEvent(category, action, label) {
-      var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
-          _ref2$value = _ref2.value,
-          value = _ref2$value === void 0 ? null : _ref2$value,
-          opts = _objectWithoutProperties__default["default"](_ref2, _excluded);
+      var _ref4 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
+          _ref4$value = _ref4.value,
+          value = _ref4$value === void 0 ? null : _ref4$value,
+          opts = _objectWithoutProperties__default["default"](_ref4, _excluded);
 
       var data = _objectSpread__default["default"](_objectSpread__default["default"]({}, opts), {}, {
         event: 'eventInteraction',
@@ -1902,20 +1920,28 @@ var Tracking = /*#__PURE__*/function (_BaseTracking) {
   }, {
     key: "trackMedia",
     value: function trackMedia(type, media, action) {
-      var _ref3 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
-          _ref3$value = _ref3.value,
-          value = _ref3$value === void 0 ? null : _ref3$value,
-          opts = _objectWithoutProperties__default["default"](_ref3, _excluded2);
-
-      var _ref4 = media || {},
-          _ref4$id = _ref4.id,
-          mediaId = _ref4$id === void 0 ? null : _ref4$id,
-          _ref4$name = _ref4.name,
-          name = _ref4$name === void 0 ? null : _ref4$name,
-          _ref4$duration = _ref4.duration,
-          duration = _ref4$duration === void 0 ? null : _ref4$duration,
-          _ref4$currentTime = _ref4.currentTime,
-          currentTime = _ref4$currentTime === void 0 ? null : _ref4$currentTime;
+      var _ref5 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
+          _ref5$value = _ref5.value,
+          value = _ref5$value === void 0 ? null : _ref5$value,
+          _ref5$currentTime = _ref5.currentTime,
+          optsCurrentTime = _ref5$currentTime === void 0 ? null : _ref5$currentTime,
+          opts = _objectWithoutProperties__default["default"](_ref5, _excluded2);
+
+      var _ref6 = media || {},
+          _ref6$id = _ref6.id,
+          mediaId = _ref6$id === void 0 ? null : _ref6$id,
+          _ref6$name = _ref6.name,
+          name = _ref6$name === void 0 ? null : _ref6$name,
+          _ref6$duration = _ref6.duration,
+          rootDuration = _ref6$duration === void 0 ? null : _ref6$duration,
+          _ref6$currentTime = _ref6.currentTime,
+          currentTime = _ref6$currentTime === void 0 ? optsCurrentTime : _ref6$currentTime,
+          _ref6$metadata = _ref6.metadata,
+          metadata = _ref6$metadata === void 0 ? {} : _ref6$metadata;
+
+      var _ref7 = metadata || {},
+          _ref7$duration = _ref7.duration,
+          duration = _ref7$duration === void 0 ? rootDuration : _ref7$duration;
 
       var label = name;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.2.365",
+    "version": "0.2.375",
     "description": "",
     "keywords": [
         "javascript"
@@ -36,7 +36,15 @@
         "./components": "./lib/components.js",
         "./contexts": "./lib/contexts.js",
         "./hooks": "./lib/hooks.js",
-        "./utils": "./lib/utils.js"
+        "./utils": "./lib/utils.js",
+        "./scss/mixins": "./scss/_mixins.scss",
+        "./scss/placeholders": "./scss/_placeholders.scss",
+        "./scss/theme": "./scss/_theme.scss",
+        "./scss/variables": "./scss/_variables.scss",
+        "./scss/styles": "./scss/styles.scss",
+        "./scss/upload": "./scss/upload.scss",
+        "./scss/vendor": "./scss/vendor.scss",
+        "./assets/css/styles.css": "./assets/css/styles.css"
     },
     "browser": {
         ".": "./es/index.js",
@@ -98,7 +106,7 @@
         "debug": "^4.3.1",
         "flat": "^5.0.2",
         "hoist-non-react-statics": "^3.3.2",
-        "lodash": "^4.17.20",
+        "lodash": "^4.17.21",
         "param-case": "^3.0.4",
         "prop-types": "^15.7.2",
         "react-helmet": "^6.1.0",
@@ -117,5 +125,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b7cf35b6fbf51a8d0fbe6c019b6bd4c11a63b637"
+    "gitHead": "9ebbd762e94c3943073e47397ca9d3729d59c570"
 }