Merge branch 'master' into dynamic_tooltip_content

Author: aronhelser

CHANGELOG.md

@@ -1,6 +1,15 @@
 ## Change Log
 
-### 3.4.1 (2018/04/05 17:15 +00:00)
+### 3.4.3 (2018/04/11 15:12 +00:00)
+- [#207](https://github.com/wwayne/react-tooltip/pull/207) Return tooltip to original position when possible (@hassanbot)
+- [#301](https://github.com/wwayne/react-tooltip/pull/301) insert css as first to allow easy css styling without important (@roblan)
+
+### 3.4.2 (2018/04/09 18:58 +00:00)
+- [#373](https://github.com/wwayne/react-tooltip/pull/373) fix(example): 'made dev' works again, small fixes. (@aronhelser)
+- [#337](https://github.com/wwayne/react-tooltip/pull/337) Fix README show tip usage error (@gaohailang)
+- [#359](https://github.com/wwayne/react-tooltip/pull/359) License should use H2 as the previous sections do (@konekoya)
+
+### 3.4.1 (2018/04/05 17:24 +00:00)
 - [#369](https://github.com/wwayne/react-tooltip/pull/369) fix(index.js): add missing argument so tooltip hides. (@aronhelser)
 - [#372](https://github.com/wwayne/react-tooltip/pull/372) Travis: update node version to fix travis build. (@aronhelser)
 

README.md

@@ -147,8 +147,9 @@ Same for empty children, if you don't want show the tooltip when the children is
 ## Article
 [How I insert sass into react component](https://medium.com/@wwayne_me/how-i-insert-sass-into-my-npm-react-component-b46b9811c226#.gi4hxu44a)
 
-## Authors
-see [AUTHORS](https://github.com/wwayne/react-tooltip/blob/master/AUTHORS.txt)
+## Contributing
+
+We welcome your contribution! Fork the repo, make some changes, submit a pull-request! Our [contributing](contributing.md) doc has some details.
 
 ## License
 

contributing.md

@@ -0,0 +1,24 @@
+# Contributing
+
+This doc needs help! Please submit your PR...
+
+## Pull request testing
+
+Some notes on testing and releasing.
+* For a PR, follow Github's command-line instructions for retrieving the branch with the changes.
+* `make dev` starts a development server, open `http://localhost:8888` to see the example website.
+* Provide feedback on the PR about your results.
+
+## Doing a release
+
+We really want to use semantic-release instead of this:
+
+* `make deploy` updates the files in the `standalone` directory
+* update the version number in `package.json`
+    - Fixes update the patch number, features update the minor number.
+    - Major version update is reserved for API breaking changes, not just additions. 
+* `npm run github-changes -- -n 3.X.Y` to update the changelog
+* `git add`, `git commit` and `git push` to get the version to master.
+* `git tag -a 3.X.Y -m 3.X.Y` `git push --tags`
+* `npm publish`
+* add a version on the github release page, based on the tag

example/src/index.js

@@ -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 = {
@@ -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>
@@ -252,4 +252,4 @@ class Test extends Component {
   }
 }
 
-render(<Test />, document.getElementById('main'))
+ReactDOM.render(<Test />, document.getElementById('main'))