Skip to content

Commit 62d622b

Browse files
committed
fix(Tooltip): remove old arrow markup, correct enabled className
1 parent b9d3ea7 commit 62d622b

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/Tooltip.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const propTypes = {
1111
disabled: PropTypes.bool,
1212
tether: PropTypes.object,
1313
tetherRef: PropTypes.func,
14-
classNames: PropTypes.any,
14+
className: PropTypes.string,
1515
cssModule: PropTypes.object,
1616
toggle: PropTypes.func,
1717
autohide: PropTypes.bool,
@@ -36,7 +36,10 @@ const defaultProps = {
3636

3737
const defaultTetherConfig = {
3838
classPrefix: 'bs-tether',
39-
classes: { element: 'tooltip in', enabled: 'open' },
39+
classes: {
40+
element: false,
41+
enabled: 'in',
42+
},
4043
constraints: [
4144
{ to: 'scrollParent', attachment: 'together none' },
4245
{ to: 'window', attachment: 'together none' }
@@ -184,14 +187,14 @@ class Tooltip extends React.Component {
184187
const attributes = omit(this.props, Object.keys(propTypes));
185188
const classes = mapToCssModules(classNames(
186189
'tooltip-inner',
187-
this.props.classNames
190+
this.props.className
188191
), this.props.cssModule);
189192

190193
let tetherConfig = this.getTetherConfig();
191194

192195
return (
193196
<TetherContent
194-
arrow="tooltip"
197+
className="tooltip"
195198
tether={tetherConfig}
196199
tetherRef={this.props.tetherRef}
197200
isOpen={this.props.isOpen}

src/__tests__/Tooltip.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ describe('Tooltip', () => {
4747
const tooltips = document.getElementsByClassName('tooltip');
4848

4949
expect(ReactDOM.findDOMNode(instance)).toBe(null);
50+
expect(document.body.querySelectorAll('.tooltip.in').length).toBe(0);
5051
expect(target.className).toBe('');
5152
expect(tooltips.length).toBe(0);
5253
wrapper.detach();
@@ -64,6 +65,7 @@ describe('Tooltip', () => {
6465
const tooltips = document.getElementsByClassName('tooltip');
6566

6667
expect(ReactDOM.findDOMNode(instance)).toBe(null);
68+
expect(document.body.querySelectorAll('.tooltip.in').length).toBe(1);
6769
expect(target.className.indexOf('bs-tether-target') > -1).toBe(true);
6870
expect(tooltips.length).toBe(1);
6971
expect(tooltips[0].textContent).toBe('Tooltip Content');

0 commit comments

Comments
 (0)