@@ -168,11 +168,15 @@ function (_React$Component) {
168168 }
169169
170170 var _assertThisInitialize2 = _assertThisInitialized ( _assertThisInitialized ( _this ) ) ,
171+ content = _assertThisInitialize2 . content ,
171172 trackVertical = _assertThisInitialize2 . trackVertical ,
172173 trackHorizontal = _assertThisInitialize2 . trackHorizontal ,
173174 thumbVertical = _assertThisInitialize2 . thumbVertical ,
174175 thumbHorizontal = _assertThisInitialize2 . thumbHorizontal ;
175176
177+ content . removeEventListener ( "scroll" , _this . handleScrollEvent , {
178+ passive : true
179+ } ) ;
176180 trackVertical . removeEventListener ( "mousedown" , _this . handleTrackVerticalMousedownEvent ) ;
177181 trackHorizontal . removeEventListener ( "mousedown" , _this . handleTrackHorizontalMousedownEvent ) ;
178182 thumbVertical . removeEventListener ( "mousedown" , _this . handleThumbVerticalMousedownEvent ) ;
@@ -580,13 +584,13 @@ function (_React$Component) {
580584 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" ] ) ;
581585
582586 var browserScrollbarWidth = ( 0 , _utilities . getScrollbarWidth ) ( ) ;
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 : "" ) ;
587+ var holderClassNames = "ScrollbarsCustom-holder" + ( className ? " " + className : "" ) ,
588+ wrapperClassNames = "ScrollbarsCustom-wrapper" + ( wrapperClassName ? " " + wrapperClassName : "" ) ,
589+ contentClassNames = "ScrollbarsCustom-content" + ( contentClassName ? " " + contentClassName : "" ) ,
590+ trackVerticalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackVertical" + ( trackVerticalClassName ? " " + trackVerticalClassName : "" ) ,
591+ trackHorizontalClassNames = "ScrollbarsCustom-track ScrollbarsCustom-trackHorizontal" + ( trackHorizontalClassName ? " " + trackHorizontalClassName : "" ) ,
592+ thumbVerticalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + ( thumbVerticalClassName ? " " + thumbVerticalClassName : "" ) ,
593+ thumbHorizontalClassNames = "ScrollbarsCustom-thumb ScrollbarsCustom-thumbHorizontal" + ( thumbHorizontalClassName ? " " + thumbHorizontalClassName : "" ) ;
590594
591595 var holderStyles = _objectSpread ( { } , style , defaultStyles && defaultElementsStyles . holder , {
592596 direction : rtl === true && "rtl" || rtl === false && "ltr" || null
@@ -630,15 +634,15 @@ function (_React$Component) {
630634 if ( permanentScrollbars || permanentScrollbarY ) {
631635 trackVerticalStyles . display = null ;
632636
633- if ( noScroll || ! scrollY ) {
637+ if ( noScroll || noScrollY ) {
634638 thumbVerticalStyles . display = "none" ;
635639 }
636640 }
637641
638642 if ( permanentScrollbars || permanentScrollbarX ) {
639643 trackHorizontalStyles . display = null ;
640644
641- if ( noScroll || ! scrollX ) {
645+ if ( noScroll || noScrollX ) {
642646 thumbHorizontalStyles . display = "none" ;
643647 }
644648 }
@@ -809,6 +813,8 @@ function (_React$Component) {
809813
810814exports . default = Scrollbar ;
811815
816+ _defineProperty ( Scrollbar , "displayName" , "Scrollbar" ) ;
817+
812818_defineProperty ( Scrollbar , "propTypes" , {
813819 minimalThumbsSize : _propTypes . default . number ,
814820 fallbackScrollbarWidth : _propTypes . default . number ,
0 commit comments