Skip to content

Commit

Permalink
Revert "React Data Grid V5 (#1266)"
Browse files Browse the repository at this point in the history
This reverts commit f5ffea6.
  • Loading branch information
amanmahajan7 committed Oct 24, 2018
1 parent f5ffea6 commit 3131729
Show file tree
Hide file tree
Showing 170 changed files with 8,260 additions and 11,100 deletions.
16 changes: 6 additions & 10 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
{
"presets": [
"es2015",
"react",
"stage-2"
],
"plugins": [
"transform-class-properties",
"transform-es3-member-expression-literals",
"transform-es3-property-literals"
]
"presets": ["react", "es2015-loose"],
"plugins": [
'transform-class-properties',
'transform-es3-member-expression-literals',
'transform-es3-property-literals'
]
}
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
*/
"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: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ dist
npm-debug.log
lerna-debug.log
**.orig
.vscode
package-lock.json
.vscode
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/frozen-cols)
- [Frozen columns](http://adazzle.github.io/react-data-grid/#/examples/fixed-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: +0xEbrDGXwT78XtVnyF0CQcqiKZCgQSVq9DZaIH2YhI=
secure: vqGk4eUIvg1ngzdW4WE2hlq1U7YupunkayeCh7bXy8M=


# 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/publishNext.ps1
./ci/publish/publishBranch.ps1
}
28 changes: 14 additions & 14 deletions ci/publish/publishNext.ps1 → ci/publish/publishBranch.ps1
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
$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
$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):[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
8 changes: 2 additions & 6 deletions config/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* 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 @@ -28,7 +27,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 @@ -87,10 +86,7 @@ module.exports = function (config) {
loaders: webpackConfig.module.loaders
},
resolve: {
extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx'],
alias: {
common: path.resolve('packages/common/')
}
extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx']
},
plugins: [
new RewirePlugin()
Expand Down
9 changes: 1 addition & 8 deletions config/webpack.common.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
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 @@ -37,8 +36,7 @@ const config = {
amd: 'react-dom'
},
'react/addons': 'React',
moment: 'moment',
immutable: 'immutable'
moment: 'moment'
},
module: {
loaders: [
Expand All @@ -47,11 +45,6 @@ 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": "rowOverscanEndIdx",
"name": "displayEnd",
"type": null
},
{
Expand All @@ -69,13 +69,13 @@
"modifiers": [],
"params": [
{
"name": "rowOverscanStartIdx",
"name": "displayStart",
"type": {
"name": "number"
}
},
{
"name": "rowOverscanEndIdx",
"name": "displayEnd",
"type": {
"name": "number"
}
Expand Down Expand Up @@ -287,56 +287,56 @@
"required": false,
"description": ""
},
"rowOverscanStartIdx": {
"displayStart": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"rowOverscanEndIdx": {
"displayEnd": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"rowVisibleStartIdx": {
"visibleStart": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"rowVisibleEndIdx": {
"visibleEnd": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colVisibleStartIdx": {
"colVisibleStart": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colVisibleEndIdx": {
"colVisibleEnd": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colOverscanStartIdx": {
"colDisplayStart": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colOverscanEndIdx": {
"colDisplayEnd": {
"type": {
"name": "number"
},
Expand Down Expand Up @@ -4178,28 +4178,28 @@
"required": false,
"description": ""
},
"colVisibleStartIdx": {
"colVisibleStart": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colVisibleEndIdx": {
"colVisibleEnd": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colOverscanStartIdx": {
"colDisplayStart": {
"type": {
"name": "number"
},
"required": true,
"description": ""
},
"colOverscanEndIdx": {
"colDisplayEnd": {
"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`


### `colOverscanEndIdx` (required)
### `colDisplayEnd` (required)

type: `number`


### `colOverscanStartIdx` (required)
### `colDisplayStart` (required)

type: `number`


### `colVisibleEndIdx` (required)
### `colVisibleEnd` (required)

type: `number`


### `colVisibleStartIdx` (required)
### `colVisibleStart` (required)

type: `number`

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


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

type: `number`


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

type: `number`

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


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

type: `number`


### `rowVisibleStartIdx` (required)
### `visibleStart` (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')`


### `colOverscanEndIdx` (required)
### `colDisplayEnd` (required)

type: `number`


### `colOverscanStartIdx` (required)
### `colDisplayStart` (required)

type: `number`


### `colVisibleEndIdx` (required)
### `colVisibleEnd` (required)

type: `number`


### `colVisibleStartIdx` (required)
### `colVisibleStart` (required)

type: `number`

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

0 comments on commit 3131729

Please sign in to comment.