Merge branch 'master' of https://github.com/bsalex/react-data-components into bsalex-master

carlosrocha · carlosrocha · commit c97aeb103f80 · 2015-11-06T00:15:57.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: node_js
 
 node_js:
-  - "iojs"
-
+  - "4.1"
diff --git a/example/flux/app.js b/example/flux/app.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOM = require('react-dom');
 var FluxTable = require('./FluxTable');
 var WebAPIUtils = require('./WebAPIUtils');
 var DataStore = require('./DataStore');
@@ -21,4 +22,4 @@ DataStore.init({
 
 WebAPIUtils.getCsvFile('/sample_data.csv');
 
-React.render(<FluxTable />, document.body);
+ReactDOM.render(<FluxTable />, document.getElementById('app'));
diff --git a/example/flux/index.html b/example/flux/index.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="https://cdn.rawgit.com/carlosrocha/react-data-components/master/css/table-twbs.css">
   </head>
   <body>
+    <div id="app"></div>
     <script src="../flux.entry.js"></script>
   </body>
 </html>
diff --git a/example/table/index.html b/example/table/index.html
@@ -7,5 +7,6 @@
   </head>
   <body>
     <script src="../table.entry.js"></script>
+    <div id="app" />
   </body>
 </html>
diff --git a/example/table/main.js b/example/table/main.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOM = require('react-dom');
 var { DataTable } = require('react-data-components');
 var d3 = require('d3');
 
@@ -31,5 +32,5 @@ function buildTable(data) {
 }
 
 d3.csv('/sample_data.csv', function(error, rows) {
-  React.render(buildTable(rows), document.body);
+  ReactDOM.render(buildTable(rows), document.getElementById('app'));
 });
diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
     "CHANGELOG.md",
     "LICENSE",
     "css",
-    "lib"
+    "lib",
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -24,22 +25,24 @@
   "babel": {
     "stage": 0
   },
-  "peerDependencies": {
-    "react": "^0.13.0"
-  },
   "devDependencies": {
     "babel": "^5.8.21",
     "babel-eslint": "^4.0.8",
     "babel-jest": "^5.3.0",
-    "babel-loader": "^5.3.1",
+    "babel-loader": "^5.3.3",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.0.2",
+    "babel-plugin-transform-react-constant-elements": "^6.0.2",
+    "babel-preset-es2015": "^6.0.12",
+    "babel-preset-react": "^6.0.2",
     "d3": "^3.5.6",
-    "eslint": "^1.1.0",
-    "eslint-plugin-react": "^3.2.2",
-    "flux": "^2.0.3",
-    "jest-cli": "^0.5.0",
-    "rimraf": "^2.4.2",
-    "webpack": "^1.11.0",
-    "webpack-dev-server": "^1.10.1"
+    "eslint": "^1.7.3",
+    "eslint-plugin-react": "^3.6.3",
+    "flux": "^2.1.1",
+    "jest-cli": "^0.6.1",
+    "react-addons-test-utils": "^0.14.1",
+    "rimraf": "^2.4.3",
+    "webpack": "^1.12.2",
+    "webpack-dev-server": "^1.12.1"
   },
   "scripts": {
     "lint": "eslint src",
@@ -59,6 +62,8 @@
   },
   "dependencies": {
     "lodash.some": "^3.2.3",
-    "lodash.sortby": "^3.1.5"
+    "lodash.sortby": "^3.1.5",
+    "react": "^0.14.1",
+    "react-dom": "^0.14.1"
   }
 }
diff --git a/src/Pagination.js b/src/Pagination.js
@@ -1,21 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes, Component } from 'react';
 
 // Used to cancel events.
 var preventDefault = e => e.preventDefault();
 
