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
2 changes: 1 addition & 1 deletion src/IntersectionObserver.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
),
);

if (element && once) observer?.unobserve(element);
if (once) observer?.unobserve(_entry.target);
}
}
},
Expand Down
63 changes: 63 additions & 0 deletions tests/e2e/fixtures/OnceElementChangeFixture.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<script lang="ts">
import IntersectionObserver from "svelte-intersection-observer";

let element: null | HTMLDivElement = null;
let elementB: null | HTMLDivElement = null;
let intersecting = false;
</script>

<header class:intersecting>
{intersecting ? "Element is in view" : "Element is not in view"}
<button
data-testid="switch"
onclick={() => (element = elementB)}
>
Switch
</button>
</header>

<IntersectionObserver
{element}
bind:intersecting
once
>
<div
data-testid="el-a"
bind:this={element}
>
A
</div>
</IntersectionObserver>

<div
data-testid="el-b"
bind:this={elementB}
>
B
</div>

<style>
header {
position: fixed;
top: 0;
left: 0;
width: 100%;
padding: 1rem;
background-color: #e0f7f6;
}

[data-testid="el-a"] {
height: 38vh;
padding: 1rem;
background-color: #376462;
color: #fff;
}

[data-testid="el-b"] {
margin-top: calc(100vh + 1px);
height: 38vh;
padding: 1rem;
background-color: #2ecc71;
color: #fff;
}
</style>
31 changes: 31 additions & 0 deletions tests/unit/IntersectionObserver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import BasicFixture from "../e2e/fixtures/BasicFixture.svelte";
import EachBindingFixture from "../e2e/fixtures/EachBindingFixture.svelte";
import ElementChangeFixture from "../e2e/fixtures/ElementChangeFixture.svelte";
import ElementNullFixture from "../e2e/fixtures/ElementNullFixture.svelte";
import OnceElementChangeFixture from "../e2e/fixtures/OnceElementChangeFixture.svelte";
import OnceFixture from "../e2e/fixtures/OnceFixture.svelte";
import RootFixture from "../e2e/fixtures/RootFixture.svelte";
import RootMarginChangeFixture from "../e2e/fixtures/RootMarginChangeFixture.svelte";
Expand Down Expand Up @@ -80,6 +81,36 @@ describe("IntersectionObserver", () => {
).toContain("Intersect count: 1");
});

test("once unobserves the entry's own target, not a stale element prop, when the element changes before delivery", () => {
const rendered = render(OnceElementChangeFixture);
cleanup = rendered.cleanup;
const elementA = rendered.target.querySelector('[data-testid="el-a"]');
const elementB = rendered.target.querySelector('[data-testid="el-b"]');
const switchButton = rendered.target.querySelector(
'[data-testid="switch"]',
);
if (
!elementA ||
!elementB ||
!(switchButton instanceof HTMLButtonElement)
) {
throw new Error("fixture markup missing");
}

const observer = MockIntersectionObserver.last();
expect(observer.observedElements.has(elementA)).toBe(true);

switchButton.click();
flushSync();

flushSync(() =>
observer.trigger([{ target: elementA, isIntersecting: true }]),
);

expect(observer.observedElements.has(elementB)).toBe(true);
expect(observer.observedElements.has(elementA)).toBe(false);
});

test("skip pauses and resumes observation without losing state", () => {
const rendered = render(SkipFixture);
cleanup = rendered.cleanup;
Expand Down