Skip to content
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

Jump to bottom

refs #1529 Add loader when loading more search results #1564

Merged
merged 1 commit into from
Jul 27, 2024
Merged

refs #1529 Add loader when loading more search results #1564

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
20 changes: 15 additions & 5 deletions src/components/search/Results.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useRouter } from 'next/router'
import { useCallback, useState } from 'react'
import { BsSearch, BsPeople, BsHash, BsChatQuote, BsBackspace } from 'react-icons/bs'
import { FormattedMessage, useIntl } from 'react-intl'
import { Input, InputGroup, List, Avatar, Form } from 'rsuite'
import { Input, InputGroup, List, Avatar, Form, Loader } from 'rsuite'
import { Server } from 'src/entities/server'
import Status from 'src/components/timelines/status/Status'
import emojify from 'src/utils/emojify'
Expand All @@ -31,6 +31,8 @@ export default function Results(props: Props) {
const [hashtags, setHashtags] = useState<Array<Entity.Tag>>([])
const [statuses, setStatuses] = useState<Array<Entity.Status>>([])
const [customEmojis, setCustomEmojis] = useState<Array<CustomEmojiCategory>>([])
const [loadingAccount, setLoadingAccount] = useState<boolean>(false)
const [loadingHashtag, setLoadingHashtag] = useState<boolean>(false)

const search = async (word: string) => {
const res = await props.client.search(word, { limit: 5, resolve: true })
Expand All @@ -42,12 +44,18 @@ export default function Results(props: Props) {
}

const loadMoreAccount = useCallback(async () => {
const res = await props.client.search(word, { type: 'accounts', limit: 5, offset: accounts.length })
setLoadingAccount(true)
const res = await props.client.search(word, { type: 'accounts', limit: 5, offset: accounts.length }).finally(() => {
setLoadingAccount(false)
})
setAccounts(prev => prev.concat(res.data.accounts))
}, [word, accounts])

const loadMoreHashtag = useCallback(async () => {
const res = await props.client.search(word, { type: 'hashtags', limit: 5, offset: hashtags.length })
setLoadingHashtag(true)
const res = await props.client.search(word, { type: 'hashtags', limit: 5, offset: hashtags.length }).finally(() => {
setLoadingHashtag(false)
})
setHashtags(prev => prev.concat(res.data.hashtags))
}, [word, hashtags])

Expand Down Expand Up @@ -133,8 +141,9 @@ export default function Results(props: Props) {
key="more"
style={{ backgroundColor: 'var(--rs-border-primary)', padding: '1em 0', textAlign: 'center', cursor: 'pointer' }}
onClick={() => loadMoreAccount()}
disabled={loadingAccount}
>
<FormattedMessage id="search.results.more" />
{loadingAccount ? <Loader /> : <FormattedMessage id="search.results.more" />}
</List.Item>
</List>
</div>
Expand All @@ -158,8 +167,9 @@ export default function Results(props: Props) {
key="more"
style={{ backgroundColor: 'var(--rs-border-primary)', padding: '1em 0', textAlign: 'center', cursor: 'pointer' }}
onClick={() => loadMoreHashtag()}
disabled={loadingHashtag}
>
<FormattedMessage id="search.results.more" />
{loadingHashtag ? <Loader /> : <FormattedMessage id="search.results.more" />}
</List.Item>
</List>
</div>
Expand Down