@micromag/viewer 0.3.249 → 0.3.251

package/es/index.js

@@ -5,14 +5,13 @@ 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, StoryProvider, ScreenSizeProvider, ViewerProvider, useRoutes, useRoutePush, GoogleKeysProvider, GoogleMapsClientProvider, FieldsProvider, ComponentsProvider, SCREENS_NAMESPACE, VisitorProvider, PlaybackProvider, TrackingProvider, RoutesProvider } from '@micromag/core/contexts';
+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 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 EventEmitter from 'wolfy87-eventemitter';
@@ -23,6 +22,7 @@ import { useIntl, FormattedMessage } from 'react-intl';
 import { faTimes } from '@fortawesome/free-solid-svg-icons/faTimes';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useSpring } from '@react-spring/core';
+import { animated } from '@react-spring/web';
 import Scroll from '@micromag/element-scroll';
 import ShareOptions from '@micromag/element-share-options';
 import { useGesture } from '@use-gesture/react';
@@ -114,7 +114,6 @@ function useScreenInteraction() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
       screens = _ref.screens,
       screenIndex = _ref.screenIndex,
-      screenWidth = _ref.screenWidth,
       _ref$disableCurrentSc = _ref.disableCurrentScreenNavigation,
       disableCurrentScreenNavigation = _ref$disableCurrentSc === void 0 ? false : _ref$disableCurrentSc,
       _ref$clickOnSiblings = _ref.clickOnSiblings,
@@ -184,14 +183,13 @@ function useScreenInteraction() {
     }
 
     var _currentTarget$getBou = currentTarget.getBoundingClientRect(),
+        left = _currentTarget$getBou.left,
         width = _currentTarget$getBou.width;
 
-    var margin = (width - screenWidth) / 2;
-    var screenPreviousZone = screenWidth * (1 - nextScreenWidthPercent);
-    var previousZone = margin + screenPreviousZone;
-    var direction = x < previousZone ? 'previous' : 'next';
+    var relativeX = x - left;
+    var direction = relativeX < width * (1 - nextScreenWidthPercent) ? 'previous' : 'next';
     var lastIndex = screensCount - 1;
