@micromag/viewer 0.3.207 → 0.3.213

package/es/index.js

@@ -14,6 +14,7 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 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';
@@ -22,7 +23,6 @@ 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';
@@ -511,14 +511,14 @@ var styles$e = {"container":"micromag-viewer-buttons-toggle-button-container","n
 
 var propTypes$i = {
   className: PropTypes.string,
-  toggled: PropTypes.number,
+  progressSpring: PropTypes.number,
   button: PropTypes.node,
   toggledButton: PropTypes.node,
   toggledButtonClassName: PropTypes.string
 };
 var defaultProps$i = {
   className: null,
-  toggled: 0,
+  progressSpring: 0,
   button: null,
   toggledButton: null,
   toggledButtonClassName: null
@@ -526,26 +526,27 @@ var defaultProps$i = {
 
 var ToggleButton = function ToggleButton(_ref) {
   var className = _ref.className,
-      toggled = _ref.toggled,
+      progressSpring = _ref.progressSpring,
       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("div", {
+  }, /*#__PURE__*/React.createElement(animated.div, {
     className: styles$e.normal,
-    style: getToggleButtonStyles(toggled)
-  }, button), /*#__PURE__*/React.createElement("div", {
+    style: {
+      transform: progressSpring.to(function (p) {
+        return "translateY(".concat(p * -100, "%)");
+      })
+    }
+  }, button), /*#__PURE__*/React.createElement(animated.div, {
     className: classNames([styles$e.toggled, _defineProperty({}, toggledButtonClassName, toggledButtonClassName !== null)]),
-    style: getToggleButtonStyles(toggled - 1)
+    style: {
+      transform: progressSpring.to(function (p) {
+        return "translateY(".concat((p - 1) * -100, "%)");
+      })
+    }
   }, toggledButton));
 };
 
@@ -556,20 +557,20 @@ var styles$d = {"backdrop":"micromag-viewer-menus-menu-container-backdrop","heig
 
 var propTypes$h = {
   className: PropTypes.string,
-  transitionProgress: PropTypes.number,
+  progressSpring: PropTypes.number,
   theme: PropTypes$1.viewerTheme,
   children: PropTypes.node
 };
 var defaultProps$h = {
   className: null,
-  transitionProgress: 0,
+  progressSpring: 0,
   theme: null,
   children: null
 };
 
 var ViewerMenuContainer = function ViewerMenuContainer(_ref) {
   var className = _ref.className,
-      transitionProgress = _ref.transitionProgress,
+      progressSpring = _ref.progressSpring,
       viewerTheme = _ref.theme,
       children = _ref.children;
 
@@ -587,17 +588,25 @@ var ViewerMenuContainer = function ViewerMenuContainer(_ref) {
     style: {
       pointerEvents: 'none'
     }
-  }, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(animated.div, {
     className: styles$d.heightContainer,
     style: _objectSpread({
-      height: "".concat(transitionProgress * 100, "%"),
-      pointerEvents: transitionProgress < 0.25 ? 'none' : 'auto',
-      zIndex: Math.round(2 + transitionProgress)
+      opacity: progressSpring,
+      // transform: progressSpring.to((p) => `translateY(${(1 - p) * -100}%)`),
+      // height: progressSpring.to((p) => `${p * 100}%`),
+      pointerEvents: progressSpring.to(function (p) {
+        return p < 0.25 ? 'none' : 'auto';
+      }),
+      zIndex: progressSpring.to(function (p) {
+        return Math.round(2 + p);
+      })
     }, backgroundColorStyle)
-  }, children), /*#__PURE__*/React.createElement("div", {
+  }, children), /*#__PURE__*/React.createElement(animated.div, {
     className: styles$d.backdrop,
     style: {
-      opacity: easings.easeOutQuint(transitionProgress)
+      opacity: progressSpring.to(function (p) {
+        return easings.easeOutQuint(p);
+      })
     }
   }));
 };
@@ -924,7 +933,10 @@ 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)])
+    className: classNames([styles$a.container, (_ref4 = {}, _defineProperty(_ref4, className, className !== null), _defineProperty(_ref4, styles$a.isCurrent, current), _ref4)]),
+    style: {
+      paddingBottom: "".concat(screenHeight / screenWidth * 100, "%")
+    }
   }, /*#__PURE__*/React.createElement("button", {
     type: "button",
     className: styles$a.button,
@@ -957,7 +969,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","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 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","inner":"micromag-viewer-menus-menu-preview-inner","frame":"micromag-viewer-menus-menu-preview-frame","fillPulse":"micromag-viewer-menus-menu-preview-fillPulse","isLoading":"micromag-viewer-menus-menu-preview-isLoading","screen":"micromag-viewer-menus-menu-preview-screen","intro":"micromag-viewer-menus-menu-preview-intro"};
 
 var propTypes$c = {
   viewerTheme: PropTypes$1.viewerTheme,
@@ -968,6 +980,7 @@ var propTypes$c = {
   onClickScreen: PropTypes.func,
   maxThumbsWidth: PropTypes.number,
   paddingTop: PropTypes.number,
+  scrollDisabled: PropTypes.bool,
   // @todo to reimplement:
   // shouldLoad: PropTypes.bool,
   // toggleFullscreen: PropTypes.func,
@@ -985,6 +998,7 @@ var defaultProps$c = {
   onClickScreen: null,
   maxThumbsWidth: 140,
   paddingTop: null,
+  scrollDisabled: false,
   // toggleFullscreen: null,
   // fullscreenActive: false,
   // fullscreenEnabled: false,
@@ -1000,6 +1014,7 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
       onClickScreen = _ref.onClickScreen,
       maxThumbsWidth = _ref.maxThumbsWidth,
       paddingTop = _ref.paddingTop,
+      scrollDisabled = _ref.scrollDisabled,
       className = _ref.className;
 
   var _useDimensionObserver = useDimensionObserver(),
@@ -1026,12 +1041,29 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
   var brandImageStyle = brandImageUrl !== null ? {
     backgroundImage: "url(".concat(brandImageUrl, ")")
   } : null; // const { url: brandLogoUrl = null } = brandLogo || {};
-  // @todo optimize all of this the proper way
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      screensMounted = _useState2[0],
+      setScreensMounted = _useState2[1]; // @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), {}, {
@@ -1042,7 +1074,8 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
     className: styles$9.content,
     ref: containerRef
   }, /*#__PURE__*/React.createElement(Scroll, {
-    className: styles$9.scroll
+    className: styles$9.scroll,
+    disabled: scrollDisabled
   }, /*#__PURE__*/React.createElement("nav", {
     className: styles$9.nav,
     style: {
@@ -1052,38 +1085,36 @@ var ViewerMenuPreview = function ViewerMenuPreview(_ref) {
     className: styles$9.items
   }, items.map(function (item, index) {
     var _ref6 = item || {},
-        screenId = _ref6.screenId,
-        _ref6$screen = _ref6.screen,
-        screen = _ref6$screen === void 0 ? null : _ref6$screen;
+        screenId = _ref6.screenId;
 
     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.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",
+      className: styles$9.inner
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classNames([styles$9.frame, _defineProperty({}, styles$9.isLoading, !screenMounted)]),
       style: {
-        animationDelay: "".concat(index * -50, "ms")
+        paddingBottom: "".concat(screenHeight / screenWidth * 100, "%")
       }
-    }, /*#__PURE__*/React.createElement("rect", {
-      width: "10",
-      height: "16"
-    })) : /*#__PURE__*/React.createElement(ViewerMenuScreen, {
+    }, screenMounted ? /*#__PURE__*/React.createElement(ViewerMenuScreen, {
+      className: styles$9.screen,
       item: item,
       index: index,
       screenSize: screenSize,
       onClick: onClickScreen,
       focusable: focusable
-    })));
+    }) : null)));
   }))))));
 };
 
