Merge pull request #69 from xobotyi/dev-master

v4.0.0-alpha.20
xobotyi · May 24, 2019 · ec7fbdc · ec7fbdc
2 parents 83eef25 + 932a441
commit ec7fbdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-scrollbars-custom",
   "description": "The best React custom scrollbars component",
-  "version": "4.0.0-alpha.19",
+  "version": "4.0.0-alpha.20",
   "repository": {
     "type": "git",
     "url": "https://github.com/xobotyi/react-scrollbars-custom.git"

diff --git a/src/Scrollbar.tsx b/src/Scrollbar.tsx
@@ -317,12 +317,11 @@ export default class Scrollbar extends React.Component<ScrollbarProps, Scrollbar
       content: {
         ...(useDefaultStyles && defaultStyle.content),
         ...(useDefaultStyles &&
-          !(
-            props.translateContentSizesToHolder ||
-            props.translateContentSizeYToHolder ||
-            props.translateContentSizeXToHolder
-          ) && {
-            minHeight: "100%",
+          !(props.translateContentSizesToHolder || props.translateContentSizeYToHolder) && {
+            minHeight: "100%"
+          }),
+        ...(useDefaultStyles &&
+          !(props.translateContentSizesToHolder || props.translateContentSizeXToHolder) && {
             minWidth: "100%"
           }),
         ...props.contentProps!.style
@@ -747,6 +746,10 @@ export default class Scrollbar extends React.Component<ScrollbarProps, Scrollbar
       maximalThumbYSize,
 
       fallbackScrollbarWidth,
+      scrollbarWidth,
+
+      scrollTop,
+      scrollLeft,
 
       trackClickBehavior,