diff --git a/.gitignore b/.gitignore index d0c9565..0a672e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /node_modules /dist -package-lock.json \ No newline at end of file +package-lock.json +*.nosync diff --git a/package.json b/package.json index cbb4709..ebba915 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-grid-react-example", - "version": "22.1.0", + "version": "23.0.0", "description": "Example Reach applicaiton using ag-Grid.", "main": "dist/ag-grid-react-example.js", "scripts": { @@ -38,7 +38,7 @@ }, "homepage": "http://www.ag-grid.com/", "devDependencies": { - "@ag-grid-community/core": "~22.1.0", + "@ag-grid-community/core": "~23.0.0", "@babel/core": "7.4.4", "@babel/plugin-proposal-class-properties": "7.4.4", "@babel/plugin-proposal-function-bind": "7.2.0", @@ -62,9 +62,9 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-grid-enterprise/all-modules": "~22.1.0", - "@ag-grid-community/react": "~22.1.0", - "bootstrap": "4.3.1", + "@ag-grid-enterprise/all-modules": "~23.0.0", + "@ag-grid-community/react": "~23.0.0", + "bootstrap": "4.4.1", "d3": "4.9.1", "lodash": "4.17.11", "react": "16.8.6", diff --git a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx index 369f89f..a40b133 100644 --- a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx +++ b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx @@ -1,5 +1,5 @@ -import React, {Component} from "react"; -import {AgGridColumn, AgGridReact} from "@ag-grid-community/react"; +import React, { Component } from "react"; +import { AgGridColumn, AgGridReact } from "@ag-grid-community/react"; import RowDataFactory from "./RowDataFactory"; import DateComponent from "./DateComponent.jsx"; import SkillsCellRenderer from './SkillsCellRenderer.jsx'; @@ -17,7 +17,7 @@ import "./RichGridDeclarativeExample.css"; // import {AllCommunityModules} from "@ag-grid-community/all-modules"; // for enterprise features -import {AllModules} from "@ag-grid-enterprise/all-modules"; +import { AllModules } from "@ag-grid-enterprise/all-modules"; export default class RichGridDeclarativeExample extends Component { constructor(props) { @@ -57,7 +57,7 @@ export default class RichGridDeclarativeExample extends Component { /* Demo related methods */ onToggleSidebar = (event) => { - this.setState({sideBar: event.target.checked}); + this.setState({ sideBar: event.target.checked }); }; deselectAll() { @@ -65,7 +65,7 @@ export default class RichGridDeclarativeExample extends Component { } onQuickFilterText = (event) => { - this.setState({quickFilterText: event.target.value}); + this.setState({ quickFilterText: event.target.value }); }; onRefreshData = () => { @@ -128,58 +128,58 @@ export default class RichGridDeclarativeExample extends Component { render() { return ( -
+

Rich Grid with Declarative Markup Example

-
-
- Employees Skills and Contact Details: { this.state.rowCount } +
+
+ Employees Skills and Contact Details: {this.state.rowCount}
-
+
Grid API: - + Column API:
-
-
+
+
-
+
Filter API:
-
-
+
+
- +
-
+
- +
-
+
+ checkboxSelection sortable={false} suppressMenu filter={false} pinned> + cellEditorFramework={NameCellEditor} + enableRowGroup enablePivot pinned editable /> + cellRenderer={RichGridDeclarativeExample.countryCellRenderer} + filterParams={{ + cellRenderer: RichGridDeclarativeExample.countryCellRenderer, + cellHeight: 20 + }} + enableRowGroup enablePivot pinned editable /> + pinned columnGroupShow="open" + cellRenderer={RichGridDeclarativeExample.dateCellRenderer} /> + cellRendererFramework={SkillsCellRenderer} + filterFramework={SkillsFilter} /> + cellRendererFramework={ProficiencyCellRenderer} + filterFramework={ProficiencyFilter} /> - - - + + +
diff --git a/src-large-data/index.js b/src-large-data/index.js index e96ebe7..db2deae 100644 --- a/src-large-data/index.js +++ b/src-large-data/index.js @@ -5,7 +5,7 @@ import React from 'react'; import LargeGrid from './largeGrid.jsx'; import '@ag-grid-community/core/dist/styles/ag-grid.css'; -import '@ag-grid-community/core/dist/styles/ag-theme-fresh.css'; +import '@ag-grid-community/core/dist/styles/ag-theme-balham.css'; // waiting for dom to load before booting react. we could alternatively // put the index.js reference at the end fo the index.html, but i prefer this way. diff --git a/src-large-data/largeGrid.jsx b/src-large-data/largeGrid.jsx index 75dd0ed..39b42f3 100644 --- a/src-large-data/largeGrid.jsx +++ b/src-large-data/largeGrid.jsx @@ -63,7 +63,7 @@ export default class MyApp extends Component { render() { return ( -
+
); diff --git a/src-trader-dashboard/components/FxQuoteMatrix.jsx b/src-trader-dashboard/components/FxQuoteMatrix.jsx index 925b8c4..dad7ea3 100644 --- a/src-trader-dashboard/components/FxQuoteMatrix.jsx +++ b/src-trader-dashboard/components/FxQuoteMatrix.jsx @@ -61,7 +61,7 @@ class FxQuoteMatrix extends Component { render() { return (
+ className="ag-theme-balham"> + className="ag-theme-balham"> + className="ag-theme-balham">