Merge pull request #217 from dhilt/issue-213-duble-clip-fix

Double clip case

package-dist.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-ui-scroll",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "Infinite/virtual scroll for Angular",
   "main": "./bundles/ngx-ui-scroll.umd.js",
   "module": "./fesm5/ngx-ui-scroll.js",

package.json

@@ -14,7 +14,7 @@
     "deploy-app": "npm run build-app && firebase deploy",
     "preinstall": "cd server && npm install",
     "postinstall": "npm run build-app",
-    "pack:install": "npm run build && npm pack ./dist && npm install ngx-ui-scroll-1.8.4.tgz --no-save",
+    "pack:install": "npm run build && npm pack ./dist && npm install ngx-ui-scroll-1.8.5.tgz --no-save",
     "pack:start": "npm run pack:install && npm start",
     "build": "node build.js",
     "publish:lib": "npm run build && npm publish ./dist",

src/component/classes/state/clip.ts

@@ -19,9 +19,13 @@ export class ClipModel {
     this.reset();
   }
 
-  reset() {
+  reset(isForce?: boolean) {
     this.doClip = false;
-    this.forceReset();
+    if (!isForce) {
+      this.forceReset();
+    } else {
+      this.simulate = false;
+    }
   }
 
   forceReset() {

src/component/processes/clip.ts

@@ -46,12 +46,14 @@ export default class Clip {
       buffer.items = buffer.items.filter(({ toRemove }) => !toRemove);
     }
 
-    logger.log(() => [
-      `clipped ${itemsToRemove.length} items` +
-      (size.backward ? `, +${size.backward} fwd px` : '') +
-      (size.forward ? `, +${size.forward} bwd px` : '') +
-      `, range: [${itemsToRemove[0].$index}..${itemsToRemove[itemsToRemove.length - 1].$index}]`
-    ]);
+    logger.log(() => itemsToRemove.length
+      ? [
+        `clipped ${itemsToRemove.length} items` +
+        (size.backward ? `, +${size.backward} fwd px` : '') +
+        (size.forward ? `, +${size.forward} bwd px` : '') +
+        `, range: [${itemsToRemove[0].$index}..${itemsToRemove[itemsToRemove.length - 1].$index}]`
+      ]
+      : 'clipped 0 items');
 
     viewport.scrollPosition = position;
 

src/component/processes/start.ts

@@ -14,8 +14,8 @@ export default class Start {
     if (!fetch.simulate) {
       fetch.reset();
     }
-    if (!clip.simulate && !clip.force) {
-      clip.reset();
+    if (!clip.simulate) {
+      clip.reset(clip.force);
     }
     render.reset();
 

src/ui-scroll.version.ts

@@ -1 +1 @@
-export default '1.8.4';
+export default '1.8.5';

tests/bug.spec.ts

@@ -221,4 +221,24 @@ describe('Bug Spec', () => {
     });
   });
 
+  describe('double clip', () =>
+    makeTest({
+      title: 'should clip once',
+      config: {
+        datasourceName: 'default',
+        datasourceSettings: { adapter: true, bufferSize: 50 }
+      },
+      it: (misc: Misc) => async (done: Function) => {
+        const { clip } = misc.scroller.state;
+        await misc.relaxNext();
+        expect(clip.callCount).toEqual(0);
+        await misc.adapter.clip();
+        expect(clip.callCount).toEqual(1);
+        await misc.adapter.clip();
+        expect(clip.callCount).toEqual(1);
+        done();
+      }
+    })
+  );
+
 });