Make search term work a bit better

This commit is contained in:
Jackson Harper 2024-02-08 09:03:19 +08:00
parent 6b707ae2ca
commit 88a4dc6c28
2 changed files with 26 additions and 11 deletions

View file

@ -48,7 +48,8 @@ type LibraryHeaderProps = {
layout: LayoutType
updateLayout: (layout: LayoutType) => void
showSearchModal: () => void
searchTerm: string | undefined
applySearchQuery: (searchQuery: string) => void
showFilterMenu: boolean
setShowFilterMenu: (show: boolean) => void
@ -168,12 +169,7 @@ function LargeHeaderLayout(props: LibraryHeaderProps): JSX.Element {
</Button>
{showSearchBar ? (
<SearchBox
{...props}
searchTerm=""
applySearchQuery={() => {}}
setShowSearchBar={setShowSearchBar}
/>
<SearchBox {...props} setShowSearchBar={setShowSearchBar} />
) : (
<Button
title="search"
@ -397,14 +393,15 @@ export function SearchBox(props: SearchBoxProps): JSX.Element {
}}
/>
</form>
<Box
<HStack
alignment="center"
css={{
py: '15px',
marginLeft: 'auto',
}}
>
<IconButton
style="searchButton"
{/* <Button
css={{ padding: '4px', borderRadius: '50px', fontSize: '10px' }}
onClick={(event) => {
if (searchTerm && searchTerm.length) {
event.preventDefault()
@ -415,6 +412,21 @@ export function SearchBox(props: SearchBoxProps): JSX.Element {
}
}}
tabIndex={-1}
>
clear
</Button> */}
<IconButton
style="searchButton"
onClick={(event) => {
if (searchTerm && searchTerm.length && searchTerm != 'in:inbox') {
event.preventDefault()
setSearchTerm('in:inbox')
props.applySearchQuery('')
} else {
props.setShowSearchBar(false)
}
}}
tabIndex={-1}
>
<X
width={16}
@ -422,7 +434,7 @@ export function SearchBox(props: SearchBoxProps): JSX.Element {
color={theme.colors.grayTextContrast.toString()}
/>
</IconButton>
</Box>
</HStack>
</HStack>
</Box>
)

View file

@ -563,6 +563,9 @@ export default function Home(): JSX.Element {
setShowHighlightsModal={setShowHighlightsModal}
justifyText={readerSettings.justifyText ?? undefined}
highContrastText={readerSettings.highContrastText ?? undefined}
highlightOnRelease={
readerSettings.highlightOnRelease ?? undefined
}
articleMutations={{
createHighlightMutation,
deleteHighlightMutation,