Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tdzienniak authored Nov 8, 2017
2 parents 86ba455 + a63731b commit 2db8015
Show file tree
Hide file tree
Showing 143 changed files with 3,386 additions and 1,522 deletions.
77 changes: 39 additions & 38 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,59 +1,60 @@
> **HAVE YOU ALREADY SEARCHED FOR SIMILAR ISSUES? PLEASE HELP US OUT AND DOUBLE-CHECK FIRST!**
- Have you already searched for similar issues? Please help us out and double-check first!

> **ALSO, PLEASE DON'T BE THAT PERSON WHO DELETES THIS TEMPLATE. IT'S HERE FOR A REASON.**
- Also, please don't be that person who deletes this template. It's here for a reason.

> **THANKS!**
- Thanks!

**WHICH VERSION OF REACT ARE YOU USING?**
```
Officially Supported:
[ ] v0.14.x
```
---

```
Community Supported:
[ ] v15.0.x
```
### Which version of React JS are you using?

**WHICH BROWSER ARE YOU USING?**
✅ Officially supported ✅
- [ ] v15.4.x

```
Officially Supported:
[ ] IE 9 / IE 10 / IE 11
[ ] Edge
[ ] Chrome
```
⚠️ Not officially supported, expect warnings ⚠️
- [ ] v15.5.x
- [ ] v15.6.x

```
Should work:
[ ] Firefox
[ ] Safari
```

--------
☣️ Not officially supported, expect warnings and errors ☣️
- [ ] v16.x.x

**I'm submitting a ...** (check one with "x")
```
[ ] bug report
[ ] feature request
[ ] support request => Please do not submit support request here, instead see https://github.com/adazzle/react-data-grid/blob/master/CONTRIBUTING.md
```
---

**Current behavior**
### Which browser are you using?

✅ Officially supported ✅
- [ ] IE 9 / IE 10 / IE 11
- [ ] Edge
- [ ] Chrome

**Expected/desired behavior**
⚠️ Not officially supported, but "should work" ⚠️
- [ ] Firefox
- [ ] Safari

---

**Reproduction of the problem**
If the current behavior is a bug or you can illustrate your feature request better with an example, please provide the steps to reproduce and if possible a minimal demo of the problem.
### I'm submitting a ...

- [ ] 🐛 Bug Report
- [ ] 💡 Feature Request

**What is the expected behavior?**
> 👋 Need general support? Not sure about how to use React itself, or how to get started with the Grid?
> Please do not submit support request here. Instead see
> https://github.com/adazzle/react-data-grid/blob/master/CONTRIBUTING.md
---

**What is the motivation / use case for changing the behavior?**
### Issue Details

