diff --git a/components/combobox/__examples__/base-inline-help-tooltip.jsx b/components/combobox/__examples__/base-inline-help-tooltip.jsx index 8ec0bfae0f..44cd8febdc 100644 --- a/components/combobox/__examples__/base-inline-help-tooltip.jsx +++ b/components/combobox/__examples__/base-inline-help-tooltip.jsx @@ -139,7 +139,6 @@ class Example extends React.Component { align="top left" content="Type to search Salesforce objects..." id="field-level-help-tooltip" - position="overflowBoundaryElement" /> } labels={{ diff --git a/components/combobox/combobox.jsx b/components/combobox/combobox.jsx index 04abdd467b..de4c84c225 100644 --- a/components/combobox/combobox.jsx +++ b/components/combobox/combobox.jsx @@ -20,15 +20,14 @@ import classNames from 'classnames'; import shortid from 'shortid'; -import Button from '../button'; import Dialog from '../utilities/dialog'; import InnerInput from '../../components/input/private/inner-input'; import InputIcon from '../icon/input-icon'; import Menu from './private/menu'; import Label from '../forms/private/label'; import SelectedListBox from '../pill-container/private/selected-listbox'; -import Tooltip from '../tooltip'; +import FieldLevelHelpTooltip from '../tooltip/private/field-level-help-tooltip'; import KEYS from '../../utilities/key-code'; import KeyBuffer from '../../utilities/key-buffer'; import keyLetterMenuItemSelect from '../../utilities/key-letter-menu-item-select'; @@ -1379,33 +1378,6 @@ class Combobox extends React.Component { ); }; - renderFieldLevelHelpTooltip(fieldLevelHelpTooltip, labels, assistiveText) { - if ( - (labels.label || (assistiveText && assistiveText.label)) && - this.props.fieldLevelHelpTooltip - ) { - const defaultTooltipProps = { - triggerClassName: 'slds-form-element__icon', - children: ( -