-    var nextIndex = index;
+    var nextIndex = index; // @todo investigate what clickOnSiblings is doing
 
     if (direction === 'previous' && !clickOnSiblings) {
       nextIndex = Math.max(0, screenIndex - 1);
@@ -513,14 +511,14 @@ var styles$e = {"container":"micromag-viewer-buttons-toggle-button-container","n
 
 var propTypes$i = {
   className: PropTypes.string,
-  progressSpring: PropTypes.number,
+  toggled: PropTypes.number,
   button: PropTypes.node,
   toggledButton: PropTypes.node,
   toggledButtonClassName: PropTypes.string
 };
 var defaultProps$i = {
   className: null,
-  progressSpring: 0,
+  toggled: 0,
   button: null,
   toggledButton: null,
   toggledButtonClassName: null
@@ -528,27 +526,26 @@ var defaultProps$i = {
 
 var ToggleButton = function ToggleButton(_ref) {
   var className = _ref.className,
-      progressSpring = _ref.progressSpring,
+      toggled = _ref.toggled,
       button = _ref.button,
       toggledButton = _ref.toggledButton,
       toggledButtonClassName = _ref.toggledButtonClassName;
   if (button === null) return false;
+
+  var getToggleButtonStyles = function getToggleButtonStyles(t) {
+    return {
+      transform: "translateY(".concat(t * -100, "%)")
+    };
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: classNames([styles$e.container, _defineProperty({}, className, className !== null)])
-  }, /*#__PURE__*/React.createElement(animated.div, {
+  }, /*#__PURE__*/React.createElement("div", {
     className: styles$e.normal,
-    style: {
-      transform: progressSpring.to(function (p) {
-        return "translateY(".concat(p * -100, "%)");
-      })
-    }
-  }, button), /*#__PURE__*/React.createElement(animated.div, {
+    style: getToggleButtonStyles(toggled)
+  }, button), /*#__PURE__*/React.createElement("div", {
     className: classNames([styles$e.toggled, _defineProperty({}, toggledButtonClassName, toggledButtonClassName !== null)]),
-    style: {
-      transform: progressSpring.to(function (p) {
-        return "translateY(".concat((p - 1) * -100, "%)");
-      })
-    }
+    style: getToggleButtonStyles(toggled - 1)
   }, toggledButton));
 };
 
@@ -559,20 +556,20 @@ var styles$d = {"backdrop":"micromag-viewer-menus-menu-container-backdrop","heig
 
 var propTypes$h = {
   className: PropTypes.string,
-  progressSpring: PropTypes.number,
+  transitionProgress: PropTypes.number,
   theme: PropTypes$1.viewerTheme,
   children: PropTypes.node
 };
 var defaultProps$h = {
   className: null,
-  progressSpring: 0,
+  transitionProgress: 0,
   theme: null,
   children: null
 };
 
 var ViewerMenuContainer = function ViewerMenuContainer(_ref) {
   var className = _ref.className,
-      progressSpring = _ref.progressSpring,
+      transitionProgress = _ref.transitionProgress,
       viewerTheme = _ref.theme,
       children = _ref.children;
 
@@ -590,26 +587,17 @@ var ViewerMenuContainer = function ViewerMenuContainer(_ref) {
     style: {
       pointerEvents: 'none'
     }
-  }, /*#__PURE__*/React.createElement(animated.div, {
+  }, /*#__PURE__*/React.createElement("div", {
     className: styles$d.heightContainer,
     style: _objectSpread({
-      opacity: progressSpring,
-      transform: progressSpring.to(function (p) {
-        return "translateY(".concat((1 - p) * -2, "rem)");
-      }),
-      pointerEvents: progressSpring.to(function (p) {
-        return p < 0.25 ? 'none' : 'auto';
-      }),
-      zIndex: progressSpring.to(function (p) {
-        return Math.round(2 + p);
-      })
+      height: "".concat(transitionProgress * 100, "%"),
+      pointerEvents: transitionProgress < 0.25 ? 'none' : 'auto',
+      zIndex: Math.round(2 + transitionProgress)
     }, backgroundColorStyle)
-  }, children), /*#__PURE__*/React.createElement(animated.div, {
+  }, children), /*#__PURE__*/React.createElement("div", {
     className: styles$d.backdrop,
     style: {
-      opacity: progressSpring.to(function (p) {
-        return easings.easeOutQuint(p);
-      })
+      opacity: easings.easeOutQuint(transitionProgress)
     }
   }));
 };
@@ -936,10 +924,7 @@ var ViewerMenuScreen = function ViewerMenuScreen(_ref) {
     }]
   })) : '');
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames([styles$a.container, (_ref4 = {}, _defineProperty(_ref4, className, className !== null), _defineProperty(_ref4, styles$a.isCurrent, current), _ref4)]),
-    style: {
-      paddingBottom: "".concat(screenHeight / screenWidth * 100, "%")
-    }
+    className: classNames([styles$a.container, (_ref4 = {}, _defineProperty(_ref4, className, className !== null), _defineProperty(_ref4, styles$a.isCurrent, current), _ref4)])
   }, /*#__PURE__*/React.createElement("button", {
     type: "button",
     className: styles$a.button,
@@ -972,7 +957,7 @@ var ViewerMenuScreen = function ViewerMenuScreen(_ref) {
 ViewerMenuScreen.propTypes = propTypes$d;
 ViewerMenuScreen.defaultProps = defaultProps$d;
 
-var styles$9 = {"scroll":"micromag-viewer-menus-menu-preview-scroll","container":"micromag-viewer-menus-menu-preview-container","disabled":"micromag-viewer-menus-menu-preview-disabled","screenButton":"micromag-viewer-menus-menu-preview-screenButton","content":"micromag-viewer-menus-menu-preview-content","buttons":"micromag-viewer-menus-menu-preview-buttons","organisation":"micromag-viewer-menus-menu-preview-organisation","icon":"micromag-viewer-menus-menu-preview-icon","title":"micromag-viewer-menus-menu-preview-title","nav":"micromag-viewer-menus-menu-preview-nav","item":"micromag-viewer-menus-menu-preview-item","items":"micromag-viewer-menus-menu-preview-items","inner":"micromag-viewer-menus-menu-preview-inner","frame":"micromag-viewer-menus-menu-preview-frame","screen":"micromag-viewer-menus-menu-preview-screen","intro":"micromag-viewer-menus-menu-preview-intro"};
+var styles$9 = {"scroll":"micromag-viewer-menus-menu-preview-scroll","container":"micromag-viewer-menus-menu-preview-container","disabled":"micromag-viewer-menus-menu-preview-disabled","screenButton":"micromag-viewer-menus-menu-preview-screenButton","buttons":"micromag-viewer-menus-menu-preview-buttons","content":"micromag-viewer-menus-menu-preview-content","organisation":"micromag-viewer-menus-menu-preview-organisation","icon":"micromag-viewer-menus-menu-preview-icon","title":"micromag-viewer-menus-menu-preview-title","nav":"micromag-viewer-menus-menu-preview-nav","item":"micromag-viewer-menus-menu-preview-item","items":"micromag-viewer-menus-menu-preview-items","screen":"micromag-viewer-menus-menu-preview-screen","loading":"micromag-viewer-menus-menu-preview-loading","fillPulse":"micromag-viewer-menus-menu-preview-fillPulse"};
 
 var propTypes$c = {
   viewerTheme: PropTypes$1.viewerTheme,
@@ -983,7 +968,6 @@ var propTypes$c = {
   onClickScreen: PropTypes.func,
   maxThumbsWidth: PropTypes.number,
   paddingTop: PropTypes.number,
-  scrollDisabled: PropTypes.bool,
   // @todo to reimplement:
   // shouldLoad: PropTypes.bool,
   // toggleFullscreen: PropTypes.func,
@@ -1001,7 +985,6 @@ var defaultProps$c = {
   onClickScreen: null,
   maxThumbsWidth: 140,
   paddingTop: null,
-  scrollDisabled: false,
   // toggleFullscreen: null,
   // fullscreenActive: false,
   // fullscreenEnabled: false,
@@ -1017,7 +1000,6 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
       onClickScreen = _ref.onClickScreen,
       maxThumbsWidth = _ref.maxThumbsWidth,
       paddingTop = _ref.paddingTop,
-      scrollDisabled = _ref.scrollDisabled,
       className = _ref.className;
 
   var _useDimensionObserver = useDimensionObserver(),
@@ -1044,29 +1026,12 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
   var brandImageStyle = brandImageUrl !== null ? {
     backgroundImage: "url(".concat(brandImageUrl, ")")
   } : null; // const { url: brandLogoUrl = null } = brandLogo || {};
-
-  var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      screensMounted = _useState2[0],
-      setScreensMounted = _useState2[1]; // @todo optimize all of this the proper way
+  // @todo optimize all of this the proper way
   // const finalItems = useMemo(
   //     () => (!focusable ? items.map((s, i) => (i > 6 ? { screenId: s.screenId } : s)) : items),
   //     [items, focusable],
   // );
 
-
-  useEffect(function () {
-    if (items.length === screensMounted.length) {
-      return null;
-    }
-
-    var timeout = setTimeout(function () {
-      setScreensMounted([].concat(_toConsumableArray(screensMounted), [true]));
-    }, 40);
-    return function () {
-      clearTimeout(timeout);
-    };
-  }, [items, screensMounted, setScreensMounted]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames([styles$9.container, _defineProperty({}, className, className !== null)]),
     style: _objectSpread(_objectSpread({}, brandImageStyle), {}, {
@@ -1077,8 +1042,7 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
     className: styles$9.content,
     ref: containerRef
   }, /*#__PURE__*/React.createElement(Scroll, {
-    className: styles$9.scroll,
-    disabled: scrollDisabled
+    className: styles$9.scroll
   }, /*#__PURE__*/React.createElement("nav", {
     className: styles$9.nav,
     style: {
@@ -1088,36 +1052,38 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
     className: styles$9.items
   }, items.map(function (item, index) {
     var _ref6 = item || {},
-        screenId = _ref6.screenId;
+        screenId = _ref6.screenId,
+        _ref6$screen = _ref6.screen,
+        screen = _ref6$screen === void 0 ? null : _ref6$screen;
 
     var itemStyles = {
       width: "".concat(100 / thumbsPerLine, "%")
     };
-
-    var _ref7 = screenSize || {},
-        screenWidth = _ref7.width,
-        screenHeight = _ref7.height;
-
-    var screenMounted = screensMounted[index] || false;
     return /*#__PURE__*/React.createElement("li", {
       key: "item-".concat(screenId),
       className: styles$9.item,
       style: itemStyles
     }, /*#__PURE__*/React.createElement("div", {
-      className: styles$9.inner
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classNames([styles$9.frame, _defineProperty({}, styles$9.isLoading, !screenMounted)]),
+      className: styles$9.screen
+    }, screen === null ? /*#__PURE__*/React.createElement("svg", {
+      className: styles$9.loading,
+      xmlns: "http://www.w3.org/2000/svg",
+      width: "10",
+      height: "16",
+      viewBox: "0 0 10 16",
       style: {
-        paddingBottom: "".concat(screenHeight / screenWidth * 100, "%")
+        animationDelay: "".concat(index * -50, "ms")
       }
-    }, screenMounted ? /*#__PURE__*/React.createElement(ViewerMenuScreen, {
-      className: styles$9.screen,
+    }, /*#__PURE__*/React.createElement("rect", {
+      width: "10",
+      height: "16"
+    })) : /*#__PURE__*/React.createElement(ViewerMenuScreen, {
       item: item,
       index: index,
       screenSize: screenSize,
       onClick: onClickScreen,
       focusable: focusable
-    }) : null)));
+    })));
   }))))));
 };
 
@@ -1177,6 +1143,7 @@ var propTypes$a = {
   description: PropTypes.string,
   items: PropTypes$1.menuItems,
   focusable: PropTypes.bool,
+  // shouldLoad: PropTypes.bool, // @todo still needed? to re-implement?
   paddingTop: PropTypes.number,
   currentScreenIndex: PropTypes.number,
   shareUrl: PropTypes.string,
@@ -1266,7 +1233,7 @@ var ViewerMenuShare = function ViewerMenuShare(_ref) {
       setFinalShareUrl = _useState4[1];
 
   useEffect(function () {
-    setFinalShareUrl(shareCurrentScreen && currentScreenIndex !== 0 ? "".concat(shareUrl, "/").concat(currentScreenIndex + 1) : shareUrl);
+    setFinalShareUrl(shareCurrentScreen && currentScreenIndex !== 0 ? "".concat(shareUrl, "/").concat(currentScreenIndex) : shareUrl);
   }, [shareCurrentScreen, currentScreenIndex, setFinalShareUrl]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames([styles$7.container, _defineProperty({}, className, className !== null)]),
@@ -1321,7 +1288,7 @@ var ViewerMenuShare = function ViewerMenuShare(_ref) {
 ViewerMenuShare.propTypes = propTypes$a;
 ViewerMenuShare.defaultProps = defaultProps$a;
 
-var styles$6 = {"container":"micromag-viewer-container","menuContainer":"micromag-viewer-menuContainer","menuPreview":"micromag-viewer-menuPreview","menuShare":"micromag-viewer-menuShare","screenContainer":"micromag-viewer-screenContainer","screensFrame":"micromag-viewer-screensFrame","landscape":"micromag-viewer-landscape","hideMenu":"micromag-viewer-hideMenu","menuNavContainer":"micromag-viewer-menuNavContainer","dots":"micromag-viewer-dots","menuTopContainer":"micromag-viewer-menuTopContainer","content":"micromag-viewer-content","withoutGestures":"micromag-viewer-withoutGestures","fadeMenu":"micromag-viewer-fadeMenu","withShadow":"micromag-viewer-withShadow","isOpened":"micromag-viewer-isOpened","menuItem":"micromag-viewer-menuItem","menuButton":"micromag-viewer-menuButton","slidingButton":"micromag-viewer-slidingButton","screensMenuButtonToggled":"micromag-viewer-screensMenuButtonToggled","navButton":"micromag-viewer-navButton","previous":"micromag-viewer-previous","next":"micromag-viewer-next","screen":"micromag-viewer-screen","current":"micromag-viewer-current","playbackControls":"micromag-viewer-playbackControls","arrowHint":"micromag-viewer-arrowHint","webView":"micromag-viewer-webView"};
+var styles$6 = {"container":"micromag-viewer-container","menuContainer":"micromag-viewer-menuContainer","menuPreview":"micromag-viewer-menuPreview","screenContainer":"micromag-viewer-screenContainer","screensFrame":"micromag-viewer-screensFrame","landscape":"micromag-viewer-landscape","hideMenu":"micromag-viewer-hideMenu","menuNavContainer":"micromag-viewer-menuNavContainer","dots":"micromag-viewer-dots","menuTopContainer":"micromag-viewer-menuTopContainer","content":"micromag-viewer-content","withoutGestures":"micromag-viewer-withoutGestures","fadeMenu":"micromag-viewer-fadeMenu","withShadow":"micromag-viewer-withShadow","isOpened":"micromag-viewer-isOpened","menuItem":"micromag-viewer-menuItem","menuItemScreens":"micromag-viewer-menuItemScreens","menuButton":"micromag-viewer-menuButton","slidingButton":"micromag-viewer-slidingButton","screensMenuButtonToggled":"micromag-viewer-screensMenuButtonToggled","isHidden":"micromag-viewer-isHidden","navButton":"micromag-viewer-navButton","previous":"micromag-viewer-previous","next":"micromag-viewer-next","screen":"micromag-viewer-screen","current":"micromag-viewer-current","playbackControls":"micromag-viewer-playbackControls","arrowHint":"micromag-viewer-arrowHint","webView":"micromag-viewer-webView"};
 
 var propTypes$9 = {
   story: PropTypes$1.story.isRequired,
@@ -1426,11 +1393,6 @@ var ViewerMenu = function ViewerMenu(_ref) {
       shareOpened = _useState4[0],
       setShareOpened = _useState4[1];
 
-  var _useState5 = useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      menuMounted = _useState6[0],
-      setMenuMounted = _useState6[1];
-
   var _useDimensionObserver = useDimensionObserver(),
       navContainerRef = _useDimensionObserver.ref,
       _useDimensionObserver2 = _useDimensionObserver.height,
@@ -1479,7 +1441,8 @@ var ViewerMenu = function ViewerMenu(_ref) {
     var base = typeof window !== 'undefined' ? window.location.host : '';
     var path = shareBasePath !== null ? "".concat(base).concat(shareBasePath) : base;
     return path;
-  }, [shareBasePath]);
+  }, [shareBasePath]); // @note possible to extract some of that logic
+
   var onOpenMenu = useCallback(function () {
     setMenuOpened(true);
     setShareOpened(false);
@@ -1570,7 +1533,6 @@ var ViewerMenu = function ViewerMenu(_ref) {
     springParams: springParams
   }),
       bindShareDrag = _useDragProgress.bind,
-      draggingShare = _useDragProgress.dragging,
       shareOpenedProgress = _useDragProgress.progress;
 
   var computeMenuProgress = useCallback(function (_ref9) {
@@ -1618,7 +1580,6 @@ var ViewerMenu = function ViewerMenu(_ref) {
     springParams: springParams
   }),
       bindMenuDrag = _useDragProgress2.bind,
-      draggingMenu = _useDragProgress2.dragging,
       menuOpenedProgress = _useDragProgress2.progress;
 
   var keyboardShortcuts = useMemo(function () {
@@ -1634,13 +1595,6 @@ var ViewerMenu = function ViewerMenu(_ref) {
   useKeyboardShortcuts(keyboardShortcuts); // should be zero if either screens menu or share menu is opened
 
   var dotsOpacity = Math.min(1, Math.max(0, 1 - (menuOpenedProgress + shareOpenedProgress)));
-  useEffect(function () {
-    if ((menuOpened || draggingMenu) && !menuMounted) {
-      setMenuMounted(true);
-    } else if (!menuOpened && !draggingMenu && menuMounted) {
-      setMenuMounted(false);
-    }
-  }, [menuOpened, draggingMenu, menuMounted, setMenuMounted]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames([styles$6.menuNavContainer, (_ref11 = {}, _defineProperty(_ref11, styles$6.withShadow, withShadow), _defineProperty(_ref11, styles$6.isOpened, menuOpened || shareOpened), _ref11)]),
     ref: refDots,
@@ -1651,42 +1605,38 @@ var ViewerMenu = function ViewerMenu(_ref) {
     className: styles$6.menuTopContainer,
     ref: navContainerRef
   }, !withoutShareMenu ? /*#__PURE__*/React.createElement("div", Object.assign({
-    className: styles$6.menuItem
+    className: classNames([styles$6.menuItem, styles$6.menuShare])
   }, bindShareDrag()), /*#__PURE__*/React.createElement(ToggleButton, {
     className: styles$6.slidingButton,
     button: /*#__PURE__*/React.createElement(ShareButton, {
       className: styles$6.menuButton,
       onClick: onOpenShare,
       theme: menuTheme,
-      iconPosition: "left",
-      focusable: !shareOpened
+      iconPosition: "left"
     }),
     toggledButton: /*#__PURE__*/React.createElement(CloseButton, {
       className: styles$6.menuButton,
       onClick: onCloseShare,
       theme: menuTheme,
-      iconPosition: "left",
-      focusable: shareOpened
+      iconPosition: "left"
     }),
-    progressSpring: shareOpenedProgress
+    toggled: shareOpenedProgress
   })) : null, !withoutScreensMenu ? /*#__PURE__*/React.createElement("div", Object.assign({
-    className: styles$6.menuItem
+    className: classNames([styles$6.menuItem, styles$6.menuItemScreens])
   }, bindMenuDrag()), /*#__PURE__*/React.createElement(ToggleButton, {
     className: styles$6.slidingButton,
     button: /*#__PURE__*/React.createElement(MenuButton, {
       className: styles$6.menuButton,
       onClick: onOpenMenu,
-      theme: menuTheme,
-      focusable: !menuOpened
+      theme: menuTheme
     }),
     toggledButton: /*#__PURE__*/React.createElement(CloseButton, {
       className: styles$6.menuButton,
       onClick: onCloseMenu,
       theme: menuTheme,
-      iconPosition: "right",
-      focusable: menuOpened
+      iconPosition: "right"
     }),
-    progressSpring: menuOpenedProgress,
+    toggled: menuOpenedProgress,
     toggledButtonClassName: styles$6.screensMenuButtonToggled
   })) : null), /*#__PURE__*/React.createElement(ViewerMenuDots, Object.assign({}, menuTheme, {
     direction: "horizontal",
@@ -1700,14 +1650,15 @@ var ViewerMenu = function ViewerMenu(_ref) {
     onClose: onClickCloseViewer,
     className: styles$6.dots,
     style: {
-      opacity: Math.pow(dotsOpacity, 5) // @note this is like a "quint" easing, meaning it'll go towards 1 slowly first and then fast as it approaches 1
-
+      opacity: Math.pow(dotsOpacity, 5),
+      // @note this is like a "quint" easing, meaning it'll go towards 1 slowly first and then fast as it approaches 1
+      pointerEvents: dotsOpacity < 1 ? 'none' : 'auto'
     }
   }))), /*#__PURE__*/React.createElement(ViewerMenuContainer, {
     className: styles$6.menuContainer,
-    progressSpring: shareOpenedProgress,
+    transitionProgress: shareOpenedProgress,
     theme: viewerTheme
-  }, draggingShare || shareOpened ? /*#__PURE__*/React.createElement(ViewerMenuShare, {
+  }, shareOpenedProgress > 0 ? /*#__PURE__*/React.createElement(ViewerMenuShare, {
     viewerTheme: viewerTheme,
     className: styles$6.menuShare,
     title: title,
@@ -1722,9 +1673,9 @@ var ViewerMenu = function ViewerMenu(_ref) {
     onClose: onCloseShare
   }) : null), /*#__PURE__*/React.createElement(ViewerMenuContainer, {
     className: styles$6.menuContainer,
-    progressSpring: menuOpenedProgress,
+    transitionProgress: menuOpenedProgress,
     theme: viewerTheme
-  }, menuMounted ? /*#__PURE__*/React.createElement(ViewerMenuPreview, {
+  }, menuOpenedProgress > 0 ? /*#__PURE__*/React.createElement(ViewerMenuPreview, {
     viewerTheme: viewerTheme,
     className: styles$6.menuPreview,
     screenSize: screenSize,
@@ -1736,7 +1687,6 @@ var ViewerMenu = function ViewerMenu(_ref) {
     onShare: onShare,
     onClickScreen: onClickScreen,
     onClose: onCloseMenu,
-    scrollDisabled: draggingMenu,
     toggleFullscreen: toggleFullscreen,
     fullscreenActive: fullscreenActive,
     fullscreenEnabled: fullscreenEnabled
@@ -1745,9 +1695,8 @@ var ViewerMenu = function ViewerMenu(_ref) {
 
 ViewerMenu.propTypes = propTypes$9;
 ViewerMenu.defaultProps = defaultProps$9;
-var ViewerMenu$1 = /*#__PURE__*/React.memo(ViewerMenu);
 
-var styles$5 = {"container":"micromag-viewer-screen-container","inner":"micromag-viewer-screen-inner","navigationHint":"micromag-viewer-screen-navigationHint"};
+var styles$5 = {"container":"micromag-viewer-screen-container","navigationHint":"micromag-viewer-screen-navigationHint"};
 
 var propTypes$8 = {
   screen: PropTypes$1.screenComponent,
@@ -1757,7 +1706,6 @@ var propTypes$8 = {
   active: PropTypes.bool,
   mediaRef: PropTypes.func,
   width: PropTypes.number,
-  index: PropTypes.number,
   height: PropTypes.number,
   scale: PropTypes.number,
   // withNavigationHint: PropTypes.bool,  // @todo
@@ -1769,7 +1717,6 @@ var defaultProps$8 = {
   screenState: null,
   current: false,
   active: true,
-  index: null,
   mediaRef: null,
   width: null,
   height: null,
@@ -1781,7 +1728,6 @@ var defaultProps$8 = {
 function ViewerScreen(_ref) {
   var screen = _ref.screen,
       renderContext = _ref.renderContext,
-      index = _ref.index,
       screenState = _ref.screenState,
       active = _ref.active,
       current = _ref.current,
@@ -1790,47 +1736,23 @@ function ViewerScreen(_ref) {
       height = _ref.height,
       scale = _ref.scale,
       className = _ref.className;
-
-  var _useState = useState(active || current),
-      _useState2 = _slicedToArray(_useState, 2),
-      mounted = _useState2[0],
-      setMounted = _useState2[1];
-
-  useEffect(function () {
-    var timeout = null;
-
-    if (active !== mounted) {
-      timeout = setTimeout(function () {
-        setMounted(active);
-      }, 200);
-    }
-
-    return function () {
-      if (timeout !== null) {
-        clearTimeout(timeout);
-      }
-    };
-  }, [active, mounted, setMounted, index]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames([styles$5.container, _defineProperty({}, className, className !== null)])
   }, /*#__PURE__*/React.createElement("div", {
-    className: styles$5.inner,
     style: {
       width: width,
       height: height,
       transform: scale !== null ? "scale(".concat(scale, ")") : null,
-      transformOrigin: scale !== null ? '0 0' : null,
-      opacity: mounted ? 1 : null
+      transformOrigin: scale !== null ? '0 0' : null
     }
-  }, mounted ? /*#__PURE__*/React.createElement(Screen, {
+  }, /*#__PURE__*/React.createElement(Screen, {
     screen: screen,
     renderContext: renderContext,
     screenState: screenState,
-    index: index,
     active: active,
     current: current,
     mediaRef: mediaRef
-  }) : null));
+  })));
 }
 
 ViewerScreen.propTypes = propTypes$8;
@@ -1943,10 +1865,9 @@ var stopDragEventsPropagation = {
 
 function getFormattedTimestamp(s) {
   var withMilliseconds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var parts = "".concat(s).split('.');
-  var seconds = parts[0];
-  var ms = withMilliseconds && parts.length > 1 ? ":".concat(parts[1].substring(0, 3)) : '';
-  return (s - (s %= 60)) / 60 + (9 < seconds ? ':' : ':0') + ~~s + ms; // eslint-disable-line
+  var sparts = withMilliseconds ? "".concat(s).split('.') : [];
+  var ms = sparts.length > 1 ? ":".concat(sparts[1].substring(0, 3)) : '';
+  return (s - (s %= 60)) / 60 + (9 < s ? ':' : ':0') + ~~s + ms; // eslint-disable-line
 }
 
 var SHOW_MILLISECONDS_THRESHOLD = 5; // show milliseconds when scrubbing if length of video is shorter than 5 seconds
@@ -2440,6 +2361,7 @@ 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,
@@ -2483,10 +2405,11 @@ var defaultProps$2 = {
   screenState: null,
   deviceScreens: getDeviceScreens(),
   renderContext: 'view',
+  visitor: null,
   onScreenChange: null,
   tapNextScreenWidthPercent: 0.8,
   storyIsParsed: false,
-  neighborScreensActive: 1,
+  neighborScreensActive: 2,
   neighborScreenOffset: 105,
   neighborScreenScale: 0.8,
   withMetadata: false,
@@ -2525,6 +2448,7 @@ 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,
@@ -2845,48 +2769,34 @@ var Viewer = function Viewer(_ref) {
     springParams: springParams
   }),
       isDragging = _useDragProgress.dragging,
-      progressSpring = _useDragProgress.progress,
+      screenIndexProgress = _useDragProgress.progress,
       dragContentBind = _useDragProgress.bind;
 
-  var getScreenStylesByIndex = function getScreenStylesByIndex(index, spring) {
+  var getScreenStylesByIndex = function getScreenStylesByIndex(index, progress) {
     if (transitionType === 'stack') {
+      var _t = index - progress;
+
+      var _clamped = Math.min(1, Math.max(0, _t));
+
+      var invert = Math.min(1, Math.max(0, -_t));
+      var opacity = Math.max(0, 1 - 0.75 * invert + (_t + 1)); // just hide other screens
+
+      if (Math.abs(_t) > neighborScreensActive) return {
+        opacity: 0
+      };
       return {
-        zIndex: index,
-        opacity: spring.to(function (progress) {
-          var t = index - progress;
-          var invert = Math.min(1, Math.max(0, -t));
-          if (Math.abs(t) > neighborScreensActive) return 0;
-          return Math.max(0, 1 - 0.75 * invert + (t + 1));
-        }),
-        transform: spring.to(function (progress) {
-          var t = index - progress;
-          var clamped = Math.min(1, Math.max(0, t));
-          var invert = Math.min(1, Math.max(0, -t));
-          if (Math.abs(t) > neighborScreensActive) return 'translateX(100%)';
-          return "translateX(".concat(clamped * 100, "%) scale(").concat(1 - 0.2 * invert, ")");
-        }),
-        boxShadow: spring.to(function (progress) {
-          var t = index - progress;
-          if (Math.abs(t) > neighborScreensActive) return null;
-          var clamped = Math.min(1, Math.max(0, t));
-          return "0 0 ".concat(4 * (1 - clamped), "rem ").concat(-0.5 * (1 - clamped), "rem black");
-        })
+        opacity: opacity,
+        transform: "translateX(".concat(_clamped * 100, "%) scale(").concat(1 - 0.2 * invert, ")"),
+        boxShadow: "0 0 ".concat(4 * (1 - _clamped), "rem ").concat(-0.5 * (1 - _clamped), "rem black"),
+        zIndex: index
       };
     }
 
+    var t = index - progress;
+    var clamped = Math.min(1, Math.max(0, Math.abs(t)));
     return {
-      opacity: spring.to(function (progress) {
-        var t = index - progress;
-        if (Math.abs(t) > neighborScreensActive) return 0;
-        var clamped = Math.min(1, Math.max(0, Math.abs(t)));
-        return 1 - 0.75 * clamped;
-      }),
-      transform: spring.to(function (progress) {
-        var t = index - progress;
-        if (Math.abs(t) > neighborScreensActive) return "translate(100%)";
-        var clamped = Math.min(1, Math.max(0, Math.abs(t)));
-        return "translateX(".concat(t * neighborScreenOffset, "%) scale(").concat(1 - (1 - neighborScreenScale) * clamped, ")");
-      }),
+      opacity: 1 - 0.75 * clamped,
+      transform: "translateX(".concat(t * neighborScreenOffset, "%) scale(").concat(1 - (1 - neighborScreenScale) * clamped, ")"),
       zIndex: screensCount - index
     };
   };
@@ -2943,8 +2853,8 @@ var Viewer = function Viewer(_ref) {
   useKeyboardShortcuts(keyboardShortcuts, {
     disabled: renderContext !== 'view'
   });
-  return /*#__PURE__*/React.createElement(StoryProvider, {
-    story: parsedStory
+  return /*#__PURE__*/React.createElement(VisitorProvider, {
+    visitor: visitor
   }, /*#__PURE__*/React.createElement(ScreenSizeProvider, {
     size: screenSize
   }, /*#__PURE__*/React.createElement(ViewerProvider, {
@@ -2972,7 +2882,7 @@ var Viewer = function Viewer(_ref) {
     }), (_ref15 = {}, _defineProperty(_ref15, styles$6.landscape, landscape), _defineProperty(_ref15, styles$6.withoutGestures, withoutGestures), _defineProperty(_ref15, styles$6.hideMenu, !menuVisible), _defineProperty(_ref15, styles$6.fadeMenu, playing && playbackControls && !playbackcontrolsVisible), _defineProperty(_ref15, styles$6.ready, ready || withoutScreensTransforms), _defineProperty(_ref15, styles$6.hasInteracted, hasInteracted), _defineProperty(_ref15, styles$6.isDragging, isDragging), _defineProperty(_ref15, className, className), _ref15)]),
     ref: containerRef,
     onContextMenu: onContextMenu
-  }, !withoutMenu ? /*#__PURE__*/React.createElement(ViewerMenu$1, {
+  }, !withoutMenu ? /*#__PURE__*/React.createElement(ViewerMenu, {
     story: parsedStory,
     currentScreenIndex: screenIndex,
     withShadow: menuOverScreen && !withoutMenuShadow,
@@ -3007,12 +2917,12 @@ var Viewer = function Viewer(_ref) {
   }, screens.map(function (screen, i) {
     var current = screenIndex === i;
     var active = i >= screenIndex - neighborScreensActive && i <= screenIndex + neighborScreensActive;
-    var screenStyles = getScreenStylesByIndex(i, progressSpring);
-    return /*#__PURE__*/React.createElement(animated.div, {
+    var screenStyles = getScreenStylesByIndex(i, screenIndexProgress);
+    return /*#__PURE__*/React.createElement("div", {
       key: "screen-viewer-".concat(screen.id || '', "-").concat(i + 1),
       style: screenStyles,
       className: classNames([styles$6.screenContainer, _defineProperty({}, styles$6.current, current)])
-    }, screen !== null ? /*#__PURE__*/React.createElement(ViewerScreen, {
+    }, screen !== null && active ? /*#__PURE__*/React.createElement(ViewerScreen, {
       className: styles$6.screen,
       screen: screen,
       screenState: current ? screenState : null,
@@ -3126,7 +3036,7 @@ var defaultRoutes = {
   screen: screen
 };
 
-var _excluded = ["story", "screenComponents", "memoryRouter", "basePath", "routes", "withoutRouter", "googleApiKey", "visitor", "trackingVariables", "locale", "locales", "translations", "pathWithIndex"];
+var _excluded = ["story", "screenComponents", "memoryRouter", "basePath", "routes", "withoutRouter", "googleApiKey", "trackingVariables", "locale", "locales", "translations", "pathWithIndex"];
 var propTypes = {
   story: PropTypes$1.story,
   screen: PropTypes.string,
@@ -3136,7 +3046,6 @@ 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),
@@ -3153,7 +3062,6 @@ var defaultProps = {
   routes: defaultRoutes,
   withoutRouter: false,
   googleApiKey: null,
-  visitor: null,
   trackingVariables: null,
   locale: 'en',
   locales: ['fr', 'en'],
@@ -3170,7 +3078,6 @@ 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,9 +3127,7 @@ var ViewerContainer = function ViewerContainer(_ref) {
   }, /*#__PURE__*/React.createElement(ScreensProvider, null, /*#__PURE__*/React.createElement(ComponentsProvider, {
     namespace: SCREENS_NAMESPACE,
     components: screenComponents || {}
-  }, /*#__PURE__*/React.createElement(VisitorProvider, {
-    visitor: visitor
-  }, /*#__PURE__*/React.createElement(PlaybackProvider, null, /*#__PURE__*/React.createElement(TrackingProvider, {
+  }, /*#__PURE__*/React.createElement(UserInteractionProvider, null, /*#__PURE__*/React.createElement(PlaybackProvider, null, /*#__PURE__*/React.createElement(TrackingProvider, {
     variables: finalTrackingVariables
   }, withoutRouter ? /*#__PURE__*/React.createElement(Viewer, Object.assign({
     story: story,