fix: should set viewLength to the content size, without paddings

oliviertassinari · Jun 24, 2021 · ce0cdb1 · ce0cdb1
1 parent a12dd90
commit ce0cdb1
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/packages/react-swipeable-views/src/SwipeableViews.js b/packages/react-swipeable-views/src/SwipeableViews.js
@@ -100,6 +100,12 @@ const axisProperties = {
     y: 'clientHeight',
     'y-reverse': 'clientHeight',
   },
+  padding: {
+    x: ['paddingLeft', 'paddingRight'],
+    'x-reverse': ['paddingRight', 'paddingLeft'],
+    y: ['paddingTop', 'paddingBottom'],
+    'y-reverse': ['paddingBottom', 'paddingTop'],
+  },
 };
 
 function createTransition(property, options) {
@@ -363,8 +369,13 @@ class SwipeableViews extends React.Component {
     const { axis } = this.props;
 
     const touch = applyRotationMatrix(event.touches[0], axis);
+    const rootStyle = window.getComputedStyle(this.rootNode);
+
+    this.viewLength =
+      this.rootNode.getBoundingClientRect()[axisProperties.length[axis]] -
+      parseInt(rootStyle[axisProperties.padding[axis][0]], 10) -
+      parseInt(rootStyle[axisProperties.padding[axis][1]], 10);
 
-    this.viewLength = this.rootNode.getBoundingClientRect()[axisProperties.length[axis]];
     this.startX = touch.pageX;
     this.lastX = touch.pageX;
     this.vx = 0;
@@ -382,7 +393,6 @@ class SwipeableViews extends React.Component {
         .split('(')[1]
         .split(')')[0]
         .split(',');
-      const rootStyle = window.getComputedStyle(this.rootNode);
 
       const tranformNormalized = applyRotationMatrix(
         {
@@ -392,11 +402,7 @@ class SwipeableViews extends React.Component {
         axis,
       );
 
-      this.startIndex =
-        -tranformNormalized.pageX /
-          (this.viewLength -
-            parseInt(rootStyle.paddingLeft, 10) -
-            parseInt(rootStyle.paddingRight, 10)) || 0;
+      this.startIndex = -tranformNormalized.pageX / this.viewLength;
     }
   };