@tent-official/react-walkthrough 1.2.0 → 1.3.3

package/dist/index.mjs

@@ -220,11 +220,13 @@ var useWalkthrough = ({
   animationSpeed = 350,
   displayTotal,
   displayStepOffset,
-  isClearLastPositionOnEnd = false
+  isClearLastPositionOnEnd = false,
+  onStepNext
 }) => {
   const started = useRef(false);
   const onCompleteRef = useRef(onWalkthroughComplete);
   const handleWhenLastStepRef = useRef(handleWhenLastStep);
+  const onStepNextRef = useRef(onStepNext);
   const conditionMet = startWhenCondition === void 0 ? true : typeof startWhenCondition === "function" ? startWhenCondition() : !!startWhenCondition;
   useEffect(() => {
     onCompleteRef.current = onWalkthroughComplete;
@@ -232,6 +234,9 @@ var useWalkthrough = ({
   useEffect(() => {
     handleWhenLastStepRef.current = handleWhenLastStep;
   }, [handleWhenLastStep]);
+  useEffect(() => {
+    onStepNextRef.current = onStepNext;
+  }, [onStepNext]);
   const start = useCallback(() => {
     if (isDone(storageSuffix, name) || started.current) return;
     started.current = true;
@@ -255,7 +260,8 @@ var useWalkthrough = ({
         animationSpeed,
         displayTotal,
         displayStepOffset,
-        isClearLastPositionOnEnd
+        isClearLastPositionOnEnd,
+        onStepNext: onStepNextRef.current
       }
     });
   }, [
@@ -629,6 +635,7 @@ var WalkthroughOverlay = ({
   const popoverRef = useRef(null);
   const [popoverPos, setPopoverPos] = useState(null);
   const [popoverHidden, setPopoverHidden] = useState(false);
+  const [isDismissing, setIsDismissing] = useState(false);
   const displayStepRef = useRef(null);
   const displayPosRef = useRef(null);
   const [validSteps, setValidSteps] = useState([]);
@@ -641,6 +648,7 @@ var WalkthroughOverlay = ({
     if (!activeTour) {
       setValidSteps([]);
       setIsDelaying(false);
+      setIsDismissing(false);
       waitingForElsRef.current = false;
       delayDoneForRef.current = null;
       skipNextRecomputeRef.current = false;
@@ -840,6 +848,7 @@ var WalkthroughOverlay = ({
     setPopoverHidden(false);
   }, [popoverHidden, isAnimating, step, popoverPos]);
   if (!activeTour) return null;
+  if (isDismissing) return null;
   if (_activeOverlayId !== null && _activeOverlayId !== instanceIdRef.current) {
     return null;
   }
@@ -930,6 +939,7 @@ var WalkthroughOverlay = ({
     const hasMoreOriginalSteps = currentOrigIdx < activeTour.steps.length - 1;
     const effectiveIsLast = isLast && !(hasTrigger && hasMoreOriginalSteps);
     if (effectiveIsLast) {
+      setIsDismissing(true);
       if (activeTour.handleWhenLastStep) activeTour.handleWhenLastStep();
       completeTour();
     } else {
@@ -981,6 +991,12 @@ var WalkthroughOverlay = ({
     }
   };
   const next = () => {
+    var _a2;
+    const currentOrigIdx = validSteps[currentValidPos]._originalIdx;
+    const stepNextCb = (_a2 = activeTour.onStepNext) == null ? void 0 : _a2[currentOrigIdx];
+    if (typeof stepNextCb === "function") {
+      stepNextCb();
+    }
     const hasTrigger = !!step.triggerElOnNext;
     if (hasTrigger) {
       setPopoverHidden(true);
@@ -993,8 +1009,8 @@ var WalkthroughOverlay = ({
         triggerTarget.dispatchEvent(new MouseEvent("mouseup", { bubbles: true, cancelable: true, button: 0 }));
         triggerTarget.click();
       }
-      const currentOrigIdx = validSteps[currentValidPos]._originalIdx;
-      const nextOrigIdx = currentOrigIdx + 1;
+      const currentOrigIdx2 = validSteps[currentValidPos]._originalIdx;
+      const nextOrigIdx = currentOrigIdx2 + 1;
       const nextStepDef = activeTour.steps[nextOrigIdx];
       if (nextStepDef) {
         const nextElId = resolveElId(nextStepDef.el);
@@ -1036,8 +1052,7 @@ var WalkthroughOverlay = ({
         }
         return;
       }
-      setPopoverHidden(true);
-      setPopoverPos(null);
+      setIsDismissing(true);
       if (activeTour.handleWhenLastStep) activeTour.handleWhenLastStep();
       setTimeout(() => completeTour(), 300);
       return;
@@ -1056,6 +1071,7 @@ var WalkthroughOverlay = ({
     }
   };
   const skip = () => {
+    setIsDismissing(true);
     completeTour();
   };
   const popoverWidth = clampSize(step.width, window.innerWidth);