From c088c589e8ea1a57fea8b3ff30efc5024c100665 Mon Sep 17 00:00:00 2001 From: Evan Sharp Date: Mon, 9 Dec 2019 20:49:51 -0500 Subject: [PATCH] fix(DropdownToggle): pass innerRef to popper Also updates react-popper to a version which support ref objects Fixes #1471 --- package.json | 2 +- src/DropdownToggle.js | 4 +- yarn.lock | 88 ++++++++++++++++++++++++++++++++----------- 3 files changed, 68 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index e85ebc4ce..6f3f5ad61 100644 --- a/package.json +++ b/package.json @@ -258,7 +258,7 @@ "classnames": "^2.2.3", "prop-types": "^15.5.8", "react-lifecycles-compat": "^3.0.4", - "react-popper": "^1.3.3", + "react-popper": "^1.3.6", "react-transition-group": "^2.3.1" }, "peerDependencies": { diff --git a/src/DropdownToggle.js b/src/DropdownToggle.js index 47ee7259a..110a9d1c2 100644 --- a/src/DropdownToggle.js +++ b/src/DropdownToggle.js @@ -50,7 +50,7 @@ class DropdownToggle extends React.Component { } render() { - const { className, color, cssModule, caret, split, nav, tag, ...props } = this.props; + const { className, color, cssModule, caret, split, nav, tag, innerRef, ...props } = this.props; const ariaLabel = props['aria-label'] || 'Toggle Dropdown'; const classes = mapToCssModules(classNames( className, @@ -88,7 +88,7 @@ class DropdownToggle extends React.Component { } return ( - + {({ ref }) => (