Merge 0.12.1

.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": ["es2015", "flow", "react"],
+  "plugins": ["transform-class-properties", "transform-object-rest-spread"],
+  "env": {
+    "production": {
+      "plugins": ["transform-react-remove-prop-types"]
+    }
+  }
+}

.eslintrc

@@ -1,52 +1,26 @@
 {
   "parser": "babel-eslint",
-
-  "rules": {
-    "curly": [2, "all"],
-    "indent": [2, 2, {"VariableDeclarator": 2}],
-    "linebreak-style": [2, "unix"],
-    "one-var": 0,
-    "space-before-function-paren": [2, "never"],
-
-    "react/jsx-boolean-value": 1,
-    "react/jsx-curly-spacing": [2, "never"],
-    "react/jsx-no-undef": 1,
-    "react/no-danger": 1,
-    "react/react-in-jsx-scope": 1
-  },
-
   "globals": {
     "require": false,
     "module": false,
-    "global": false,
-
-    "SyntheticEvent": false,
-    "ReactElement": false,
-
-    "PreloadType": false,
-    "ElementHeight": false,
-    "CSSStyle": false,
-    "ReactInfiniteUtilityFunctions": false,
-    "ReactInfiniteProvidedDefaultProps": false,
-    "ReactInfiniteProps": false,
-    "ReactInfiniteComputedProps": false,
-    "ReactInfiniteState": false,
-    "InfiniteComputer": false
+    "global": false
   },
-
   "env": {
     "es6": true,
     "browser": true
   },
-
-  "extends": ["semistandard"],
-
-  "ecmaFeatures": {
-    "jsx": true,
-    "experimentalObjectRestSpread": true
+  "rules": {
+    "react/no-did-update-set-state": "off",
+    "flowtype/define-flow-type": 1
   },
-
+  "extends": [
+    "seatgeek-standard",
+    "seatgeek-react-standard"
+  ],
   "plugins": [
-    "react"
+    "react",
+    "prettier",
+    "flowtype"
   ]
 }
+

.flowconfig

@@ -3,6 +3,8 @@
 .*/build/.*
 .*/dist/.*
 .*/y18n/.*
+.*/babel-plugin-transform-react-remove-prop-types/.*
+.*json
 
 [include]
 

.travis.yml

@@ -1,12 +1,16 @@
 sudo: false
 language: node_js
 node_js:
-  - 0.10
+  - lts/*
+cache:
+  directories:
+    - node_modules
+    - /home/travis/.cypress/Cypress
 env:
   - TEST=1
   - TYPECHECK=1
   - LINT=1
-
+  - BROWSER=1
 script:
   - ./config/travis/test.sh
 after_success: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

Gulpfile.js

@@ -5,9 +5,10 @@ var del = require('del');
 
 var browserifyCreator = require('./pipeline/browserify');
 
-var args = require('yargs').alias('P', 'production')
-               .alias('D', 'development')
-               .alias('E', 'example').argv;
+var args = require('yargs')
+  .alias('P', 'production')
+  .alias('D', 'development')
+  .alias('E', 'example').argv;
 
 var envObject = {
   production: args.production,
@@ -20,17 +21,21 @@ var buildFunction = browserifyCreator(false, envObject, INFINITE_SOURCE);
 
 gulp.task('build-bundle', buildFunction);
 gulp.task('cleanly-build-bundle', ['clean'], buildFunction);
-gulp.task('watch-develop-bundle', browserifyCreator(true, {development: true}, INFINITE_SOURCE));
+gulp.task(
+  'watch-develop-bundle',
+  browserifyCreator(true, { development: true }, INFINITE_SOURCE)
+);
 
 // This task builds everything for release: the dist
 // folder is populated with react-infinite.js and
 // react-infinite.min.js, while the build folder is
 // provided with a copy of the source transpiled to ES5.
 gulp.task('release', ['cleanly-build-bundle'], function() {
   // Transpile CommonJS files to ES5 with React's tools.
-  gulp.src(['./src/**/*.js', './src/**/*.jsx'])
-      .pipe(babel())
-      .pipe(gulp.dest('build'));
+  gulp
+    .src(['./src/**/*.js', './src/**/*.jsx'])
+    .pipe(babel())
+    .pipe(gulp.dest('build'));
 });
 
 gulp.task('clean', function() {
@@ -40,31 +45,30 @@ gulp.task('clean', function() {
 // This task is used to build the examples. It is used
 // in the development watch function as well.
 gulp.task('examples', function() {
-  gulp.src('./examples/*.jsx')
-    .pipe(babel())
-    .pipe(gulp.dest('examples'));
+  gulp.src('./examples/*.jsx').pipe(babel()).pipe(gulp.dest('examples'));
 });
 
 gulp.task('server', function() {
-  gulp.src(__dirname)
-      .pipe(server({
-        port: 8080,
-        directoryListing: true,
-        livereload: {
-          enable: true,
-          filter: function(filename) {
-            if (filename.match(__dirname + '/examples')) {
-              return true;
-              // The examples draw from /dist, which should change
-              // when the source files change
-            } else if (filename.match(__dirname + '/dist')) {
-              return true;
-            } else {
-              return false;
-            }
+  gulp.src(__dirname).pipe(
+    server({
+      port: 8080,
+      directoryListing: true,
+      livereload: {
+        enable: true,
+        filter: function(filename) {
+          if (filename.match(__dirname + '/examples')) {
+            return true;
+            // The examples draw from /dist, which should change
+            // when the source files change
+          } else if (filename.match(__dirname + '/dist')) {
+            return true;
+          } else {
+            return false;
           }
         }
-      }));
+      }
+    })
+  );
 });
 
 // This task is used for development. When run, it sets up

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015, SeatGeek, Inc.
+Copyright (c) 2014-2017, SeatGeek, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -124,9 +124,6 @@ When working with the window as the scroll container, it is sometimes useful to
 #### **Function** `handleScroll(DOMNode node)`
 Defaults to `function(){}`. A function that is called when the container is scrolled, i.e. when the `onScroll` event of the infinite scrolling container is fired. The only argument passed to it is the native DOM [Node](https://developer.mozilla.org/en-US/docs/Web/API/Node) of the scrolling container.
 
-#### **Number** `infiniteLoadBeginBottomOffset`
-**Deprecated as of 0.6.0. Please use `infiniteLoadBeginEdgeOffset`, which is identical but renamed.**
-
 #### **Number** `infiniteLoadBeginEdgeOffset`
 Defaults to `undefined`, which means that infinite loading is disabled. To disable infinite loading, do not provide this property or set it to undefined.
 
@@ -164,15 +161,17 @@ Code samples are now available in the `/examples` directory for your perusal. Tw
 To get you started, here is some sample code that implements an infinite scroll with an simulated delay of 2.5 seconds. A [live demo of this example is available](http://chairnerd.seatgeek.com/react-infinite-a-browser-ready-efficient-scrolling-container-based-on-uitableview/) on our blog.
 
 ```js
-var ListItem = React.createClass({
+var createReactClass = require('create-react-class');
+
+var ListItem = createReactClass({
     render: function() {
         return <div className="infinite-list-item">
         List Item {this.props.num}
         </div>;
     }
 });
 
-var InfiniteList = React.createClass({
+var InfiniteList = createReactClass({
     getInitialState: function() {
         return {
             elements: this.buildElements(0, 20),