@tent-official/react-walkthrough 1.1.101 → 1.2.0

package/dist/index.mjs

@@ -534,27 +534,40 @@ var choosePopoverDir = (rect, popoverW, popoverH, gap, preferred) => {
     let offsetX = 0;
     let offsetY = 0;
     let maxHeight = void 0;
+    let align = "start";
     if (dir === "top" || dir === "bottom") {
-      const popoverRight = rect.left + popoverW;
-      if (popoverRight > vw - EDGE_MARGIN) {
-        offsetX = vw - EDGE_MARGIN - popoverRight;
-      }
-      if (rect.left + offsetX < EDGE_MARGIN) {
-        offsetX = EDGE_MARGIN - rect.left;
+      const rectCenter = rect.left + rect.width / 2;
+      align = rectCenter > vw / 2 ? "end" : "start";
+      if (align === "start") {
+        const popoverRight = rect.left + popoverW;
+        if (popoverRight > vw - EDGE_MARGIN) {
+          offsetX = vw - EDGE_MARGIN - popoverRight;
+        }
+      } else {
+        const popoverLeft = rect.left + rect.width - popoverW;
+        if (popoverLeft < EDGE_MARGIN) {
+          offsetX = EDGE_MARGIN - popoverLeft;
+        }
       }
       if (space[dir] < popoverH) {
         maxHeight = Math.max(space[dir], 60);
       }
     } else {
-      const popoverBottom = rect.top + popoverH;
-      if (popoverBottom > vh - EDGE_MARGIN) {
-        offsetY = vh - EDGE_MARGIN - popoverBottom;
-      }
-      if (rect.top + offsetY < EDGE_MARGIN) {
-        offsetY = EDGE_MARGIN - rect.top;
+      const rectMiddle = rect.top + rect.height / 2;
+      align = rectMiddle > vh / 2 ? "end" : "start";
+      if (align === "start") {
+        const popoverBottom = rect.top + popoverH;
+        if (popoverBottom > vh - EDGE_MARGIN) {
+          offsetY = vh - EDGE_MARGIN - popoverBottom;
+        }
+      } else {
+        const popoverTop = rect.top + rect.height - popoverH;
+        if (popoverTop < EDGE_MARGIN) {
+          offsetY = EDGE_MARGIN - popoverTop;
+        }
       }
     }
-    return { dir, offsetX, offsetY, ...maxHeight != null && { maxHeight } };
+    return { dir, align, offsetX, offsetY, ...maxHeight != null && { maxHeight } };
   };
   if (preferred && fits(preferred)) return buildResult(preferred);
   const order = ["bottom", "top", "right", "left"];
@@ -594,7 +607,7 @@ var WalkthroughOverlay = ({
   prevColor,
   skipColor
 } = {}) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   injectKeyframes();
   const { activeTour } = useGlobalState();
   const instanceIdRef = useRef(null);
@@ -896,9 +909,9 @@ var WalkthroughOverlay = ({
   const totalSteps = validSteps.length;
   const isLast = currentValidPos === totalSteps - 1;
   const stepOffset = (_c = activeTour.displayStepOffset) != null ? _c : 0;
-  const displayCurrentStep = currentValidPos + 1 + stepOffset;
-  const displayTotalSteps = (_d = activeTour.displayTotal) != null ? _d : totalSteps;
-  const borderRadius = (_e = step.borderRadius) != null ? _e : 10;
+  const displayCurrentStep = (_d = step.displayStep) != null ? _d : currentValidPos + 1 + stepOffset;
+  const displayTotalSteps = (_f = (_e = step.displayTotal) != null ? _e : activeTour.displayTotal) != null ? _f : totalSteps;
+  const borderRadius = (_g = step.borderRadius) != null ? _g : 10;
   const {
     isShowSkip = true,
     isShowPrev = true,
@@ -908,9 +921,9 @@ var WalkthroughOverlay = ({
     skipLabel: tourSkipLabel = "Skip",
     doneLabel = "Done"
   } = activeTour;
-  const nextLabel = (_f = step.nextLabel) != null ? _f : tourNextLabel;
-  const prevLabel = (_g = step.prevLabel) != null ? _g : tourPrevLabel;
-  const skipLabel = (_h = step.skipLabel) != null ? _h : tourSkipLabel;
+  const nextLabel = (_h = step.nextLabel) != null ? _h : tourNextLabel;
+  const prevLabel = (_i = step.prevLabel) != null ? _i : tourPrevLabel;
+  const skipLabel = (_j = step.skipLabel) != null ? _j : tourSkipLabel;
   const advanceStep = (hasTrigger) => {
     var _a2;
     const currentOrigIdx = validSteps[currentValidPos]._originalIdx;
@@ -924,6 +937,43 @@ var WalkthroughOverlay = ({
       setPopoverPos(null);
       const nextValidStep = validSteps[currentValidPos + 1];
       const nextOrigIdx = hasTrigger && !nextValidStep ? currentOrigIdx + 1 : (_a2 = nextValidStep == null ? void 0 : nextValidStep._originalIdx) != null ? _a2 : currentOrigIdx + 1;
+      const shouldForceRecompute = !!step.forceRecompute;
+      if (shouldForceRecompute) {
+        const nextStepDef = activeTour.steps[nextOrigIdx];
+        if (nextStepDef) {
+          const nextElId = resolveElId(nextStepDef.el);
+          const SETTLE_DELAY = 150;
+          const doAdvance = () => {
+            setGlobalState((s) => ({
+              ...s,
+              activeTour: { ...s.activeTour, currentStep: nextOrigIdx }
+            }));
+          };
+          const alreadyExists = document.getElementById(nextElId);
+          if (alreadyExists) {
+            setTimeout(() => doAdvance(), SETTLE_DELAY);
+          } else {
+            waitingForElsRef.current = true;
+            const observer = new MutationObserver(() => {
+              const found = document.getElementById(nextElId);
+              if (found) {
+                observer.disconnect();
+                waitingForElsRef.current = false;
+                setTimeout(() => doAdvance(), SETTLE_DELAY);
+              }
+            });
+            observer.observe(document.body, { childList: true, subtree: true });
+            setTimeout(() => {
+              observer.disconnect();
+              if (waitingForElsRef.current) {
+                waitingForElsRef.current = false;
+                doAdvance();
+              }
+            }, 3e3);
+          }
+          return;
+        }
+      }
       setGlobalState((s) => ({
         ...s,
         activeTour: { ...s.activeTour, currentStep: nextOrigIdx }
@@ -953,7 +1003,9 @@ var WalkthroughOverlay = ({
           const alreadyInValid = validSteps.some((s) => s._originalIdx === nextOrigIdx);
           const newValidSteps = alreadyInValid ? validSteps : [...validSteps, nextStepWithIdx].sort((a, b) => a._originalIdx - b._originalIdx);
           setValidSteps(newValidSteps);
-          skipNextRecomputeRef.current = true;
+          if (!step.forceRecompute) {
+            skipNextRecomputeRef.current = true;
+          }
           setGlobalState((s) => ({
             ...s,
             activeTour: { ...s.activeTour, currentStep: nextOrigIdx }
@@ -1028,22 +1080,10 @@ var WalkthroughOverlay = ({
     displayPosRef.current = currentValidPos;
   }
   const ds = displayStepRef.current;
-  const dir = (_i = popoverPos == null ? void 0 : popoverPos.dir) != null ? _i : "bottom";
-  const offsetX = (_j = popoverPos == null ? void 0 : popoverPos.offsetX) != null ? _j : 0;
-  const offsetY = (_k = popoverPos == null ? void 0 : popoverPos.offsetY) != null ? _k : 0;
-  if (popoverReady && step) {
-    const dbgEl = document.getElementById(resolveElId(step.el));
-    const dbgReal = dbgEl ? dbgEl.getBoundingClientRect() : null;
-    console.log("[WT-DEBUG] anchor rect vs real element", {
-      anchorRect: { top: rect.top, left: rect.left, width: rect.width, height: rect.height },
-      realElement: dbgReal ? { top: dbgReal.top, left: dbgReal.left, width: dbgReal.width, height: dbgReal.height } : null,
-      dir,
-      offsetX,
-      offsetY,
-      popoverPos,
-      containerElement: activeTour == null ? void 0 : activeTour.containerElement
-    });
-  }
+  const dir = (_k = popoverPos == null ? void 0 : popoverPos.dir) != null ? _k : "bottom";
+  const align = (_l = popoverPos == null ? void 0 : popoverPos.align) != null ? _l : "start";
+  const offsetX = (_m = popoverPos == null ? void 0 : popoverPos.offsetX) != null ? _m : 0;
+  const offsetY = (_n = popoverPos == null ? void 0 : popoverPos.offsetY) != null ? _n : 0;
   const anchorStyle = popoverReady ? {
     position: "fixed",
     top: rect.top,
@@ -1059,11 +1099,13 @@ var WalkthroughOverlay = ({
     pointerEvents: "none",
     zIndex: 99999
   };
+  const hAlign = align === "end" ? { right: offsetX } : { left: offsetX };
+  const vAlign = align === "end" ? { bottom: offsetY } : { top: offsetY };
   const dirStyles = {
-    bottom: { top: `calc(100% + ${$popoverGap}px)`, left: offsetX },
-    top: { bottom: `calc(100% + ${$popoverGap}px)`, left: offsetX },
-    right: { top: offsetY, left: `calc(100% + ${$popoverGap}px)` },
-    left: { top: offsetY, right: `calc(100% + ${$popoverGap}px)` }
+    bottom: { top: `calc(100% + ${$popoverGap}px)`, ...hAlign },
+    top: { bottom: `calc(100% + ${$popoverGap}px)`, ...hAlign },
+    right: { left: `calc(100% + ${$popoverGap}px)`, ...vAlign },
+    left: { right: `calc(100% + ${$popoverGap}px)`, ...vAlign }
   };
   const maxHeightStyle = (popoverPos == null ? void 0 : popoverPos.maxHeight) != null ? { maxHeight: popoverPos.maxHeight, overflowY: "auto" } : {};
   const popoverStyle = popoverReady ? {
@@ -1135,7 +1177,7 @@ var WalkthroughOverlay = ({
       /* @__PURE__ */ jsxs(PopoverBody, { children: [
         /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "row", justifyContent: "space-between" }, children: [
           pStep.title ? /* @__PURE__ */ jsx(PopoverTitle, { children: pStep.title }) : "",
-          ((_l = pStep.isShowStep) != null ? _l : pIsShowStep) && /* @__PURE__ */ jsxs("span", { style: { color: "#a1a1aa", fontSize: "12px", fontWeight: "400" }, children: [
+          ((_o = pStep.isShowStep) != null ? _o : pIsShowStep) && /* @__PURE__ */ jsxs("span", { style: { color: "#a1a1aa", fontSize: "12px", fontWeight: "400" }, children: [
             pDisplayCurrentStep,
             "/",
             pDisplayTotalSteps
@@ -1160,7 +1202,7 @@ var WalkthroughOverlay = ({
           }
         ) }),
         /* @__PURE__ */ jsxs(ButtonGroup, { children: [
-          ((_m = pStep.isShowPrev) != null ? _m : pIsShowPrev) && pCurrentValidPos > 0 && /* @__PURE__ */ jsx(
+          ((_p = pStep.isShowPrev) != null ? _p : pIsShowPrev) && pCurrentValidPos > 0 && /* @__PURE__ */ jsx(
             "button",
             {
               className: "wt-btn",