chore: update deps (#695)

DevExpress · Jan 26, 2018 · 8502904 · 8502904
1 parent 11aa663
commit 8502904
Show file tree

Hide file tree

Showing 18 changed files with 193 additions and 144 deletions.
diff --git a/packages/dx-core/package.json b/packages/dx-core/package.json
@@ -46,12 +46,12 @@
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.24.1",
     "core-js": "^2.5.3",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
-    "jest": "^22.1.1",
+    "eslint-plugin-jest": "^21.7.0",
+    "jest": "^22.1.4",
     "rollup": "0.50.0",
     "rollup-plugin-babel": "^3.0.3",
     "rollup-plugin-license": "^0.5.0"

diff --git a/packages/dx-grid-core/package.json b/packages/dx-grid-core/package.json
@@ -47,12 +47,12 @@
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.24.1",
     "core-js": "^2.5.3",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
-    "jest": "^22.1.1",
+    "eslint-plugin-jest": "^21.7.0",
+    "jest": "^22.1.4",
     "rollup": "0.50.0",
     "rollup-plugin-babel": "^3.0.3",
     "rollup-plugin-license": "^0.5.0"

diff --git a/packages/dx-react-core/package.json b/packages/dx-react-core/package.json
@@ -55,14 +55,14 @@
     "core-js": "^2.5.3",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
+    "eslint-plugin-jest": "^21.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.5.1",
-    "jest": "^22.1.1",
+    "jest": "^22.1.4",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-test-renderer": "^16.2.0",

diff --git a/packages/dx-react-demos/package.json b/packages/dx-react-demos/package.json
@@ -35,14 +35,14 @@
     "@devexpress/dx-react-grid-bootstrap3": "1.0.0-rc.1",
     "@devexpress/dx-react-grid-material-ui": "1.0.0-rc.1",
     "core-js": "^2.5.3",
-    "material-ui": "1.0.0-beta.29",
+    "material-ui": "1.0.0-beta.30",
     "material-ui-icons": "1.0.0-beta.17",
-    "prismjs": "^1.9.0",
+    "prismjs": "^1.10.0",
     "prop-types": "^15.6.0",
     "react": "^16.2.0",
-    "react-bootstrap": "^0.32.0",
+    "react-bootstrap": "^0.32.1",
     "react-dom": "^16.2.0",
-    "react-frame-component": "^2.0.1",
+    "react-frame-component": "^2.0.2",
     "react-redux": "^5.0.6",
     "react-router-dom": "^4.2.2",
     "redux": "^3.7.2",
@@ -60,25 +60,25 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "concurrently": "^3.5.1",
-    "css-loader": "^0.28.8",
+    "css-loader": "^0.28.9",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
+    "eslint-plugin-jest": "^21.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.5.1",
-    "jest": "^22.1.1",
+    "jest": "^22.1.4",
     "mustache": "^2.3.0",
     "node-static": "^0.7.10",
     "nodemon": "^1.14.11",
     "react-test-renderer": "^16.2.0",
     "source-map-loader": "^0.2.3",
     "style-loader": "^0.19.1",
     "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.11.0",
+    "webpack-dev-server": "^2.11.1",
     "write-file-webpack-plugin": "^4.2.0"
   }
 }
