Skip to content

Commit de09362

Browse files
committed
Critical bug fixed (wrong classnames was assigned);
Added overflow: hidden; to tracks;
1 parent 026478f commit de09362

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

dist/index.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ var defaultElementsStyles = {
7070
top: 0,
7171
margin: "8px 0",
7272
background: "rgba(0,0,0,.1)",
73-
borderRadius: 4
73+
borderRadius: 4,
74+
overflow: "hidden"
7475
},
7576
trackHorizontal: {
7677
position: "absolute",
@@ -80,7 +81,8 @@ var defaultElementsStyles = {
8081
left: 0,
8182
margin: "0 8px",
8283
background: "rgba(0,0,0,.1)",
83-
borderRadius: 4
84+
borderRadius: 4,
85+
overflow: "hidden"
8486
},
8587
thumbVertical: {
8688
cursor: "pointer",
@@ -578,13 +580,13 @@ function (_React$Component) {
578580
props = _objectWithoutProperties(_this$props2, ["minimalThumbsSize", "fallbackScrollbarWidth", "scrollDetectionThreshold", "defaultStyles", "noScroll", "noScrollX", "noScrollY", "permanentScrollbars", "permanentScrollbarX", "permanentScrollbarY", "rtl", "momentum", "tagName", "children", "style", "className", "wrapperStyle", "contentStyle", "trackVerticalStyle", "trackHorizontalStyle", "thumbVerticalStyle", "thumbHorizontalStyle", "wrapperClassName", "contentClassName", "trackVerticalClassName", "trackHorizontalClassName", "thumbVerticalClassName", "thumbHorizontalClassName", "onScroll", "onScrollStart", "onScrollStop", "renderWrapper", "renderContent", "renderTrackVertical", "renderTrackHorizontal", "renderThumbVertical", "renderThumbHorizontal"]);
579581

580582
var browserScrollbarWidth = (0, _utilities.getScrollbarWidth)();
581-
var holderClassNames = "ScrollbarsCustom-holder" + (className && " " + className),
582-
wrapperClassNames = "ScrollbarsCustom-wrapper" + (wrapperClassName && " " + wrapperClassName),
583-
contentClassNames = "ScrollbarsCustom-content" + (contentClassName && " " + contentClassName),
584-
trackVerticalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackVertical" + (trackVerticalClassName && " " + trackVerticalClassName),
585-
trackHorizontalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackHorizontal" + (trackHorizontalClassName && " " + trackHorizontalClassName),
586-
thumbVerticalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (thumbVerticalClassName && " " + thumbVerticalClassName),
587-
thumbHorizontalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (thumbHorizontalClassName && " " + thumbHorizontalClassName);
583+
var holderClassNames = "ScrollbarsCustom-holder" + (!!className ? " " + className : ""),
584+
wrapperClassNames = "ScrollbarsCustom-wrapper" + (!!wrapperClassName ? " " + wrapperClassName : ""),
585+
contentClassNames = "ScrollbarsCustom-content" + (!!contentClassName ? " " + contentClassName : ""),
586+
trackVerticalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackVertical" + (!!trackVerticalClassName ? " " + trackVerticalClassName : ""),
587+
trackHorizontalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackHorizontal" + (!!trackHorizontalClassName ? " " + trackHorizontalClassName : ""),
588+
thumbVerticalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (!!thumbVerticalClassName ? " " + thumbVerticalClassName : ""),
589+
thumbHorizontalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (!!thumbHorizontalClassName ? " " + thumbHorizontalClassName : "");
588590

589591
var holderStyles = _objectSpread({}, style, defaultStyles && defaultElementsStyles.holder, {
590592
direction: rtl === true && "rtl" || rtl === false && "ltr" || null

examples/app/style.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ body {
5858
display: block;
5959
background: #D0D3D7;
6060
border-radius: 1rem;
61+
overflow: hidden;
6162

6263
&.ScrollbarsCustom-trackVertical {
6364
height: calc(100% - 2rem);
@@ -377,6 +378,7 @@ body {
377378
width: 8px;
378379
background: rgba(0, 0, 0, 0.1);
379380
grid-area: 1 / 2 / auto / auto;
381+
overflow: hidden;
380382

381383
& > .ScrollbarsCustom-thumb {
382384
cursor: pointer;
@@ -450,6 +452,7 @@ body {
450452
width: 8px;
451453
background: rgba(0, 0, 0, 0.1);
452454
grid-area: 1 / 2 / auto / auto;
455+
overflow: hidden;
453456

454457
& > .ScrollbarsCustom-thumb {
455458
cursor: pointer;

src/index.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const defaultElementsStyles = {
3232
margin: "8px 0",
3333
background: "rgba(0,0,0,.1)",
3434
borderRadius: 4,
35+
overflow: "hidden",
3536
},
3637
trackHorizontal: {
3738
position: "absolute",
@@ -42,6 +43,7 @@ const defaultElementsStyles = {
4243
margin: "0 8px",
4344
background: "rgba(0,0,0,.1)",
4445
borderRadius: 4,
46+
overflow: "hidden",
4547
},
4648
thumbVertical: {
4749
cursor: "pointer",
@@ -637,13 +639,13 @@ export default class Scrollbar extends React.Component
637639

638640
const browserScrollbarWidth = getScrollbarWidth();
639641

640-
const holderClassNames = "ScrollbarsCustom-holder" + (className && (" " + className)),
641-
wrapperClassNames = "ScrollbarsCustom-wrapper" + (wrapperClassName && (" " + wrapperClassName)),
642-
contentClassNames = "ScrollbarsCustom-content" + (contentClassName && (" " + contentClassName)),
643-
trackVerticalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackVertical" + (trackVerticalClassName && (" " + trackVerticalClassName)),
644-
trackHorizontalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackHorizontal" + (trackHorizontalClassName && (" " + trackHorizontalClassName)),
645-
thumbVerticalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (thumbVerticalClassName && (" " + thumbVerticalClassName)),
646-
thumbHorizontalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (thumbHorizontalClassName && (" " + thumbHorizontalClassName));
642+
const holderClassNames = "ScrollbarsCustom-holder" + (!!className ? (" " + className) : ""),
643+
wrapperClassNames = "ScrollbarsCustom-wrapper" + (!!wrapperClassName ? (" " + wrapperClassName) : ""),
644+
contentClassNames = "ScrollbarsCustom-content" + (!!contentClassName ? (" " + contentClassName) : ""),
645+
trackVerticalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackVertical" + (!!trackVerticalClassName ? (" " + trackVerticalClassName) : ""),
646+
trackHorizontalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackHorizontal" + (!!trackHorizontalClassName ? (" " + trackHorizontalClassName) : ""),
647+
thumbVerticalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (!!thumbVerticalClassName ? (" " + thumbVerticalClassName) : ""),
648+
thumbHorizontalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + (!!thumbHorizontalClassName ? (" " + thumbHorizontalClassName) : "");
647649

648650
const holderStyles = {
649651
...style,

0 commit comments

Comments
 (0)