Merge remote-tracking branch 'origin/release-5.0.1'

.babelrc

@@ -1,8 +1,12 @@
 {
-    "presets": ["react", "es2015-loose"],
-    "plugins": [
-        'transform-class-properties',
-        'transform-es3-member-expression-literals',
-        'transform-es3-property-literals'
-    ]
+  "presets": [
+    "es2015",
+    "react",
+    "stage-2"
+  ],
+  "plugins": [
+    "transform-class-properties",
+    "transform-es3-member-expression-literals",
+    "transform-es3-property-literals"
+  ]
 }

.eslintrc

@@ -61,7 +61,6 @@
  */
     "comma-dangle": [2, "never"],    // http://eslint.org/docs/rules/comma-dangle
     "no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
-    "no-console": 1,                 // http://eslint.org/docs/rules/no-console
     "no-debugger": 1,                // http://eslint.org/docs/rules/no-debugger
     "no-alert": 1,                   // http://eslint.org/docs/rules/no-alert
     "no-constant-condition": 1,      // http://eslint.org/docs/rules/no-constant-condition

.gitignore

@@ -9,4 +9,5 @@ dist
 npm-debug.log
 lerna-debug.log
 **.orig
-.vscode
+.vscode
+package-lock.json

.npmignore

@@ -16,6 +16,5 @@ bower.json
 CONTRIBUTING.md
 .flowconfig
 secure-file
-flow
 ci
 npm-debug.log

CHANGELOG.md

