fix(open-amdocs#17): Upgraded to React 17, including fix to Scrollable

gaeaehrlich · May 2, 2021 · cde6c9b · cde6c9b
1 parent 37180ad
commit cde6c9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -59,8 +59,8 @@
     "nyc": "15.1.0",
     "postcss": "8.2.1",
     "prop-types": "15.7.2",
-    "react": "16.14.0",
-    "react-dom": "16.14.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "rollup": "2.35.0",
     "rollup-plugin-postcss": "4.0.0",
     "rollup-plugin-terser": "7.0.2",

diff --git a/src/components/Scrollable/Scrollable.jsx b/src/components/Scrollable/Scrollable.jsx
@@ -105,6 +105,7 @@ export default class Scrollable extends React.PureComponent {
         return {
             className: classNames('scrollbar-inner', element.props.className),
             ref: copyComponentRef(element.ref, this.container),
+            onScroll: this.handleOnScroll,
         }
     };
 
@@ -115,7 +116,7 @@ export default class Scrollable extends React.PureComponent {
         const content = React.Children.toArray(children).filter(child => ![VerticalScrollbarPlaceholder, HorizontalScrollbarPlaceholder].includes(child.type));
         return (
             <ResizeObserver onResize={this.updateScrollbars}>
-                <div className='scrollbar' style={style} onScroll={this.handleOnScroll}>
+                <div className='scrollbar' style={style}>
                     {React.cloneElement(element, this.getElementProps(), content)}
                     {React.cloneElement(vsb ? vsb.props.children : <VerticalScrollbar/>, {ref: this.vertical, container: this.container})}
                     {React.cloneElement(hsb ? hsb.props.children : <HorizontalScrollbar/>, {ref: this.horizontal, container: this.container})}