Skip to content

fix(example): 'made dev' works again, small fixes. #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2018
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: 6 additions & 6 deletions example/src/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict'

import React, { Component } from 'react'
import {render, findDOMNode} from 'react-dom'
import React from 'react'
import ReactDOM from 'react-dom'
import ReactTooltip from '../../src'

class Test extends Component {
class Test extends React.Component {
constructor(props) {
super(props);
this.state = {
Expand Down Expand Up @@ -157,8 +157,8 @@ class Test extends Component {
<ReactTooltip id='custom-off-event'/>
{/*
<div>
<button onClick={() => { ReactTooltip.show(findDOMNode(this.refs.target)) }}>Show toolip</button>
<button onClick={() => { ReactTooltip.hide(findDOMNode(this.refs.target)) }}>Hide toolip</button>
<button onClick={() => { ReactTooltip.show(ReactDOM.findDOMNode(this.refs.target)) }}>Show toolip</button>
<button onClick={() => { ReactTooltip.hide(ReactDOM.findDOMNode(this.refs.target)) }}>Hide toolip</button>
</div>
*/}
</div>
Expand Down Expand Up @@ -252,4 +252,4 @@ class Test extends Component {
}
}

render(<Test />, document.getElementById('main'))
ReactDOM.render(<Test />, document.getElementById('main'))
26 changes: 25 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tooltip",
"version": "3.4.1",
"version": "3.4.2",
"description": "react tooltip component",
"main": "dist/index.js",
"scripts": {
Expand Down Expand Up @@ -73,6 +73,8 @@
"jsdom": "^9.2.1",
"mocha": "^2.5.3",
"node-sass": "^3.7.0",
"react": "^16.1.1",
"react-dom": "^16.1.1",
"react-addons-test-utils": "^15.1.0",
"sinon": "^1.17.4",
"snazzy": "^2.0.1",
Expand Down
6 changes: 4 additions & 2 deletions src/decorators/trackRemoval.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ export default function (target) {
if (MutationObserver == null) return

const observer = new MutationObserver((mutations) => {
for (const mutation of mutations) {
for (const element of mutation.removedNodes) {
for (let m1 = 0; m1 < mutations.length; m1++) {
const mutation = mutations[m1]
for (let m2 = 0; m2 < mutation.removedNodes.length; m2++) {
const element = mutation.removedNodes[m2]
if (element === this.state.currentTarget) {
this.hideTooltip()
return
Expand Down
6 changes: 4 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

import React, { Component } from 'react'
import React from 'react'
import PropTypes from 'prop-types'
import ReactDOM from 'react-dom'
import classname from 'classnames'
Expand Down Expand Up @@ -28,7 +28,7 @@ import cssStyle from './style'
@isCapture
@getEffect
@trackRemoval
class ReactTooltip extends Component {
class ReactTooltip extends React.Component {

static propTypes = {
children: PropTypes.any,
Expand Down Expand Up @@ -450,13 +450,15 @@ class ReactTooltip extends Component {
if (html) {
return (
<Wrapper className={`${tooltipClass} ${extraClass}`}
id={this.props.id}
{...ariaProps}
data-id='tooltip'
dangerouslySetInnerHTML={{__html: placeholder}}/>
)
} else {
return (
<Wrapper className={`${tooltipClass} ${extraClass}`}
id={this.props.id}
{...ariaProps}
data-id='tooltip'>{placeholder}</Wrapper>
)
Expand Down
65 changes: 14 additions & 51 deletions standalone/react-tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -1427,52 +1427,13 @@ exports.default = function (target) {
if (MutationObserver == null) return;

var observer = new MutationObserver(function (mutations) {
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;

try {
for (var _iterator = mutations[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var mutation = _step.value;
var _iteratorNormalCompletion2 = true;
var _didIteratorError2 = false;
var _iteratorError2 = undefined;

try {
for (var _iterator2 = mutation.removedNodes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var element = _step2.value;

if (element === _this.state.currentTarget) {
_this.hideTooltip();
return;
}
}
} catch (err) {
_didIteratorError2 = true;
_iteratorError2 = err;
} finally {
try {
if (!_iteratorNormalCompletion2 && _iterator2.return) {
_iterator2.return();
}
} finally {
if (_didIteratorError2) {
throw _iteratorError2;
}
}
}
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
for (var m1 = 0; m1 < mutations.length; m1++) {
var mutation = mutations[m1];
for (var m2 = 0; m2 < mutation.removedNodes.length; m2++) {
var element = mutation.removedNodes[m2];
if (element === _this.state.currentTarget) {
_this.hideTooltip();
return;
}
}
}
Expand Down Expand Up @@ -1640,8 +1601,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen

function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.default)(_class = (0, _customEvent2.default)(_class = (0, _isCapture2.default)(_class = (0, _getEffect2.default)(_class = (0, _trackRemoval2.default)(_class = (_temp = _class2 = function (_Component) {
_inherits(ReactTooltip, _Component);
var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.default)(_class = (0, _customEvent2.default)(_class = (0, _isCapture2.default)(_class = (0, _getEffect2.default)(_class = (0, _trackRemoval2.default)(_class = (_temp = _class2 = function (_React$Component) {
_inherits(ReactTooltip, _React$Component);

function ReactTooltip(props) {
_classCallCheck(this, ReactTooltip);
Expand Down Expand Up @@ -2097,14 +2058,16 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
}

if (html) {
return _react2.default.createElement(Wrapper, _extends({ className: tooltipClass + ' ' + extraClass
return _react2.default.createElement(Wrapper, _extends({ className: tooltipClass + ' ' + extraClass,
id: this.props.id
}, ariaProps, {
'data-id': 'tooltip',
dangerouslySetInnerHTML: { __html: placeholder } }));
} else {
return _react2.default.createElement(
Wrapper,
_extends({ className: tooltipClass + ' ' + extraClass
_extends({ className: tooltipClass + ' ' + extraClass,
id: this.props.id
}, ariaProps, {
'data-id': 'tooltip' }),
placeholder
Expand All @@ -2114,7 +2077,7 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
}]);

return ReactTooltip;
}(_react.Component), _class2.propTypes = {
}(_react2.default.Component), _class2.propTypes = {
children: _propTypes2.default.any,
place: _propTypes2.default.string,
type: _propTypes2.default.string,
Expand Down
4 changes: 2 additions & 2 deletions standalone/react-tooltip.min.js

Large diffs are not rendered by default.