Skip to content

Commit ac29b67

Browse files
NasgulNexusDakEnviy
authored andcommitted
fix: revert "do not manual refetch disabled queries" (#43)
1 parent 758640b commit ac29b67

File tree

6 files changed

+2
-208
lines changed

6 files changed

+2
-208
lines changed

src/react-query/hooks/__tests__/useQueryData.refetch.test.ts

Lines changed: 0 additions & 180 deletions
This file was deleted.

src/react-query/impl/infinite/hooks.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {useMemo} from 'react';
22

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

66
import type {
@@ -16,7 +16,6 @@ import type {
1616
} from '../../../core';
1717
import {useRefetchInterval} from '../../hooks/useRefetchInterval';
1818
import {normalizeStatus} from '../../utils/normalizeStatus';
19-
import {warnDisabledRefetch} from '../../utils/warnDisabledRefetch';
2019

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

67-
const isDisabled = composedOptions.enabled === false || composedOptions.queryFn === skipToken;
68-
6966
return {
7067
...state,
7168
status: normalizeStatus(state.status, state.fetchStatus),
7269
data: transformedData,
7370
originalStatus: state.status,
7471
originalData: state.data,
75-
refetch: isDisabled ? warnDisabledRefetch : state.refetch,
7672
} as DataSourceState<TDataSource>;
7773
};

src/react-query/impl/plain/hooks.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {type QueryObserverOptions, skipToken, useQuery} from '@tanstack/react-query';
1+
import {type QueryObserverOptions, useQuery} from '@tanstack/react-query';
22

33
import type {
44
DataSourceContext,
@@ -12,7 +12,6 @@ import type {
1212
} from '../../../core';
1313
import {useRefetchInterval} from '../../hooks/useRefetchInterval';
1414
import {normalizeStatus} from '../../utils/normalizeStatus';
15-
import {warnDisabledRefetch} from '../../utils/warnDisabledRefetch';
1615

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

56-
const isDisabled = composedOptions.enabled === false || composedOptions.queryFn === skipToken;
57-
5855
return {
5956
...state,
6057
status: normalizeStatus(state.status, state.fetchStatus),
6158
originalStatus: state.status,
62-
refetch: isDisabled ? warnDisabledRefetch : state.refetch,
6359
} as DataSourceState<TDataSource>;
6460
};

src/react-query/types/options.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ export interface QueryDataAdditionalOptions<
1111
TQueryKey extends QueryKey = QueryKey,
1212
> {
1313
refetchInterval?: RefetchInterval<TQueryFnData, TError, TQueryData, TQueryKey>;
14-
/**
15-
* @deprecated The use of the enabled option is deprecated.
16-
* It is recommended to use idle as query parameters to control query state.
17-
*/
18-
enabled?: boolean;
1914
/** Normalization configuration (enable/disable) */
2015
normalize?: boolean;
2116
/** Optimistic data update configuration */

src/react-query/utils/warn.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/react-query/utils/warnDisabledRefetch.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)