Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export AbortSignal #9

Merged
merged 16 commits into from
Aug 21, 2024
15 changes: 14 additions & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,28 @@ declare const domLoaded: Promise<void> & {
/**
Synchronously check if the DOM has already finished loading.

@example
```
import domLoaded from 'dom-loaded';

if (domLoaded.hasLoaded) {
console.log('The DOM has already finished loading.')
console.log('The DOM has already finished loading.');
}
```
*/
readonly hasLoaded: boolean;

/**
An `AbortSignal` that triggers when the DOM finishes loading or immediately if it has already loaded.

@example
```
import domLoaded from 'dom-loaded';

showLoader({signal: domLoaded.signal});
```
*/
readonly signal: AbortSignal;
};

export default domLoaded;
10 changes: 9 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
const hasLoaded = () => document.readyState === 'interactive' || document.readyState === 'complete';

const controller = new AbortController();

const domLoaded = new Promise(resolve => {
if (hasLoaded()) {
resolve();
controller.abort();
} else {
document.addEventListener('DOMContentLoaded', () => {
resolve();
controller.abort();
}, {
capture: true,
once: true,
Expand All @@ -17,5 +21,9 @@ const domLoaded = new Promise(resolve => {
export default domLoaded;

Object.defineProperty(domLoaded, 'hasLoaded', {
get: () => hasLoaded(),
get: hasLoaded,
});

Object.defineProperty(domLoaded, 'signal', {
get: () => controller.signal,
});
1 change: 1 addition & 0 deletions index.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ import domLoaded from './index.js';

expectAssignable<Promise<void>>(domLoaded);
expectType<boolean>(domLoaded.hasLoaded);
expectType<AbortSignal>(domLoaded.signal);
6 changes: 6 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ Type: `boolean`

Synchronously check if the DOM has already finished loading.

### domLoaded.signal

Type: [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)

An `AbortSignal` that triggers when the DOM finishes loading or immediately if it has already loaded.

## Related

- [element-ready](https://github.com/sindresorhus/element-ready) - Detect when an element is ready in the DOM
15 changes: 15 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,18 @@ test('domLoaded.hasLoaded', async t => {

t.true(window.domLoaded.hasLoaded);
});

test('domLoaded.signal', async t => {
const {window} = new JSDOM('<body></body>', {
runScripts: 'outside-only',
});

const loadedPromise = new Promise(resolve => {
window.document.addEventListener('DOMContentLoaded', resolve);
});

await loadedPromise;
window.eval(umdWrappedDomLoaded);

t.true(window.domLoaded.signal.aborted);
});