Skip to content

Commit d7afbcb

Browse files
committed
minor tooltip update
1 parent fcf8ddb commit d7afbcb

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

components/SLDSTooltip/index.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ module.exports = React.createClass( {
6868

6969
getHorizontalAlign() {
7070
if (this.props.align==='left') {
71-
return 'right';
71+
return 'left';
7272
}
7373
else if (this.props.align==='right') {
74-
return 'left';
74+
return 'right';
7575
}
7676
return 'center';
7777
},
@@ -92,11 +92,12 @@ module.exports = React.createClass( {
9292
'slds-popover--tooltip':true,
9393
'slds-nubbin--top':this.props.align === 'bottom',
9494
'slds-nubbin--bottom':this.props.align === 'top',
95-
'slds-nubbin--left':this.props.align === 'left',
96-
'slds-nubbin--right':this.props.align === 'right'
95+
'slds-nubbin--left':this.props.align === 'right',
96+
'slds-nubbin--right':this.props.align === 'left'
9797
};
9898

9999
return this.state.isOpen?<SLDSPopover
100+
key={this.getHorizontalAlign()+' '+this.getVerticalAlign()}
100101
targetElement={this.refs.tooltipTarget}
101102
closeOnTabKey={true}
102103
className=''

demo/pages/HomePage/TooltipSection.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {SLDSTooltip,SLDSButton} from '../../../components';
1414

1515
import {default as PrismCode} from 'react-prism/lib/PrismCode';
1616

17-
const alignNames = ['left','right','top','bottom'];
17+
const alignNames = ['left','top','right','bottom'];
1818

1919
module.exports = React.createClass( {
2020

@@ -31,7 +31,7 @@ module.exports = React.createClass( {
3131
componentDidMount () {
3232
setInterval ( ()=>{
3333
this.nextAlign();
34-
},2000);
34+
},300);
3535
},
3636

3737
handleOnUpdateHighlighted () {
@@ -71,7 +71,6 @@ module.exports = React.createClass( {
7171
<div className="slds-p-vertical--large">
7272
<p>
7373
<SLDSTooltip
74-
key={'align_'+this.state.alignIndex}
7574
content={<span>Tooltip with top alignment</span>}
7675
align={alignNames[this.state.alignIndex]}>
7776
Tooltip align top
@@ -80,7 +79,7 @@ module.exports = React.createClass( {
8079
</div>
8180

8281
<div ref="super" className="slds-p-vertical--large">
83-
<p>
82+
<p style={{marginTop:'5rem'}}>
8483
<SLDSTooltip
8584
content={<span>Tooltip with bottom alignment</span>}
8685
align='bottom'

0 commit comments

Comments
 (0)