Skip to content

Commit 8c4726e

Browse files
committed
removed ability to pass an array to custom classname field;
1 parent c63086f commit 8c4726e

File tree

2 files changed

+7
-47
lines changed

2 files changed

+7
-47
lines changed

src/index.js

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -637,27 +637,13 @@ export default class Scrollbar extends React.Component
637637

638638
const browserScrollbarWidth = getScrollbarWidth();
639639

640-
const holderClassNames = ["ScrollbarsCustom-holder"]
641-
.concat((className || false) ? (typeof className === "string" ? [className] : className) : [])
642-
.join(" "),
643-
wrapperClassNames = ["ScrollbarsCustom-wrapper"]
644-
.concat((wrapperClassName || false) ? (typeof wrapperClassName === "string" ? [wrapperClassName] : wrapperClassName) : [])
645-
.join(" "),
646-
contentClassNames = ["ScrollbarsCustom-content"]
647-
.concat((contentClassName || false) ? (typeof contentClassName === "string" ? [contentClassName] : contentClassName) : [])
648-
.join(" "),
649-
trackVerticalClassNames = ["ScrollbarsCustom-track", "ScrollbarsCustom-trackVertical"]
650-
.concat((trackVerticalClassName || false) ? (typeof trackVerticalClassName === "string" ? [trackVerticalClassName] : trackVerticalClassName) : [])
651-
.join(" "),
652-
trackHorizontalClassNames = ["ScrollbarsCustom-track", "ScrollbarsCustom-trackHorizontal"]
653-
.concat((thumbVerticalClassName || false) ? (typeof thumbVerticalClassName === "string" ? [thumbVerticalClassName] : thumbVerticalClassName) : [])
654-
.join(" "),
655-
thumbVerticalClassNames = ["ScrollbarsCustom-thumb", "ScrollbarsCustom-thumbVertical"]
656-
.concat((trackHorizontalClassName || false) ? (typeof trackHorizontalClassName === "string" ? [trackHorizontalClassName] : trackHorizontalClassName) : [])
657-
.join(" "),
658-
thumbHorizontalClassNames = ["ScrollbarsCustom-thumb", "ScrollbarsCustom-thumbHorizontal"]
659-
.concat((thumbHorizontalClassName || false) ? (typeof thumbHorizontalClassName === "string" ? [thumbHorizontalClassName] : thumbHorizontalClassName) : [])
660-
.join(" ");
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));
661647

662648
const holderStyles = {
663649
...style,

tests/Scrollbar/rendering.js

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,6 @@ export default function performTests() {
130130
done();
131131
});
132132
});
133-
134-
it("should apply if it is an array", (done) => {
135-
render(<Scrollbar className={ ['awesome', 'classname'] }
136-
wrapperClassName={ ['awesome', 'classname'] } contentClassName={ ['awesome', 'classname'] }
137-
trackHorizontalClassName={ ['awesome', 'classname'] } trackVerticalClassName={ ['awesome', 'classname'] }
138-
thumbHorizontalClassName={ ['awesome', 'classname'] } thumbVerticalClassName={ ['awesome', 'classname'] } />,
139-
node,
140-
function () {
141-
expect(this.holder.classList.contains('awesome')).toBeTruthy();
142-
expect(this.holder.classList.contains('classname')).toBeTruthy();
143-
expect(this.wrapper.classList.contains('awesome')).toBeTruthy();
144-
expect(this.wrapper.classList.contains('classname')).toBeTruthy();
145-
expect(this.content.classList.contains('awesome')).toBeTruthy();
146-
expect(this.content.classList.contains('classname')).toBeTruthy();
147-
expect(this.trackHorizontal.classList.contains('awesome')).toBeTruthy();
148-
expect(this.trackHorizontal.classList.contains('classname')).toBeTruthy();
149-
expect(this.trackVertical.classList.contains('awesome')).toBeTruthy();
150-
expect(this.trackVertical.classList.contains('classname')).toBeTruthy();
151-
expect(this.thumbHorizontal.classList.contains('awesome')).toBeTruthy();
152-
expect(this.thumbHorizontal.classList.contains('classname')).toBeTruthy();
153-
expect(this.thumbVertical.classList.contains('awesome')).toBeTruthy();
154-
expect(this.thumbVertical.classList.contains('classname')).toBeTruthy();
155-
156-
done();
157-
});
158-
});
159133
});
160134

161135
describe("when disabling default styles", () => {

0 commit comments

Comments
 (0)