-export default class Pagination {
-
-  static defaultProps = {
-    showPages: 5,
-  };
-
-  static propTypes = {
-    onChangePage: PropTypes.func.isRequired,
-    totalPages: PropTypes.number.isRequired,
-    currentPage: PropTypes.number.isRequired,
-    showPages: PropTypes.number,
-  };
-
+export default class Pagination extends Component {
   shouldComponentUpdate(nextProps) {
     var props = this.props;
 
@@ -127,3 +115,14 @@ export default class Pagination {
     );
   }
 }
+
+Pagination.defaultProps = {
+  showPages: 5,
+};
+
+Pagination.propTypes = {
+  onChangePage: PropTypes.func.isRequired,
+  totalPages: PropTypes.number.isRequired,
+  currentPage: PropTypes.number.isRequired,
+  showPages: PropTypes.number,
+};
diff --git a/src/SearchField.js b/src/SearchField.js
@@ -1,8 +1,9 @@
-var React = require('react');
+import React, { Component } from 'react';
 
-class SearchField {
+class SearchField extends Component {
 
-  constructor() {
+  constructor(...props) {
+    super(...props);
     this.onChange = this.onChange.bind(this);
   }
 
diff --git a/src/SelectField.js b/src/SelectField.js
@@ -1,8 +1,9 @@
-var React = require('react');
+import React, { Component } from 'react';
 
-class SelectField {
+class SelectField extends Component {
 
-  constructor() {
+  constructor(...props) {
+    super(...props);
     this.onChange = this.onChange.bind(this);
   }
 
diff --git a/src/Table.js b/src/Table.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes, Component } from 'react';
+import ReactDOM from 'react-dom';
 
 let simpleGet = key => data => data[key];
 let keyGetter = keys => data => keys.map(key => data[key]);
@@ -37,66 +38,17 @@ function buildSortProps(col, sortBy, onSort) {
   };
 }
 
-export default class Table {
-
-  static defaultProps = {
-    buildRowOptions: () => ({}),
-    sortBy: {},
-  };
-
-  static propTypes = {
-
-    keys: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.string,
-    ]).isRequired,
-
-    columns: PropTypes.arrayOf(PropTypes.shape({
-      title: PropTypes.string.isRequired,
-      prop: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.number,
-      ]),
-      render: PropTypes.func,
-      sortable: PropTypes.bool,
-      defaultContent: PropTypes.string,
-      width: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.number,
-      ]),
-      className: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.func,
-      ]),
-    })).isRequired,
-
-    dataArray: PropTypes.arrayOf(PropTypes.oneOfType([
-      PropTypes.array,
-      PropTypes.object,
-    ])).isRequired,
-
-    buildRowOptions: PropTypes.func,
-
-    sortBy: PropTypes.shape({
-      prop: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.number,
-      ]),
-      order: PropTypes.oneOf([ 'ascending', 'descending' ]),
-    }),
-
-    onSort: PropTypes.func,
-  };
-
-  constructor() {
+export default class Table extends Component {
+  constructor(props) {
+    super(props);
     this._headers = [];
   }
 
   componentDidMount() {
     // If no width was specified, then set the width that the browser applied
     // initially to avoid recalculating width between pages.
     this._headers.forEach(header => {
-      let thDom = React.findDOMNode(header);
+      let thDom = ReactDOM.findDOMNode(header);
       if (!thDom.style.width) {
         thDom.style.width = `${thDom.offsetWidth}px`;
       }
@@ -166,3 +118,52 @@ export default class Table {
   }
 
 }
+
+
+Table.defaultProps = {
+  buildRowOptions: () => ({}),
+  sortBy: {},
+};
+
+Table.propTypes = {
+  keys: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.string),
+    PropTypes.string,
+  ]).isRequired,
+
+  columns: PropTypes.arrayOf(PropTypes.shape({
+    title: PropTypes.string.isRequired,
+    prop: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
+    render: PropTypes.func,
+    sortable: PropTypes.bool,
+    defaultContent: PropTypes.string,
+    width: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
+    className: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.func,
+    ]),
+  })).isRequired,
+
+  dataArray: PropTypes.arrayOf(PropTypes.oneOfType([
+    PropTypes.array,
+    PropTypes.object,
+  ])).isRequired,
+
+  buildRowOptions: PropTypes.func,
+
+  sortBy: PropTypes.shape({
+    prop: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
+    order: PropTypes.oneOf([ 'ascending', 'descending' ]),
+  }),
+
+  onSort: PropTypes.func,
+};
diff --git a/src/__tests__/Pagination-test.js b/src/__tests__/Pagination-test.js
@@ -8,8 +8,8 @@ describe('Pagination', function() {
   var Pagination;
 
   beforeEach(function() {
-    React = require('react/addons');
-    TestUtils = React.addons.TestUtils;
+    React = require('react');
+    TestUtils = require('react-addons-test-utils');
     Pagination = require('../Pagination');
     onChangePage = jest.genMockFunction();
   });
diff --git a/src/__tests__/Table-test.js b/src/__tests__/Table-test.js
@@ -7,8 +7,8 @@ describe('Table', function() {
   var Table;
 
   beforeEach(function() {
-    React = require('react/addons');
-    TestUtils = React.addons.TestUtils;
+    React = require('react');
+    TestUtils = require('react-addons-test-utils');
     Table = require('../Table');
   });
 

-Original file line number
+Diff line change
@@ @@ -1,5 +1,4 @@ @@
 language: node_js
 node_js:
 -  - "iojs"
+-
 +  - "4.1"