Merge branch 'b23.0.2' into latest

.gitignore

@@ -1,3 +1,4 @@
 /node_modules
 /dist
-package-lock.json
+package-lock.json
+*.nosync

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-grid-react-example",
-  "version": "22.0.0",
+  "version": "23.0.2",
   "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.0.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.0.0",
+    "@ag-grid-enterprise/all-modules": "~23.0.0",
-    "@ag-grid-community/react": "~22.0.0",
+    "@ag-grid-community/react": "~23.0.0",
-    "bootstrap": "4.3.1",
+    "bootstrap": "4.4.1",
     "d3": "4.9.1",
     "lodash": "4.17.11",
     "react": "16.8.6",
@@ -73,4 +73,4 @@
     "react-router-dom": "5.0.0",
     "redux": "4.0.1"
   }
-}
+}

src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx

@@ -1,5 +1,5 @@
-import React, {Component} from "react";
+import React, { Component } from "react";
-import {AgGridColumn, AgGridReact} from "@ag-grid-community/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) {
@@ -29,7 +29,7 @@ export default class RichGridDeclarativeExample extends Component {
             rowData: new RowDataFactory().createRowData(),
             rowCount: null,
             icons: {
-                columnRemoveFromGroup: '<i class="fa fa-remove"/>',
+                columnRemoveFromGroup: '<i class="fa fa-times"/>',
                 filter: '<i class="fa fa-filter"/>',
                 sortAscending: '<i class="fa fa-long-arrow-down"/>',
                 sortDescending: '<i class="fa fa-long-arrow-up"/>',
@@ -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 = () => {
@@ -75,23 +75,25 @@ export default class RichGridDeclarativeExample extends Component {
     };
 
     invokeSkillsFilterMethod = () => {
-        let skillsFilter = this.api.getFilterInstance('skills');
+        this.api.getFilterInstance('skills', (instance) => {
-        let componentInstance = skillsFilter.getFrameworkComponentInstance();
+            let componentInstance = instance.getFrameworkComponentInstance();
-        componentInstance.helloFromSkillsFilter();
+            componentInstance.helloFromSkillsFilter();
+        });
     };
 
     dobFilter = () => {
-        let dateFilterComponent = this.api.getFilterInstance('dob');
+        this.api.getFilterInstance('dob', (dateFilterComponent) => {
-        dateFilterComponent.setModel({
+            dateFilterComponent.setModel({
-            type: 'equals',
+                type: 'equals',
-            dateFrom: '2000-01-01'
+                dateFrom: '2000-01-01'
-        });
+            });
 
-        // as the date filter is a React component, and its using setState internally, we need
+            // as the date filter is a React component, and its using setState internally, we need
-        // to allow time for the state to be set (as setState is an async operation)
+            // to allow time for the state to be set (as setState is an async operation)
-        // simply wait for the next tick
+            // simply wait for the next tick
-        setTimeout(() => {
+            setTimeout(() => {
-            this.api.onFilterChanged();
+                this.api.onFilterChanged();
+            });
         });
     };
 
@@ -128,58 +130,58 @@ export default class RichGridDeclarativeExample extends Component {
 
     render() {
         return (
-            <div style={{width: '900px'}}>
+            <div style={{ width: '900px' }}>
                 <h1>Rich Grid with Declarative Markup Example</h1>
-                <div style={{display: "inline-block", width: "100%"}}>
+                <div style={{ display: "inline-block", width: "100%" }}>
-                    <div style={{float: "left"}}>
+                    <div style={{ float: "left" }}>
-                        <b>Employees Skills and Contact Details: </b>{ this.state.rowCount }
+                        <b>Employees Skills and Contact Details: </b>{this.state.rowCount}
                     </div>
                 </div>
-                <div style={{marginTop: 10}}>
+                <div style={{ marginTop: 10 }}>
                     <div>
                         <span>
                             Grid API:
                             <button onClick={() => {
-                                this.api.selectAll()
+                                this.api.selectAll();
                             }} className="btn btn-primary">Select All</button>
                             <button onClick={() => {
-                                this.api.deselectAll()
+                                this.api.deselectAll();
                             }} className="btn btn-primary">Clear Selection</button>
                         </span>
-                        <span style={{float: "right"}}>
+                        <span style={{ float: "right" }}>
                             Column API:
                             <button onClick={() => {
-                                this.columnApi.setColumnVisible('country', false)
+                                this.columnApi.setColumnVisible('country', false);
                             }} className="btn btn-primary">Hide Country Column</button>
                             <button onClick={() => {
-                                this.columnApi.setColumnVisible('country', true)
+                                this.columnApi.setColumnVisible('country', true);
                             }} className="btn btn-primary">Show Country Column</button>
                         </span>
                     </div>
-                    <div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
+                    <div style={{ display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10 }}>
-                        <div style={{float: "left"}}>
+                        <div style={{ float: "left" }}>
                             <button onClick={this.onRefreshData} className="btn btn-primary">Refresh Data</button>
                         </div>
-                        <div style={{float: "right"}}>
+                        <div style={{ float: "right" }}>
                             Filter API:
                             <button onClick={this.invokeSkillsFilterMethod}
-                                    className="btn btn-primary">Invoke Skills Filter Method
+                                className="btn btn-primary">Invoke Skills Filter Method
                             </button>
                             <button onClick={this.dobFilter} className="btn btn-primary">DOB equals to 01/01/2000
                             </button>
                         </div>
                     </div>
-                    <div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
+                    <div style={{ display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10 }}>
-                        <div style={{float: "left"}}>
+                        <div style={{ float: "left" }}>
                             <label htmlFor="sideBarToggle">Show Side Bar&nbsp;</label>
-                            <input type="checkbox" id="sideBarToggle" onChange={this.onToggleSidebar} style={{marginRight: 5}}/>
+                            <input type="checkbox" id="sideBarToggle" onChange={this.onToggleSidebar} style={{ marginRight: 5 }} />
                         </div>
-                        <div style={{float: "right", marginLeft: 20}}>
+                        <div style={{ float: "right", marginLeft: 20 }}>
                             <label htmlFor="quickFilter">Quick Filter:&nbsp;</label>
-                            <input type="text" id="quickFilter" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/>
+                            <input type="text" id="quickFilter" onChange={this.onQuickFilterText} placeholder="Type text to filter..." />
                         </div>
                     </div>
-                    <div style={{height: 400, width: 900}} className="ag-theme-balham">
+                    <div style={{ height: 400, width: 900 }} className="ag-theme-balham">
                         <AgGridReact
                             // listening for events
                             onGridReady={this.onGridReady}
@@ -219,36 +221,36 @@ export default class RichGridDeclarativeExample extends Component {
                                     menuIcon: 'fa-bars'
                                 }
                             }}>
-                            <AgGridColumn headerName="#" width={30}
+                            <AgGridColumn headerName="#" width={40}
-                                          checkboxSelection sortable={false} suppressMenu filter={false} pinned>
+                                checkboxSelection sortable={false} suppressMenu filter={false} pinned>
                             </AgGridColumn>
                             <AgGridColumn headerName="Employee" headerGroupComponentFramework={HeaderGroupComponent}>
                                 <AgGridColumn field="name" width={150}
-                                              cellEditorFramework={NameCellEditor}
+                                    cellEditorFramework={NameCellEditor}
-                                              enableRowGroup enablePivot pinned editable/>
+                                    enableRowGroup enablePivot pinned editable />
                                 <AgGridColumn field="country" width={150}
-                                              cellRenderer={RichGridDeclarativeExample.countryCellRenderer}
+                                    cellRenderer={RichGridDeclarativeExample.countryCellRenderer}
-                                              filterParams={{
+                                    filterParams={{
-                                                  cellRenderer: RichGridDeclarativeExample.countryCellRenderer,
+                                        cellRenderer: RichGridDeclarativeExample.countryCellRenderer,
-                                                  cellHeight: 20
+                                        cellHeight: 20
-                                              }}
+                                    }}
-                                              enableRowGroup enablePivot pinned editable/>
+                                    enableRowGroup enablePivot pinned editable />
                                 <AgGridColumn field="dob" width={175} headerName="DOB" filter="agDateColumnFilter"
-                                              pinned columnGroupShow="open"
+                                    pinned columnGroupShow="open"
-                                              cellRenderer={RichGridDeclarativeExample.dateCellRenderer}/>
+                                    cellRenderer={RichGridDeclarativeExample.dateCellRenderer} />
                             </AgGridColumn>
                             <AgGridColumn headerName="IT Skills">
                                 <AgGridColumn field="skills" width={120} enableRowGroup enablePivot sortable={false}
-                                              cellRendererFramework={SkillsCellRenderer}
+                                    cellRendererFramework={SkillsCellRenderer}
-                                              filterFramework={SkillsFilter}/>
+                                    filterFramework={SkillsFilter} />
                                 <AgGridColumn field="proficiency" width={160} enableValue
-                                              cellRendererFramework={ProficiencyCellRenderer}
+                                    cellRendererFramework={ProficiencyCellRenderer}
-                                              filterFramework={ProficiencyFilter}/>
+                                    filterFramework={ProficiencyFilter} />
                             </AgGridColumn>
                             <AgGridColumn headerName="Contact">
-                                <AgGridColumn field="mobile" width={150} filter="text"/>
+                                <AgGridColumn field="mobile" width={150} filter="text" />
-                                <AgGridColumn field="landline" width={150} filter="text"/>
+                                <AgGridColumn field="landline" width={150} filter="text" />
-                                <AgGridColumn field="address" width={500} filter="text"/>
+                                <AgGridColumn field="address" width={500} filter="text" />
                             </AgGridColumn>
                         </AgGridReact>
                     </div>

src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx

@@ -1,6 +1,7 @@
 import React, {Component} from "react";
 import {connect} from "react-redux";
 import {AgGridReact} from "@ag-grid-community/react";
+import {AllModules} from "@ag-grid-enterprise/all-modules";
 
 import PriceRenderer from "./PriceRenderer";
 
@@ -43,6 +44,7 @@ class GridComponent extends Component {
                     // properties
                     columnDefs={this.state.columnDefs}
                     rowData={this.props.rowData}
+                    modules={AllModules}
 
                     // events
                     onGridReady={this.onGridReady}>

src-examples/simpleReduxHooksExample/GridComponent.jsx

@@ -1,6 +1,7 @@
 import React, {useContext} from "react";
 import {Context} from "./store";
 import {AgGridReact} from "@ag-grid-community/react";
+import {AllModules} from "@ag-grid-enterprise/all-modules";
 
 /*
  * This component serves to display the row data (provided by redux)
@@ -21,6 +22,7 @@ export default function GridComponent() {
                 // properties
                 columnDefs={columnDefs}
                 rowData={rowData}
+                modules={AllModules}
 
                 defaultColDef={{filter: true}}
 

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.

src-large-data/largeGrid.jsx

@@ -63,7 +63,7 @@ export default class MyApp extends Component {
 
     render() {
         return (
-            <div style={{height: '100%'}} className="ag-theme-fresh">
+            <div style={{height: '100%'}} className="ag-theme-balham">
                 <AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData} modules={AllModules}/>
             </div>
         );

src-trader-dashboard/components/FxQuoteMatrix.jsx

@@ -61,7 +61,7 @@ class FxQuoteMatrix extends Component {
     render() {
         return (
             <div style={{height: 410, width: 800}}
-                 className="ag-theme-fresh">
+                 className="ag-theme-balham">
                 <AgGridReact
                     // properties
                     columnDefs={this.state.columnDefs}

src-trader-dashboard/components/PriceChangesGrid.jsx

@@ -152,7 +152,7 @@ export default class extends Component {
     render() {
         return (
             <div style={{height: 410, width: 800}}
-                 className="ag-theme-fresh">
+                 className="ag-theme-balham">
                 <AgGridReact
                     // properties
                     columnDefs={this.state.columnDefs}

src-trader-dashboard/components/TopMoversGrid.jsx

@@ -63,7 +63,7 @@ class TopMoversGrid extends Component {
     render() {
         return (
             <div style={{height: 410, width: 400}}
-                 className="ag-theme-fresh">
+                 className="ag-theme-balham">
                 <AgGridReact
                     // properties
                     columnDefs={this.state.columnDefs}

src-trader-dashboard/index.js

@@ -9,7 +9,7 @@ import StoreService from './services/StoreService';
 import TraderDashboard from "./components/TraderDashboard.jsx";
 
 import "@ag-grid-enterprise/all-modules/dist/styles/ag-grid.css";
-import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-fresh.css";
+import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-balham.css";
 
 let store = StoreService.STORE;