v1.0.0-dev.5

darkroomengineering · Jan 21, 2023 · 2aa7bc3 · 2aa7bc3 · vercel · Jan 21, 2023
1 parent 86e4b89
commit 2aa7bc3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/bundled/lenis.js b/bundled/lenis.js
@@ -75,7 +75,7 @@
     }
   });
 
-  var version = "1.0.0-dev.4";
+  var version = "1.0.0-dev.5";
 
   function clamp(min, input, max) {
     return Math.max(min, Math.min(input, max));
@@ -522,14 +522,19 @@
             return;
           }
           _classPrivateFieldLooseBase(_this, _isSmooth2)[_isSmooth2] = _classPrivateFieldLooseBase(_this, _options)[_options].smoothTouch && type === 'touch' || _classPrivateFieldLooseBase(_this, _options)[_options].smoothWheel && type === 'wheel';
-          if (!_this.isSmooth) return;
+          if (!_this.isSmooth) {
+            _classPrivateFieldLooseBase(_this, _isScrolling2)[_isScrolling2] = false;
+            _classPrivateFieldLooseBase(_this, _animate)[_animate].stop();
+            return;
+          }
           event.preventDefault();
           var delta = deltaY;
           if (_classPrivateFieldLooseBase(_this, _options)[_options].gestureOrientation === 'both') {
             delta = deltaX + deltaY;
           } else if (_classPrivateFieldLooseBase(_this, _options)[_options].gestureOrientation === 'horizontal') {
             delta = deltaX;
           }
+          console.log('scrollTo', _classPrivateFieldLooseBase(_this, _targetScroll)[_targetScroll] + delta);
           _this.scrollTo(_classPrivateFieldLooseBase(_this, _targetScroll)[_targetScroll] + delta, {}, false);
         }
       });
@@ -618,6 +623,7 @@
     };
     _proto.stop = function stop() {
       _classPrivateFieldLooseBase(this, _isStopped2)[_isStopped2] = true;
+      _classPrivateFieldLooseBase(this, _animate)[_animate].stop();
     };
     _proto.raf = function raf(time) {
       var deltaTime = time - (_classPrivateFieldLooseBase(this, _time)[_time] || time);
@@ -735,7 +741,7 @@
     }, {
       key: "limit",
       get: function get() {
-        return this.isHorizontal ? _classPrivateFieldLooseBase(this, _content)[_content].width - _classPrivateFieldLooseBase(this, _wrapper)[_wrapper].width : _classPrivateFieldLooseBase(this, _content)[_content].height - _classPrivateFieldLooseBase(this, _wrapper)[_wrapper].height;
+        return Math.round(this.isHorizontal ? _classPrivateFieldLooseBase(this, _content)[_content].width - _classPrivateFieldLooseBase(this, _wrapper)[_wrapper].width : _classPrivateFieldLooseBase(this, _content)[_content].height - _classPrivateFieldLooseBase(this, _wrapper)[_wrapper].height);
       }
     }, {
       key: "isHorizontal",
@@ -745,7 +751,7 @@
     }, {
       key: "scroll",
       get: function get() {
-        return clampedModulo(_classPrivateFieldLooseBase(this, _animatedScroll)[_animatedScroll], this.limit);
+        return _classPrivateFieldLooseBase(this, _options)[_options].infinite ? clampedModulo(_classPrivateFieldLooseBase(this, _animatedScroll)[_animatedScroll], this.limit) : _classPrivateFieldLooseBase(this, _animatedScroll)[_animatedScroll];
       }
     }, {
       key: "progress",
@@ -782,6 +788,7 @@
   }();
   function _setScroll2(scroll) {
     if (_classPrivateFieldLooseBase(this, _options)[_options].infinite) {
+      // modulo scroll value
       scroll = this.scroll;
     }
 

diff --git a/bundled/lenis.min.js b/bundled/lenis.min.js
diff --git a/dist/lenis.js b/dist/lenis.js
diff --git a/dist/lenis.mjs b/dist/lenis.mjs
diff --git a/dist/lenis.modern.mjs b/dist/lenis.modern.mjs
diff --git a/dist/lenis.umd.js b/dist/lenis.umd.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studio-freight/lenis",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0-dev.5",
   "description": "Lenis is a smooth scroll library to normalize the scrolling experience across devices",
   "files": [
     "dist"