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
40 changes: 37 additions & 3 deletions src/raf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,42 @@ if (typeof window !== 'undefined' && 'requestAnimationFrame' in window) {
caf = (handle: number) => window.cancelAnimationFrame(handle);
}

export default function wrapperRaf(callback: () => void): number {
return raf(callback);
let rafUUID = 0;
const rafIds = new Map<number, number>();

function cleanup(id: number) {
rafIds.delete(id);
}

export default function wrapperRaf(callback: () => void, times = 1): number {
rafUUID += 1;
const id = rafUUID;

function callRef(leftTimes: number) {
if (leftTimes === 0) {
// Clean up
cleanup(id);

// Trigger
callback();
} else {
// Next raf
const realId = raf(() => {
callRef(leftTimes - 1);
});

// Bind real raf id
rafIds.set(id, realId);
}
}

callRef(times);

return id;
}

wrapperRaf.cancel = caf;
wrapperRaf.cancel = (id: number) => {
const realId = rafIds.get(id);
cleanup(realId);
return caf(realId);
};
38 changes: 38 additions & 0 deletions tests/raf.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,42 @@ describe('raf', () => {
done();
});
});

it('cancel', done => {
let bamboo = false;

const id = raf(() => {
bamboo = true;
}, 2);

raf.cancel(id);

requestAnimationFrame(() => {
requestAnimationFrame(() => {
requestAnimationFrame(() => {
expect(bamboo).toBeFalsy();
done();
});
});
});
});

it('multiple times', done => {
let bamboo = false;

raf(() => {
bamboo = true;
}, 2);

expect(bamboo).toBeFalsy();

requestAnimationFrame(() => {
expect(bamboo).toBeFalsy();

requestAnimationFrame(() => {
expect(bamboo).toBeTruthy();
done();
});
});
});
});