enhance search view & close #41

src/components/PostList/PostList.tsx

@@ -10,6 +10,7 @@ type Props = {
   posts: PostDataProps[]
   pageSize?: number
   layout?: PostListLayout
+  loading?: boolean
 }
 
 const getGridItemWidth = (index: number) => {
@@ -56,7 +57,7 @@ export const PostsList = (props: Props) => {
               key={index}
             >
               <PostLink href={`/article/${post.slug}`}>
-                <PostWrapper>
+                <PostWrapper className={props.loading ? 'loading' : ''}>
                   <Post data={post} />
                 </PostWrapper>
               </PostLink>
@@ -82,6 +83,12 @@ const PostWrapper = styled.div`
   padding: 16px 0;
   border-top: 1px solid rgb(var(--lsd-theme-primary));
   width: 100%;
+
+  transition: opacity 0.3s ease-in-out;
+
+  &.loading {
+    opacity: 0.5;
+  }
 `
 
 const PostLink = styled(Link)`

src/components/RelatedArticles/RelatedArticles.tsx

@@ -1,10 +1,9 @@
 import { getArticleCover } from '@/utils/data.utils'
-import { Typography } from '@acid-info/lsd-react'
 import styled from '@emotion/styled'
 import { PostsList } from '../PostList/PostList'
-import { Section } from '../Section/Section'
+import { SearchHook } from '@/types/data.types'
-import { SearchHook, SearchResultItem } from '@/types/data.types'
 import { UnbodyGoogleDoc } from '@/lib/unbody/unbody.types'
+import { SearchResultsSection } from '@/components/SearchResultsSection/SearchResultsSection'
 
 type Props = {
   data: SearchHook<UnbodyGoogleDoc>
@@ -12,32 +11,29 @@ type Props = {
 
 export default function RelatedArticles({ data }: Props) {
   if (!data.loading && !data.data) return null
-
   return (
     <Container>
-      <Section
+      <SearchResultsSection
-        title={data.loading ? 'Loading...' : 'Related Articles'}
+        resultSize={data.data.length}
-        matches={data.loading ? undefined : data.data.length}
+        loading={data.loading}
+        title={'Related Articles'}
       >
         {
           <PostsList
-            posts={
+            posts={data.data.map((article) => ({
-              data.loading
+              slug: article.doc.slug,
-                ? []
+              date: article.doc.modifiedAt,
-                : data.data.map((article) => ({
+              title: article.doc.title,
-                    slug: article.doc.slug,
+              description: article.doc.subtitle, // TODO: summary is not available
-                    date: article.doc.modifiedAt,
+              mentions: article.doc.mentions,
-                    title: article.doc.title,
+              tags: article.doc.tags,
-                    description: article.doc.subtitle, // TODO: summary is not available
+              coverImage: getArticleCover(article.doc.blocks),
-                    mentions: article.doc.mentions,
+            }))}
-                    tags: article.doc.tags,
-                    coverImage: getArticleCover(article.doc.blocks),
-                  }))
-            }
             pageSize={4}
+            loading={data.loading}
           />
         }
-      </Section>
+      </SearchResultsSection>
     </Container>
   )
 }

src/components/RelatedContent/RelatedContent.tsx

@@ -1,21 +1,24 @@
 import styled from '@emotion/styled'
-import { Section } from '../Section/Section'
+import { SearchHook, SearchResultItem } from '@/types/data.types'
-import { SearchResultItem } from '@/types/data.types'
 import { UnbodyImageBlock, UnbodyTextBlock } from '@/lib/unbody/unbody.types'
 import { Grid } from '../Grid/Grid'
 import { ImageBlock, TextBlock } from '../ContentBlock'
 import { UnbodyGraphQl } from '@/lib/unbody/unbody-content.types'
+import { SearchResultsSection } from '@/components/SearchResultsSection/SearchResultsSection'
 
 type Props = {
-  blocks: SearchResultItem<UnbodyImageBlock | UnbodyTextBlock>[]
+  data: SearchHook<UnbodyTextBlock | UnbodyImageBlock>
 }
-
+export default function RelatedContent({ data }: Props) {
-export default function RelatedContent({ blocks }: Props) {
   return (
     <Container>
-      <Section title={'Related Content'} matches={blocks?.length}>
+      <SearchResultsSection
+        resultSize={data.data.length}
+        loading={data.loading}
+        title={'Related Content'}
+      >
         <Grid>
-          {blocks.map(
+          {data.data.map(
             (block: SearchResultItem<UnbodyImageBlock | UnbodyTextBlock>) => {
               if (!block.doc.document || !block.doc.document[0]) return null
 
@@ -23,7 +26,6 @@ export default function RelatedContent({ blocks }: Props) {
               if (UnbodyGraphQl.UnbodyDocumentTypeNames.GoogleDoc) {
                 refArticle = block.doc.document[0]
               }
-
               switch (block.doc.__typename) {
                 case UnbodyGraphQl.UnbodyDocumentTypeNames.TextBlock:
                   return <TextBlock doc={block.doc} />
@@ -34,7 +36,7 @@ export default function RelatedContent({ blocks }: Props) {
             },
           )}
         </Grid>
-      </Section>
+      </SearchResultsSection>
     </Container>
   )
 }

src/components/SearchResultsSection/SearchResultsSection.tsx

@@ -0,0 +1,35 @@
+import { Section } from '@/components/Section/Section'
+import React, { PropsWithChildren } from 'react'
+import { Typography } from '@acid-info/lsd-react'
+
+type Props = PropsWithChildren<{
+  resultSize: number
+  loading: boolean
+  title: string
+}>
+
+export const SearchResultsSection = ({
+  resultSize,
+  loading,
+  title,
+  children,
+}: Props) => (
+  <Section
+    title={title}
+    subtitle={
+      loading ? (
+        <Typography genericFontFamily="sans-serif" variant="body2">
+          Loading...
+        </Typography>
+      ) : (
+        <>
+          <Typography genericFontFamily="sans-serif" variant="body2">
+            {resultSize} matches
+          </Typography>
+        </>
+      )
+    }
+  >
+    {children}
+  </Section>
+)

src/components/Section/Section.tsx

@@ -1,25 +1,29 @@
 import { Typography } from '@acid-info/lsd-react'
 import styled from '@emotion/styled'
-import { PropsWithChildren } from 'react'
+import React, { PropsWithChildren } from 'react'
 
 type Props = PropsWithChildren<{
   title: string
-  matches?: number | string
+  subtitle?: string | React.ReactNode
 }>
 
-export const Section = ({ title, matches, children, ...props }: Props) => {
+export const Section = ({ title, subtitle, children, ...props }: Props) => {
   return (
     <section style={{ width: '100%' }} {...props}>
       <Container>
         <Typography genericFontFamily="sans-serif" variant="body2">
           {title}
         </Typography>
-        {matches && (
+        {subtitle && (
           <>
             <Typography variant="body2">•</Typography>
-            <Typography genericFontFamily="sans-serif" variant="body2">
+            {typeof subtitle === 'string' ? (
-              {matches} matches
+              <Typography genericFontFamily="sans-serif" variant="body2">
-            </Typography>
+                subtitle
+              </Typography>
+            ) : (
+              subtitle
+            )}
           </>
         )}
       </Container>

src/pages/search.tsx

@@ -54,26 +54,22 @@ export default function SearchPage({
 
   useEffect(() => {
     if (mounted) {
-      if (query.length > 0 || topics.length > 0) {
+      const serchArgs = [
-        const serchArgs = [
+        extractQueryFromQuery(router.query),
-          extractQueryFromQuery(router.query),
+        extractTopicsFromQuery(router.query),
-          extractTopicsFromQuery(router.query),
+      ]
-        ]
+      articles.search(...(serchArgs as [string, string[]]))
-        articles.search(...(serchArgs as [string, string[]]))
+      blocks.search(...(serchArgs as [string, string[]]))
-        blocks.search(...(serchArgs as [string, string[]]))
-      } else {
-        articles.reset(initialArticles)
-        blocks.reset(initialBlocks)
-      }
     } else {
-      hasUpdated.current = true
+      articles.reset(initialArticles)
+      blocks.reset(initialBlocks)
     }
   }, [mounted, router.query])
 
   return (
-    <div>
+    <div style={{ minHeight: '80vh' }}>
       <RelatedArticles data={articles} />
-      {blocks.data?.length && <RelatedContent blocks={blocks.data} />}
+      <RelatedContent data={blocks} />
     </div>
   )
 }