Skip to content

Commit f2a5d04

Browse files
committed
3.2.0
1 parent 218c225 commit f2a5d04

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Change Log
22

3+
### 3.2.0 (2016/09/30 01:09 +00:00)
4+
- [#200](https://github.com/wwayne/react-tooltip/pull/200) Remove countTransform because the way of transform calculation is cha… (@wwayne)
5+
- [#195](https://github.com/wwayne/react-tooltip/pull/195) Use node parent when calculating offset (@iamdoron)
6+
37
### 3.1.8 (2016/09/14 13:37 +00:00)
48
- [#194](https://github.com/wwayne/react-tooltip/pull/194) Add resizeHide option (@wwayne)
59
- [#193](https://github.com/wwayne/react-tooltip/pull/193) hide specific tooltip (@wwayne)

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-tooltip",
3-
"version": "3.1.8",
3+
"version": "3.2.0",
44
"description": "react tooltip component",
55
"main": "dist/index.js",
66
"scripts": {

standalone/react-tooltip.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
371371
function ReactTooltip(props) {
372372
_classCallCheck(this, ReactTooltip);
373373

374-
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(ReactTooltip).call(this, props));
374+
var _this = _possibleConstructorReturn(this, (ReactTooltip.__proto__ || Object.getPrototypeOf(ReactTooltip)).call(this, props));
375375

376376
_this.state = {
377377
place: 'top', // Direction of tooltip
@@ -612,8 +612,7 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
612612
delayShow: e.currentTarget.getAttribute('data-delay-show') || this.props.delayShow || 0,
613613
delayHide: e.currentTarget.getAttribute('data-delay-hide') || this.props.delayHide || 0,
614614
border: e.currentTarget.getAttribute('data-border') ? e.currentTarget.getAttribute('data-border') === 'true' : this.props.border || false,
615-
extraClass: e.currentTarget.getAttribute('data-class') || this.props.class || '',
616-
countTransform: e.currentTarget.getAttribute('data-count-transform') ? e.currentTarget.getAttribute('data-count-transform') === 'true' : this.props.countTransform != null ? this.props.countTransform : true
615+
extraClass: e.currentTarget.getAttribute('data-class') || this.props.class || ''
617616
}, function () {
618617
if (scrollHide) _this5.addScrollListener(e);
619618
_this5.updateTooltip(e);
@@ -745,11 +744,10 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
745744
var place = _state2.place;
746745
var effect = _state2.effect;
747746
var offset = _state2.offset;
748-
var countTransform = _state2.countTransform;
749747

750748
var node = _reactDom2.default.findDOMNode(this);
751749

752-
var result = (0, _getPosition2.default)(currentEvent, currentTarget, node, place, effect, offset, countTransform);
750+
var result = (0, _getPosition2.default)(currentEvent, currentTarget, node, place, effect, offset);
753751

754752
if (result.isNewState) {
755753
// Switch to reverse placement
@@ -837,7 +835,6 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
837835
isCapture: _react.PropTypes.bool,
838836
globalEventOff: _react.PropTypes.string,
839837
getContent: _react.PropTypes.any,
840-
countTransform: _react.PropTypes.bool,
841838
afterShow: _react.PropTypes.func,
842839
afterHide: _react.PropTypes.func,
843840
disable: _react.PropTypes.bool,
@@ -894,7 +891,7 @@ Object.defineProperty(exports, "__esModule", {
894891
value: true
895892
});
896893

897-
exports.default = function (e, target, node, place, effect, offset, countTransform) {
894+
exports.default = function (e, target, node, place, effect, offset) {
898895
var tipWidth = node.clientWidth;
899896
var tipHeight = node.clientHeight;
900897

@@ -914,10 +911,10 @@ exports.default = function (e, target, node, place, effect, offset, countTransfo
914911
var windowWidth = window.innerWidth;
915912
var windowHeight = window.innerHeight;
916913

917-
var _ref = countTransform && getParent(target, countTransform) || { parentTop: 0, parentLeft: 0 };
914+
var _getParent = getParent(node);
918915

919-
var parentTop = _ref.parentTop;
920-
var parentLeft = _ref.parentLeft;
916+
var parentTop = _getParent.parentTop;
917+
var parentLeft = _getParent.parentLeft;
921918

922919
// Get the edge offset of the tooltip
923920

standalone/react-tooltip.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)