Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bad0029
Merge branch 'release-4.0.0' into next
amanmahajan7 Apr 23, 2018
2178b18
Merge branch 'release-4.0.8' into next
amanmahajan7 May 11, 2018
0cb07db
Allow for optional SimpleCellFormatter.value prop (#948)
chuntley May 22, 2018
1c273ed
Improve Cell navigation Performance (#1123)
malonecj May 24, 2018
7188e97
Fix Cell component export and columns count (#1227)
amanmahajan7 Jun 17, 2018
9b3504d
update file names (#1245)
colindjk Jul 23, 2018
5d76eb9
Rectangular selection range support (on top of 'next') (#1210)
rowanhill Jul 26, 2018
bbe8502
Scrolling improvements (#1254)
malonecj Aug 29, 2018
10d40fe
Merge master into next
conor-j-malone Aug 30, 2018
bfca2a4
Publish next branch on commit to next
conor-j-malone Sep 4, 2018
9529cb7
Get selected row columns if applicable
conor-j-malone Sep 4, 2018
c88ca23
Fix failing tests
conor-j-malone Sep 4, 2018
81137a9
Update npmrc token
conor-j-malone Sep 4, 2018
5134c89
Fix some zIndex issues around frozen cells and editors
conor-j-malone Sep 5, 2018
ab2da43
Remove ReactDataGrid dependency from addons bundle (#1272)
malonecj Sep 11, 2018
2cebeb5
Pass renderBase row and correct ref to custom row renderer
conor-j-malone Sep 11, 2018
ca24aee
Change editor container to be fixed position
conor-j-malone Sep 12, 2018
e026531
Add missing rdg-editor-container class on EditorContainer (#1275)
nstepien Sep 13, 2018
5f6bbf8
Ensure row refs reference an RDG Row component
conor-j-malone Sep 13, 2018
a6fe057
Show all columns unless scrolling vertically
conor-j-malone Sep 14, 2018
fe956c7
isFrozen column check
conor-j-malone Sep 17, 2018
1d4ad8c
Render edtior container without taking scrollLeft into account if col…
conor-j-malone Sep 19, 2018
e640fe8
Set CellMask position to be fixed when scrolling horizontally and fro…
conor-j-malone Sep 19, 2018
75d07ce
Unit tests and refactoring (#1279)
Runi-B Sep 19, 2018
6225892
Upgrade to RDG 5
conor-j-malone Sep 19, 2018
f8e6ff5
Merge branch 'next' of https://github.com/adazzle/react-data-grid int…
conor-j-malone Sep 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -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"
]
}
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ dist
npm-debug.log
lerna-debug.log
**.orig
.vscode
.vscode
package-lock.json
Binary file modified .npmrc.enc
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
access_token:
secure: dHfUgllfTEAqpcoz3iQj8TO0DGh8n90Coqf0+IXT0bIRNSIxGTDu991X+FStY613
npmrc_token:
secure: vqGk4eUIvg1ngzdW4WE2hlq1U7YupunkayeCh7bXy8M=
secure: +0xEbrDGXwT78XtVnyF0CQcqiKZCgQSVq9DZaIH2YhI=


# Install scripts. (runs after repo cloning)
Expand Down Expand Up @@ -48,5 +48,5 @@ on_success:
- 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
./ci/publish/publishNext.ps1
}
28 changes: 14 additions & 14 deletions ci/publish/publishBranch.ps1 → ci/publish/publishNext.ps1
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
$nextVersion = node ./ci/publish/getNextVersion
git config --global credential.helper store
git config --global push.default simple
Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`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
$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):x-oauth-basic@github.com`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
8 changes: 6 additions & 2 deletions config/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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'];
}
Expand Down Expand Up @@ -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()
Expand Down
9 changes: 8 additions & 1 deletion config/webpack.common.config.js
Original file line number Diff line number Diff line change
@@ -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"';
Expand Down Expand Up @@ -36,7 +37,8 @@ const config = {
amd: 'react-dom'
},
'react/addons': 'React',
moment: 'moment'
moment: 'moment',
immutable: 'immutable'
},
module: {
loaders: [
Expand All @@ -45,6 +47,11 @@ const config = {
]
},
plugins: getPlugins(),
resolve: {
alias: {
common: path.resolve('packages/common/')
}
},
postLoaders: [
{
test: /\.js$/,
Expand Down
30 changes: 15 additions & 15 deletions docs/api/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"type": null
},
{
"name": "displayEnd",
"name": "rowOverscanEndIdx",
"type": null
},
{
Expand All @@ -69,13 +69,13 @@
"modifiers": [],
"params": [
{
"name": "displayStart",
"name": "rowOverscanStartIdx",
"type": {
"name": "number"
}
},
{
"name": "displayEnd",
"name": "rowOverscanEndIdx",
"type": {
"name": "number"
}
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down
16 changes: 8 additions & 8 deletions docs/markdowns/Canvas.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -46,12 +46,12 @@ type: `union(object|array)`
type: `element`


### `displayEnd` (required)
### `rowOverscanEndIdx` (required)

type: `number`


### `displayStart` (required)
### `rowOverscanStartIdx` (required)

type: `number`

Expand Down Expand Up @@ -145,12 +145,12 @@ type: `string`
type: `union(number|string)`


### `visibleEnd` (required)
### `rowVisibleEndIdx` (required)

type: `number`


### `visibleStart` (required)
### `rowVisibleStartIdx` (required)

type: `number`

Expand Down
8 changes: 4 additions & 4 deletions docs/markdowns/Row.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
7 changes: 5 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"lerna": "2.0.0-beta.34",
"version": "4.0.8"
"lerna": "2.8.0",
"version": "5.0.0",
"packages": [
"packages/*"
]
}
Loading