@gitlab/ui 39.7.0 → 39.7.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [39.7.1](https://gitlab.com/gitlab-org/gitlab-ui/compare/v39.7.0...v39.7.1) (2022-05-04)
+
+
+### Bug Fixes
+
+* **GlInfiniteScroll:** Fix GlInfiniteScroll not firing bottomReached event in some cases ([d4c8d91](https://gitlab.com/gitlab-org/gitlab-ui/commit/d4c8d91aa913133ac8d3d55ab351a4660a5c2f2b))
+
 # [39.7.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v39.6.1...v39.7.0) (2022-05-03)
 
 

package/dist/components/base/infinite_scroll/infinite_scroll.js

@@ -8,6 +8,7 @@ const throttleDuration = 1000;
  */
 
 const adjustScrollGap = 5;
+const THRESHOLD = 1;
 var script = {
   props: {
     /**
@@ -164,9 +165,9 @@ var script = {
     },
 
     handleScroll: throttle(function handleScrollThrottled() {
-      if (this.scrollTop() + this.maxListHeight >= this.itemsListHeight()) {
+      if (Math.abs(this.itemsListHeight() - this.maxListHeight - this.scrollTop()) < THRESHOLD) {
         this.bottomReached();
-      } else if (this.scrollTop() === 0) {
+      } else if (this.scrollTop() <= THRESHOLD) {
         this.topReached();
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "39.7.0",
+  "version": "39.7.1",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/base/infinite_scroll/infinite_scroll.spec.js

@@ -73,7 +73,7 @@ describe('Infinite Scroll component', () => {
 
     expect(wrapper.emitted('bottomReached')).toBeFalsy();
 
-    mockScrollTo({ top: INITIAL_HEIGHT });
+    mockScrollTo({ top: INITIAL_HEIGHT - 0.5 });
     expect(wrapper.emitted('bottomReached')).toBeTruthy();
   });
 

package/src/components/base/infinite_scroll/infinite_scroll.vue

@@ -7,6 +7,7 @@ const throttleDuration = 1000;
  * Values in pixels, should be a small amount.
  */
 export const adjustScrollGap = 5;
+const THRESHOLD = 1;
 
 export default {
   props: {
@@ -138,9 +139,9 @@ export default {
       return this.$refs.infiniteContainer.scrollTop;
     },
     handleScroll: throttle(function handleScrollThrottled() {
-      if (this.scrollTop() + this.maxListHeight >= this.itemsListHeight()) {
+      if (Math.abs(this.itemsListHeight() - this.maxListHeight - this.scrollTop()) < THRESHOLD) {
         this.bottomReached();
-      } else if (this.scrollTop() === 0) {
+      } else if (this.scrollTop() <= THRESHOLD) {
         this.topReached();
       }
     }),