Skip to content

Enhance search results display #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enhance search results display #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 33 additions & 11 deletions components/items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@ export default function Items ({ ssrData, variables = DEFAULT_VARIABLES, query,
<div className={styles.grid}>
{ad && <ListItem item={ad} ad />}
{itemsWithPins.filter(filter).map((item, i) => (
<ListItem key={`${item.id}-${i + 1}`} item={item} rank={rank && i + 1} itemClassName={variables.includeComments ? 'py-2' : ''} pinnable={isHome ? false : pins?.length > 0} />
<ListItem
key={`${item.id}-${i + 1}`}
item={item}
rank={rank && i + 1}
itemClassName={variables.includeComments ? 'py-2' : ''}
pinnable={isHome ? false : pins?.length > 0}
isSearchResults={Boolean(variables.includeComments && variables.q)}
/>
))}
</div>
<Foooter
Expand All @@ -67,16 +74,31 @@ export default function Items ({ ssrData, variables = DEFAULT_VARIABLES, query,
)
}

export function ListItem ({ item, ...props }) {
return (
item.parentId
? <CommentFlat item={item} noReply includeParent {...props} />
: (item.isJob
? <ItemJob item={item} />
: (item.searchText
? <ItemFull item={item} noReply {...props} />
: <Item item={item} {...props} />))
)
export function ListItem ({ item, isSearchResults, ...props }) {
const searchClasses = isSearchResults
? [
styles.searchResult,
item.parentId ? styles.searchResultComment : styles.searchResultPost
].join(' ')
: ''

const content = item.parentId
? <CommentFlat item={item} noReply includeParent {...props} />
: (item.isJob
? <ItemJob item={item} />
: (item.searchText
? <ItemFull item={item} noReply {...props} />
: <Item item={item} {...props} />))

if (isSearchResults) {
return (
<div className={searchClasses}>
{content}
</div>
)
}

return content
}

export function ItemsSkeleton ({ rank, startRank = 0, limit = LIMIT, Footer }) {
Expand Down
16 changes: 16 additions & 0 deletions components/items.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
.grid {
display: grid;
grid-template-columns: auto minmax(0, 1fr);
}

.searchResult {
background: var(--theme-commentBg);
margin-bottom: 10px;
padding-left: 0.75rem;
grid-column: 1 / -1;
}

.searchResultPost {
border-left: 1px solid var(--bs-secondary);
}

.searchResultComment {
border-left: 1px solid var(--bs-info);
border-radius: 0;
}
28 changes: 21 additions & 7 deletions pages/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,27 @@ export default function Index ({ ssrData }) {
return (
<SearchLayout sub={sub}>
{variables.q
? <Items
ssrData={ssrData}
query={SUB_SEARCH}
destructureData={data => data.search}
variables={variables}
noMoreText='NO MORE'
/>
? (
<>
<div className='text-muted small d-flex align-items-center gap-2 mb-1'>
<div className='d-flex align-items-center gap-1'>
<span style={{ display: 'inline-block', height: '12px', borderLeft: '1px solid var(--bs-secondary)' }} />
<span>post</span>
</div>
<div className='d-flex align-items-center gap-1'>
<span style={{ display: 'inline-block', height: '12px', borderLeft: '1px solid var(--bs-info)' }} />
<span>comment</span>
</div>
</div>
<Items
ssrData={ssrData}
query={SUB_SEARCH}
destructureData={data => data.search}
variables={variables}
noMoreText='NO MORE'
/>
</>
)
: (
<div className={styles.content}>
<div className={styles.box}>
Expand Down