@micromag/viewer 0.3.244 → 0.3.246

package/es/index.js

@@ -5,16 +5,16 @@ import React, { useEffect, useState, useCallback, useMemo, useRef } from 'react'
 import { Switch, Route, MemoryRouter } from 'react-router';
 import { Link, BrowserRouter } from 'react-router-dom';
 import { PropTypes as PropTypes$1 } from '@micromag/core';
-import { useViewerSize, usePlaybackContext, useViewerWebView, useViewerInteraction, VisitorProvider, ScreenSizeProvider, ViewerProvider, useRoutes, useRoutePush, GoogleKeysProvider, GoogleMapsClientProvider, FieldsProvider, ComponentsProvider, SCREENS_NAMESPACE, UserInteractionProvider, PlaybackProvider, TrackingProvider, RoutesProvider } from '@micromag/core/contexts';
+import { useViewerSize, usePlaybackContext, useViewerWebView, useViewerInteraction, StoryProvider, ScreenSizeProvider, ViewerProvider, useRoutes, useRoutePush, GoogleKeysProvider, GoogleMapsClientProvider, FieldsProvider, ComponentsProvider, SCREENS_NAMESPACE, VisitorProvider, PlaybackProvider, TrackingProvider, RoutesProvider } from '@micromag/core/contexts';
 import fieldsManager from '@micromag/fields/manager';
 import { IntlProvider } from '@micromag/intl';
 import { ScreensProvider } from '@micromag/screens';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import { animated } from '@react-spring/web';
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
-import { animated } from '@react-spring/web';
 import EventEmitter from 'wolfy87-eventemitter';
 import { Label, ScreenPreview, Screen, Button as Button$1, Meta, FontFaces } from '@micromag/core/components';
 import { useDimensionObserver, useTrackEvent, useDragProgress, useMediaProgress, useParsedStory, useLoadedFonts, useTrackScreenView, useScreenSizeFromElement, useFullscreen } from '@micromag/core/hooks';
