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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@ver0/eslint-config": "^1.3.6",
"@ver0/eslint-formatter-gha": "^1.0.1",
"@ver0/react-hooks-testing": "^1.0.3",
"@vitest/coverage-v8": "^3.2.4",
"@vitest/coverage-v8": "^4.1.10",
"eslint": "^9.37.0",
"js-cookie": "^3.0.8",
"jsdom": "^29.1.1",
Expand All @@ -73,7 +73,7 @@
"rimraf": "^6.1.3",
"semantic-release": "^25.0.8",
"typescript": "^5.9.3",
"vitest": "^3.2.4"
"vitest": "^4.1.10"
},
"packageManager": "yarn@4.10.2"
}
24 changes: 15 additions & 9 deletions src/useIntersectionObserver/index.dom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@ import {useIntersectionObserver} from '../index.js';
import {expectResultValue} from '../util/testing/test-helpers.js';

describe('useIntersectionObserver', () => {
const IntersectionObserverMock = vi.fn((_cb: (entries: IntersectionObserverEntry[]) => void) => ({
observe: vi.fn(),
unobserve: vi.fn(),
disconnect: vi.fn(),
takeRecords: () => [],
root: document,
rootMargin: '0px',
thresholds: [0],
}));
// A function declaration keeps the mock constructable -- vitest 4 mocks
// with arrow implementations cannot be called with `new`.
function intersectionObserverMock(_cb: (entries: IntersectionObserverEntry[]) => void) {
return {
observe: vi.fn(),
unobserve: vi.fn(),
disconnect: vi.fn(),
takeRecords: () => [],
root: document,
rootMargin: '0px',
thresholds: [0],
};
}

const IntersectionObserverMock = vi.fn(intersectionObserverMock);
vi.stubGlobal('IntersectionObserver', IntersectionObserverMock);

beforeEach(() => {
Expand Down
16 changes: 11 additions & 5 deletions src/useMeasure/index.dom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ describe('useMeasure', () => {
const unobserveSpy = vi.fn();
const disconnectSpy = vi.fn();

const ResizeObserverSpy = vi.fn((_cb: (entries: ResizeObserverEntry[]) => void) => ({
observe: observeSpy,
unobserve: unobserveSpy,
disconnect: disconnectSpy,
}));
// A function declaration keeps the mock constructable -- vitest 4 mocks
// with arrow implementations cannot be called with `new`.
function resizeObserverMock(_cb: (entries: ResizeObserverEntry[]) => void) {
return {
observe: observeSpy,
unobserve: unobserveSpy,
disconnect: disconnectSpy,
};
}

const ResizeObserverSpy = vi.fn(resizeObserverMock);
const initialRO = globalThis.ResizeObserver;

const raf = globalThis.requestAnimationFrame;
Expand Down
16 changes: 11 additions & 5 deletions src/useResizeObserver/index.dom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ describe('useResizeObserver', () => {
const unobserveSpy = vi.fn();
const disconnectSpy = vi.fn();

const ResizeObserverSpy = vi.fn((_cb: (entries: ResizeObserverEntry[]) => void) => ({
observe: observeSpy,
unobserve: unobserveSpy,
disconnect: disconnectSpy,
}));
// A function declaration keeps the mock constructable -- vitest 4 mocks
// with arrow implementations cannot be called with `new`.
function resizeObserverMock(_cb: (entries: ResizeObserverEntry[]) => void) {
return {
observe: observeSpy,
unobserve: unobserveSpy,
disconnect: disconnectSpy,
};
}

const ResizeObserverSpy = vi.fn(resizeObserverMock);
const initialRO = globalThis.ResizeObserver;

beforeAll(() => {
Expand Down
24 changes: 12 additions & 12 deletions src/useStorageValue/index.dom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,32 +282,32 @@ describe('useStorageValue', () => {

describe('should handle window`s `storage` event', () => {
it('should update state if tracked key is updated', async () => {
const {result} = await renderHook(() => useStorageValue<string>(localStorage, 'foo'));
const {result} = await renderHook(() => useStorageValue<string>(globalThis.localStorage, 'foo'));
let value = expectResultValue(result);
expect(value.value).toBe(null);

localStorage.setItem('foo', 'bar');
globalThis.localStorage.setItem('foo', 'bar');
await act(async () => {
globalThis.dispatchEvent(
new StorageEvent('storage', {key: 'foo', storageArea: localStorage, newValue: '"foo"'}),
new StorageEvent('storage', {key: 'foo', storageArea: globalThis.localStorage, newValue: '"foo"'}),
);
});

value = expectResultValue(result);
expect(value.value).toBe('foo');
localStorage.removeItem('foo');
globalThis.localStorage.removeItem('foo');
});

it('should not update data on event storage or key mismatch', async () => {
const {result} = await renderHook(() => useStorageValue<string>(localStorage, 'foo'));
const {result} = await renderHook(() => useStorageValue<string>(globalThis.localStorage, 'foo'));
let value = expectResultValue(result);
expect(value.value).toBe(null);

await act(async () => {
globalThis.dispatchEvent(
new StorageEvent('storage', {
key: 'foo',
storageArea: sessionStorage,
storageArea: globalThis.sessionStorage,
newValue: '"foo"',
}),
);
Expand All @@ -319,22 +319,22 @@ describe('useStorageValue', () => {
globalThis.dispatchEvent(
new StorageEvent('storage', {
key: 'bar',
storageArea: localStorage,
storageArea: globalThis.localStorage,
newValue: 'foo',
}),
);
});
value = expectResultValue(result);
expect(value.value).toBe(null);

localStorage.removeItem('foo');
globalThis.localStorage.removeItem('foo');
});
});

describe('synchronisation', () => {
it('should update state of all hooks with the same key in same storage', async () => {
const hook1 = await renderHook(() => useStorageValue<string>(localStorage, 'foo'));
const hook2 = await renderHook(() => useStorageValue<string>(localStorage, 'foo'));
const hook1 = await renderHook(() => useStorageValue<string>(globalThis.localStorage, 'foo'));
const hook2 = await renderHook(() => useStorageValue<string>(globalThis.localStorage, 'foo'));

let value1 = expectResultValue(hook1.result);
let value2 = expectResultValue(hook2.result);
Expand All @@ -357,15 +357,15 @@ describe('useStorageValue', () => {
expect(value1.value).toBe(null);
expect(value2.value).toBe(null);

localStorage.setItem('foo', '"123"');
globalThis.localStorage.setItem('foo', '"123"');
await act(async () => {
value1.fetch();
});
value1 = expectResultValue(hook1.result);
value2 = expectResultValue(hook2.result);
expect(value1.value).toBe('123');
expect(value2.value).toBe('123');
localStorage.removeItem('foo');
globalThis.localStorage.removeItem('foo');
});
});
});
3 changes: 3 additions & 0 deletions vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ export default defineConfig({
dir: './src',
setupFiles: ['./src/util/testing/setup/react-hooks.test.ts', './src/util/testing/setup/vibrate.test.ts'],
passWithNoTests: true,
// Node >= 25 ships Web Storage globals; without --localstorage-file
// they are non-functional stubs that shadow jsdom's storage in workers.
execArgv: ['--no-experimental-webstorage'],
projects: [
{
extends: true,
Expand Down
Loading
Loading