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.

Sign up for GitHub

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

fix: test utils, only use act when in an act environment #668

Merged
merged 1 commit into from
Apr 8, 2024
Merged

fix: test utils, only use act when in an act environment #668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions src/test-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { act } from "react-dom/test-utils";

declare global {
// biome-ignore lint/style/noVar: Needs to be `var`, not `let` or `const`, for typing to work
var IS_REACT_ACT_ENVIRONMENT: boolean;
}
type Item = {
callback: IntersectionObserverCallback;
elements: Set<Element>;
Expand Down Expand Up @@ -93,6 +96,10 @@ export function resetIntersectionMocking() {
observers.clear();
}

function getIsReactActEnvironment() {
return Boolean(global.IS_REACT_ACT_ENVIRONMENT);
}

function triggerIntersection(
elements: Element[],
trigger: boolean | number,
Expand Down Expand Up @@ -148,7 +155,8 @@ function triggerIntersection(
}

// Trigger the IntersectionObserver callback with all the entries
if (act) act(() => item.callback(entries, observer));
if (act && getIsReactActEnvironment())
act(() => item.callback(entries, observer));
else item.callback(entries, observer);
}
/**
Expand Down