clear-react-router 1.4.3 → 1.4.5

package/dist/components/Router.d.ts

@@ -2,6 +2,7 @@ type RouterProps = {
     isAnimated?: boolean;
     animationDuration?: number;
     spinner?: boolean;
+    preserveScroll?: boolean;
 };
-export declare const Router: ({ isAnimated, animationDuration, spinner }: RouterProps) => import("react/jsx-runtime").JSX.Element | null;
+export declare const Router: ({ isAnimated, animationDuration, spinner, preserveScroll }: RouterProps) => import("react/jsx-runtime").JSX.Element | null;
 export {};

package/dist/components/RouterProvider.d.ts

@@ -4,7 +4,6 @@ type RouteProviderProps = {
     children: ReactNode;
     routeList: RouteItem[];
     context?: Record<string, unknown>;
-    preserveScroll?: boolean;
 };
-export declare const RouterProvider: ({ children, routeList, context: initialContext, preserveScroll, }: RouteProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const RouterProvider: ({ children, routeList, context: initialContext }: RouteProviderProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/context/RouterProviderContext.d.ts

@@ -7,7 +7,7 @@ export type NavigationContextValue = {
     location: Location;
     blockerState: BlockerState;
     isLoading: boolean;
-    nextRouteItem: RouteItem | undefined;
+    nextItem: RouteItem | undefined;
 };
 export type ActionsContextValue = {
     setLocation: Dispatch<SetStateAction<Location>>;

package/dist/hooks/useHandleNavigation.d.ts

@@ -6,13 +6,12 @@ type UseHandleNavigation = {
     context: Record<string, unknown>;
     revalidateCache(arg: RevalidateCacheArgs): Promise<void>;
     setContext: Dispatch<SetStateAction<Record<string, unknown>>>;
-    setScrollMap: Dispatch<SetStateAction<Record<string, number>>>;
     setLoaderState: Dispatch<SetStateAction<LoaderState>>;
 };
-export declare const useHandleNavigation: ({ setLocation, routeList, context, revalidateCache, setContext, setScrollMap, setLoaderState, }: UseHandleNavigation) => {
+export declare const useHandleNavigation: ({ setLocation, routeList, context, revalidateCache, setContext, setLoaderState, }: UseHandleNavigation) => {
     blockerState: BlockerState;
     updateLocation: (nextLocation: Location) => Promise<void>;
     updateBlockedRoute: ({ type, payload }: UpdateBlockedRouteProps) => void;
-    nextRouteItem: RouteItem | undefined;
+    nextItem: RouteItem | undefined;
 };
 export {};

package/dist/hooks/usePreserveScroll.d.ts

@@ -1,6 +1,7 @@
 type UsePreserveScrollParams = {
     pathname: string;
     preserveScroll: boolean;
+    nextPathname?: string;
 };
-export declare const usePreserveScroll: ({ pathname, preserveScroll }: UsePreserveScrollParams) => import("react").Dispatch<import("react").SetStateAction<Record<string, number>>>;
+export declare const usePreserveScroll: ({ pathname, preserveScroll, nextPathname }: UsePreserveScrollParams) => void;
 export {};

package/dist/index.js

@@ -45,7 +45,7 @@ var require_react_jsx_runtime_production = /* @__PURE__ */ __commonJSMin(((expor
 var import_jsx_runtime = (/* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = require_react_jsx_runtime_production();
 })))();
-var Provider = ({ children, setContext, context, updateBlockedRoute, updateLocation, location, setLocation, prefetchLoader, loaderState, blockerState, routeList, isLoading, nextRouteItem }) => {
+var Provider = ({ children, setContext, context, updateBlockedRoute, updateLocation, location, setLocation, prefetchLoader, loaderState, blockerState, routeList, isLoading, nextItem }) => {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PropsContext.Provider, {
 		value: { routeList },
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionsContext.Provider, {
@@ -66,7 +66,7 @@ var Provider = ({ children, setContext, context, updateBlockedRoute, updateLocat
 						blockerState,
 						location,
 						isLoading,
-						nextRouteItem
+						nextItem
 					},
 					children
 				})
@@ -136,22 +136,14 @@ var comparePaths = (el, pathname) => {
 };
 //#endregion
 //#region hooks/useHandleNavigation.ts
-var useHandleNavigation = ({ setLocation, routeList, context, revalidateCache, setContext, setScrollMap, setLoaderState }) => {
+var useHandleNavigation = ({ setLocation, routeList, context, revalidateCache, setContext, setLoaderState }) => {
 	const [blockedRoute, setBlockedRoute] = useState({
 		from: "",
 		to: ""
 	});
-	const [nextRouteItem, setNextRouteItem] = useState();
+	const [nextItem, setNextItem] = useState();
 	const prevPathname = useRef("");
 	const navigationSeq = useRef(0);
-	const updateScrollMap = useCallback(() => setScrollMap((prevState) => {
-		const scrollPosition = document.scrollingElement?.scrollTop ?? 0;
-		if (!scrollPosition || prevState[prevPathname.current] === scrollPosition) return prevState;
-		return {
-			...prevState,
-			[prevPathname.current]: scrollPosition
-		};
-	}), [setScrollMap]);
 	const navigation = useCallback((nextLocation) => {
 		setLocation(nextLocation);
 		prevPathname.current = nextLocation.pathname;
@@ -169,9 +161,8 @@ var useHandleNavigation = ({ setLocation, routeList, context, revalidateCache, s
 	const navigationHandler = useCallback(async (nextLocation) => {
 		navigationSeq.current = navigationSeq.current + 1;
 		const seq = navigationSeq.current;
-		updateScrollMap();
 		const nextItem = routeList.find((el) => comparePaths(el, nextLocation.pathname));
-		setNextRouteItem(nextItem);
+		setNextItem(nextItem);
 		const params = getParamsObject({
 			routeItem: nextItem,
 			pathname: nextLocation.pathname
@@ -221,8 +212,7 @@ var useHandleNavigation = ({ setLocation, routeList, context, revalidateCache, s
 		routeList,
 		transitionedNavigation,
 		setContext,
-		setLoaderState,
-		updateScrollMap
+		setLoaderState
 	]);
 	const setNextLocationRef = useLatest(navigationHandler);
 	const updateBlockedRoute = useCallback(({ type, payload = "" }) => setBlockedRoute((prevState) => {
@@ -276,7 +266,7 @@ var useHandleNavigation = ({ setLocation, routeList, context, revalidateCache, s
 		}, [blockedRoute]),
 		updateLocation,
 		updateBlockedRoute,
-		nextRouteItem
+		nextItem
 	};
 };
 //#endregion
@@ -351,45 +341,23 @@ var useLoader = ({ routeList, context, setContext, setLoaderState }) => {
 	};
 };
 //#endregion
-//#region hooks/usePreserveScroll.ts
-var usePreserveScroll = ({ pathname, preserveScroll }) => {
-	const [scrollMap, setScrollMap] = useState({});
-	useEffect(() => {
-		if (!preserveScroll || !pathname || !scrollMap[pathname]) return;
-		document.scrollingElement?.scrollTo({
-			top: scrollMap[pathname],
-			behavior: "smooth"
-		});
-	}, [
-		pathname,
-		scrollMap,
-		preserveScroll
-	]);
-	return setScrollMap;
-};
-//#endregion
 //#region components/RouterProvider.tsx
-var RouterProvider = ({ children, routeList, context: initialContext = {}, preserveScroll = true }) => {
+var RouterProvider = ({ children, routeList, context: initialContext = {} }) => {
 	const [location, setLocation] = useState({});
 	const [context, setContext] = useState(initialContext);
 	const [loaderState, setLoaderState] = useState({});
-	const setScrollMap = usePreserveScroll({
-		pathname: location.pathname,
-		preserveScroll
-	});
 	const { prefetchLoader, revalidateCache, isLoading } = useLoader({
 		routeList,
 		context,
 		setContext,
 		setLoaderState
 	});
-	const { blockerState, updateLocation, updateBlockedRoute, nextRouteItem } = useHandleNavigation({
+	const { blockerState, updateLocation, updateBlockedRoute, nextItem } = useHandleNavigation({
 		setLocation,
 		routeList,
 		context,
 		setContext,
 		revalidateCache,
-		setScrollMap,
 		setLoaderState
 	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Provider, {
@@ -404,7 +372,7 @@ var RouterProvider = ({ children, routeList, context: initialContext = {}, prese
 			context,
 			setContext,
 			routeList,
-			nextRouteItem,
+			nextItem,
 			isLoading
 		}), [
 			blockerState,
@@ -416,7 +384,7 @@ var RouterProvider = ({ children, routeList, context: initialContext = {}, prese
 			routeList,
 			updateBlockedRoute,
 			updateLocation,
-			nextRouteItem
+			nextItem
 		]),
 		children
 	});
@@ -470,6 +438,34 @@ var useApplyCustomAnimation = (animationDuration) => {
 	}, [animationDuration]);
 };
 //#endregion
+//#region hooks/usePreserveScroll.ts
+var usePreserveScroll = ({ pathname, preserveScroll, nextPathname }) => {
+	const [scrollMap, setScrollMap] = useState({});
+	const prevPathname = useRef("");
+	useEffect(() => {
+		setScrollMap((prevState) => {
+			const scrollPosition = document.scrollingElement?.scrollTop ?? 0;
+			if (!scrollPosition || prevState[prevPathname.current] === scrollPosition) return prevState;
+			return {
+				...prevState,
+				[prevPathname.current]: scrollPosition
+			};
+		});
+		prevPathname.current = pathname;
+	}, [pathname, nextPathname]);
+	useEffect(() => {
+		if (!preserveScroll || !pathname || !scrollMap[pathname]) return;
+		document.scrollingElement?.scrollTo({
+			top: scrollMap[pathname],
+			behavior: "smooth"
+		});
+	}, [
+		pathname,
+		scrollMap,
+		preserveScroll
+	]);
+};
+//#endregion
 //#region context/RouterViewContext.ts
 var RouterViewContext = createContext({});
 //#endregion
@@ -492,38 +488,39 @@ var renderElement = (Component) => {
 //#endregion
 //#region components/Router.tsx
 var ALL_LOCATIONS = "*";
-var Router = ({ isAnimated, animationDuration, spinner = true }) => {
-	const { location, isLoading, nextRouteItem } = useNavigationState();
+var Router = ({ isAnimated, animationDuration, spinner = true, preserveScroll = true }) => {
+	const { location, isLoading, nextItem } = useNavigationState();
 	const { routeList } = usePropsData();
 	const { loaderState } = useRouterData();
+	usePreserveScroll({
+		nextPathname: nextItem?.path,
+		pathname: location.pathname,
+		preserveScroll
+	});
 	useApplyCustomAnimation(animationDuration);
 	const routeItem = useMemo(() => {
 		if (!location.pathname) return void 0;
 		return routeList.find((el) => el.path === ALL_LOCATIONS || comparePaths(el, location.pathname));
 	}, [location.pathname, routeList]);
-	const pendingRoute = useMemo(() => {
-		if (location.pathname) return void 0;
-		return routeList.find((el) => comparePaths(el, window.location.pathname));
-	}, [location.pathname, routeList]);
 	const params = useMemo(() => {
 		return getParamsObject({
-			routeItem: routeItem || pendingRoute,
+			routeItem: routeItem || nextItem,
 			pathname: location.pathname || window.location.pathname
 		});
 	}, [
 		location.pathname,
 		routeItem,
-		pendingRoute
+		nextItem
 	]);
 	const shouldErrorElementShown = useMemo(() => Boolean(loaderState[location.pathname]?.loaderError || loaderState[location.pathname]?.beforeLoadError), [loaderState, location.pathname]);
-	if (!routeItem && !pendingRoute) return null;
-	if (!routeItem && pendingRoute) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ViewProvider, {
+	if (!routeItem && !nextItem) return null;
+	if (!routeItem && nextItem) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ViewProvider, {
 		params,
-		children: renderElement(pendingRoute?.loaderFallback)
+		children: renderElement(nextItem?.loaderFallback)
 	});
 	if (!isAnimated && !shouldErrorElementShown && isLoading) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ViewProvider, {
 		params,
-		children: renderElement(nextRouteItem?.loaderFallback)
+		children: renderElement(nextItem?.loaderFallback)
 	});
 	if (shouldErrorElementShown) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ViewProvider, {
 		params,

package/dist/provider/Provider.d.ts

@@ -3,5 +3,5 @@ import { type ActionsContextValue, type DataContextValue, type NavigationContext
 type ProviderProps = PropsContextValue & NavigationContextValue & ActionsContextValue & DataContextValue & {
     children: ReactNode;
 };
-export declare const Provider: ({ children, setContext, context, updateBlockedRoute, updateLocation, location, setLocation, prefetchLoader, loaderState, blockerState, routeList, isLoading, nextRouteItem, }: ProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Provider: ({ children, setContext, context, updateBlockedRoute, updateLocation, location, setLocation, prefetchLoader, loaderState, blockerState, routeList, isLoading, nextItem, }: ProviderProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-react-router",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "A lightweight, type-safe routing library for React applications",
   "author": "Andrew Bubnov",
   "scripts": {