```
Please include:
- What the current behavior is
- What the desired behvaior is
- (If Bug) Steps to reproduce the issue
- (If Feature) The motivation / use case for the feature
We especially love screenshots / videos of problems, and remember
The Best Issue Is A Pull Request™
```

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ test/coverage
dist
.npmrc
npm-debug.log
**.orig
**.orig
.vscode
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Use [Github issues](https://github.com/adazzle/react-data-grid/issues) for featu

## <a name="question"></a> Got a Question or Problem?

If you have questions about how to *use* react-data-grid, please direct them to [StackOverflow](http://stackoverflow.com/questions/tagged/react-data-grid). We are also available on our Slack channel
If you have questions about how to *use* react-data-grid, please direct them to [StackOverflow](http://stackoverflow.com/questions/tagged/react-data-grid). We are also available on our [Slack channel](https://react-data-grid.herokuapp.com/)

## <a name="issue"></a> Found an Issue?
If you find a bug in the source code or a mistake in the documentation, you can help us by
Expand Down
84 changes: 84 additions & 0 deletions config/karma.dev.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/*
* In local config, only run tests using phantom js. No code coverage reports applied
*/
const webpack = require('webpack');
const path = require('path');
const karma = require('karma');
const argv = require('minimist')(process.argv.slice(2));

// load our current karma config file
const { preprocessors: defaultPreprocessors,
files: defaultFiles,
basePath,
webpack: defaultWebpack,
webpackServer } = karma.config.parseConfig(path.resolve('config/karma.js'));

let files = defaultFiles;
let preprocessors = defaultPreprocessors;
// if "--file" present, run only tests for that file and enable sourcemaps
if (argv.file) {
const testFile = path.resolve(argv.file);
files = [...defaultFiles.slice(0, defaultFiles.length - 1), testFile];
preprocessors = Object.keys(defaultPreprocessors).reduce( (res, key) => {
if (key === defaultFiles[defaultFiles.length - 1].pattern) {
res[testFile] = [...defaultPreprocessors[key], 'sourcemap'];
} else {
res[key] = defaultPreprocessors[key];
}
return res;
}, {});
console.log(`Running just the tests in ${testFile}`);
} else {
console.log('Running all tests.');
}

// Setup webpack file
const webpackCfg = Object.keys(defaultWebpack).reduce((res, key) => {
let value = defaultWebpack[key];
if (key === 'module') {
value = Object.assign({}, value, { postLoaders: null});
} else if (key === 'plugins') {
value = [...value, new webpack.SourceMapDevToolPlugin({
filename: null,
test: /\.(ts|jsx|tsx)($|\?)/i
})];
}
res[key] = value;
return res;
}, {});
webpackCfg.devtool = argv.file ? 'inline-source-map' : undefined;

module.exports = function(config) {
config.set({
basePath,
// test files & preprocessing
files,
preprocessors,
// webpack
webpack: webpackCfg,
webpackServer,

browserNoActivityTimeout: 1000000,
// reporting
reporters: ['mocha'],
mochaReporter: {
ignoreSkipped: true,
output: !!argv.file ? 'full' : 'minimal'
},
// runs & watch
autoWatch: true,
singleRun: false,

// test framework & browser setup
frameworks: ['jasmine'],
browsers: ['ChromeDebugging'],
port: 9876,
customLaunchers: {
ChromeDebugging: {
base: 'Chrome',
flags: [ '--remote-debugging-port=9333' ],
debug: true
}
}
});
};
28 changes: 17 additions & 11 deletions config/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = function (config) {
if(RELEASE){
browsers = ['Chrome','Firefox','IE']
}else if(DEBUG){
browsers = ['Chrome'];
browsers = ['ChromeDebugging'];
}
return browsers;
};
Expand Down Expand Up @@ -107,7 +107,8 @@ module.exports = function (config) {
externals: {
'cheerio': 'window',
'react/lib/ExecutionEnvironment': true,
'react/lib/ReactContext': true
'react/lib/ReactContext': true,
'react/addons': true
}
},

Expand Down Expand Up @@ -158,15 +159,15 @@ module.exports = function (config) {
browsers: getBrowsers(),

plugins: [
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-phantomjs-launcher-nonet',
'karma-ie-launcher',
'karma-jasmine',
'karma-jasmine-matchers',
'karma-webpack',
'karma-junit-reporter',
'karma-coverage'
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-phantomjs-launcher-nonet',
'karma-ie-launcher',
'karma-jasmine',
'karma-jasmine-matchers',
'karma-webpack',
'karma-junit-reporter',
'karma-coverage'
],

customLaunchers: {
Expand All @@ -177,6 +178,11 @@ module.exports = function (config) {
IE8: {
base: 'IE',
'x-ua-compatible': 'IE=EmulateIE8'
},
ChromeDebugging: {
base: 'Chrome',
flags: [ '--remote-debugging-port=9333' ],
debug: true
}
},

Expand Down
10 changes: 5 additions & 5 deletions docs/api/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -5471,12 +5471,12 @@
"value": {
"startDate": {
"name": "custom",
"raw": "React.PropTypes.Date.isRequired",
"raw": "PropTypes.Date.isRequired",
"required": true
},
"endDate": {
"name": "custom",
"raw": "React.PropTypes.Date.isRequired",
"raw": "PropTypes.Date.isRequired",
"required": true
}
}
Expand Down Expand Up @@ -5542,7 +5542,7 @@
"name": "objectOf",
"value": {
"name": "custom",
"raw": "{\r\n id: React.PropTypes.string,\r\n title: React.PropTypes.string,\r\n value: React.PropTypes.string,\r\n text: React.PropTypes.string\r\n}"
"raw": "{\r\n id: PropTypes.string,\r\n title: PropTypes.string,\r\n value: PropTypes.string,\r\n text: PropTypes.string\r\n}"
}
}
]
Expand Down Expand Up @@ -5921,7 +5921,7 @@
"returns": null
},
{
"name": "isClickInisdeEditor",
"name": "isClickInsideEditor",
"docblock": null,
"modifiers": [],
"params": [
Expand Down Expand Up @@ -6262,7 +6262,7 @@
"name": "objectOf",
"value": {
"name": "custom",
"raw": "{\r\n id: React.PropTypes.string,\r\n title: React.PropTypes.string,\r\n value: React.PropTypes.string,\r\n text: React.PropTypes.string\r\n}"
"raw": "{\r\n id: PropTypes.string,\r\n title: PropTypes.string,\r\n value: PropTypes.string,\r\n text: PropTypes.string\r\n}"
}
}
]
Expand Down
6 changes: 6 additions & 0 deletions docs/markdowns/ReactDataGrid.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ type: `element`
type: `func`


### `enableCellAutoFocus`

type: `bool`
defaultValue: `true`


### `enableCellSelect`

type: `bool`
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"lerna": "2.0.0-beta.34",
"version": "2.0.32"
"version": "2.0.73"
}
24 changes: 15 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"pretest": "npm run eslint",
"test": "./node_modules/.bin/karma start ./config/karma.js --singleRun true --release true",
"dev-test": "./node_modules/.bin/karma start ./config/karma.js --singleRun false --debug true",
"dev-test": "./node_modules/.bin/karma start ./config/karma.dev.js --singleRun false --debug true",
"postinstall": "lerna bootstrap",
"build": "webpack --config ./config/webpack.config.prod.js --release true",
"dev-server": "node webpack-dev-server.js",
Expand All @@ -23,21 +23,24 @@
"react-component"
],
"peerDependencies": {
"react": "^15.4.2",
"react-dom": "^15.4.2"
"react": "^15.6.2",
"react-dom": "^15.6.2"
},
"dependencies": {
"classnames": "^1.2.0",
"create-react-class": "^15.6.2",
"es5-shim": "^4.0.3",
"fbjs": "^0.6.1",
"fs-extra": "^0.30.0",
"object-assign": "^2.0.0",
"prop-types": "^15.5.10",
"react-contextmenu": "1.6.2",
"react-dnd": "^2.1.4",
"react-dnd-html5-backend": "^2.1.2",
"react-input-autosize": "1.1.0",
"react-select": "^1.0.0-beta14",
"reselect": "^2.5.1",
"ron-react-autocomplete": "^4.0.2"
"ron-react-autocomplete": "^4.0.5"
},
"devDependencies": {
"avcoveralls": "^1.0.0",
Expand Down Expand Up @@ -66,19 +69,21 @@
"gulp-util": "^3.0.0",
"immutable": "^3.7.3",
"istanbul-instrumenter-loader": "^0.1.2",
"jasmine-core": "^2.2.0",
"jasmine-core": "2.6.1",
"jasmine-enzyme": "^1.2.0",
"karma": "^0.13.10",
"karma-chrome-launcher": "^0.1.4",
"karma-coverage": "^0.2.6",
"karma": "^1.1.0",
"karma-chrome-launcher": "^0.2.0",
"karma-coverage": "^0.4.0",
"karma-firefox-launcher": "^0.1.3",
"karma-ie-launcher": "^0.1.5",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-jasmine-matchers": "^0.1.3",
"karma-junit-reporter": "^0.2.2",
"karma-phantomjs-launcher": "^0.1.4",
"karma-phantomjs-launcher-nonet": "^0.1.3",
"karma-webpack": "^1.7.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-mocha-reporter": "^2.2.3",
"lerna": "2.0.0-beta.34",
"minimist": "^1.1.0",
"mkdirp": "^0.5.1",
Expand All @@ -98,6 +103,7 @@
"rewire-webpack": "^1.0.0",
"run-sequence": "^1.2.2",
"semver": "^5.0.3",
"sinon": "^4.0.2",
"style-loader": "^0.13.1",
"underscore": "^1.8.3",
"vinyl-source-stream": "^0.1.1",
Expand Down
Loading

0 comments on commit 2db8015

Please sign in to comment.