fix: classnames undefined if not all defined (fix #228)

Grsmto · Nov 18, 2018 · 37a4b55 · 37a4b55
1 parent f0bb5e3
commit 37a4b55
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/packages/simplebar/demo/Demo.js b/packages/simplebar/demo/Demo.js
@@ -27,7 +27,10 @@ function menuRenderer(params) {
 
 class Demo extends React.Component {
   componentDidMount() {
-      // new SimpleBar(document.getElementById('manual-instantiation'));
+    new SimpleBar(document.getElementById('manual-instantiation'));
+    new SimpleBar(document.getElementById('with-classnames'), {
+      classNames: { vertical: 'my-custom-class' }
+    });
   }
 
   render() {
@@ -179,6 +182,22 @@ class Demo extends React.Component {
                 </div>
               </div>
           </section>
+        <section>
+          <div className="col">
+            <h2>With custom classnames</h2>
+            <div
+              id="with-classnames"
+              className="demo4"
+              style={{ width: '200px' }}
+            >
+              <div className="box">1</div>
+              <div className="box">2</div>
+              <div className="box">3</div>
+              <div className="box">4</div>
+              <div className="box">5</div>
+            </div>
+          </div>
+        </section>
       </section>
     );
   }

diff --git a/packages/simplebar/src/simplebar.js b/packages/simplebar/src/simplebar.js
@@ -17,9 +17,9 @@ export default class SimpleBar {
     this.resizeObserver;
     this.scrollbarWidth;
     this.minScrollbarWidth = 20;
-    this.options = Object.assign({}, SimpleBar.defaultOptions, options);
+    this.options = { ...SimpleBar.defaultOptions, ...options };
+    this.classNames = { ...SimpleBar.defaultOptions.classNames, ...this.options.classNames };
     this.isRtl;
-    this.classNames = this.options.classNames;
     this.axis = {
       x: {
         scrollOffsetAttr: 'scrollLeft',