diff --git a/packages/dx-react-demos/src/demo-sources/grid-basic/table-row-template.jsxt b/packages/dx-react-demos/src/demo-sources/grid-basic/table-row-template.jsxt
@@ -16,7 +16,7 @@ const styles = {
     backgroundColor: '#f5f5f5',
   },
   health: {
-    backgroundColor: '#c8e6c9',
+    backgroundColor: '#a2e2a4',
   },
   telecom: {
     backgroundColor: '#b3e5fc',

diff --git a/packages/dx-react-demos/src/demo-sources/grid-featured-controlled-mode/material-ui/demo.jsx b/packages/dx-react-demos/src/demo-sources/grid-featured-controlled-mode/material-ui/demo.jsx
@@ -99,7 +99,7 @@ CommitButton.propTypes = {
 };
 
 const CancelButton = ({ onExecute }) => (
-  <IconButton color="accent" onClick={onExecute} title="Cancel changes">
+  <IconButton color="secondary" onClick={onExecute} title="Cancel changes">
     <CancelIcon />
   </IconButton>
 );
@@ -373,7 +373,7 @@ class DemoBase extends React.PureComponent {
           </DialogContent>
           <DialogActions>
             <Button onClick={this.cancelDelete} color="primary">Cancel</Button>
-            <Button onClick={this.deleteRows} color="accent">Delete</Button>
+            <Button onClick={this.deleteRows} color="secondary">Delete</Button>
           </DialogActions>
         </Dialog>
       </Paper>

diff --git a/packages/dx-react-demos/src/demo-sources/grid-featured-redux-integration/demo.jsxt b/packages/dx-react-demos/src/demo-sources/grid-featured-redux-integration/demo.jsxt
@@ -11,6 +11,7 @@ import {
   Table, TableHeaderRow, TableFilterRow, TableSelection, TableGroupRow, TableRowDetail,
   GroupingPanel, PagingPanel, DragDropProvider, TableColumnReordering, TableColumnResizing, Toolbar,
 } from '@devexpress/dx-react-grid-<%&themeName%>';
+import { withStyles } from 'material-ui/styles';
 
 import {
   generateRows,
@@ -40,12 +41,18 @@ const tableDetailColumnExtensions = [
   { columnName: 'status', width: 125 },
 ];
 
+const styles = theme => ({
+  title: {
+    color: theme.palette.text.primary,
+  },
+});
+
 export const GRID_STATE_CHANGE_ACTION = 'GRID_STATE_CHANGE';
 
-const GridDetailContainer = ({ row }) => (
+const GridDetailContainerBase = ({ row, classes }) => (
   <div style={{ margin: 20 }}>
     <div>
-      <h5>{row.firstName} {row.lastName}&apos;s Tasks:</h5>
+      <h5 className={classes.title}>{row.firstName} {row.lastName}&apos;s Tasks:</h5>
     </div>
     <<%&wrapperTag%>>
       <Grid
@@ -60,10 +67,13 @@ const GridDetailContainer = ({ row }) => (
     </<%&wrapperTag%>>
   </div>
 );
-GridDetailContainer.propTypes = {
+GridDetailContainerBase.propTypes = {
   row: PropTypes.object.isRequired,
+  classes: PropTypes.object.isRequired,
 };
 
+const GridDetailContainer = withStyles(styles, { name: 'ReduxIntegrationDemo' })(GridDetailContainerBase);
+
 const ReduxGridDetailContainer = connect(state => state)(GridDetailContainer);
 
 const GridContainer = ({

diff --git a/packages/dx-react-demos/src/theme-sources/material-ui/components/highlighted-cell.jsx b/packages/dx-react-demos/src/theme-sources/material-ui/components/highlighted-cell.jsx
@@ -20,7 +20,6 @@ const styles = theme => ({
   highlightedCell: {
     paddingLeft: theme.spacing.unit,
     paddingRight: theme.spacing.unit,
-    borderBottom: `1px solid ${theme.palette.text.lightDivider}`,
   },
 });
 

diff --git a/packages/dx-react-demos/src/theme-sources/material-ui/components/progress-bar-cell.jsx b/packages/dx-react-demos/src/theme-sources/material-ui/components/progress-bar-cell.jsx
@@ -7,7 +7,6 @@ const styles = theme => ({
   progressBarCell: {
     paddingLeft: theme.spacing.unit,
     paddingRight: theme.spacing.unit,
-    borderBottom: `1px solid ${theme.palette.text.lightDivider}`,
   },
   progressBar: {
     backgroundColor: theme.palette.primary[300],

diff --git a/packages/dx-react-grid-bootstrap3/package.json b/packages/dx-react-grid-bootstrap3/package.json
@@ -61,17 +61,17 @@
     "core-js": "^2.5.3",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
+    "eslint-plugin-jest": "^21.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.5.1",
-    "jest": "^22.1.1",
+    "jest": "^22.1.4",
     "react": "^16.2.0",
-    "react-bootstrap": "^0.32.0",
+    "react-bootstrap": "^0.32.1",
     "react-dom": "^16.2.0",
     "react-test-renderer": "^16.2.0",
     "rollup": "0.50.0",
@@ -88,6 +88,6 @@
     "@devexpress/dx-react-core": "1.0.0-rc.1",
     "@devexpress/dx-react-grid": "1.0.0-rc.1",
     "react": "^16.2.0",
-    "react-bootstrap": "^0.32.0"
+    "react-bootstrap": "^0.32.1"
   }
 }
diff --git a/packages/dx-react-grid-material-ui/package.json b/packages/dx-react-grid-material-ui/package.json
@@ -61,19 +61,19 @@
     "core-js": "^2.5.3",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
+    "eslint-plugin-jest": "^21.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.5.1",
-    "jest": "^22.1.1",
+    "jest": "^22.1.4",
     "jss": "^9.5.1",
-    "jss-preset-default": "^4.0.1",
+    "jss-preset-default": "^4.1.0",
     "jss-theme-reactor": "^0.11.1",
-    "material-ui": "1.0.0-beta.29",
+    "material-ui": "1.0.0-beta.30",
     "material-ui-icons": "1.0.0-beta.17",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
@@ -91,7 +91,7 @@
     "@devexpress/dx-grid-core": "1.0.0-rc.1",
     "@devexpress/dx-react-core": "1.0.0-rc.1",
     "@devexpress/dx-react-grid": "1.0.0-rc.1",
-    "material-ui": "1.0.0-beta.29",
+    "material-ui": "1.0.0-beta.30",
     "material-ui-icons": "1.0.0-beta.17",
     "react": "^16.2.0"
   }

diff --git a/packages/dx-react-grid-material-ui/src/templates/paging-panel/pager.jsx b/packages/dx-react-grid-material-ui/src/templates/paging-panel/pager.jsx
@@ -4,12 +4,13 @@ import classNames from 'classnames';
 import { withStyles } from 'material-ui/styles';
 import { PageSizeSelector } from './page-size-selector';
 import { Pagination } from './pagination';
+import { getBorderColor } from '../utils';
 
 const styles = theme => ({
   pager: {
     overflow: 'hidden',
     padding: theme.spacing.unit * 1.5,
-    borderTop: `1px solid ${theme.palette.text.lightDivider}`,
+    borderTop: getBorderColor(theme),
   },
 });
 

diff --git a/packages/dx-react-grid-material-ui/src/templates/table-detail-cell.jsx b/packages/dx-react-grid-material-ui/src/templates/table-detail-cell.jsx
@@ -6,7 +6,7 @@ import { withStyles } from 'material-ui/styles';
 
 const styles = theme => ({
   active: {
-    backgroundColor: theme.palette.background.contentFrame,
+    backgroundColor: theme.palette.background.default,
   },
 });
 

diff --git a/packages/dx-react-grid-material-ui/src/templates/toolbar/toolbar.jsx b/packages/dx-react-grid-material-ui/src/templates/toolbar/toolbar.jsx
@@ -3,15 +3,11 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import ToolbarMUI from 'material-ui/Toolbar';
 import { withStyles } from 'material-ui/styles';
-import { darken, fade, lighten } from 'material-ui/styles/colorManipulator';
+import { getBorderColor } from '../utils';
 
 const styles = theme => ({
   toolbar: {
-    borderBottom: `1px solid ${
-      theme.palette.type === 'light'
-        ? lighten(fade(theme.palette.text.lightDivider, 1), 0.925)
-        : darken(fade(theme.palette.text.lightDivider, 1), 0.685)
-    }`,
+    borderBottom: getBorderColor(theme),
   },
 });
 

diff --git a/packages/dx-react-grid-material-ui/src/templates/utils.jsx b/packages/dx-react-grid-material-ui/src/templates/utils.jsx
@@ -0,0 +1,7 @@
+import { darken, fade, lighten } from 'material-ui/styles/colorManipulator';
+
+export const getBorderColor = theme => (`1px solid ${
+  theme.palette.type === 'light'
+    ? lighten(fade(theme.palette.divider, 1), 0.88)
+    : darken(fade(theme.palette.divider, 1), 0.8)
+}`);
diff --git a/packages/dx-react-grid/package.json b/packages/dx-react-grid/package.json
@@ -59,15 +59,15 @@
     "core-js": "^2.5.3",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.6.2",
+    "eslint-plugin-jest": "^21.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.5.1",
-    "jest": "^22.1.1",
+    "jest": "^22.1.4",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-test-renderer": "^16.2.0",

diff --git a/packages/dx-testing/package.json b/packages/dx-testing/package.json
@@ -14,7 +14,7 @@
     "lint:fix": "yarn run lint -- --fix"
   },
   "devDependencies": {
-    "eslint": "^4.15.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.8.0"
   }