fix(InfiniteGrid): fix attached scroll and no request append event (#229

) * fix(InfiniteGrid): fix no children and request append event * fix(InfiniteGrid): fix attached scroll Close #227 Close #228
naver · Oct 12, 2018 · e8e1f42 · e8e1f42
1 parent 514ce55
commit e8e1f42
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 9 deletions.
diff --git a/src/InfiniteGrid.js b/src/InfiniteGrid.js
@@ -314,11 +314,14 @@ class InfiniteGrid extends Component {
 			}
 		}
 		// check childElement
-		if (!size) {
-			this._insert(toArray(renderer.container.children), true);
-			return this;
-		}
-		if (!items.length) {
+		if (!size || !items.length) {
+			const children = toArray(renderer.container.children);
+
+			if (children.length) {
+				this._insert(children, true);
+			} else {
+				this._requestAppend({});
+			}
 			return this;
 		}
 		// layout datas
@@ -885,7 +888,7 @@ ig.on("imageError", e => {
 			 */
 			this.trigger("append", {
 				isTrusted: TRUSTED,
-				groupKey: this.getGroupKeys().pop(),
+				groupKey: this.getGroupKeys().pop() || "",
 				startLoading: userStyle => {
 					this.startLoading(true, userStyle);
 				},
@@ -974,7 +977,10 @@ ig.on("imageError", e => {
 
 		const size = this._getEdgeValue("end");
 
-		isAppend && this._setContainerSize(size + this._status.loadingSize || 0);
+		if (isAppend) {
+			this._setContainerSize(size + this._status.loadingSize || 0);
+			this._scrollTo(scrollPos);
+		}
 		!isLayout && this._process(PROCESSING, false);
 
 		/**

diff --git a/test/unit/InfiniteGrid.spec.js b/test/unit/InfiniteGrid.spec.js
@@ -169,9 +169,19 @@ describe("InfiniteGrid Test", function () {
         outlines.forEach(outline => {
           expect(outline).to.be.equals(outlines[0]);
         });
-
-
       });
+      it(`should check no children and call 'append' event`, async() => {
+        // Given
+        const waitAppend = waitEvent(this.inst, "append");
+
+        // When
+        this.inst.layout();
+
+        const rv = await waitAppend;
+
+        // Then
+        expect(rv.groupKey).to.be.equals("");
+      })
       it(`should check getStatus(startCursor, endCursor)`, async () => {
         // Given
         await waitInsert(this.inst, true, 10, 10);
@@ -435,6 +445,36 @@ describe("InfiniteGrid Test", function () {
       });
     });
   });
+  describe(`When scroll is attached to the Bottom`, function () {
+    beforeEach(() => {
+      this.el = sandbox();
+      this.el.innerHTML = `<div id='infinite'></div><div id="footer" style="position:relative;width: 100%; height: ${window.innerHeight * 3}px;"></div>`;
+      this.inst = new InfiniteGrid("#infinite", {
+        margin: 5,
+      });
+      this.inst.setLayout(GridLayout);
+    });
+    afterEach(() => {
+      if (this.inst) {
+        this.inst.destroy();
+        this.inst = null;
+      }
+      cleanup();
+    });
+    it (`should check attached scroll`, async () => {
+      // Given
+      const scrollPos = document.body.offsetHeight - window.innerHeight;
+
+      // When
+      window.scrollTo(0, scrollPos);
+      await wait(100);
+      await waitInsert(this.inst, true, 10, 4);
+
+      // Then
+      expect(Math.max(document.body.scrollTop, document.documentElement.scrollTop)).to.be.equals(scrollPos);
+
+    });
+  });
   describe(`When appending, image test`, function () {
     beforeEach(() => {
       this.el = sandbox();