refs #4792 Show detail in search results

h3poteto · Jul 2, 2024 · 620ba5f · 620ba5f
1 parent 247116e
commit 620ba5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/renderer/components/timelines/Search.tsx b/renderer/components/timelines/Search.tsx
@@ -8,6 +8,7 @@ import Statuses from './search/Statuses'
 import { Account } from '@/db'
 import Accounts from './search/Accounts'
 import Hashtags from './search/Hashtags'
+import Detail from '../detail/Detail'
 
 type Props = {
   client: MegalodonInterface
@@ -65,10 +66,17 @@ export default function Search(props: Props) {
     }
   }
 
+  const timelineClass = () => {
+    if (router.query.detail) {
+      return 'timeline-with-drawer'
+    }
+    return 'timeline'
+  }
+
   return (
     <>
-      <div className="search w-full h-full">
-        <section className="h-full w-full">
+      <div className="flex timeline-wrapper">
+        <section className={`h-full ${timelineClass()}`}>
           <div className="w-full theme-text-primary p-2 flex justify-center" style={{ height: '56px' }}>
             <form onSubmit={ev => submit(ev)}>
               <Input
@@ -117,6 +125,7 @@ export default function Search(props: Props) {
             </TabsBody>
           </Tabs>
         </section>
+        <Detail client={props.client} account={props.account} className="detail" openMedia={props.openMedia} />
       </div>
     </>
   )

diff --git a/renderer/components/timelines/search/Hashtags.tsx b/renderer/components/timelines/search/Hashtags.tsx
@@ -12,7 +12,7 @@ export default function Hashtags(props: Props) {
   const router = useRouter()
 
   const openTag = (tag: string) => {
-    router.push({ query: { id: router.query.id, timeline: router.query.timeline, hashtag: tag, detail: true } })
+    router.push({ query: { id: router.query.id, timeline: router.query.timeline, tag: tag, detail: true } })
   }
 
   return (