small refactor

zestia · Mar 8, 2024 · 0afb6e2 · 0afb6e2
1 parent 805ab24
commit 0afb6e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/addon/components/infinite-scroller.gjs b/addon/components/infinite-scroller.gjs
@@ -8,7 +8,8 @@ const { round } = Math;
 
 export default class InfiniteScrollerComponent extends Component {
   @tracked isLoading = false;
-  @tracked isScrollable = false;
+  @tracked scrollState = {};
+  @tracked lastScrollState = {};
 
   debug;
   scroller;
@@ -77,10 +78,14 @@ export default class InfiniteScrollerComponent extends Component {
   }
 
   _checkShouldLoadMore() {
-    const scrollState = this._getScrollState();
-    const shouldLoadMore = scrollState.reachedBottom && !this.isLoading;
+    this.scrollState = this._getScrollState();
 
-    this._debug({ ...scrollState, shouldLoadMore });
+    const shouldLoadMore = this.scrollState.reachedBottom && !this.isLoading;
+
+    this._debug({
+      ...this.scrollState,
+      shouldLoadMore
+    });
 
     if (shouldLoadMore) {
       this.loadMore();
@@ -92,11 +97,9 @@ export default class InfiniteScrollerComponent extends Component {
       return;
     }
 
-    const scrollState = this._getScrollState();
-
-    this._debug({ ...scrollState });
+    this.scrollState = this._getScrollState();
 
-    this.isScrollable = scrollState.isScrollable;
+    this._debug(this.scrollState);
   }
 
   _debug(state) {
@@ -132,7 +135,7 @@ export default class InfiniteScrollerComponent extends Component {
 
   get _api() {
     return {
-      isScrollable: this.isScrollable,
+      isScrollable: this.scrollState.isScrollable,
       isLoading: this.isLoading,
       loadMore: this.loadMore
     };
@@ -149,7 +152,7 @@ export default class InfiniteScrollerComponent extends Component {
     <div
       class="infinite-scroller"
       data-loading="{{this.isLoading}}"
-      data-scrollable="{{this.isScrollable}}"
+      data-scrollable="{{this.scrollState.isScrollable}}"
       ...attributes
       {{this.setScroller @element}}
     >

diff --git a/tests/integration/components/infinite-scroller-test.gjs b/tests/integration/components/infinite-scroller-test.gjs
@@ -47,7 +47,7 @@ module('infinite-scroller', function (hooks) {
     assert.dom('.infinite-scroller').exists('has an appropriate class name');
   });
 
-  test('scrollable class', async function (assert) {
+  test('scrollable attr', async function (assert) {
     assert.expect(2);
 
     await render(<template>