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
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,18 @@ online example: http://react-component.github.io/tooltip/examples/
<td></td>
<td>function returning html node which will act as tooltip contaier</td>
</tr>
<tr>
<td>offsetX</td>
<td>number</td>
<td></td>
<td>Offset in the X direction by a number of pixels</td>
</tr>
<tr>
<td>offsetY</td>
<td>number</td>
<td></td>
<td>Offset in the Y direction by a number of pixels</td>
</tr>
</tbody>
</table>

Expand Down
27 changes: 26 additions & 1 deletion examples/simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ var Test = React.createClass({
placement: 'right',
trigger: {
hover: 1
}
},
offsetX: null,
offsetY: null
};
},
onPlacementChange(e) {
Expand All @@ -38,6 +40,18 @@ var Test = React.createClass({
});
},

onOffsetXChange(e) {
this.setState({
offsetX: e.target.value
})
},

onOffsetYChange(e) {
this.setState({
offsetY: e.target.value
})
},

preventDefault(e) {
e.preventDefault();
},
Expand Down Expand Up @@ -87,6 +101,15 @@ var Test = React.createClass({
<input value='click' checked={trigger.click} type='checkbox' onChange={this.onTriggerChange}/>
click
</label>
<br/>
<label>
offsetX:
<input type='text' onChange={this.onOffsetXChange}/>
</label>
<label>
offsetY:
<input type='text' onChange={this.onOffsetYChange}/>
</label>
</div>
<div style={{margin: 100}}>
<Tooltip placement={this.state.placement}
Expand All @@ -95,6 +118,8 @@ var Test = React.createClass({
trigger={Object.keys(this.state.trigger)}
onVisibleChange={this.onVisibleChange}
overlay={<span>i am a tooltip</span>}
offsetX={this.state.offsetX}
offsetY={this.state.offsetY}
transitionName={this.state.transitionName}>
<a href='#' style={{margin: 20}} onClick={this.preventDefault}>trigger</a>
</Tooltip>
Expand Down
8 changes: 7 additions & 1 deletion src/Popup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const Popup = React.createClass({

render() {
const props = this.props;
const {prefixCls, placement, style} = props;
const {prefixCls, placement, style, offsetX, offsetY} = props;
let className;

if (props.visible || !this.rootNode) {
Expand All @@ -81,6 +81,12 @@ const Popup = React.createClass({
} else {
align = placementAlignMap[placement];
}
if (offsetX) {
align.offset[0] = offsetX;
}
if (offsetY) {
align.offset[1] = offsetY;
}

return (<Animate component=""
exclusive={true}
Expand Down
4 changes: 4 additions & 0 deletions src/Tooltip.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ const Tooltip = React.createClass({
mouseEnterDelay: React.PropTypes.number,
mouseLeaveDelay: React.PropTypes.number,
getTooltipContainer: React.PropTypes.func,
offsetX: React.PropTypes.number,
offsetY: React.PropTypes.number
},

getDefaultProps() {
Expand Down Expand Up @@ -204,6 +206,8 @@ const Tooltip = React.createClass({
trigger={props.trigger}
placement={props.placement}
animation={props.animation}
offsetX={props.offsetX}
offsetY={props.offsetY}
{...mouseProps}
wrap={this}
style={props.overlayStyle}
Expand Down
41 changes: 41 additions & 0 deletions tests/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,47 @@ describe('rc-tooltip', function () {
});
});

describe('offset', ()=> {
it('offsetX works', (done)=> {
let offsetX = 10;
var tooltip = React.render(<Tooltip trigger={['click']} offsetX={offsetX} placement="bottomRight" overlay={<strong>tooltip</strong>}>
<div className="target">click</div>
</Tooltip>, div);
var domNode = React.findDOMNode(tooltip).firstChild;
Simulate.click(domNode);
setTimeout(()=> {
var popupDomNode = tooltip.getPopupDomNode();
expect(popupDomNode).to.be.ok();
var targetOffset = $(domNode).offset();
var popupOffset = $(popupDomNode).offset();
console.log(popupOffset, targetOffset);
expect(popupOffset.left).to.be(targetOffset.left + offsetX);
Simulate.click(domNode);
done();
}, 20);
});

it('offsetY works', (done)=> {
let offsetY = 50;
var tooltip = React.render(<Tooltip trigger={['click']} offsetY={offsetY} placement="topRight" overlay={<strong>tooltip</strong>}>
<div className="target">click</div>
</Tooltip>, div);
var domNode = React.findDOMNode(tooltip).firstChild;
Simulate.click(domNode);
setTimeout(()=> {
var popupDomNode = tooltip.getPopupDomNode();
expect(popupDomNode).to.be.ok();
var targetOffset = $(domNode).offset();
var popupOffset = $(popupDomNode).offset();
console.log(popupOffset, targetOffset);
expect(popupOffset.top).to.be(targetOffset.top - $(popupDomNode).outerHeight() + offsetY);
Simulate.click(domNode);
done();
}, 20);
});

});

if (window.TransitionEvent) {
it('transitionName works', (done)=> {
var tooltip = React.render(<Tooltip
Expand Down