Skip to content
Open
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
1 change: 1 addition & 0 deletions packages/react-intersection-observer/src/InView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export class InView extends React.Component<
prevProps.scrollMargin !== this.props.scrollMargin ||
prevProps.root !== this.props.root ||
prevProps.threshold !== this.props.threshold ||
prevProps.triggerOnce !== this.props.triggerOnce ||
prevProps.skip !== this.props.skip ||
prevProps.trackVisibility !== this.props.trackVisibility ||
prevProps.delay !== this.props.delay
Expand Down
99 changes: 99 additions & 0 deletions packages/react-intersection-observer/src/__tests__/InView.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,105 @@ test("Should unobserve when triggerOnce comes into view", () => {
expect(instance.unobserve).toHaveBeenCalled();
});

test("Should resume observing when triggerOnce is disabled while in view", () => {
const callback = vi.fn();
const { container, rerender } = render(
<InView triggerOnce onChange={callback}>
Inner
</InView>,
);
const element = container.children[0];
const initialObserver = intersectionMockInstance(element);
vi.spyOn(initialObserver, "unobserve");

mockAllIsIntersecting(true);
expect(callback).toHaveBeenCalledTimes(1);
expect(callback).toHaveBeenNthCalledWith(
1,
true,
expect.objectContaining({ isIntersecting: true }),
);
expect(initialObserver.unobserve).toHaveBeenCalledWith(element);

callback.mockClear();
rerender(
<InView triggerOnce={false} onChange={callback}>
Inner
</InView>,
);
const resumedObserver = intersectionMockInstance(element);
expect(resumedObserver).not.toBe(initialObserver);

// A fresh observer reports the element's current state.
mockAllIsIntersecting(true);
expect(callback).toHaveBeenNthCalledWith(
1,
true,
expect.objectContaining({ isIntersecting: true }),
);

mockAllIsIntersecting(false);
expect(callback).toHaveBeenNthCalledWith(
2,
false,
expect.objectContaining({ isIntersecting: false }),
);

mockAllIsIntersecting(true);
expect(callback).toHaveBeenNthCalledWith(
3,
true,
expect.objectContaining({ isIntersecting: true }),
);
expect(callback).toHaveBeenCalledTimes(3);
});

test("Should stop observing when triggerOnce is enabled while in view", () => {
const callback = vi.fn();
const { container, rerender } = render(
<InView triggerOnce={false} onChange={callback}>
Inner
</InView>,
);
const element = container.children[0];
const initialObserver = intersectionMockInstance(element);
vi.spyOn(initialObserver, "unobserve");

mockAllIsIntersecting(true);
expect(callback).toHaveBeenCalledTimes(1);
expect(callback).toHaveBeenNthCalledWith(
1,
true,
expect.objectContaining({ isIntersecting: true }),
);

callback.mockClear();
rerender(
<InView triggerOnce onChange={callback}>
Inner
</InView>,
);
expect(initialObserver.unobserve).toHaveBeenCalledWith(element);

const triggerOnceObserver = intersectionMockInstance(element);
expect(triggerOnceObserver).not.toBe(initialObserver);
vi.spyOn(triggerOnceObserver, "unobserve");

// A fresh observer reports the element's current state before triggerOnce stops it.
mockAllIsIntersecting(true);
expect(callback).toHaveBeenCalledTimes(1);
expect(callback).toHaveBeenNthCalledWith(
1,
true,
expect.objectContaining({ isIntersecting: true }),
);
expect(triggerOnceObserver.unobserve).toHaveBeenCalledWith(element);

mockAllIsIntersecting(false);
mockAllIsIntersecting(true);
expect(callback).toHaveBeenCalledTimes(1);
});

test("Should unobserve when unmounted", () => {
const { container, unmount } = render(<InView triggerOnce>Inner</InView>);
const instance = intersectionMockInstance(container.children[0]);
Expand Down