Skip to content

Commit e21ef6c

Browse files
authored
refactor: remove cancel method as it no longer exists (#3142)
* refactor: remove cancel method as it no longer exists it wasn't doing anything in that test * refactor: remove cancel method as it no longer exists use signal in playground example instead of cancel fn
1 parent 250c654 commit e21ef6c

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

examples/playground/src/index.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ function Todos({ initialFilter = "", setEditingIndex }) {
181181

182182
const { status, data, isFetching, error, failureCount, refetch } = useQuery(
183183
["todos", { filter }],
184-
() => fetchTodos({ filter })
184+
fetchTodos
185185
);
186186

187187
return (
@@ -370,9 +370,16 @@ function AddTodo() {
370370
);
371371
}
372372

373-
function fetchTodos({ filter } = {}) {
373+
function fetchTodos({ signal, queryKey: [, { filter }] }) {
374374
console.info("fetchTodos", { filter });
375-
const promise = new Promise((resolve, reject) => {
375+
376+
if (signal) {
377+
signal.addEventListener("abort", () => {
378+
console.info("cancelled", filter);
379+
});
380+
}
381+
382+
return new Promise((resolve, reject) => {
376383
setTimeout(() => {
377384
if (Math.random() < errorRate) {
378385
return reject(
@@ -382,10 +389,6 @@ function fetchTodos({ filter } = {}) {
382389
resolve(list.filter((d) => d.name.includes(filter)));
383390
}, queryTimeMin + Math.random() * (queryTimeMax - queryTimeMin));
384391
});
385-
386-
promise.cancel = () => console.info("cancelled", filter);
387-
388-
return promise;
389392
}
390393

391394
function fetchTodoById({ id }) {

src/reactjs/tests/useQuery.test.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4268,17 +4268,9 @@ describe('useQuery', () => {
42684268
const key = queryKey()
42694269
const states: UseQueryResult<string>[] = []
42704270

4271-
const queryFn = () => {
4272-
let cancelFn = jest.fn()
4273-
4274-
const promise = new Promise<string>((resolve, reject) => {
4275-
cancelFn = jest.fn(() => reject('Cancelled'))
4276-
sleep(50).then(() => resolve('OK'))
4277-
})
4278-
4279-
;(promise as any).cancel = cancelFn
4280-
4281-
return promise
4271+
const queryFn = async () => {
4272+
await sleep(50)
4273+
return 'OK'
42824274
}
42834275

42844276
function Page() {

0 commit comments

Comments
 (0)