fix(Dropdown): error message when passing a function to innerRef (#2932)

dnbexperience · Nov 28, 2023 · c362a4a · c362a4a
1 parent e4fd9f9
commit c362a4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/dnb-eufemia/src/components/button/Button.d.ts b/packages/dnb-eufemia/src/components/button/Button.d.ts
@@ -138,7 +138,7 @@ export type ButtonProps = {
    */
   skeleton?: ButtonSkeleton;
   disabled?: boolean;
-  inner_ref?: any;
+  inner_ref?: React.Ref;
   className?: string;
   innerRef?: any;
   /**

diff --git a/packages/dnb-eufemia/src/components/button/Button.js b/packages/dnb-eufemia/src/components/button/Button.js
@@ -67,10 +67,14 @@ export default class Button extends React.PureComponent {
 
   componentDidMount() {
     if (this.props.innerRef) {
-      this.props.innerRef.current = this._ref.current
+      typeof this.props.innerRef === 'function'
+        ? this.props.innerRef(this._ref.current)
+        : (this.props.innerRef.current = this._ref.current)
     }
     if (this.props.inner_ref) {
-      this.props.inner_ref.current = this._ref.current
+      typeof this.props.innerRef === 'function'
+        ? this.props.inner_ref(this._ref.current)
+        : (this.props.inner_ref.current = this._ref.current)
     }
   }
 
@@ -313,10 +317,10 @@ Button.propTypes = {
   stretch: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
   skeleton: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
   disabled: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
-  inner_ref: PropTypes.object,
+  inner_ref: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
 
   className: PropTypes.string,
-  innerRef: PropTypes.object,
+  innerRef: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
   children: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.func,

diff --git a/packages/dnb-eufemia/src/components/dropdown/Dropdown.js b/packages/dnb-eufemia/src/components/dropdown/Dropdown.js
@@ -75,8 +75,8 @@ export default class Dropdown extends React.PureComponent {
       PropTypes.string,
       PropTypes.bool,
     ]),
-    innerRef: PropTypes.object,
-    buttonRef: PropTypes.object,
+    innerRef: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
+    buttonRef: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
     globalStatus: PropTypes.shape({
       id: PropTypes.string,
       message: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),