Merge pull request #2 from alex-wilmer/react15

⬆️ React 15 + whitelist props on span, yarn.lock

Author: adrianmcli

package.json

@@ -20,12 +20,11 @@
     "eslint": "^1.6.0",
     "eslint-plugin-react": "^3.5.1",
     "gulp": "^3.9.0",
-    "react": "^0.14.0",
-    "react-component-gulp-tasks": "^0.7.6",
-    "react-dom": "^0.14.0"
+    "react-component-gulp-tasks": "^0.7.6"
   },
   "peerDependencies": {
-    "react": "^0.14.0"
+    "react": ">= 15",
+    "react-dom": ">= 15"
   },
   "browserify-shim": {
     "react": "global:React"

src/ReactRotatingText.js

@@ -23,7 +23,7 @@ class ReactRotatingText extends React.Component {
     // save the timeouts so we can stop on unmount
     const timeout = setTimeout(loopingFunc, pause);
     this.timeouts.push(timeout);
-    
+
     // prevent memory leak
     const maxTimeouts = 100;
     if (this.timeouts.length > maxTimeouts) {
@@ -36,10 +36,10 @@ class ReactRotatingText extends React.Component {
     const { output } = this.state;
     const { typingInterval } = this.props;
     const loopingFunc = this._type.bind(this, text, callback);
-    
+
     // set the string one character longer
     this.setState({output: text.substr(0, output.length + 1)});
-    
+
     // if we're still not done, recursively loop again
     if (output.length < text.length) {
       this._loop(loopingFunc, typingInterval);
@@ -52,10 +52,10 @@ class ReactRotatingText extends React.Component {
     const { output } = this.state;
     const { deletingInterval } = this.props;
     const loopingFunc = this._erase.bind(this, callback);
-    
+
     // set the string one character shorter
     this.setState({output: output.substr(0, output.length - 1)});
-    
+
     // if we're still not done, recursively loop again
     if (output.length !== 0) {
       this._loop(loopingFunc, deletingInterval);
@@ -77,16 +77,26 @@ class ReactRotatingText extends React.Component {
       });
       this._loop(loopingFunc, emptyPause);
     };
-    
+
     type.bind(this)(items[index], () => {
       this._loop(erase.bind(this, nextWord), pause);
     });
   };
 
   render() {
-    const { color, cursor, ...other } = this.props;
+    const {
+      color,
+      cursor,
+      deletingInterval, 
+      emptyPause,
+      items,
+      pause,
+      typingInterval,
+      ...other
+    } = this.props;
+
     return (
-      <span style={{color: color}} {...other}>
+      <span style={{ color }} {...other}>
         { this.state.output }
         { cursor ? <span className="react-rotating-text-cursor">|</span> : null }
       </span>
@@ -114,4 +124,4 @@ ReactRotatingText.defaultProps = {
   typingInterval: 50,
 };
 
-export default ReactRotatingText;
+export default ReactRotatingText;