✨ Replace react hook based pathname with browser api

bluesky-social · Jan 3, 2025 · c52f4f5 · c52f4f5
1 parent 70a6072
commit c52f4f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/components/shell/CommandPalette/Root.tsx b/components/shell/CommandPalette/Root.tsx
@@ -46,9 +46,7 @@ export const CommandPaletteRoot = ({
   children: React.ReactNode
 }) => {
   const router = useRouter()
-  const pathname = usePathname()
-  const searchParams = useSearchParams()
-  const staticActions = getStaticActions({ router, pathname, searchParams })
+  const staticActions = getStaticActions({ router })
   return (
     <KBarProvider actions={staticActions}>
       <KBarPortal>

diff --git a/components/shell/CommandPalette/actions.ts b/components/shell/CommandPalette/actions.ts
@@ -1,15 +1,6 @@
 import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime'
-import { ReadonlyURLSearchParams } from 'next/navigation'
 
-export const getStaticActions = ({
-  router,
-  pathname,
-  searchParams,
-}: {
-  router: AppRouterInstance
-  pathname: string
-  searchParams: ReadonlyURLSearchParams
-}) => [
+export const getStaticActions = ({ router }: { router: AppRouterInstance }) => [
   {
     id: 'quick-action-modal',
     name: 'Open Quick Action Panel',
@@ -25,9 +16,10 @@ export const getStaticActions = ({
     shortcut: ['w'],
     keywords: 'workspace,panel',
     perform: () => {
-      const newParams = new URLSearchParams(searchParams)
+      const pathname = window.location.pathname
+      const newParams = new URLSearchParams(window.location.search)
       newParams.set('workspaceOpen', 'true')
-      router.push((pathname ?? '') + '?' + newParams.toString())
+      router.push(`${pathname}?${newParams.toString()}`)
     },
   },
   {