@micromag/viewer 0.3.818 → 0.3.819

package/es/index.js

@@ -3136,17 +3136,25 @@ var Viewer = function Viewer(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     hasInteracted = _useState4[0],
     setHasInteracted = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    wasUnmuted = _useState6[0],
+    setWasUnmuted = _useState6[1];
   var onInteractionPrivate = useCallback(function () {
+    var _ref1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref1$target = _ref1.target,
+      target = _ref1$target === void 0 ? null : _ref1$target;
     if (onInteraction !== null) {
       onInteraction();
     }
     if (!hasInteracted) {
       setHasInteracted(true);
-      if (!withoutAutoUnmute && setMuted !== null) {
-        setMuted(false);
-      }
     }
-  }, [onInteraction, hasInteracted, setHasInteracted, withoutAutoUnmute, setMuted]);
+    if (!withoutAutoUnmute && !wasUnmuted && setMuted !== null && (target === null || !checkClickable(target))) {
+      setMuted(false);
+      setWasUnmuted(true);
+    }
+  }, [onInteraction, hasInteracted, setHasInteracted, withoutAutoUnmute, setMuted, wasUnmuted]);
   var _useScreenInteraction = useScreenInteraction({
       screens: screens,
       screenIndex: screenIndex,
@@ -3162,21 +3170,21 @@ var Viewer = function Viewer(_ref) {
     disableInteraction = _useScreenInteraction.disableInteraction;
 
   // Long press to pause playback
-  var _useState5 = useState(null),
-    _useState6 = _slicedToArray(_useState5, 2),
-    pointerDownTime = _useState6[0],
-    setPointerDownTime = _useState6[1];
-  var _useState7 = useState(false),
+  var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    longPressPaused = _useState8[0],
-    setLongPressPaused = _useState8[1];
+    pointerDownTime = _useState8[0],
+    setPointerDownTime = _useState8[1];
+  var _useState9 = useState(false),
+    _useState0 = _slicedToArray(_useState9, 2),
+    longPressPaused = _useState0[0],
+    setLongPressPaused = _useState0[1];
   useEffect(function () {
     setLongPressPaused(false);
     setPointerDownTime(null);
   }, [screenIndex]);
   useEffect(function () {
-    var _ref1 = playbackMedia || {},
-      mediaTagName = _ref1.tagName;
+    var _ref10 = playbackMedia || {},
+      mediaTagName = _ref10.tagName;
     var mediaIsVideo = mediaTagName === 'VIDEO';
     if (pointerDownTime === null || !playing || !mediaIsVideo) {
       return function () {};
@@ -3192,22 +3200,22 @@ var Viewer = function Viewer(_ref) {
   var onPointerDown = useCallback(function () {
     setPointerDownTime(Date.now());
   }, []);
-  var onTap = useCallback(function (_ref10) {
-    var currentTarget = _ref10.currentTarget,
-      event = _ref10.event,
-      target = _ref10.target,
-      _ref10$xy = _slicedToArray(_ref10.xy, 2),
-      x = _ref10$xy[0],
-      y = _ref10$xy[1],
-      elapsedTime = _ref10.elapsedTime,
-      _ref10$args = _slicedToArray(_ref10.args, 1),
-      bindState = _ref10$args[0];
+  var onTap = useCallback(function (_ref11) {
+    var currentTarget = _ref11.currentTarget,
+      event = _ref11.event,
+      target = _ref11.target,
+      _ref11$xy = _slicedToArray(_ref11.xy, 2),
+      x = _ref11$xy[0],
+      y = _ref11$xy[1],
+      elapsedTime = _ref11.elapsedTime,
+      _ref11$args = _slicedToArray(_ref11.args, 1),
+      bindState = _ref11$args[0];
     setPointerDownTime(null);
-    var _ref11 = bindState || {},
-      _ref11$playing = _ref11.playing,
-      currentPlaying = _ref11$playing === void 0 ? false : _ref11$playing,
-      _ref11$longPressPause = _ref11.longPressPaused,
-      currentLongPressPaused = _ref11$longPressPause === void 0 ? false : _ref11$longPressPause;
+    var _ref12 = bindState || {},
+      _ref12$playing = _ref12.playing,
+      currentPlaying = _ref12$playing === void 0 ? false : _ref12$playing,
+      _ref12$longPressPause = _ref12.longPressPaused,
+      currentLongPressPaused = _ref12$longPressPause === void 0 ? false : _ref12$longPressPause;
     if (!currentPlaying && currentLongPressPaused) {
       setPlaying(true);
       setLongPressPaused(false);
@@ -3228,12 +3236,12 @@ var Viewer = function Viewer(_ref) {
       y: y
     });
   }, [interactWithScreen, screenIndex, tapMaximumDuration]);
-  var computeScreenProgress = useCallback(function (_ref12) {
-    var active = _ref12.active,
-      _ref12$movement = _slicedToArray(_ref12.movement, 1),
-      mx = _ref12$movement[0],
-      _ref12$velocity = _slicedToArray(_ref12.velocity, 1),
-      vx = _ref12$velocity[0];
+  var computeScreenProgress = useCallback(function (_ref13) {
+    var active = _ref13.active,
+      _ref13$movement = _slicedToArray(_ref13.movement, 1),
+      mx = _ref13$movement[0],
+      _ref13$velocity = _slicedToArray(_ref13.velocity, 1),
+      vx = _ref13$velocity[0];
     var p = mx / screenContainerWidth; // drag "ratio": how much of the screen width has been swiped?
     var forwards = mx < 0; // true if swiping to left (to navigate forwards)
     var newIndex = !forwards ? screenIndex - 1 : screenIndex + 1; // which item index are we moving towards?
@@ -3246,15 +3254,15 @@ var Viewer = function Viewer(_ref) {
     }
     return screenIndex - progress;
   }, [screenContainerWidth, screenIndex]);
-  var onScreenProgress = useCallback(function (progress, _ref13) {
-    var active = _ref13.active,
-      _ref13$args = _slicedToArray(_ref13.args, 1),
-      bindState = _ref13$args[0];
-    var _ref14 = bindState || {},
-      _ref14$playing = _ref14.playing,
-      currentPlaying = _ref14$playing === void 0 ? false : _ref14$playing,
-      _ref14$longPressPause = _ref14.longPressPaused,
-      currentLongPressPaused = _ref14$longPressPause === void 0 ? false : _ref14$longPressPause;
+  var onScreenProgress = useCallback(function (progress, _ref14) {
+    var active = _ref14.active,
+      _ref14$args = _slicedToArray(_ref14.args, 1),
+      bindState = _ref14$args[0];
+    var _ref15 = bindState || {},
+      _ref15$playing = _ref15.playing,
+      currentPlaying = _ref15$playing === void 0 ? false : _ref15$playing,
+      _ref15$longPressPause = _ref15.longPressPaused,
+      currentLongPressPaused = _ref15$longPressPause === void 0 ? false : _ref15$longPressPause;
     if (!active && !currentPlaying && currentLongPressPaused) {
       setPlaying(true);
       setLongPressPaused(false);
@@ -3268,10 +3276,10 @@ var Viewer = function Viewer(_ref) {
       });
     }
   }, [onScreenNavigate, screenIndex]);
-  var _useState9 = useState(true),
-    _useState0 = _slicedToArray(_useState9, 2),
-    transitioned = _useState0[0],
-    setTransitioned = _useState0[1];
+  var _useState1 = useState(true),
+    _useState10 = _slicedToArray(_useState1, 2),
+    transitioned = _useState10[0],
+    setTransitioned = _useState10[1];
   var onTransitionStart = useCallback(function () {
     setTransitioned(false);
   }, [setTransitioned]);
@@ -3360,11 +3368,11 @@ var Viewer = function Viewer(_ref) {
     menuDotsContainerRef = _useDimensionObserver3.ref,
     _useDimensionObserver4 = _useDimensionObserver3.height,
     menuDotsContainerHeight = _useDimensionObserver4 === void 0 ? 0 : _useDimensionObserver4;
-  var onClickScreen = useCallback(function (_ref15) {
-    var itemScreenId = _ref15.screenId;
+  var onClickScreen = useCallback(function (_ref16) {
+    var itemScreenId = _ref16.screenId;
     onInteractionPrivate();
-    var index = screens.findIndex(function (_ref16) {
-      var id = _ref16.id;
+    var index = screens.findIndex(function (_ref17) {
+      var id = _ref17.id;
       return id === itemScreenId;
     });
     changeIndex(index);
@@ -3427,34 +3435,34 @@ var Viewer = function Viewer(_ref) {
       }
     }
   }, []);
-  var _useState1 = useState(null),
-    _useState10 = _slicedToArray(_useState1, 2),
-    currentShareIncentive = _useState10[0],
-    setCurrentShareIncentive = _useState10[1];
-  var _useState11 = useState(false),
+  var _useState11 = useState(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    shareIncentiveVisible = _useState12[0],
-    setShareIncentiveVisible = _useState12[1];
-  var _ref17 = currentScreen || {},
-    _ref17$header = _ref17.header,
-    header = _ref17$header === void 0 ? null : _ref17$header;
-  var _ref18 = header || {},
-    _ref18$shareIncentive = _ref18.shareIncentive,
-    shareIncentive = _ref18$shareIncentive === void 0 ? null : _ref18$shareIncentive;
-  var _ref19 = shareIncentive || {},
-    _ref19$active = _ref19.active,
-    hasShareIncentive = _ref19$active === void 0 ? false : _ref19$active,
-    _ref19$label = _ref19.label,
-    shareIncentiveLabel = _ref19$label === void 0 ? null : _ref19$label;
-  var _ref20 = currentShareIncentive || {},
+    currentShareIncentive = _useState12[0],
+    setCurrentShareIncentive = _useState12[1];
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    shareIncentiveVisible = _useState14[0],
+    setShareIncentiveVisible = _useState14[1];
+  var _ref18 = currentScreen || {},
+    _ref18$header = _ref18.header,
+    header = _ref18$header === void 0 ? null : _ref18$header;
+  var _ref19 = header || {},
+    _ref19$shareIncentive = _ref19.shareIncentive,
+    shareIncentive = _ref19$shareIncentive === void 0 ? null : _ref19$shareIncentive;
+  var _ref20 = shareIncentive || {},
+    _ref20$active = _ref20.active,
+    hasShareIncentive = _ref20$active === void 0 ? false : _ref20$active,
     _ref20$label = _ref20.label,
-    currentShareIncentiveLabel = _ref20$label === void 0 ? null : _ref20$label;
-  var _ref21 = shareIncentiveLabel || {},
-    _ref21$body = _ref21.body,
-    incentiveLabel = _ref21$body === void 0 ? null : _ref21$body;
-  var _ref22 = currentShareIncentiveLabel || {},
+    shareIncentiveLabel = _ref20$label === void 0 ? null : _ref20$label;
+  var _ref21 = currentShareIncentive || {},
+    _ref21$label = _ref21.label,
+    currentShareIncentiveLabel = _ref21$label === void 0 ? null : _ref21$label;
+  var _ref22 = shareIncentiveLabel || {},
     _ref22$body = _ref22.body,
-    currentIncentiveLabel = _ref22$body === void 0 ? null : _ref22$body;
+    incentiveLabel = _ref22$body === void 0 ? null : _ref22$body;
+  var _ref23 = currentShareIncentiveLabel || {},
+    _ref23$body = _ref23.body,
+    currentIncentiveLabel = _ref23$body === void 0 ? null : _ref23$body;
   useEffect(function () {
     setShareIncentiveVisible(true);
     if (hasShareIncentive && shareIncentiveLabel !== currentShareIncentiveLabel) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/viewer",
-    "version": "0.3.818",
+    "version": "0.3.819",
     "private": false,
     "description": "",
     "keywords": [
@@ -91,5 +91,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "190e12076d300577e586cefb97cb7896a35c50ac"
+    "gitHead": "b7c7a54b829d32d669a0e1e6e366312c66ef0525"
 }