Skip to content

fix: update intersection callback ref every time prop change #1096

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

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix: update intersection callback ref every time prop change #1096

Show file tree
Hide file tree
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
19 changes: 9 additions & 10 deletions sandpack-react/src/Playground.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ export default {

export const Basic: React.FC = () => {
return (
<>
{new Array(10).fill(null).map((_, index) => (
<Sandpack
options={{
initMode: "user-visible",
}}
template="static"
/>
))}
</>
<div style={{ height: "400vh" }}>
<Sandpack
options={{
initMode: "user-visible",
bundlerURL: "https://786946de.sandpack-bundler-4bw.pages.dev",
}}
template="react"
/>
</div>
);
};
29 changes: 17 additions & 12 deletions sandpack-react/src/contexts/utils/useClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ export const useClient: UseClient = (
/**
* Refs
*/
type InterserctionObserverCallback = (
entries: IntersectionObserverEntry[]
) => void;
const intersectionObserverCallback = useRef<
InterserctionObserverCallback | undefined
>();
const intersectionObserver = useRef<IntersectionObserver | null>(null);
const lazyAnchorRef = useRef<HTMLDivElement>(null);
const registeredIframes = useRef<
Expand Down Expand Up @@ -233,6 +239,14 @@ export const useClient: UseClient = (
setState((prev) => ({ ...prev, error: null, status: "running" }));
}, [createClient]);

intersectionObserverCallback.current = (
entries: IntersectionObserverEntry[]
): void => {
if (entries.some((entry) => entry.isIntersecting)) {
runSandpack();
}
};

const initializeSandpackIframe = useCallback((): void => {
const autorun = options?.autorun ?? true;

Expand All @@ -252,23 +266,14 @@ export const useClient: UseClient = (
// If any component registered a lazy anchor ref component, use that for the intersection observer
intersectionObserver.current = new IntersectionObserver((entries) => {
if (entries.some((entry) => entry.isIntersecting)) {
runSandpack();

if (lazyAnchorRef.current) {
intersectionObserver.current?.unobserve(lazyAnchorRef.current);
}
intersectionObserverCallback.current?.(entries);
}
}, observerOptions);

intersectionObserver.current.observe(lazyAnchorRef.current);
} else if (lazyAnchorRef.current && state.initMode === "user-visible") {
intersectionObserver.current = new IntersectionObserver((entries) => {
if (entries.some((entry) => entry.isIntersecting)) {
runSandpack();
} else {
Object.keys(clients.current).map(unregisterBundler);
unregisterAllClients();
}
intersectionObserverCallback.current?.(entries);
}, observerOptions);

intersectionObserver.current.observe(lazyAnchorRef.current);
Expand Down Expand Up @@ -371,7 +376,7 @@ export const useClient: UseClient = (
};

const recompileMode = options?.recompileMode ?? "delayed";
const recompileDelay = options?.recompileDelay ?? 500;
const recompileDelay = options?.recompileDelay ?? 200;

const dispatchMessage = (
message: SandpackMessage,
Expand Down