Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
180 changes: 0 additions & 180 deletions src/react-query/hooks/__tests__/useQueryData.refetch.test.ts

This file was deleted.

6 changes: 1 addition & 5 deletions src/react-query/impl/infinite/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useMemo} from 'react';

import {skipToken, useInfiniteQuery} from '@tanstack/react-query';
import {useInfiniteQuery} from '@tanstack/react-query';
import type {InfiniteData, InfiniteQueryObserverOptions} from '@tanstack/react-query';

import type {
Expand All @@ -16,7 +16,6 @@ import type {
} from '../../../core';
import {useRefetchInterval} from '../../hooks/useRefetchInterval';
import {normalizeStatus} from '../../utils/normalizeStatus';
import {warnDisabledRefetch} from '../../utils/warnDisabledRefetch';

import type {AnyInfiniteQueryDataSource, InfiniteQueryObserverExtendedOptions} from './types';
import {composeOptions} from './utils';
Expand Down Expand Up @@ -64,14 +63,11 @@ export const useInfiniteQueryData = <TDataSource extends AnyInfiniteQueryDataSou
[state.data],
);

const isDisabled = composedOptions.enabled === false || composedOptions.queryFn === skipToken;

return {
...state,
status: normalizeStatus(state.status, state.fetchStatus),
data: transformedData,
originalStatus: state.status,
originalData: state.data,
refetch: isDisabled ? warnDisabledRefetch : state.refetch,
} as DataSourceState<TDataSource>;
};
6 changes: 1 addition & 5 deletions src/react-query/impl/plain/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {type QueryObserverOptions, skipToken, useQuery} from '@tanstack/react-query';
import {type QueryObserverOptions, useQuery} from '@tanstack/react-query';

import type {
DataSourceContext,
Expand All @@ -12,7 +12,6 @@ import type {
} from '../../../core';
import {useRefetchInterval} from '../../hooks/useRefetchInterval';
import {normalizeStatus} from '../../utils/normalizeStatus';
import {warnDisabledRefetch} from '../../utils/warnDisabledRefetch';

import type {AnyPlainQueryDataSource, QueryObserverExtendedOptions} from './types';
import {composeOptions} from './utils';
Expand Down Expand Up @@ -53,12 +52,9 @@ export const usePlainQueryData = <TDataSource extends AnyPlainQueryDataSource>(
const composedOptions = usePlainQueryDataOptions(extendedOptions);
const state = useQuery(composedOptions);

const isDisabled = composedOptions.enabled === false || composedOptions.queryFn === skipToken;

return {
...state,
status: normalizeStatus(state.status, state.fetchStatus),
originalStatus: state.status,
refetch: isDisabled ? warnDisabledRefetch : state.refetch,
} as DataSourceState<TDataSource>;
};
5 changes: 0 additions & 5 deletions src/react-query/types/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ export interface QueryDataAdditionalOptions<
TQueryKey extends QueryKey = QueryKey,
> {
refetchInterval?: RefetchInterval<TQueryFnData, TError, TQueryData, TQueryKey>;
/**
* @deprecated The use of the enabled option is deprecated.
* It is recommended to use idle as query parameters to control query state.
*/
enabled?: boolean;
/** Normalization configuration (enable/disable) */
normalize?: boolean;
/** Optimistic data update configuration */
Expand Down
8 changes: 0 additions & 8 deletions src/react-query/utils/warn.ts

This file was deleted.

5 changes: 0 additions & 5 deletions src/react-query/utils/warnDisabledRefetch.ts

This file was deleted.

Loading