@@ -1,3 +1,20 @@
+
+## 5.0.1 (Oct 22, 2018)
+
+### React-Data-Grid
+- **Bugfix:** Fix CopyMask columns ([1289](https://github.com/adazzle/react-data-grid/pull/1272)
+
+
+## 5.0.0 (Oct 22, 2018)
+
+### React-Data-Grid
+- **Feature:** Improve Cell navigation Performance ([1123](https://github.com/adazzle/react-data-grid/pull/1123)
+- **Feature:** Scrolling improvements ([1254](https://github.com/adazzle/react-data-grid/pull/1254)
+- **Feature:** Remove react-data-grid dependency from react-data-grid-addons bundle  ([1272](https://github.com/adazzle/react-data-grid/pull/1272)
+
+
+
+
 ## 4.0.8 (May 10, 2018)
 
 ### React-Data-Grid

README.md

@@ -62,7 +62,7 @@ Features
 - [Rich cell editors like autocomplete, checkbox and dropdown editors, complete with keyboard navigation](http://adazzle.github.io/react-data-grid/#/examples/built-in-editors)
 - Custom cell Editors - Easily create your own
 - [Custom cell Formatters](http://adazzle.github.io/react-data-grid/#/examples/custom-formatters)
-- [Frozen columns](http://adazzle.github.io/react-data-grid/#/examples/fixed-cols)
+- [Frozen columns](http://adazzle.github.io/react-data-grid/#/examples/frozen-cols)
 - [Resizable columns](http://adazzle.github.io/react-data-grid/#/examples/resizable-cols)
 - [Sorting](http://adazzle.github.io/react-data-grid/#/examples/sortable-cols) 
 - [Filtering](http://adazzle.github.io/react-data-grid/#/examples/filterable-sortable-grid) 

appveyor.yml

@@ -12,7 +12,7 @@ environment:
   access_token:
     secure: dHfUgllfTEAqpcoz3iQj8TO0DGh8n90Coqf0+IXT0bIRNSIxGTDu991X+FStY613
   npmrc_token:
-    secure: vqGk4eUIvg1ngzdW4WE2hlq1U7YupunkayeCh7bXy8M=
+    secure: +0xEbrDGXwT78XtVnyF0CQcqiKZCgQSVq9DZaIH2YhI=
 
 
 # Install scripts. (runs after repo cloning)
@@ -46,7 +46,4 @@ build: off
 on_success:
 # If merging to next branch, publish with 'next' tag
   - npm run beforepublish
-  - ps: >-
-      if(!$env:APPVEYOR_SCHEDULED_BUILD -and !$env:appveyor_pull_request_number -and $env:APPVEYOR_REPO_BRANCH -eq 'next') {
-        ./ci/publish/publishBranch.ps1
-      }
+  - powershell ./ci/publish/publishNext.ps1

ci/publish/publishNext.ps1

@@ -0,0 +1,15 @@
+if (!$env:APPVEYOR_SCHEDULED_BUILD -and !$env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_REPO_BRANCH -eq 'next') {
+  $nextVersion = node ./ci/publish/getNextVersion prerelease
+  git config --global credential.helper store
+  git config --global push.default simple
+  Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):[email protected]`n"
+  git config --global user.name $env:APPVEYOR_REPO_COMMIT_AUTHOR
+  git config --global user.email $env:APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL
+  git checkout $env:APPVEYOR_REPO_BRANCH
+  Write-Host "Publishing $($nextVersion) to npm"
+  if($?) {
+    ./node_modules/.bin/lerna publish --repo-version $nextVersion --npm-tag=$env:APPVEYOR_REPO_BRANCH --yes --skip-git
+  }
+
+  exit $lastexitcode
+}

config/karma.js

@@ -2,6 +2,7 @@
 * In local config, only run tests using phantom js. No code coverage reports applied
 */
 var webpack = require('webpack');
+require('airbnb-browser-shims');
 var webpackConfig = require('./webpack.common.config.js');
 var RewirePlugin = require("rewire-webpack");
 var path = require('path');
@@ -27,7 +28,7 @@ module.exports = function (config) {
       return BROWSERS.split(',');
     }
     if(RELEASE){
-      browsers = ['Chrome','Firefox','IE']
+      browsers = ['Chrome','Firefox', 'IE']
     }else if(DEBUG){
       browsers = ['ChromeDebugging'];
     }
@@ -86,7 +87,10 @@ module.exports = function (config) {
         loaders: webpackConfig.module.loaders
       },
       resolve: {
-        extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx']
+        extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx'],
+        alias: {
+          common: path.resolve('packages/common/')
+        }
       },
       plugins: [
         new RewirePlugin()

config/webpack.common.config.js

@@ -1,6 +1,7 @@
 const webpack = require('webpack');
 const argv = require('minimist')(process.argv.slice(2));
 const RELEASE = argv.release;
+const path = require('path');
 
 function getPlugins() {
   const nodeEnv = RELEASE ? '"production"' : '"development"';
@@ -36,7 +37,8 @@ const config = {
       amd: 'react-dom'
     },
     'react/addons': 'React',
-    moment: 'moment'
+    moment: 'moment',
+    immutable: 'immutable'
   },
   module: {
     loaders: [
@@ -45,6 +47,11 @@ const config = {
     ]
   },
   plugins: getPlugins(),
+  resolve: {
+    alias: {
+      common: path.resolve('packages/common/')
+    }
+  },
   postLoaders: [
     {
       test: /\.js$/,

docs/api/docs.json

@@ -53,7 +53,7 @@
             "type": null
           },
           {
-            "name": "displayEnd",
+            "name": "rowOverscanEndIdx",
             "type": null
           },
           {
@@ -69,13 +69,13 @@
         "modifiers": [],
         "params": [
           {
-            "name": "displayStart",
+            "name": "rowOverscanStartIdx",
             "type": {
               "name": "number"
             }
           },
           {
-            "name": "displayEnd",
+            "name": "rowOverscanEndIdx",
             "type": {
               "name": "number"
             }
@@ -287,56 +287,56 @@
         "required": false,
         "description": ""
       },
-      "displayStart": {
+      "rowOverscanStartIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "displayEnd": {
+      "rowOverscanEndIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "visibleStart": {
+      "rowVisibleStartIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "visibleEnd": {
+      "rowVisibleEndIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colVisibleStart": {
+      "colVisibleStartIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colVisibleEnd": {
+      "colVisibleEndIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colDisplayStart": {
+      "colOverscanStartIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colDisplayEnd": {
+      "colOverscanEndIdx": {
         "type": {
           "name": "number"
         },
@@ -4178,28 +4178,28 @@
         "required": false,
         "description": ""
       },
-      "colVisibleStart": {
+      "colVisibleStartIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colVisibleEnd": {
+      "colVisibleEndIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colDisplayStart": {
+      "colOverscanStartIdx": {
         "type": {
           "name": "number"
         },
         "required": true,
         "description": ""
       },
-      "colDisplayEnd": {
+      "colOverscanEndIdx": {
         "type": {
           "name": "number"
         },

docs/markdowns/Canvas.md

@@ -16,22 +16,22 @@ type: `shaperequire('./PropTypeShapes/CellMetaDataShape')`
 type: `string`
 
 
-### `colDisplayEnd` (required)
+### `colOverscanEndIdx` (required)
 
 type: `number`
 
 
-### `colDisplayStart` (required)
+### `colOverscanStartIdx` (required)
 
 type: `number`
 
 
-### `colVisibleEnd` (required)
+### `colVisibleEndIdx` (required)
 
 type: `number`
 
 
-### `colVisibleStart` (required)
+### `colVisibleStartIdx` (required)
 
 type: `number`
 
@@ -46,12 +46,12 @@ type: `union(object|array)`
 type: `element`
 
 
-### `displayEnd` (required)
+### `rowOverscanEndIdx` (required)
 
 type: `number`
 
 
-### `displayStart` (required)
+### `rowOverscanStartIdx` (required)
 
 type: `number`
 
@@ -145,12 +145,12 @@ type: `string`
 type: `union(number|string)`
 
 
-### `visibleEnd` (required)
+### `rowVisibleEndIdx` (required)
 
 type: `number`
 
 
-### `visibleStart` (required)
+### `rowVisibleStartIdx` (required)
 
 type: `number`
 

docs/markdowns/Row.md

@@ -17,22 +17,22 @@ type: `func`
 defaultValue: `require('./Cell')`
 
 
-### `colDisplayEnd` (required)
+### `colOverscanEndIdx` (required)
 
 type: `number`
 
 
-### `colDisplayStart` (required)
+### `colOverscanStartIdx` (required)
 
 type: `number`
 
 
-### `colVisibleEnd` (required)
+### `colVisibleEndIdx` (required)
 
 type: `number`
 
 
-### `colVisibleStart` (required)
+### `colVisibleStartIdx` (required)
 
 type: `number`