Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tooltip",
"version": "3.2.1",
"version": "3.2.2",
"description": "react tooltip component",
"main": "dist/index.js",
"scripts": {
Expand Down
23 changes: 17 additions & 6 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,18 @@ class ReactTooltip extends Component {
afterHide: PropTypes.func,
disable: PropTypes.bool,
scrollHide: PropTypes.bool,
resizeHide: PropTypes.bool
resizeHide: PropTypes.bool,
wrapper: PropTypes.string
};

static defaultProps = {
resizeHide: true
resizeHide: true,
wrapper: 'div'
};

static supportedWrappers = {
'div': React.DOM.div,
'span': React.DOM.span
};

constructor (props) {
Expand Down Expand Up @@ -417,18 +424,22 @@ class ReactTooltip extends Component {
{'type-info': this.state.type === 'info'},
{'type-light': this.state.type === 'light'}
)

let wrapper = ReactTooltip.supportedWrappers[this.props.wrapper]
if (!wrapper) wrapper = ReactTooltip.supportedWrappers['div']

if (html) {
return (
<div className={`${tooltipClass} ${extraClass}`}
<wrapper className={`${tooltipClass} ${extraClass}`}
{...ariaProps}
data-id='tooltip'
dangerouslySetInnerHTML={{__html: placeholder}}></div>
dangerouslySetInnerHTML={{__html: placeholder}}></wrapper>
)
} else {
return (
<div className={`${tooltipClass} ${extraClass}`}
<wrapper className={`${tooltipClass} ${extraClass}`}
{...ariaProps}
data-id='tooltip'>{placeholder}</div>
data-id='tooltip'>{placeholder}</wrapper>
)
}
}
Expand Down
17 changes: 13 additions & 4 deletions standalone/react-tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -808,14 +808,18 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
var isEmptyTip = _state4.isEmptyTip;

var tooltipClass = (0, _classnames2.default)('__react_component_tooltip', { 'show': this.state.show && !disable && !isEmptyTip }, { 'border': this.state.border }, { 'place-top': this.state.place === 'top' }, { 'place-bottom': this.state.place === 'bottom' }, { 'place-left': this.state.place === 'left' }, { 'place-right': this.state.place === 'right' }, { 'type-dark': this.state.type === 'dark' }, { 'type-success': this.state.type === 'success' }, { 'type-warning': this.state.type === 'warning' }, { 'type-error': this.state.type === 'error' }, { 'type-info': this.state.type === 'info' }, { 'type-light': this.state.type === 'light' });

var wrapper = ReactTooltip.supportedWrappers[this.props.wrapper];
if (!wrapper) wrapper = ReactTooltip.supportedWrappers['div'];

if (html) {
return _react2.default.createElement('div', _extends({ className: tooltipClass + ' ' + extraClass
return _react2.default.createElement('wrapper', _extends({ className: tooltipClass + ' ' + extraClass
}, ariaProps, {
'data-id': 'tooltip',
dangerouslySetInnerHTML: { __html: placeholder } }));
} else {
return _react2.default.createElement(
'div',
'wrapper',
_extends({ className: tooltipClass + ' ' + extraClass
}, ariaProps, {
'data-id': 'tooltip' }),
Expand Down Expand Up @@ -849,9 +853,14 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
afterHide: _react.PropTypes.func,
disable: _react.PropTypes.bool,
scrollHide: _react.PropTypes.bool,
resizeHide: _react.PropTypes.bool
resizeHide: _react.PropTypes.bool,
wrapper: _react.PropTypes.string
}, _class2.defaultProps = {
resizeHide: true
resizeHide: true,
wrapper: 'div'
}, _class2.supportedWrappers = {
'div': _react2.default.DOM.div,
'span': _react2.default.DOM.span
}, _temp)) || _class) || _class) || _class) || _class;

/* export default not fit for standalone, it will exports {default:...} */
Expand Down
4 changes: 2 additions & 2 deletions standalone/react-tooltip.min.js

Large diffs are not rendered by default.