clear-react-router 1.5.6 → 1.5.8

package/dist/context/RouterProviderContext.d.ts

@@ -6,7 +6,6 @@ export type NavigationContextValue = {
     isLoading: boolean;
 };
 export type ActionsContextValue = {
-    setSearch(arg: string): void;
     updateLocation(route: Location): Promise<void>;
     updateBlockedRoute(arg: UpdateBlockedRouteProps): void;
     prefetchLoader(arg: string): Promise<void>;

package/dist/hooks/useHandleNavigation.d.ts

@@ -16,7 +16,6 @@ export declare const useHandleNavigation: ({ routeList, context, revalidateCache
     updateLocation: (nextLocation: Location) => Promise<void>;
     updateBlockedRoute: ({ type, payload }: UpdateBlockedRouteProps) => void;
     routeItemData: RouteItemData;
-    setSearch: (search: string) => void;
     restoreScroll: () => void;
     currentLoaderFallback: import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | (() => import("react").ReactElement) | undefined;
 };

package/dist/hooks/useSearch.d.ts

@@ -0,0 +1 @@
+export declare const useSearch: () => string;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Suspense, createContext, lazy, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { Suspense, createContext, lazy, useCallback, useContext, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
@@ -45,10 +45,9 @@ 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, setSearch, prefetchLoader, blockerState, routeItemData, restoreScroll, currentLoaderFallback, isLoading }) => {
+var Provider = ({ children, setContext, context, updateBlockedRoute, updateLocation, prefetchLoader, blockerState, routeItemData, restoreScroll, currentLoaderFallback, isLoading }) => {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionsContext.Provider, {
 		value: {
-			setSearch,
 			updateLocation,
 			updateBlockedRoute,
 			prefetchLoader,
@@ -199,13 +198,6 @@ var useHandleNavigation = ({ routeList, context, revalidateCache, setContext, is
 	const prevPathname = useRef("");
 	const navigationSeq = useRef(0);
 	const scrollMapRef = useLatest(scrollMap);
-	const setSearch = useCallback((search) => setRouteItemData((prevState) => ({
-		...prevState,
-		location: {
-			...prevState.location,
-			search
-		}
-	})), []);
 	const restoreScroll = useCallback(() => {
 		if (!prevPathname.current || !scrollMapRef.current[prevPathname.current]) return;
 		requestAnimationFrame(() => {
@@ -229,14 +221,6 @@ var useHandleNavigation = ({ routeList, context, revalidateCache, setContext, is
 		history.pushState(null, "", fullPath);
 	}, []);
 	const transitionedNavigation = useCallback((nextLocation, routeItem) => {
-		setScrollMap((prevState) => {
-			const scrollPosition = document.scrollingElement?.scrollTop ?? 0;
-			if (!scrollPosition || prevState[prevPathname.current] === scrollPosition) return prevState;
-			return {
-				...prevState,
-				[prevPathname.current]: scrollPosition
-			};
-		});
 		if (!isAnimated) {
 			navigation(nextLocation, routeItem);
 			return;
@@ -276,6 +260,14 @@ var useHandleNavigation = ({ routeList, context, revalidateCache, setContext, is
 			return transitionedNavigation(nextLocation, nextItem);
 		}
 		if (seq !== navigationSeq.current) return;
+		setScrollMap((prevState) => {
+			const scrollPosition = document.scrollingElement?.scrollTop ?? 0;
+			if (!scrollPosition || prevState[prevPathname.current] === scrollPosition) return prevState;
+			return {
+				...prevState,
+				[prevPathname.current]: scrollPosition
+			};
+		});
 		setCurrentLoaderFallback(isCacheItemFresh({
 			routeItem: nextItem,
 			pathname: nextLocation.pathname
@@ -355,7 +347,6 @@ var useHandleNavigation = ({ routeList, context, revalidateCache, setContext, is
 		updateLocation,
 		updateBlockedRoute,
 		routeItemData,
-		setSearch,
 		restoreScroll,
 		currentLoaderFallback
 	};
@@ -446,7 +437,7 @@ var RouterProvider = ({ children, routeList, context: initialContext = {} }) =>
 		context,
 		setContext
 	});
-	const { blockerState, updateLocation, updateBlockedRoute, routeItemData, setSearch, restoreScroll, currentLoaderFallback } = useHandleNavigation({
+	const { blockerState, updateLocation, updateBlockedRoute, routeItemData, restoreScroll, currentLoaderFallback } = useHandleNavigation({
 		routeList,
 		context,
 		setContext,
@@ -456,7 +447,6 @@ var RouterProvider = ({ children, routeList, context: initialContext = {} }) =>
 	});
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Provider, {
 		...useMemo(() => ({
-			setSearch,
 			updateLocation,
 			prefetchLoader,
 			updateBlockedRoute,
@@ -472,7 +462,6 @@ var RouterProvider = ({ children, routeList, context: initialContext = {} }) =>
 			context,
 			prefetchLoader,
 			routeItemData,
-			setSearch,
 			updateBlockedRoute,
 			updateLocation,
 			currentLoaderFallback,
@@ -687,12 +676,40 @@ var useRouterContext = () => {
 	};
 };
 //#endregion
+//#region hooks/useSearch.ts
+var notify = () => {
+	window.dispatchEvent(new Event("locationChange"));
+};
+var patchHistory = () => {
+	const push = history.pushState;
+	const replace = history.replaceState;
+	history.pushState = function(...args) {
+		const result = push.apply(this, args);
+		notify();
+		return result;
+	};
+	history.replaceState = function(...args) {
+		const result = replace.apply(this, args);
+		notify();
+		return result;
+	};
+	window.addEventListener("popstate", notify);
+};
+var subscribe = (onChange) => {
+	window.addEventListener("locationChange", onChange);
+	return () => window.removeEventListener("locationChange", onChange);
+};
+var getSnapshot = () => window.location.search;
+var useSearch = () => {
+	useEffect(patchHistory, []);
+	return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+};
+//#endregion
 //#region hooks/useSearchParams.ts
 var useSearchParams = () => {
-	const { routeItemData: { location } } = useNavigationState();
-	const { setSearch } = useRouterActions();
-	const locationRef = useLatest(location);
-	const searchString = useMemo(() => location.search ? location.search.replace("?", "") : location.pathname.split("?")?.[1] ?? "", [location.pathname, location.search]);
+	const search = useSearch();
+	const searchRef = useLatest(search);
+	const searchString = search ? search.replace("?", "") : window.location.pathname.split("?")?.[1] ?? "";
 	const searchParams = useMemo(() => new URLSearchParams(searchString), [searchString]);
 	const getSearchParams = useCallback((param) => {
 		const allValues = searchParams.getAll(param);
@@ -700,24 +717,22 @@ var useSearchParams = () => {
 	}, [searchParams]);
 	const navigateWithSearchParams = useCallback((params) => {
 		const newSearch = params.toString();
-		const { pathname } = locationRef.current;
+		const { pathname } = window.location;
 		const search = newSearch ? `?${newSearch}` : "";
-		setSearch(search);
 		history.replaceState(null, "", pathname + search);
-	}, [locationRef, setSearch]);
+	}, []);
 	return {
 		searchParams,
 		getSearchParams,
 		setSearchParams: useCallback((param, value) => {
-			const search = locationRef.current.search || "";
-			const currentParams = new URLSearchParams(search);
+			const currentParams = new URLSearchParams(searchRef.current);
 			if (typeof param === "string" && value !== void 0) {
 				currentParams.delete(param);
 				(Array.isArray(value) ? value : [value]).forEach((v) => currentParams.append(param, v));
 				navigateWithSearchParams(currentParams);
 			} else if (typeof param === "function") navigateWithSearchParams(param(currentParams));
 			else throw new Error("useSearchParams first argument must be either function or string");
-		}, [locationRef, navigateWithSearchParams])
+		}, [navigateWithSearchParams, searchRef])
 	};
 };
 //#endregion

package/dist/provider/Provider.d.ts

@@ -3,5 +3,5 @@ import { type ActionsContextValue, type DataContextValue, type NavigationContext
 type ProviderProps = NavigationContextValue & ActionsContextValue & DataContextValue & {
     children: ReactNode;
 };
-export declare const Provider: ({ children, setContext, context, updateBlockedRoute, updateLocation, setSearch, prefetchLoader, blockerState, routeItemData, restoreScroll, currentLoaderFallback, isLoading, }: ProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Provider: ({ children, setContext, context, updateBlockedRoute, updateLocation, prefetchLoader, blockerState, routeItemData, restoreScroll, currentLoaderFallback, isLoading, }: ProviderProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/package.json

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