fix(DropdownMenu): Prevent manual styles from overriding popper styles (

reactstrap#1984)
humphreyja · Oct 29, 2020 · dc2401b · dc2401b
1 parent 9ee5b1f
commit dc2401b
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/DropdownMenu.js b/src/DropdownMenu.js
@@ -63,18 +63,21 @@ class DropdownMenu extends React.Component {
           modifiers={poperModifiers}
           positionFixed={popperPositionFixed}
         >
-          {({ ref, style, placement }) => (
-            <Tag
-              tabIndex="-1"
-              role="menu"
-              ref={ref}
-              style={style}
-              {...attrs}
-              aria-hidden={!this.context.isOpen}
-              className={classes}
-              x-placement={placement}
-            />
-          )}
+          {({ ref, style, placement }) => {
+            let combinedStyle = { ...this.props.style, ...style };
+            return (
+              <Tag
+                tabIndex="-1"
+                role="menu"
+                ref={ref}
+                {...attrs}
+                style={combinedStyle}
+                aria-hidden={!this.context.isOpen}
+                className={classes}
+                x-placement={placement}
+              />
+            );
+          }}
         </Popper>
       );
     }