feat: preserve pathname on route change

zextras · May 9, 2022 · a2c3252 · a2c3252
1 parent bc77bc9
commit a2c3252
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/shell/shell-primary-bar.tsx b/src/shell/shell-primary-bar.tsx
@@ -122,9 +122,12 @@ const ShellPrimaryBar: FC<{ activeRoute: AppRoute }> = ({ activeRoute }) => {
 	}, [primaryBarViews]);
 	useEffect(() => {
 		if (activeRoute) {
-			setRoutes((r) => ({ ...r, [activeRoute.id]: trim(history.location.pathname, '/') }));
+			setRoutes((r) => ({
+				...r,
+				[activeRoute.id]: `${trim(history.location.pathname, '/')}${history.location.search}`
+			}));
 		}
-	}, [activeRoute, history.location.pathname, primaryBarViews]);
+	}, [activeRoute, history.location, primaryBarViews]);
 	const primaryBarAccessoryViews = useAppStore((s) => s.views.primaryBarAccessories);
 	const accessories = useMemo(
 		() =>