@flowsterix/react 0.2.1 → 0.3.1

package/dist/{chunk-B6OJ26VH.mjs → chunk-L6HQUDEA.mjs}

@@ -1,6 +1,11 @@
 import {
-  useTanStackRouterTourAdapter
-} from "./chunk-LQFOZS4Y.mjs";
+  createPathString,
+  notifyRouteChange
+} from "./chunk-WTGQUDPT.mjs";
+
+// src/router/tanstackRouterAdapter.tsx
+import { useRouterState } from "@tanstack/react-router";
+import { useEffect as useEffect2 } from "react";
 
 // src/router/tanstackRouterSync.tsx
 import * as TanStackRouter from "@tanstack/react-router";
@@ -41,10 +46,25 @@ var TanStackRouterSync = ({
   return null;
 };
 
+// src/router/tanstackRouterAdapter.tsx
+var useTanStackRouterTourAdapter = () => {
+  const location = useRouterState({
+    select: (state) => state.location
+  });
+  useEffect2(() => {
+    const resolvedPathname = typeof location.pathname === "string" && location.pathname.length > 0 ? location.pathname : "/";
+    const resolvedSearch = "searchStr" in location && typeof location.searchStr === "string" ? location.searchStr : typeof location.search === "string" ? location.search : "";
+    const resolvedHash = typeof location.hash === "string" ? location.hash : "";
+    const path = typeof location.href === "string" && location.href.length > 0 ? location.href : createPathString(resolvedPathname, resolvedSearch, resolvedHash);
+    notifyRouteChange(path);
+  }, [location]);
+};
+
 export {
   setTourRouter,
   setTanStackRouter,
   getTourRouter,
   getTanStackRouter,
-  TanStackRouterSync
+  TanStackRouterSync,
+  useTanStackRouterTourAdapter
 };

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import type { BackdropInteractionMode, EventBus, FlowAnalyticsHandlers, FlowCancelReason, FlowDefinition, FlowEvents, FlowState, StartFlowOptions, Step, StorageAdapter, VersionMismatchInfo } from '@flowsterix/core';
+import type { BackdropInteractionMode, EventBus, FlowAnalyticsHandlers, FlowCancelReason, FlowDefinition, FlowEvents, FlowState, MaybePromise, StartFlowOptions, Step, StorageAdapter, VersionMismatchInfo } from '@flowsterix/core';
 import type { Dispatch, PropsWithChildren, ReactNode, SetStateAction } from 'react';
 import type { TourLabels } from './labels';
 import type { AnimationAdapter } from './motion/animationAdapter';
@@ -32,14 +32,14 @@ export interface TourContextValue {
     activeFlowId: string | null;
     state: FlowState | null;
     activeStep: Step<ReactNode> | null;
-    startFlow: (flowId: string, options?: StartFlowOptions) => FlowState;
-    next: () => FlowState;
-    back: () => FlowState;
-    goToStep: (step: number | string) => FlowState;
-    pause: () => FlowState;
-    resume: () => FlowState;
-    cancel: (reason?: FlowCancelReason) => FlowState;
-    complete: () => FlowState;
+    startFlow: (flowId: string, options?: StartFlowOptions) => MaybePromise<FlowState>;
+    next: () => MaybePromise<FlowState>;
+    back: () => MaybePromise<FlowState>;
+    goToStep: (step: number | string) => MaybePromise<FlowState>;
+    pause: () => MaybePromise<FlowState>;
+    resume: () => MaybePromise<FlowState>;
+    cancel: (reason?: FlowCancelReason) => MaybePromise<FlowState>;
+    complete: () => MaybePromise<FlowState>;
     events: EventBus<FlowEvents<ReactNode>> | null;
     debugEnabled: boolean;
     setDebugEnabled: (value: boolean) => void;

package/dist/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"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"}

package/dist/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.tsx
@@ -32,7 +22,6 @@ var index_exports = {};
 __export(index_exports, {
   AnimationAdapterProvider: () => AnimationAdapterProvider,
   OverlayBackdrop: () => OverlayBackdrop,
-  TanStackRouterSync: () => TanStackRouterSync,
   TourFocusManager: () => TourFocusManager,
   TourPopoverPortal: () => TourPopoverPortal,
   TourProvider: () => TourProvider,
@@ -41,12 +30,8 @@ __export(index_exports, {
   defaultAnimationAdapter: () => defaultAnimationAdapter,
   defaultLabels: () => defaultLabels,
   getCurrentRoutePath: () => getCurrentRoutePath,
-  getTanStackRouter: () => getTanStackRouter,
-  getTourRouter: () => getTourRouter,
   notifyRouteChange: () => notifyRouteChange,
   reducedMotionAnimationAdapter: () => reducedMotionAnimationAdapter,
-  setTanStackRouter: () => setTanStackRouter,
-  setTourRouter: () => setTourRouter,
   subscribeToRouteChanges: () => subscribeToRouteChanges,
   useAdvanceRules: () => useAdvanceRules,
   useAnimationAdapter: () => useAnimationAdapter,
@@ -60,7 +45,6 @@ __export(index_exports, {
   useHudTargetIssue: () => useHudTargetIssue,
   usePreferredAnimationAdapter: () => usePreferredAnimationAdapter,
   useRadixDialogAdapter: () => useRadixDialogAdapter,
-  useTanStackRouterTourAdapter: () => useTanStackRouterTourAdapter,
   useTour: () => useTour,
   useTourControls: () => useTourControls,
   useTourEvents: () => useTourEvents,
@@ -554,9 +538,10 @@ var TourProvider = ({
       } else {
         pendingResumeRef.current.delete(flowId);
       }
-      const nextState = store.start(options);
+      const result = store.start(options);
+      const nextState = store.getState();
       if (!options?.resume) {
-        return nextState;
+        return result;
       }
       if (previousState.stepIndex >= 0 && nextState.status === "running") {
         pendingResumeRef.current.delete(flowId);
@@ -568,7 +553,7 @@ var TourProvider = ({
       } else if (nextState.status !== "idle" && nextState.stepIndex <= 0) {
         pendingResumeRef.current.delete(flowId);
       }
-      return nextState;
+      return result;
     },
     [ensureStore, resolveResumeStrategy, runResumeHooks]
   );
@@ -628,7 +613,8 @@ var TourProvider = ({
     if (previousState.status === "paused") {
       pendingResumeRef.current.add(store.definition.id);
     }
-    const nextState = store.resume();
+    const result = store.resume();
+    const nextState = store.getState();
     if (previousState.status === "paused" && nextState.status === "running" && nextState.stepIndex >= 0) {
       pendingResumeRef.current.delete(store.definition.id);
       const resumeStrategy = resolveResumeStrategy(store.definition);
@@ -637,7 +623,7 @@ var TourProvider = ({
         void runResumeHooks(store.definition, nextState, resumeStrategy);
       }
     }
-    return nextState;
+    return result;
   }, [getActiveStore, resolveResumeStrategy, runResumeHooks]);
   const cancel = (0, import_react4.useCallback)(
     (reason) => getActiveStore().cancel(reason),
@@ -4126,66 +4112,10 @@ var createPathString = (pathname, search, hash) => {
   const hashPart = toHashString(hash);
   return `${normalizedPath}${searchPart}${hashPart}`;
 };
-
-// src/router/tanstackRouterAdapter.tsx
-var import_react_router = require("@tanstack/react-router");
-var import_react23 = require("react");
-var useTanStackRouterTourAdapter = () => {
-  const location = (0, import_react_router.useRouterState)({
-    select: (state) => state.location
-  });
-  (0, import_react23.useEffect)(() => {
-    const resolvedPathname = typeof location.pathname === "string" && location.pathname.length > 0 ? location.pathname : "/";
-    const resolvedSearch = "searchStr" in location && typeof location.searchStr === "string" ? location.searchStr : typeof location.search === "string" ? location.search : "";
-    const resolvedHash = typeof location.hash === "string" ? location.hash : "";
-    const path = typeof location.href === "string" && location.href.length > 0 ? location.href : createPathString(resolvedPathname, resolvedSearch, resolvedHash);
-    notifyRouteChange(path);
-  }, [location]);
-};
-
-// src/router/tanstackRouterSync.tsx
-var TanStackRouter = __toESM(require("@tanstack/react-router"), 1);
-var import_react24 = require("react");
-var currentRouter = null;
-var setTourRouter = (router) => {
-  currentRouter = router;
-};
-var setTanStackRouter = setTourRouter;
-var getTourRouter = () => {
-  return currentRouter;
-};
-var getTanStackRouter = getTourRouter;
-var TanStackRouterSync = ({
-  onRouterAvailable
-}) => {
-  const useRouter2 = TanStackRouter.useRouter;
-  if (typeof useRouter2 !== "function") {
-    if (typeof console !== "undefined") {
-      console.warn(
-        "[tour][router] TanStackRouterSync requires @tanstack/react-router. Call this component only inside TanStack Router environments."
-      );
-    }
-    return null;
-  }
-  useTanStackRouterTourAdapter();
-  const router = useRouter2();
-  (0, import_react24.useEffect)(() => {
-    setTourRouter(router);
-    onRouterAvailable?.(router);
-    return () => {
-      if (getTourRouter() === router) {
-        setTourRouter(null);
-      }
-      onRouterAvailable?.(null);
-    };
-  }, [router, onRouterAvailable]);
-  return null;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AnimationAdapterProvider,
   OverlayBackdrop,
-  TanStackRouterSync,
   TourFocusManager,
   TourPopoverPortal,
   TourProvider,
@@ -4194,12 +4124,8 @@ var TanStackRouterSync = ({
   defaultAnimationAdapter,
   defaultLabels,
   getCurrentRoutePath,
-  getTanStackRouter,
-  getTourRouter,
   notifyRouteChange,
   reducedMotionAnimationAdapter,
-  setTanStackRouter,
-  setTourRouter,
   subscribeToRouteChanges,
   useAdvanceRules,
   useAnimationAdapter,
@@ -4213,7 +4139,6 @@ var TanStackRouterSync = ({
   useHudTargetIssue,
   usePreferredAnimationAdapter,
   useRadixDialogAdapter,
-  useTanStackRouterTourAdapter,
   useTour,
   useTourControls,
   useTourEvents,

package/dist/index.d.ts

@@ -41,5 +41,6 @@ export type { UseHiddenTargetFallbackConfig, UseHiddenTargetFallbackResult, } fr
 export { useViewportRect } from './hooks/useViewportRect';
 export { createWaitForPredicateController } from './hooks/waitForPredicate';
 export type { WaitForPredicateController, WaitForPredicateControllerOptions, } from './hooks/waitForPredicate';
-export { createPathString, getCurrentRoutePath, getTanStackRouter, getTourRouter, notifyRouteChange, setTanStackRouter, setTourRouter, subscribeToRouteChanges, TanStackRouterSync, useTanStackRouterTourAdapter, } from './router';
+export { getCurrentRoutePath, notifyRouteChange, subscribeToRouteChanges, } from './router/routeGating';
+export { createPathString } from './router/utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}

package/dist/index.mjs

@@ -1,13 +1,3 @@
-import {
-  TanStackRouterSync,
-  getTanStackRouter,
-  getTourRouter,
-  setTanStackRouter,
-  setTourRouter
-} from "./chunk-B6OJ26VH.mjs";
-import {
-  useTanStackRouterTourAdapter
-} from "./chunk-LQFOZS4Y.mjs";
 import {
   createPathString,
   expandRect,
@@ -406,9 +396,10 @@ var TourProvider = ({
       } else {
         pendingResumeRef.current.delete(flowId);
       }
-      const nextState = store.start(options);
+      const result = store.start(options);
+      const nextState = store.getState();
       if (!options?.resume) {
-        return nextState;
+        return result;
       }
       if (previousState.stepIndex >= 0 && nextState.status === "running") {
         pendingResumeRef.current.delete(flowId);
@@ -420,7 +411,7 @@ var TourProvider = ({
       } else if (nextState.status !== "idle" && nextState.stepIndex <= 0) {
         pendingResumeRef.current.delete(flowId);
       }
-      return nextState;
+      return result;
     },
     [ensureStore, resolveResumeStrategy, runResumeHooks]
   );
@@ -480,7 +471,8 @@ var TourProvider = ({
     if (previousState.status === "paused") {
       pendingResumeRef.current.add(store.definition.id);
     }
-    const nextState = store.resume();
+    const result = store.resume();
+    const nextState = store.getState();
     if (previousState.status === "paused" && nextState.status === "running" && nextState.stepIndex >= 0) {
       pendingResumeRef.current.delete(store.definition.id);
       const resumeStrategy = resolveResumeStrategy(store.definition);
@@ -489,7 +481,7 @@ var TourProvider = ({
         void runResumeHooks(store.definition, nextState, resumeStrategy);
       }
     }
-    return nextState;
+    return result;
   }, [getActiveStore, resolveResumeStrategy, runResumeHooks]);
   const cancel = useCallback(
     (reason) => getActiveStore().cancel(reason),
@@ -3827,7 +3819,6 @@ var useHudMotion = () => {
 export {
   AnimationAdapterProvider,
   OverlayBackdrop,
-  TanStackRouterSync,
   TourFocusManager,
   TourPopoverPortal,
   TourProvider,
@@ -3836,12 +3827,8 @@ export {
   defaultAnimationAdapter,
   defaultLabels,
   getCurrentRoutePath,
-  getTanStackRouter,
-  getTourRouter,
   notifyRouteChange,
   reducedMotionAnimationAdapter,
-  setTanStackRouter,
-  setTourRouter,
   subscribeToRouteChanges,
   useAdvanceRules,
   useAnimationAdapter,
@@ -3855,7 +3842,6 @@ export {
   useHudTargetIssue,
   usePreferredAnimationAdapter,
   useRadixDialogAdapter,
-  useTanStackRouterTourAdapter,
   useTour,
   useTourControls,
   useTourEvents,

package/dist/router/index.cjs

@@ -207,23 +207,11 @@ var createPathString = (pathname, search, hash) => {
 
 // src/router/tanstackRouterAdapter.tsx
 var import_react_router = require("@tanstack/react-router");
-var import_react = require("react");
-var useTanStackRouterTourAdapter = () => {
-  const location = (0, import_react_router.useRouterState)({
-    select: (state) => state.location
-  });
-  (0, import_react.useEffect)(() => {
-    const resolvedPathname = typeof location.pathname === "string" && location.pathname.length > 0 ? location.pathname : "/";
-    const resolvedSearch = "searchStr" in location && typeof location.searchStr === "string" ? location.searchStr : typeof location.search === "string" ? location.search : "";
-    const resolvedHash = typeof location.hash === "string" ? location.hash : "";
-    const path = typeof location.href === "string" && location.href.length > 0 ? location.href : createPathString(resolvedPathname, resolvedSearch, resolvedHash);
-    notifyRouteChange(path);
-  }, [location]);
-};
+var import_react2 = require("react");
 
 // src/router/tanstackRouterSync.tsx
 var TanStackRouter = __toESM(require("@tanstack/react-router"), 1);
-var import_react2 = require("react");
+var import_react = require("react");
 var currentRouter = null;
 var setTourRouter = (router) => {
   currentRouter = router;
@@ -247,7 +235,7 @@ var TanStackRouterSync = ({
   }
   useTanStackRouterTourAdapter();
   const router = useRouter2();
-  (0, import_react2.useEffect)(() => {
+  (0, import_react.useEffect)(() => {
     setTourRouter(router);
     onRouterAvailable?.(router);
     return () => {
@@ -259,6 +247,20 @@ var TanStackRouterSync = ({
   }, [router, onRouterAvailable]);
   return null;
 };
+
+// src/router/tanstackRouterAdapter.tsx
+var useTanStackRouterTourAdapter = () => {
+  const location = (0, import_react_router.useRouterState)({
+    select: (state) => state.location
+  });
+  (0, import_react2.useEffect)(() => {
+    const resolvedPathname = typeof location.pathname === "string" && location.pathname.length > 0 ? location.pathname : "/";
+    const resolvedSearch = "searchStr" in location && typeof location.searchStr === "string" ? location.searchStr : typeof location.search === "string" ? location.search : "";
+    const resolvedHash = typeof location.hash === "string" ? location.hash : "";
+    const path = typeof location.href === "string" && location.href.length > 0 ? location.href : createPathString(resolvedPathname, resolvedSearch, resolvedHash);
+    notifyRouteChange(path);
+  }, [location]);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   TanStackRouterSync,

package/dist/router/index.mjs

@@ -3,11 +3,9 @@ import {
   getTanStackRouter,
   getTourRouter,
   setTanStackRouter,
-  setTourRouter
-} from "../chunk-B6OJ26VH.mjs";
-import {
+  setTourRouter,
   useTanStackRouterTourAdapter
-} from "../chunk-LQFOZS4Y.mjs";
+} from "../chunk-L6HQUDEA.mjs";
 import {
   createPathString,
   getCurrentRoutePath,

package/dist/router/tanstackRouterAdapter.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,16 +17,29 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/router/tanstackRouterAdapter.tsx
 var tanstackRouterAdapter_exports = {};
 __export(tanstackRouterAdapter_exports, {
+  TanStackRouterSync: () => TanStackRouterSync,
+  getTanStackRouter: () => getTanStackRouter,
+  getTourRouter: () => getTourRouter,
+  setTanStackRouter: () => setTanStackRouter,
+  setTourRouter: () => setTourRouter,
   useTanStackRouterTourAdapter: () => useTanStackRouterTourAdapter
 });
 module.exports = __toCommonJS(tanstackRouterAdapter_exports);
 var import_react_router = require("@tanstack/react-router");
-var import_react = require("react");
+var import_react2 = require("react");
 
 // src/utils/dom.ts
 var isBrowser = typeof window !== "undefined" && typeof document !== "undefined";
@@ -183,12 +198,51 @@ var createPathString = (pathname, search, hash) => {
   return `${normalizedPath}${searchPart}${hashPart}`;
 };
 
+// src/router/tanstackRouterSync.tsx
+var TanStackRouter = __toESM(require("@tanstack/react-router"), 1);
+var import_react = require("react");
+var currentRouter = null;
+var setTourRouter = (router) => {
+  currentRouter = router;
+};
+var setTanStackRouter = setTourRouter;
+var getTourRouter = () => {
+  return currentRouter;
+};
+var getTanStackRouter = getTourRouter;
+var TanStackRouterSync = ({
+  onRouterAvailable
+}) => {
+  const useRouter2 = TanStackRouter.useRouter;
+  if (typeof useRouter2 !== "function") {
+    if (typeof console !== "undefined") {
+      console.warn(
+        "[tour][router] TanStackRouterSync requires @tanstack/react-router. Call this component only inside TanStack Router environments."
+      );
+    }
+    return null;
+  }
+  useTanStackRouterTourAdapter();
+  const router = useRouter2();
+  (0, import_react.useEffect)(() => {
+    setTourRouter(router);
+    onRouterAvailable?.(router);
+    return () => {
+      if (getTourRouter() === router) {
+        setTourRouter(null);
+      }
+      onRouterAvailable?.(null);
+    };
+  }, [router, onRouterAvailable]);
+  return null;
+};
+
 // src/router/tanstackRouterAdapter.tsx
 var useTanStackRouterTourAdapter = () => {
   const location = (0, import_react_router.useRouterState)({
     select: (state) => state.location
   });
-  (0, import_react.useEffect)(() => {
+  (0, import_react2.useEffect)(() => {
     const resolvedPathname = typeof location.pathname === "string" && location.pathname.length > 0 ? location.pathname : "/";
     const resolvedSearch = "searchStr" in location && typeof location.searchStr === "string" ? location.searchStr : typeof location.search === "string" ? location.search : "";
     const resolvedHash = typeof location.hash === "string" ? location.hash : "";
@@ -198,5 +252,10 @@ var useTanStackRouterTourAdapter = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  TanStackRouterSync,
+  getTanStackRouter,
+  getTourRouter,
+  setTanStackRouter,
+  setTourRouter,
   useTanStackRouterTourAdapter
 });

package/dist/router/tanstackRouterAdapter.d.ts

@@ -1,2 +1,4 @@
+export { getTanStackRouter, getTourRouter, setTanStackRouter, setTourRouter, TanStackRouterSync, } from './tanstackRouterSync';
+export type { TanStackRouterSyncProps } from './tanstackRouterSync';
 export declare const useTanStackRouterTourAdapter: () => void;
 //# sourceMappingURL=tanstackRouterAdapter.d.ts.map

package/dist/router/tanstackRouterAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tanstackRouterAdapter.d.ts","sourceRoot":"","sources":["../../src/router/tanstackRouterAdapter.tsx"],"names":[],"mappings":"AAMA,eAAO,MAAM,4BAA4B,YAyBxC,CAAA"}
+{"version":3,"file":"tanstackRouterAdapter.d.ts","sourceRoot":"","sources":["../../src/router/tanstackRouterAdapter.tsx"],"names":[],"mappings":"AAOA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,kBAAkB,GACnB,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,eAAO,MAAM,4BAA4B,YAyBxC,CAAA"}

package/dist/router/tanstackRouterAdapter.mjs

@@ -1,7 +1,17 @@
 import {
+  TanStackRouterSync,
+  getTanStackRouter,
+  getTourRouter,
+  setTanStackRouter,
+  setTourRouter,
   useTanStackRouterTourAdapter
-} from "../chunk-LQFOZS4Y.mjs";
+} from "../chunk-L6HQUDEA.mjs";
 import "../chunk-WTGQUDPT.mjs";
 export {
+  TanStackRouterSync,
+  getTanStackRouter,
+  getTourRouter,
+  setTanStackRouter,
+  setTourRouter,
   useTanStackRouterTourAdapter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowsterix/react",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "React bindings for Flowsterix - guided tours and onboarding flows",
   "license": "MIT",
   "repository": {
@@ -64,7 +64,7 @@
   ],
   "dependencies": {
     "@floating-ui/dom": "^1.7.4",
-    "@flowsterix/core": "0.2.0"
+    "@flowsterix/core": "0.3.0"
   },
   "peerDependencies": {
     "react": ">=18",

package/dist/chunk-LQFOZS4Y.mjs

@@ -1,24 +0,0 @@
-import {
-  createPathString,
-  notifyRouteChange
-} from "./chunk-WTGQUDPT.mjs";
-
-// src/router/tanstackRouterAdapter.tsx
-import { useRouterState } from "@tanstack/react-router";
-import { useEffect } from "react";
-var useTanStackRouterTourAdapter = () => {
-  const location = useRouterState({
-    select: (state) => state.location
-  });
-  useEffect(() => {
-    const resolvedPathname = typeof location.pathname === "string" && location.pathname.length > 0 ? location.pathname : "/";
-    const resolvedSearch = "searchStr" in location && typeof location.searchStr === "string" ? location.searchStr : typeof location.search === "string" ? location.search : "";
-    const resolvedHash = typeof location.hash === "string" ? location.hash : "";
-    const path = typeof location.href === "string" && location.href.length > 0 ? location.href : createPathString(resolvedPathname, resolvedSearch, resolvedHash);
-    notifyRouteChange(path);
-  }, [location]);
-};
-
-export {
-  useTanStackRouterTourAdapter
-};