Fix a console warning when opening table dropdowns

airdcpp-web · Aug 22, 2016 · 97b7411 · 97b7411
1 parent 48af9cd
commit 97b7411
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/components/semantic/Popup.jsx b/src/components/semantic/Popup.jsx
@@ -103,9 +103,12 @@ const Popup = React.createClass({
 
 		this.createPortal();
 
-		const children = React.cloneElement(this.props.children, {
-			hide: this.hide,
-		});
+		let { children } = this.props;
+		if (typeof children.type !== 'string') {
+			children = React.cloneElement(children, {
+				hide: this.hide,
+			});
+		}
 
 		ReactDOM.render(children, this.node);
 

diff --git a/src/components/semantic/TableDropdown.jsx b/src/components/semantic/TableDropdown.jsx
@@ -1,8 +1,10 @@
 import React from 'react';
+import invariant from 'invariant';
+import classNames from 'classnames';
+
 import Popup from './Popup';
 
 import PureRenderMixin from 'react-addons-pure-render-mixin';
-import invariant from 'invariant';
 import DropdownCaption from './DropdownCaption';
 
 
@@ -27,7 +29,6 @@ const TableDropdown = React.createClass({
 	getDefaultProps() {
 		return {
 			linkCaption: true,
-			className: '',
 		};
 	},
 
@@ -67,7 +68,7 @@ const TableDropdown = React.createClass({
 		};
 
 		return (
-			<div className={ 'table dropdown ' + this.props.className }>
+			<div className={ classNames('table dropdown', this.props.className) }>
 				<Popup 
 					className="basic dropdown-content" 
 					trigger={ trigger }