clip force to not conflict with clip simulate

Author: dhilt

src/component/classes/state/clip.ts

@@ -8,6 +8,10 @@ export class ClipModel {
   forceForward: boolean;
   forceBackward: boolean;
 
+  get force(): boolean {
+    return this.forceForward || this.forceBackward;
+  }
+
   private infinite: boolean
 
   constructor() {
@@ -19,6 +23,10 @@ export class ClipModel {
 
   reset() {
     this.doClip = false;
+    this.forceReset();
+  }
+
+  forceReset() {
     this.simulate = false;
     this.forceForward = false;
     this.forceBackward = false;

src/component/processes/clip.ts

@@ -35,24 +35,18 @@ export default class Clip {
           paddings.backward.size += item.size;
         }
         clipped.push(item.$index);
-        if (clip.simulate) {
+        if (clip.simulate && !clip.force) {
           buffer.removeItem(item);
         }
         return false;
       }
       return true;
     });
-    // if (size.backward) {
-    //   paddings.forward.size += size.backward;
-    // }
-    // if (size.forward) {
-    //   paddings.backward.size += size.forward;
-    // }
     logger.log(() => [
       `clipped ${clipped.length} items` +
-      (size.backward ? `, +${size.backward} fwd px,` : '') +
-      (size.forward ? `, +${size.forward} bwd px,` : ''),
-      `range: [${clipped[0]}..${clipped[clipped.length - 1]}]`
+      (size.backward ? `, +${size.backward} fwd px` : '') +
+      (size.forward ? `, +${size.forward} bwd px` : '') +
+      `, range: [${clipped[0]}..${clipped[clipped.length - 1]}]`
     ]);
     logger.stat('after clip');
   }

src/component/processes/end.ts

@@ -47,7 +47,7 @@ export default class End {
     state.isInitialLoop = false;
     state.fetch.simulate = false;
     clip.noClip = scroller.settings.infinite || (next && clip.simulate);
-    clip.simulate = false;
+    clip.forceReset();
     state.lastPosition = scroller.viewport.scrollPosition;
     scroller.purgeInnerLoopSubscriptions();
   }

src/component/processes/userClip.ts

@@ -6,8 +6,6 @@ export default class UserClip {
   static run(scroller: Scroller, options?: ClipOptions) {
     const _options = UserClip.checkOptions(options);
 
-    scroller.state.clip.simulate = true;
-    scroller.state.clip.doClip = true;
     scroller.state.clip.forceForward = !_options.backwardOnly;
     scroller.state.clip.forceBackward = !_options.forwardOnly;