@@ -1393,6 +1424,11 @@ 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,
@@ -1533,6 +1569,7 @@ var ViewerMenu = function ViewerMenu(_ref) {
     springParams: springParams
   }),
       bindShareDrag = _useDragProgress.bind,
+      draggingShare = _useDragProgress.dragging,
       shareOpenedProgress = _useDragProgress.progress;
 
   var computeMenuProgress = useCallback(function (_ref9) {
@@ -1580,6 +1617,7 @@ var ViewerMenu = function ViewerMenu(_ref) {
     springParams: springParams
   }),
       bindMenuDrag = _useDragProgress2.bind,
+      draggingMenu = _useDragProgress2.dragging,
       menuOpenedProgress = _useDragProgress2.progress;
 
   var keyboardShortcuts = useMemo(function () {
@@ -1595,6 +1633,13 @@ 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,
@@ -1620,7 +1665,7 @@ var ViewerMenu = function ViewerMenu(_ref) {
       theme: menuTheme,
       iconPosition: "left"
     }),
-    toggled: shareOpenedProgress
+    progressSpring: shareOpenedProgress
   })) : null, !withoutScreensMenu ? /*#__PURE__*/React.createElement("div", Object.assign({
     className: classNames([styles$6.menuItem, styles$6.menuItemScreens])
   }, bindMenuDrag()), /*#__PURE__*/React.createElement(ToggleButton, {
@@ -1636,7 +1681,7 @@ var ViewerMenu = function ViewerMenu(_ref) {
       theme: menuTheme,
       iconPosition: "right"
     }),
-    toggled: menuOpenedProgress,
+    progressSpring: menuOpenedProgress,
     toggledButtonClassName: styles$6.screensMenuButtonToggled
   })) : null), /*#__PURE__*/React.createElement(ViewerMenuDots, Object.assign({}, menuTheme, {
     direction: "horizontal",
@@ -1656,9 +1701,9 @@ var ViewerMenu = function ViewerMenu(_ref) {
     }
   }))), /*#__PURE__*/React.createElement(ViewerMenuContainer, {
     className: styles$6.menuContainer,
-    transitionProgress: shareOpenedProgress,
+    progressSpring: shareOpenedProgress,
     theme: viewerTheme
-  }, shareOpenedProgress > 0 ? /*#__PURE__*/React.createElement(ViewerMenuShare, {
+  }, draggingShare || shareOpened ? /*#__PURE__*/React.createElement(ViewerMenuShare, {
     viewerTheme: viewerTheme,
     className: styles$6.menuShare,
     title: title,
@@ -1673,9 +1718,9 @@ var ViewerMenu = function ViewerMenu(_ref) {
     onClose: onCloseShare
   }) : null), /*#__PURE__*/React.createElement(ViewerMenuContainer, {
     className: styles$6.menuContainer,
-    transitionProgress: menuOpenedProgress,
+    progressSpring: menuOpenedProgress,
     theme: viewerTheme
-  }, menuOpenedProgress > 0 ? /*#__PURE__*/React.createElement(ViewerMenuPreview, {
+  }, menuMounted ? /*#__PURE__*/React.createElement(ViewerMenuPreview, {
     viewerTheme: viewerTheme,
     className: styles$6.menuPreview,
     screenSize: screenSize,
@@ -1687,6 +1732,7 @@ var ViewerMenu = function ViewerMenu(_ref) {
     onShare: onShare,
     onClickScreen: onClickScreen,
     onClose: onCloseMenu,
+    scrollDisabled: draggingMenu,
     toggleFullscreen: toggleFullscreen,
     fullscreenActive: fullscreenActive,
     fullscreenEnabled: fullscreenEnabled
@@ -1695,6 +1741,7 @@ 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","navigationHint":"micromag-viewer-screen-navigationHint"};
 
@@ -2769,34 +2816,48 @@ var Viewer = function Viewer(_ref) {
     springParams: springParams
   }),
       isDragging = _useDragProgress.dragging,
-      screenIndexProgress = _useDragProgress.progress,
+      progressSpring = _useDragProgress.progress,
       dragContentBind = _useDragProgress.bind;
 
-  var getScreenStylesByIndex = function getScreenStylesByIndex(index, progress) {
+  var getScreenStylesByIndex = function getScreenStylesByIndex(index, spring) {
     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 {
-        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
+        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");
+        })
       };
     }
 
-    var t = index - progress;
-    var clamped = Math.min(1, Math.max(0, Math.abs(t)));
     return {
-      opacity: 1 - 0.75 * clamped,
-      transform: "translateX(".concat(t * neighborScreenOffset, "%) scale(").concat(1 - (1 - neighborScreenScale) * clamped, ")"),
+      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, ")");
+      }),
       zIndex: screensCount - index
     };
   };
@@ -2882,7 +2943,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, {
+  }, !withoutMenu ? /*#__PURE__*/React.createElement(ViewerMenu$1, {
     story: parsedStory,
     currentScreenIndex: screenIndex,
     withShadow: menuOverScreen && !withoutMenuShadow,
@@ -2917,8 +2978,8 @@ 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, screenIndexProgress);
-    return /*#__PURE__*/React.createElement("div", {
+    var screenStyles = getScreenStylesByIndex(i, progressSpring);
+    return /*#__PURE__*/React.createElement(animated.div, {
       key: "screen-viewer-".concat(screen.id || '', "-").concat(i + 1),
       style: screenStyles,
       className: classNames([styles$6.screenContainer, _defineProperty({}, styles$6.current, current)])