Skip to content

Commit 9399d75

Browse files
authored
Merge pull request #272 from huumanoid/fix-wrapper-tag
Fix wrapper tag
2 parents 6a56af2 + d2a97a7 commit 9399d75

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/index.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ class ReactTooltip extends Component {
5858
wrapper: 'div'
5959
};
6060

61-
static supportedWrappers = {
62-
'div': React.DOM.div,
63-
'span': React.DOM.span
64-
};
61+
static supportedWrappers = ['div', 'span'];
6562

6663
constructor (props) {
6764
super(props)
@@ -443,21 +440,23 @@ class ReactTooltip extends Component {
443440
{'type-light': this.state.type === 'light'}
444441
)
445442

446-
let wrapper = ReactTooltip.supportedWrappers[this.props.wrapper]
447-
if (!wrapper) wrapper = ReactTooltip.supportedWrappers['div']
443+
let Wrapper = this.props.wrapper
444+
if (ReactTooltip.supportedWrappers.indexOf(Wrapper) < 0) {
445+
Wrapper = ReactTooltip.defaultProps.wrapper
446+
}
448447

449448
if (html) {
450449
return (
451-
<wrapper className={`${tooltipClass} ${extraClass}`}
450+
<Wrapper className={`${tooltipClass} ${extraClass}`}
452451
{...ariaProps}
453452
data-id='tooltip'
454-
dangerouslySetInnerHTML={{__html: placeholder}}></wrapper>
453+
dangerouslySetInnerHTML={{__html: placeholder}}/>
455454
)
456455
} else {
457456
return (
458-
<wrapper className={`${tooltipClass} ${extraClass}`}
457+
<Wrapper className={`${tooltipClass} ${extraClass}`}
459458
{...ariaProps}
460-
data-id='tooltip'>{placeholder}</wrapper>
459+
data-id='tooltip'>{placeholder}</Wrapper>
461460
)
462461
}
463462
}

0 commit comments

Comments
 (0)