@@ -2440,7 +2440,6 @@ var propTypes$2 = {
   screenState: PropTypes.string,
   deviceScreens: PropTypes$1.deviceScreens,
   renderContext: PropTypes$1.renderContext,
-  visitor: PropTypes$1.visitor,
   onScreenChange: PropTypes.func,
   tapNextScreenWidthPercent: PropTypes.number,
   storyIsParsed: PropTypes.bool,
@@ -2484,7 +2483,6 @@ var defaultProps$2 = {
   screenState: null,
   deviceScreens: getDeviceScreens(),
   renderContext: 'view',
-  visitor: null,
   onScreenChange: null,
   tapNextScreenWidthPercent: 0.8,
   storyIsParsed: false,
@@ -2527,7 +2525,6 @@ var Viewer = function Viewer(_ref) {
       screenState = _ref.screenState,
       deviceScreens = _ref.deviceScreens,
       renderContext = _ref.renderContext,
-      visitor = _ref.visitor,
       tapNextScreenWidthPercent = _ref.tapNextScreenWidthPercent,
       storyIsParsed = _ref.storyIsParsed,
       neighborScreensActive = _ref.neighborScreensActive,
@@ -2639,16 +2636,12 @@ var Viewer = function Viewer(_ref) {
   var isView = renderContext === 'view';
   var isStatic = renderContext === 'static';
   var isCapture = renderContext === 'capture';
-  var withoutScreensTransforms = isStatic || isCapture;
-
-  var _usePlaybackContext = usePlaybackContext(),
-      playing = _usePlaybackContext.playing,
-      _usePlaybackContext$c = _usePlaybackContext.controls,
-      playbackControls = _usePlaybackContext$c === void 0 ? false : _usePlaybackContext$c,
-      _usePlaybackContext$c2 = _usePlaybackContext.controlsVisible,
-      playbackcontrolsVisible = _usePlaybackContext$c2 === void 0 ? false : _usePlaybackContext$c2,
-      _usePlaybackContext$m = _usePlaybackContext.media,
-      playbackMedia = _usePlaybackContext$m === void 0 ? null : _usePlaybackContext$m;
+  var withoutScreensTransforms = isStatic || isCapture; // const {
+  //     playing,
+  //     controls: playbackControls = false,
+  //     controlsVisible: playbackcontrolsVisible = false,
+  //     media: playbackMedia = null,
+  // } = usePlaybackContext();
 
   var _useDimensionObserver = useDimensionObserver(),
       playbackControlsContainerRef = _useDimensionObserver.ref,
@@ -2946,8 +2939,8 @@ var Viewer = function Viewer(_ref) {
   useKeyboardShortcuts(keyboardShortcuts, {
     disabled: renderContext !== 'view'
   });
-  return /*#__PURE__*/React.createElement(VisitorProvider, {
-    visitor: visitor
+  return /*#__PURE__*/React.createElement(StoryProvider, {
+    story: parsedStory
   }, /*#__PURE__*/React.createElement(ScreenSizeProvider, {
     size: screenSize
   }, /*#__PURE__*/React.createElement(ViewerProvider, {
@@ -3129,7 +3122,7 @@ var defaultRoutes = {
   screen: screen
 };
 
-var _excluded = ["story", "screenComponents", "memoryRouter", "basePath", "routes", "withoutRouter", "googleApiKey", "trackingVariables", "locale", "locales", "translations", "pathWithIndex"];
+var _excluded = ["story", "screenComponents", "memoryRouter", "basePath", "routes", "withoutRouter", "googleApiKey", "visitor", "trackingVariables", "locale", "locales", "translations", "pathWithIndex"];
 var propTypes = {
   story: PropTypes$1.story,
   screen: PropTypes.string,
@@ -3139,6 +3132,7 @@ var propTypes = {
   routes: routes,
   withoutRouter: PropTypes.bool,
   googleApiKey: PropTypes.string,
+  visitor: PropTypes$1.visitor,
   trackingVariables: PropTypes$1.trackingVariables,
   locale: PropTypes.string,
   locales: PropTypes.arrayOf(PropTypes.string),
@@ -3155,6 +3149,7 @@ var defaultProps = {
   routes: defaultRoutes,
   withoutRouter: false,
   googleApiKey: null,
+  visitor: null,
   trackingVariables: null,
   locale: 'en',
   locales: ['fr', 'en'],
@@ -3171,6 +3166,7 @@ var ViewerContainer = function ViewerContainer(_ref) {
       routes = _ref.routes,
       withoutRouter = _ref.withoutRouter,
       googleApiKey = _ref.googleApiKey,
+      visitor = _ref.visitor,
       trackingVariables = _ref.trackingVariables,
       locale = _ref.locale,
       locales = _ref.locales,
@@ -3220,7 +3216,9 @@ var ViewerContainer = function ViewerContainer(_ref) {
   }, /*#__PURE__*/React.createElement(ScreensProvider, null, /*#__PURE__*/React.createElement(ComponentsProvider, {
     namespace: SCREENS_NAMESPACE,
     components: screenComponents || {}
-  }, /*#__PURE__*/React.createElement(UserInteractionProvider, null, /*#__PURE__*/React.createElement(PlaybackProvider, null, /*#__PURE__*/React.createElement(TrackingProvider, {
+  }, /*#__PURE__*/React.createElement(VisitorProvider, {
+    visitor: visitor
+  }, /*#__PURE__*/React.createElement(PlaybackProvider, null, /*#__PURE__*/React.createElement(TrackingProvider, {
     variables: finalTrackingVariables
   }, withoutRouter ? /*#__PURE__*/React.createElement(Viewer, Object.assign({
     story: story,

package/lib/index.js

@@ -16,9 +16,9 @@ var screens = require('@micromag/screens');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
+var web = require('@react-spring/web');
 var classNames = require('classnames');
 var reactHelmet = require('react-helmet');
-var web = require('@react-spring/web');
 var EventEmitter = require('wolfy87-eventemitter');
 var components = require('@micromag/core/components');
 var hooks = require('@micromag/core/hooks');
@@ -2460,7 +2460,6 @@ var propTypes$2 = {
   screenState: PropTypes__default["default"].string,
   deviceScreens: core.PropTypes.deviceScreens,
   renderContext: core.PropTypes.renderContext,
-  visitor: core.PropTypes.visitor,
   onScreenChange: PropTypes__default["default"].func,
   tapNextScreenWidthPercent: PropTypes__default["default"].number,
   storyIsParsed: PropTypes__default["default"].bool,
@@ -2504,7 +2503,6 @@ var defaultProps$2 = {
   screenState: null,
   deviceScreens: utils.getDeviceScreens(),
   renderContext: 'view',
-  visitor: null,
   onScreenChange: null,
   tapNextScreenWidthPercent: 0.8,
   storyIsParsed: false,
@@ -2547,7 +2545,6 @@ var Viewer = function Viewer(_ref) {
       screenState = _ref.screenState,
       deviceScreens = _ref.deviceScreens,
       renderContext = _ref.renderContext,
-      visitor = _ref.visitor,
       tapNextScreenWidthPercent = _ref.tapNextScreenWidthPercent,
       storyIsParsed = _ref.storyIsParsed,
       neighborScreensActive = _ref.neighborScreensActive,
@@ -2659,16 +2656,12 @@ var Viewer = function Viewer(_ref) {
   var isView = renderContext === 'view';
   var isStatic = renderContext === 'static';
   var isCapture = renderContext === 'capture';
-  var withoutScreensTransforms = isStatic || isCapture;
-
-  var _usePlaybackContext = contexts.usePlaybackContext(),
-      playing = _usePlaybackContext.playing,
-      _usePlaybackContext$c = _usePlaybackContext.controls,
-      playbackControls = _usePlaybackContext$c === void 0 ? false : _usePlaybackContext$c,
-      _usePlaybackContext$c2 = _usePlaybackContext.controlsVisible,
-      playbackcontrolsVisible = _usePlaybackContext$c2 === void 0 ? false : _usePlaybackContext$c2,
-      _usePlaybackContext$m = _usePlaybackContext.media,
-      playbackMedia = _usePlaybackContext$m === void 0 ? null : _usePlaybackContext$m;
+  var withoutScreensTransforms = isStatic || isCapture; // const {
+  //     playing,
+  //     controls: playbackControls = false,
+  //     controlsVisible: playbackcontrolsVisible = false,
+  //     media: playbackMedia = null,
+  // } = usePlaybackContext();
 
   var _useDimensionObserver = hooks.useDimensionObserver(),
       playbackControlsContainerRef = _useDimensionObserver.ref,
@@ -2966,8 +2959,8 @@ var Viewer = function Viewer(_ref) {
   useKeyboardShortcuts(keyboardShortcuts, {
     disabled: renderContext !== 'view'
   });
-  return /*#__PURE__*/React__default["default"].createElement(contexts.VisitorProvider, {
-    visitor: visitor
+  return /*#__PURE__*/React__default["default"].createElement(contexts.StoryProvider, {
+    story: parsedStory
   }, /*#__PURE__*/React__default["default"].createElement(contexts.ScreenSizeProvider, {
     size: screenSize
   }, /*#__PURE__*/React__default["default"].createElement(contexts.ViewerProvider, {
@@ -3149,7 +3142,7 @@ var defaultRoutes = {
   screen: screen
 };
 
-var _excluded = ["story", "screenComponents", "memoryRouter", "basePath", "routes", "withoutRouter", "googleApiKey", "trackingVariables", "locale", "locales", "translations", "pathWithIndex"];
+var _excluded = ["story", "screenComponents", "memoryRouter", "basePath", "routes", "withoutRouter", "googleApiKey", "visitor", "trackingVariables", "locale", "locales", "translations", "pathWithIndex"];
 var propTypes = {
   story: core.PropTypes.story,
   screen: PropTypes__default["default"].string,
@@ -3159,6 +3152,7 @@ var propTypes = {
   routes: routes,
   withoutRouter: PropTypes__default["default"].bool,
   googleApiKey: PropTypes__default["default"].string,
+  visitor: core.PropTypes.visitor,
   trackingVariables: core.PropTypes.trackingVariables,
   locale: PropTypes__default["default"].string,
   locales: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string),
@@ -3175,6 +3169,7 @@ var defaultProps = {
   routes: defaultRoutes,
   withoutRouter: false,
   googleApiKey: null,
+  visitor: null,
   trackingVariables: null,
   locale: 'en',
   locales: ['fr', 'en'],
@@ -3191,6 +3186,7 @@ var ViewerContainer = function ViewerContainer(_ref) {
       routes = _ref.routes,
       withoutRouter = _ref.withoutRouter,
       googleApiKey = _ref.googleApiKey,
+      visitor = _ref.visitor,
       trackingVariables = _ref.trackingVariables,
       locale = _ref.locale,
       locales = _ref.locales,
@@ -3240,7 +3236,9 @@ var ViewerContainer = function ViewerContainer(_ref) {
   }, /*#__PURE__*/React__default["default"].createElement(screens.ScreensProvider, null, /*#__PURE__*/React__default["default"].createElement(contexts.ComponentsProvider, {
     namespace: contexts.SCREENS_NAMESPACE,
     components: screenComponents || {}
-  }, /*#__PURE__*/React__default["default"].createElement(contexts.UserInteractionProvider, null, /*#__PURE__*/React__default["default"].createElement(contexts.PlaybackProvider, null, /*#__PURE__*/React__default["default"].createElement(contexts.TrackingProvider, {
+  }, /*#__PURE__*/React__default["default"].createElement(contexts.VisitorProvider, {
+    visitor: visitor
+  }, /*#__PURE__*/React__default["default"].createElement(contexts.PlaybackProvider, null, /*#__PURE__*/React__default["default"].createElement(contexts.TrackingProvider, {
     variables: finalTrackingVariables
   }, withoutRouter ? /*#__PURE__*/React__default["default"].createElement(Viewer, Object.assign({
     story: story,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/viewer",
-    "version": "0.3.244",
+    "version": "0.3.246",
     "description": "",
     "keywords": [
         "javascript"
@@ -59,14 +59,14 @@
         "@fortawesome/fontawesome-svg-core": "^1.2.32",
         "@fortawesome/free-solid-svg-icons": "^5.15.1",
         "@fortawesome/react-fontawesome": "^0.1.13",
-        "@micromag/core": "^0.3.243",
-        "@micromag/element-scroll": "^0.3.243",
-        "@micromag/element-share-options": "^0.3.243",
-        "@micromag/element-webview": "^0.3.243",
-        "@micromag/elements": "^0.3.243",
-        "@micromag/fields": "^0.3.243",
-        "@micromag/intl": "^0.3.243",
-        "@micromag/screens": "^0.3.244",
+        "@micromag/core": "^0.3.246",
+        "@micromag/element-scroll": "^0.3.246",
+        "@micromag/element-share-options": "^0.3.246",
+        "@micromag/element-webview": "^0.3.246",
+        "@micromag/elements": "^0.3.246",
+        "@micromag/fields": "^0.3.246",
+        "@micromag/intl": "^0.3.246",
+        "@micromag/screens": "^0.3.246",
         "@react-spring/core": "^9.1.1",
         "@react-spring/web": "^9.1.1",
         "@use-gesture/react": "^10.2.4",
@@ -85,5 +85,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "dcd79b9854820bdc42e295343dca9cd09eb90aae"
+    "gitHead": "473a4ad55684e54d3f1e62e760792ed6e003f8e7"
 }