Skip to content

Commit 00fe215

Browse files
committed
#12 - Read element in onMount
1 parent a6ee6ba commit 00fe215

File tree

2 files changed

+16
-251
lines changed

2 files changed

+16
-251
lines changed

src/dev/countries.js

Lines changed: 1 addition & 245 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/InfiniteScroll.svelte

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,19 @@
1414
let beforeScrollHeight;
1515
let beforeScrollTop;
1616
17-
$: if (component || elementScroll || window) {
18-
const element = getElement();
17+
let element;
1918
19+
onMount(() => {
20+
if (window) {
21+
element = document;
22+
} else if (elementScroll) {
23+
element = elementScroll;
24+
}
25+
26+
element = component.parentNode;
27+
});
28+
29+
$: if (element) {
2030
if (reverse) {
2131
element.scrollTop = element.scrollHeight;
2232
}
@@ -26,8 +36,6 @@
2636
}
2737
2838
$: if (isLoadMore && reverse) {
29-
const element = getElement();
30-
3139
element.scrollTop =
3240
element.scrollHeight - beforeScrollHeight + beforeScrollTop;
3341
}
@@ -71,13 +79,14 @@
7179
return elementScroll;
7280
}
7381
74-
return component.parentNode;
82+
return component && component.parentNode;
7583
};
7684
7785
onDestroy(() => {
78-
const element = getElement();
86+
if (element) {
7987
element.removeEventListener("scroll", onScroll);
8088
element.removeEventListener("resize", onScroll);
89+
}
8190
});
8291
</script>
8392

0 commit comments

Comments
 (0)