Merge branch 'master' into 3602-reduce-tooltip-icon-selector-specificity

carbon-design-system · Aug 5, 2019 · 62f9ee9 · 62f9ee9
2 parents 9cd5814 + 66efe3b
commit 62f9ee9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 135 deletions.
diff --git a/packages/react/src/components/ListBox/ListBox.js b/packages/react/src/components/ListBox/ListBox.js
@@ -9,11 +9,7 @@ import cx from 'classnames';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { settings } from 'carbon-components';
-import ListBoxField from './ListBoxField';
-import ListBoxMenu from './ListBoxMenu';
 import { ListBoxType } from './ListBoxPropTypes';
-import childrenOf from '../../prop-types/childrenOf';
-import { WarningFilled16 } from '@carbon/icons-react';
 
 const { prefix } = settings;
 
@@ -73,7 +69,10 @@ const ListBox = ({
 };
 
 ListBox.propTypes = {
-  children: childrenOf([ListBoxField, ListBoxMenu, WarningFilled16]),
+  /**
+   * Provide the contents of your ListBox
+   */
+  children: PropTypes.node,
 
   /**
    * Specify a class name to be applied on the containing list box node

diff --git a/packages/react/src/components/ListBox/ListBoxField.js b/packages/react/src/components/ListBox/ListBoxField.js
@@ -8,9 +8,6 @@
 import React from 'react';
 import { settings } from 'carbon-components';
 import PropTypes from 'prop-types';
-import ListBoxMenuIcon from './ListBoxMenuIcon';
-import ListBoxSelection from './ListBoxSelection';
-import childrenOf from '../../prop-types/childrenOf';
 
 const { prefix } = settings;
 
@@ -53,7 +50,7 @@ ListBoxField.propTypes = {
   /**
    * Provide the contents of your ListBoxField
    */
-  children: childrenOf([ListBoxMenuIcon, ListBoxSelection, 'span', 'input']),
+  children: PropTypes.node,
 
   /**
    * Specify a custom `id`

diff --git a/packages/react/src/prop-types/__tests__/childrenOf-test.js b/packages/react/src/prop-types/__tests__/childrenOf-test.js
diff --git a/packages/react/src/prop-types/childrenOf.js b/packages/react/src/prop-types/childrenOf.js