vevet 5.0.11 → 5.1.1

package/lib/esm/components/Snap/Swipe/index.js

@@ -4,31 +4,29 @@ export class SnapSwipe {
     constructor(snap) {
         this.snap = snap;
         snap.on('destroy', () => this._destroy(), { protected: true });
-        this._startIndex = snap.activeIndex;
+        const { props, activeIndex } = snap;
+        this._startIndex = activeIndex;
         this._startTime = 0;
         this._swipe = new Swipe({
             container: snap.eventsEmitter,
-            enabled: snap.props.swipe,
-            grabCursor: snap.props.grabCursor,
-            minTime: snap.props.swipeMinTime,
-            threshold: snap.props.swipeThreshold,
+            enabled: props.swipe,
+            grabCursor: props.grabCursor,
+            minTime: props.swipeMinTime,
+            threshold: props.swipeThreshold,
             axis: this.axis,
-            inertia: snap.props.freemode,
-            inertiaDuration: snap.props.swipeInertiaDuration,
-            inertiaRatio: snap.props.swipeInertiaRatio,
-            velocityModifier: (source) => {
-                if (snap.props.freemode) {
-                    return source;
-                }
-                const { coord, size: slideSize } = snap.activeSlide;
-                snap.track.target = snap.track.current;
-                const output = Object.assign(Object.assign({}, source), { [this.axis]: clamp(source[this.axis], -coord, snap.domSize - slideSize - coord) });
-                return output;
-            },
+            inertia: false,
+            inertiaDuration: props.swipeInertiaDuration,
+            inertiaRatio: props.swipeInertiaRatio,
+            velocityModifier: this._handleVelocityModifier.bind(this),
+            inertiaDistanceThreshold: 5,
         });
         this._swipe.on('start', (data) => this._handleSwipeStart(data));
         this._swipe.on('move', (data) => this._handleSwipeMove(data));
         this._swipe.on('end', (data) => this._handleSwipeEnd(data));
+        this._swipe.on('inertiaStart', () => this._handleSwipeInertiaStart());
+        this._swipe.on('inertiaEnd', () => this._handleSwipeInertiaEnd());
+        this._swipe.on('inertiaFail', () => this._handleSwipeInertiaFail());
+        this._swipe.on('inertiaCancel', () => this._handleSwipeInertiaCancel());
         // on props change
         snap.on('props', () => {
             this._swipe.updateProps({
@@ -37,7 +35,8 @@ export class SnapSwipe {
                 minTime: snap.props.swipeMinTime,
                 threshold: snap.props.swipeThreshold,
                 axis: this.axis,
-                inertia: snap.props.freemode,
+                inertiaDuration: snap.props.swipeInertiaDuration,
+                inertiaRatio: snap.props.swipeInertiaRatio,
             });
         }, { protected: true });
     }
@@ -71,6 +70,30 @@ export class SnapSwipe {
     get diff() {
         return this.axis === 'x' ? this._swipe.diff.x : this._swipe.diff.y;
     }
+    _handleVelocityModifier(source) {
+        const { props, track, activeSlide, domSize } = this.snap;
+        const { coord, size: slideSize } = activeSlide;
+        // Simple freemode
+        if (props.freemode === true) {
+            return source;
+        }
+        // Update target coordinate
+        track.target = track.current;
+        // Sticky freemode
+        if (props.freemode === 'sticky' && !track.isSlideScrolling) {
+            const virtualCoord = track.loopedCurrent - source[this.axis];
+            const magnet = this.snap.getNearestMagnet(virtualCoord);
+            if (!magnet) {
+                return source;
+            }
+            const newVelocity = track.loopedCurrent - virtualCoord - magnet.diff;
+            return Object.assign(Object.assign({}, source), { [this.axis]: newVelocity });
+        }
+        // Freemode: false, when slides are scrolled
+        const value = clamp(source[this.axis], -coord, domSize - slideSize - coord);
+        const output = Object.assign(Object.assign({}, source), { [this.axis]: value });
+        return output;
+    }
     /**
      * Handles swipe `start` event.
      */
@@ -92,23 +115,23 @@ export class SnapSwipe {
      */
     _handleSwipeMove(coords) {
         const { snap } = this;
-        const { swipeSpeed, followSwipe: shouldFollow } = snap.props;
-        if (!shouldFollow &&
-            !snap.props.followSwipe &&
-            !snap.track.isSlideScrolling) {
+        const { props, track, callbacks } = snap;
+        const { followSwipe: shouldFollow } = props;
+        if (!shouldFollow && !track.isSlideScrolling) {
             return;
         }
-        // Normalize wheel data
+        // Normalize swipe delta
         const swipeDelta = this.axis === 'x' ? coords.step.x : coords.step.y;
-        const delta = swipeDelta * -swipeSpeed;
+        const speed = this.hasInertia ? 1 : props.swipeSpeed;
+        const delta = swipeDelta * -speed;
         // Update track target
-        snap.track.iterateTarget(delta);
-        // Clamp target if inertia active
+        track.iterateTarget(delta);
+        // Clamp target if inertia is animating
         if (this._swipe.hasInertia) {
-            snap.track.clampTarget();
+            track.clampTarget();
         }
         // Emit move callbacks
-        snap.callbacks.emit('swipe', coords);
+        callbacks.emit('swipe', coords);
     }
     /** Handles swipe `end` event */
     _handleSwipeEnd(coords) {
@@ -118,38 +141,71 @@ export class SnapSwipe {
         // Emit end callbacks
         this.snap.callbacks.emit('swipeEnd', coords);
     }
+    /** Handles swipe inertia start */
+    _handleSwipeInertiaStart() {
+        this.snap.callbacks.emit('swipeInertiaStart', undefined);
+    }
+    /** Handles swipe inertia end */
+    _handleSwipeInertiaEnd() {
+        this.snap.callbacks.emit('swipeInertiaEnd', undefined);
+    }
+    /** Handles swipe inertia fail */
+    _handleSwipeInertiaFail() {
+        const { snap } = this;
+        if (snap.props.freemode === 'sticky' && !snap.track.isSlideScrolling) {
+            if (this.isShort) {
+                this._endShort();
+            }
+            else {
+                snap.stick();
+            }
+        }
+        this.snap.callbacks.emit('swipeInertiaFail', undefined);
+    }
+    /** Handles swipe inertia cancel */
+    _handleSwipeInertiaCancel() {
+        this.snap.callbacks.emit('swipeInertiaCancel', undefined);
+    }
     /** End swipe action */
     _end() {
         const { snap, _swipe: swipe } = this;
         const { props, track } = snap;
-        // handle freemode
+        // Handle freemode
         if (props.freemode) {
+            this._swipe.updateProps({ inertia: true });
+            // Clamp & stick if out of bounds
             if (!track.canLoop &&
                 (track.target < track.min || track.target > track.max)) {
                 swipe.cancelInertia();
                 snap.stick();
             }
+            // End short swipe
+            if (this.isShort && props.freemode === 'sticky') {
+                this._swipe.updateProps({ inertia: false });
+                swipe.cancelInertia();
+                this._endShort();
+            }
             return;
         }
-        // enable inertia if active slide is being scrolled
+        // Enable inertia if active slide is being scrolled
         if (track.isSlideScrolling) {
             this._swipe.updateProps({ inertia: true });
             return;
         }
-        // disable inertia
+        // Disable inertia
         this._swipe.updateProps({ inertia: false });
-        // return if followSwipe is disabled
+        // Return if followSwipe is disabled
         if (!props.followSwipe) {
             this._endNoFollow();
             return;
         }
-        // stick to target slide
+        // Short swipe
         if (this.isShort) {
             this._endShort();
+            return;
         }
-        else {
-            snap.stick();
-        }
+        // Or just stick to the nearest slide
+        snap.stick();
     }
     /** End short swipe */
     _endShort() {

package/lib/esm/components/Snap/Swipe/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/Snap/Swipe/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/Snap/Swipe/index.ts"],"names":[],"mappings":"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"}

package/lib/esm/components/Snap/Track/index.js

@@ -35,7 +35,7 @@ export class SnapTrack {
     }
     /** Get looped current value */
     get loopedCurrent() {
-        return this.canLoop ? loop(this.current, this.min, this.max) : this.current;
+        return this.loopCoord(this.current);
     }
     /** Get track offset */
     get offset() {
@@ -46,6 +46,10 @@ export class SnapTrack {
     get loopCount() {
         return Math.floor(this.current / this.max);
     }
+    /** Loop a coordinate if can loop */
+    loopCoord(coord) {
+        return this.canLoop ? loop(coord, this.min, this.max) : coord;
+    }
     /** Interpolate the current track value */
     lerp(factor) {
         let { target } = this;
@@ -65,6 +69,13 @@ export class SnapTrack {
             target = clamp(target, min - edgeSpace, max + edgeSpace);
         }
         // Interpolate current value
+        const rest = Math.abs(this.current - target);
+        const fastThreshold = 5;
+        if (rest < fastThreshold) {
+            const fastProgress = 1 - rest / fastThreshold;
+            const additionalFactor = (1 - factor) / 3;
+            factor += additionalFactor * fastProgress;
+        }
         this.current = lerp(this.current, target, factor, 0.000001);
     }
     /** Whether the track is interpolated */

package/lib/esm/components/Snap/Track/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/Snap/Track/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/Snap/Track/index.ts"],"names":[],"mappings":"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"}

package/lib/esm/components/Snap/Wheel/index.js

@@ -1,55 +1,88 @@
-import { addEventListener, normalizeWheel } from '../../../utils';
+import { addEventListener, clamp, normalizeWheel } from '../../../utils';
+import { initVevet } from '../../../global/initVevet';
+const deltasCount = 6;
 export class SnapWheel {
     constructor(_snap) {
         this._snap = _snap;
         /** Detects if wheel event is started */
         this._hasStarted = false;
-        /** Accummulated wheel value for `followWheel=false` */
-        this._noFollowAccum = 0;
+        /** Deltas history */
+        this._deltas = [];
         /** Last time wheel event was fired */
-        this._lastNoFollowTime = 0;
+        this._lastWheelTime = 0;
         _snap.on('destroy', () => this._destroy(), { protected: true });
         this._destructor = addEventListener(_snap.eventsEmitter, 'wheel', (event) => this._handleWheel(event));
     }
+    /** Destroy wheel listeners */
+    _destroy() {
+        this._destructor();
+        if (this._debounceEnd) {
+            clearTimeout(this._debounceEnd);
+        }
+    }
     /** Snap component */
     get snap() {
         return this._snap;
     }
+    /** Get absolute deltas */
+    get absDeltas() {
+        return this._deltas.map((d) => Math.abs(d));
+    }
+    /** Get last wheel time */
+    get lastWheelTime() {
+        return this._lastWheelTime;
+    }
     /**
      * Handles wheel events
      */
     _handleWheel(event) {
         const { snap } = this;
-        if (!snap.props.wheel) {
+        const { props } = snap;
+        if (!props.wheel) {
             return;
         }
         event.preventDefault();
-        const { wheelAxis } = snap.props;
-        // Start callback
+        // Get delta
+        const wheelData = normalizeWheel(event);
+        const wheelAxis = props.wheelAxis === 'auto' ? snap.axis : props.wheelAxis;
+        const delta = wheelAxis === 'x' ? wheelData.pixelX : wheelData.pixelY;
+        // Start
+        this._handleStart(delta);
+        // Start
+        this._handleMove(delta, event);
+        // Debounce End
+        if (this._debounceEnd) {
+            clearTimeout(this._debounceEnd);
+        }
+        // End callback
+        this._debounceEnd = setTimeout(() => this._handleEnd(), 200);
+    }
+    /** Handle wheel start */
+    _handleStart(delta) {
+        if (this._hasStarted || Math.abs(delta) < 2) {
+            return;
+        }
+        this._hasStarted = true;
+        this.snap.callbacks.emit('wheelStart', undefined);
+    }
+    /** Handle wheel move */
+    _handleMove(delta, event) {
         if (!this._hasStarted) {
-            this._hasStarted = true;
-            snap.callbacks.emit('wheelStart', undefined);
+            return;
         }
+        const { snap } = this;
+        const { props } = snap;
+        // Save delta
+        this._addDelta(delta);
         // Move callback
         snap.callbacks.emit('wheel', event);
-        // Normalize wheel data
-        const axis = wheelAxis === 'auto' ? snap.axis : wheelAxis;
-        const wheelData = normalizeWheel(event);
-        const wheelDelta = axis === 'x' ? wheelData.pixelX : wheelData.pixelY;
-        const delta = wheelDelta * snap.props.wheelSpeed;
-        // Update wheel target
-        if (snap.props.followWheel) {
+        // Handle wheel logic
+        if (props.followWheel) {
             this._handleFollow(delta);
         }
         else {
-            this._handleNotFollow(delta);
+            this._handleNoFollow(delta);
         }
-        // Debounce End
-        if (this._debounceEnd) {
-            clearTimeout(this._debounceEnd);
-        }
-        // End callback
-        this._debounceEnd = setTimeout(() => this._handleEnd(), 100);
     }
     /** Handle `followWheel=true` */
     _handleFollow(delta) {
@@ -57,75 +90,194 @@ export class SnapWheel {
         // Cancel snap transition
         snap.cancelTransition();
         // Update track target
-        snap.track.iterateTarget(delta);
+        snap.track.iterateTarget(delta * snap.props.wheelSpeed);
         snap.track.clampTarget();
     }
     /** Handle `followWheel=false` */
-    _handleNotFollow(delta) {
-        const { snap } = this;
-        const { props } = snap;
-        // check wheel throttling by active transition
-        if (props.wheelThrottle === 'auto' && snap.isTransitioning) {
+    _handleNoFollow(delta) {
+        // vars
+        const { snap, isTouchPad, isGainingDelta } = this;
+        const { track, activeSlide, domSize } = snap;
+        // Detect wheel throttling
+        if (this._detectNoFollowThrottle()) {
             return;
         }
-        // check wheel throttling by time
-        const timeDiff = +new Date() - this._lastNoFollowTime;
-        if (typeof props.wheelThrottle === 'number' &&
-            timeDiff < props.wheelThrottle) {
-            return;
+        // Detect if need to throttle or follow
+        let shouldFollow = false;
+        let isThrottled = true;
+        if (!shouldFollow) {
+            if (track.isSlideScrolling) {
+                if (activeSlide.coord === 0) {
+                    if (delta > 0) {
+                        shouldFollow = true;
+                    }
+                }
+                else if (activeSlide.coord === domSize - activeSlide.size) {
+                    if (delta < 0) {
+                        shouldFollow = true;
+                    }
+                }
+                else {
+                    shouldFollow = true;
+                    isThrottled = false;
+                }
+            }
         }
-        // scroll slide
-        if (snap.track.isSlideScrolling) {
-            this._handleFollow(delta);
-            this._noFollowAccum = 0;
+        // Throttle
+        if (isThrottled) {
+            if (!isTouchPad ||
+                (isTouchPad && (isGainingDelta || this.absDeltas.length === 1))) {
+                const direction = Math.sign(delta);
+                if (shouldFollow) {
+                    snap.cancelTransition();
+                    track.iterateTarget(direction);
+                    track.clampTarget();
+                    if (!isTouchPad) {
+                        track.current = track.target;
+                    }
+                }
+                else if (direction === 1) {
+                    if (!snap.props.loop && snap.activeIndex === snap.slides.length - 1) {
+                        return;
+                    }
+                    this._lastWheelTime = +new Date();
+                    snap.next();
+                }
+                else {
+                    if (!snap.props.loop && snap.activeIndex === 0) {
+                        return;
+                    }
+                    this._lastWheelTime = +new Date();
+                    snap.prev();
+                }
+            }
             return;
         }
-        // check minumum wheel threshold
-        if (Math.abs(delta) < 0.5) {
-            return;
+        // Follow wheel
+        if (shouldFollow) {
+            snap.cancelTransition();
+            const deltaWithSpeed = delta * snap.props.wheelSpeed;
+            const start = Math.min(...activeSlide.magnets);
+            const end = Math.max(...activeSlide.magnets);
+            const loopedTarget = track.loopCoord(track.target);
+            const clampedLoopedTarget = clamp(loopedTarget + deltaWithSpeed, start, end);
+            track.target += clampedLoopedTarget - loopedTarget;
+            track.clampTarget();
         }
-        // accumulate wheel value
-        this._noFollowAccum += Math.abs(delta);
-        const direction = Math.sign(delta);
-        // continue if accumulated value is more than threshold
-        if (Math.abs(this._noFollowAccum) < Math.abs(props.wheelNoFollowThreshold)) {
-            return;
+    }
+    /** Detect if wheel should be throttled */
+    _detectNoFollowThrottle() {
+        const { isTouchPad, snap } = this;
+        const { wheelThrottle } = snap.props;
+        const timeDiff = +new Date() - this._lastWheelTime;
+        // NUMBER
+        if (typeof wheelThrottle === 'number') {
+            return timeDiff < wheelThrottle;
         }
-        // detect transition direction
-        if (direction === 1) {
-            if (!snap.next()) {
-                return;
-            }
+        // AUTO
+        if (isTouchPad) {
+            return this.snap.isTransitioning;
         }
-        else if (!snap.prev()) {
-            return;
+        const visibleScrollableSlides = snap.scrollableSlides.filter((slide) => slide.isVisible);
+        if (visibleScrollableSlides.length && snap.isTransitioning) {
+            return true;
+        }
+        if (timeDiff < 500) {
+            return true;
         }
-        // reset
-        this._noFollowAccum = 0;
-        this._lastNoFollowTime = +new Date();
+        return false;
     }
     /** Handle wheel end */
     _handleEnd() {
+        if (!this._hasStarted) {
+            return;
+        }
         const { snap } = this;
-        const { props } = this.snap;
+        const { props, activeSlide, track } = snap;
+        const lastThreeDeltas = this._deltas.slice(-3).reduce((a, b) => a + b, 0);
+        // Reset states
+        this._deltas = [];
         this._hasStarted = false;
-        this._noFollowAccum = 0;
-        if (!props.freemode) {
+        // Stick to the nearest magnet
+        if (!props.freemode || props.freemode === 'sticky') {
             if (props.followWheel && props.stickOnWheelEnd) {
-                snap.stick();
+                // Classic stick when scrolling stops
+                const slideThreshold = Math.abs(props.stickOnWheelEndThreshold) / activeSlide.size;
+                if (activeSlide.progress > slideThreshold &&
+                    !track.isSlideScrolling &&
+                    lastThreeDeltas > 0) {
+                    snap.next();
+                }
+                else if (activeSlide.progress < -slideThreshold &&
+                    !track.isSlideScrolling &&
+                    lastThreeDeltas < 0) {
+                    snap.prev();
+                }
+                else {
+                    snap.stick();
+                }
             }
             else if (!props.followWheel && !snap.isTransitioning) {
+                // Stick if something goes wrong when followWheel is disabled
                 snap.stick();
             }
         }
         snap.callbacks.emit('wheelEnd', undefined);
     }
-    /** Destroy wheel listeners */
-    _destroy() {
-        this._destructor();
-        if (this._debounceEnd) {
-            clearTimeout(this._debounceEnd);
+    /** Save delta */
+    _addDelta(delta) {
+        if (this._deltas.length >= deltasCount) {
+            this._deltas.shift();
+        }
+        this._deltas.push(delta);
+    }
+    /** Detect if touchpad */
+    get isTouchPad() {
+        return !this.isStableDelta || this.isSmallDelta;
+    }
+    /** Detects if deltas are stable */
+    get isStableDelta() {
+        const deltas = this.absDeltas;
+        const precision = 0.8;
+        // get difference between deltas
+        const diffs = deltas.map((d, i) => {
+            const prev = deltas[i - 1];
+            if (!deltas[i - 1]) {
+                return 0;
+            }
+            return d - prev;
+        });
+        const zeroDiffs = diffs.filter((d) => d === 0);
+        return zeroDiffs.length > diffs.length * precision;
+    }
+    /** Detects if the latest delta is small */
+    get isSmallDelta() {
+        const deltas = this.absDeltas;
+        if (deltas.length === 0) {
+            return true;
         }
+        const last = deltas[deltas.length - 1];
+        return last < 50;
+    }
+    /** Detect if delta is gaining its value */
+    get isGainingDelta() {
+        const vevet = initVevet();
+        const deltas = this.absDeltas;
+        const precision = vevet.osName.includes('window') ? 1.5 : 1.2;
+        if (deltas.length < deltasCount) {
+            return false;
+        }
+        const lastDeltas = deltas.slice(-deltasCount);
+        const half1 = lastDeltas.slice(0, Math.floor(lastDeltas.length / 2));
+        const half2 = lastDeltas.slice(Math.floor(lastDeltas.length / 2));
+        const avg1 = this._getAverage(half1);
+        const avg2 = this._getAverage(half2);
+        const isGaining = avg2 > avg1 * precision;
+        return isGaining;
+    }
+    /** Get average value in an array */
+    _getAverage(array) {
+        return array.length ? array.reduce((a, b) => a + b, 0) / array.length : 0;
     }
 }
 //# sourceMappingURL=index.js.map