Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use loading instead of validating to avoid flicker

Browse Source
This commit is contained in:
Jackson Harper
2023-09-07 19:10:42 +08:00
parent 428e4faf51
commit ec508d80b0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
View File

@ -32,9 +32,9 @@ type LibraryFilterMenuProps = {
}
export function LibraryFilterMenu(props: LibraryFilterMenuProps): JSX.Element {
const { labels, isValidating: labelsLoading } = useGetLabelsQuery()
const { labels, isLoading: labelsLoading } = useGetLabelsQuery()
const { savedSearches, isLoading: searchesLoading } = useGetSavedSearchQuery()
const { subscriptions, isValidating: subscriptionsLoading } =
const { subscriptions, isLoading: subscriptionsLoading } =
useGetSubscriptionsQuery()
return (

3
packages/web/lib/networking/queries/useGetLabelsQuery.tsx
View File

@ -4,6 +4,7 @@ import { Label, labelFragment } from '../fragments/labelFragment'
import { publicGqlFetcher } from '../networkHelpers'
type LabelsQueryResponse = {
isLoading: boolean
isValidating: boolean
labels: Label[]
revalidate: () => void
@ -41,6 +42,7 @@ export function useGetLabelsQuery(): LabelsQueryResponse {
const result = data as LabelsResponseData
const labels = result.labels?.labels as Label[]
return {
isLoading: !error && !data,
isValidating,
labels,
revalidate: () => {
@ -52,6 +54,7 @@ export function useGetLabelsQuery(): LabelsQueryResponse {
console.log('error', error)
}
return {
isLoading: !error && !data,
isValidating: false,
labels: [],
// eslint-disable-next-line @typescript-eslint/no-empty-function

3
packages/web/lib/networking/queries/useGetSubscriptionsQuery.tsx
View File

@ -25,6 +25,7 @@ export type Subscription = {
}
type SubscriptionsQueryResponse = {
isLoading: boolean
isValidating: boolean
subscriptions: Subscription[]
revalidate: () => void
@ -84,6 +85,7 @@ export function useGetSubscriptionsQuery(
const result = data as SubscriptionsResponseData
const subscriptions = result.subscriptions.subscriptions as Subscription[]
return {
isLoading: !error && !data,
isValidating,
subscriptions,
revalidate: () => {
@ -95,6 +97,7 @@ export function useGetSubscriptionsQuery(
console.log('error', error)
}
return {
isLoading: !error && !data,
isValidating: true,
subscriptions: [],
// eslint-disable-next-line @typescript-eslint/no-empty-function