Compare commits

..

1 Commits

Author SHA1 Message Date
Sean Landsman
6d3b5d8bd7 Release 20.2.0 dist files added and license key updated 2019-03-20 13:55:44 +00:00
24 changed files with 110 additions and 169 deletions

3
.gitignore vendored
View File

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

View File

@@ -35,9 +35,8 @@ module.exports = {
},
resolve: {
alias: {
// "@ag-grid-community/core/modules": path.resolve('./node_modules/@ag-grid-community/core/dist/es2015/modules'),
"@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'),
// "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
"ag-grid-community": path.resolve('./node_modules/ag-grid-community'),
"ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
react: path.resolve('./node_modules/react')
},
extensions: ['.js', '.jsx']
@@ -49,4 +48,4 @@ module.exports = {
port: 8080,
historyApiFallback: true
}
};
};

View File

@@ -31,7 +31,7 @@ module.exports = {
},
resolve: {
alias: {
"@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'),
"ag-grid-community": path.resolve('./node_modules/ag-grid-community'),
"ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
react: path.resolve('./node_modules/react')
},
@@ -43,4 +43,4 @@ module.exports = {
devServer: {
port: 8080,
}
};
};

View File

@@ -31,7 +31,7 @@ module.exports = {
},
resolve: {
alias: {
"@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'),
"ag-grid-community": path.resolve('./node_modules/ag-grid-community'),
"ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
react: path.resolve('./node_modules/react')
},
@@ -43,4 +43,4 @@ module.exports = {
devServer: {
port: 8080,
}
};
};

View File

@@ -1,6 +1,6 @@
{
"name": "ag-grid-react-example",
"version": "23.0.0",
"version": "20.2.0",
"description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js",
"scripts": {
@@ -38,15 +38,14 @@
},
"homepage": "http://www.ag-grid.com/",
"devDependencies": {
"@ag-grid-community/core": "~23.0.0",
"@babel/core": "7.4.4",
"@babel/plugin-proposal-class-properties": "7.4.4",
"@babel/core": "7.3.4",
"@babel/plugin-proposal-class-properties": "7.3.4",
"@babel/plugin-proposal-function-bind": "7.2.0",
"@babel/preset-env": "7.4.4",
"@babel/preset-env": "7.3.4",
"@babel/preset-react": "7.0.0",
"@types/react": "16.9.2",
"@types/react-dom": "16.9.0",
"babel-loader": "8.0.6",
"@types/react": "16.8.8",
"@types/react-dom": "16.8.2",
"babel-loader": "8.0.5",
"css-loader": "2.1.1",
"file-loader": "3.0.1",
"gulp": "3.9.1",
@@ -56,20 +55,21 @@
"prop-types": "15.7.2",
"rimraf": "2.6.3",
"style-loader": "0.23.1",
"typescript": "3.4.5",
"webpack": "4.31.0",
"webpack-cli": "3.3.2",
"webpack-dev-server": "3.4.1"
"typescript": "3.3.3333",
"webpack": "4.29.6",
"webpack-cli": "3.3.0",
"webpack-dev-server": "3.2.1"
},
"dependencies": {
"@ag-grid-enterprise/all-modules": "~23.0.0",
"@ag-grid-community/react": "~23.0.0",
"bootstrap": "4.4.1",
"ag-grid-community": "^20.2.0",
"ag-grid-enterprise": "^20.2.0",
"ag-grid-react": "^20.2.0",
"bootstrap": "4.3.1",
"d3": "4.9.1",
"lodash": "4.17.11",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-redux": "7.0.3",
"react": "16.8.4",
"react-dom": "16.8.4",
"react-redux": "6.0.1",
"react-router-dom": "5.0.0",
"redux": "4.0.1"
}

View File

@@ -2,6 +2,7 @@ import React, {Component} from "react";
import {Redirect, Route, Switch} from "react-router-dom";
import NavItem from "./NavItem";
import RichGridDeclarativeExample from "./richGridDeclarativeExample/RichGridDeclarativeExample";
import SimpleReduxDynamicExample from "./simpleReduxDynamicComponentExample/SimpleReduxExample";
import SimpleReduxHookExample from "./simpleReduxHooksExample/SimpleReduxHookExample";

View File

@@ -4,14 +4,14 @@ import React from "react";
import {render} from "react-dom";
import {BrowserRouter} from "react-router-dom";
import "@ag-grid-enterprise/all-modules/dist/styles/ag-grid.css";
import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-balham.css";
import "ag-grid-community/dist/styles/ag-grid.css";
import "ag-grid-community/dist/styles/ag-theme-balham.css";
import "../node_modules/bootstrap/dist/css/bootstrap.css";
import App from "./App";
// only required when using enterprise features
// import {LicenseManager} from "@ag-grid-enterprise/all-modules";
// import {LicenseManager} from "ag-grid-enterprise/main";
// LicenseManager.setLicenseKey("<your license key>");
document.addEventListener('DOMContentLoaded', () => {

View File

@@ -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-react";
import RowDataFactory from "./RowDataFactory";
import DateComponent from "./DateComponent.jsx";
import SkillsCellRenderer from './SkillsCellRenderer.jsx';
@@ -12,12 +12,8 @@ import HeaderGroupComponent from './HeaderGroupComponent.jsx';
import SortableHeaderComponent from './SortableHeaderComponent.jsx';
import "./RichGridDeclarativeExample.css";
// for community features
// import {AllCommunityModules} from "@ag-grid-community/all-modules";
// for enterprise features
import { AllModules } from "@ag-grid-enterprise/all-modules";
// take this line out if you do not want to use ag-Grid-Enterprise
import "ag-grid-enterprise";
export default class RichGridDeclarativeExample extends Component {
constructor(props) {
@@ -29,7 +25,7 @@ export default class RichGridDeclarativeExample extends Component {
rowData: new RowDataFactory().createRowData(),
rowCount: null,
icons: {
columnRemoveFromGroup: '<i class="fa fa-times"/>',
columnRemoveFromGroup: '<i class="fa fa-remove"/>',
filter: '<i class="fa fa-filter"/>',
sortAscending: '<i class="fa fa-long-arrow-down"/>',
sortDescending: '<i class="fa fa-long-arrow-up"/>',
@@ -57,7 +53,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 +61,7 @@ export default class RichGridDeclarativeExample extends Component {
}
onQuickFilterText = (event) => {
this.setState({ quickFilterText: event.target.value });
this.setState({quickFilterText: event.target.value});
};
onRefreshData = () => {
@@ -128,58 +124,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={{ float: "left" }}>
<b>Employees Skills and Contact Details: </b>{this.state.rowCount}
<div style={{display: "inline-block", width: "100%"}}>
<div style={{float: "left"}}>
<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={{ float: "left" }}>
<div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
<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={{ float: "left" }}>
<div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
<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}
@@ -197,9 +193,6 @@ export default class RichGridDeclarativeExample extends Component {
// binding to array properties
rowData={this.state.rowData}
// register all modules (row model, csv/excel, row grouping etc)
modules={AllModules}
// no binding, just providing hard coded strings for the properties
// boolean properties will default to true if provided (ie suppressRowClickSelection => suppressRowClickSelection="true")
suppressRowClickSelection
@@ -220,35 +213,35 @@ export default class RichGridDeclarativeExample extends Component {
}
}}>
<AgGridColumn headerName="#" width={30}
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}
enableRowGroup enablePivot pinned editable />
cellEditorFramework={NameCellEditor}
enableRowGroup enablePivot pinned editable/>
<AgGridColumn field="country" width={150}
cellRenderer={RichGridDeclarativeExample.countryCellRenderer}
filterParams={{
cellRenderer: RichGridDeclarativeExample.countryCellRenderer,
cellHeight: 20
}}
enableRowGroup enablePivot pinned editable />
cellRenderer={RichGridDeclarativeExample.countryCellRenderer}
filterParams={{
cellRenderer: RichGridDeclarativeExample.countryCellRenderer,
cellHeight: 20
}}
enableRowGroup enablePivot pinned editable/>
<AgGridColumn field="dob" width={175} headerName="DOB" filter="agDateColumnFilter"
pinned columnGroupShow="open"
cellRenderer={RichGridDeclarativeExample.dateCellRenderer} />
pinned columnGroupShow="open"
cellRenderer={RichGridDeclarativeExample.dateCellRenderer}/>
</AgGridColumn>
<AgGridColumn headerName="IT Skills">
<AgGridColumn field="skills" width={120} enableRowGroup enablePivot sortable={false}
cellRendererFramework={SkillsCellRenderer}
filterFramework={SkillsFilter} />
cellRendererFramework={SkillsCellRenderer}
filterFramework={SkillsFilter}/>
<AgGridColumn field="proficiency" width={160} enableValue
cellRendererFramework={ProficiencyCellRenderer}
filterFramework={ProficiencyFilter} />
cellRendererFramework={ProficiencyCellRenderer}
filterFramework={ProficiencyFilter}/>
</AgGridColumn>
<AgGridColumn headerName="Contact">
<AgGridColumn field="mobile" width={150} filter="text" />
<AgGridColumn field="landline" width={150} filter="text" />
<AgGridColumn field="address" width={500} filter="text" />
<AgGridColumn field="mobile" width={150} filter="text"/>
<AgGridColumn field="landline" width={150} filter="text"/>
<AgGridColumn field="address" width={500} filter="text"/>
</AgGridColumn>
</AgGridReact>
</div>

View File

@@ -1,7 +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 {AgGridReact} from "ag-grid-react";
import PriceRenderer from "./PriceRenderer";
@@ -44,7 +44,8 @@ class GridComponent extends Component {
// properties
columnDefs={this.state.columnDefs}
rowData={this.props.rowData}
modules={AllModules}
reactNext={true}
// events
onGridReady={this.onGridReady}>
@@ -61,4 +62,4 @@ export default connect(
rowData: state.rowData
}
}
)(GridComponent);
)(GridComponent);

View File

@@ -1,5 +1,7 @@
import React, {Component} from "react";
import {connect} from "react-redux";
// take this line out if you do not want to use ag-Grid-Enterprise
import "ag-grid-enterprise";
import {setCurrency, updateRowData} from "./gridDataActions";

View File

@@ -41,5 +41,5 @@ export default connect(
},
null,
null,
{forwardRef: true} // must be supplied for react/redux when using AgGridReact
)(PriceRenderer);
{forwardRef: true} // must be supplied for react/redux when using GridOptions.reactNext
)(PriceRenderer);

View File

@@ -1,6 +1,8 @@
import React, {Component} from "react";
import {Provider} from "react-redux";
import {createStore} from "redux";
// take this line out if you do not want to use ag-Grid-Enterprise
import "ag-grid-enterprise";
import HeaderComponent from "./HeaderComponent";
import GridComponent from "./GridComponent";

View File

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

View File

@@ -1,18 +0,0 @@
import React, {useEffect, forwardRef, useImperativeHandle, useRef} from "react";
export default forwardRef((props, ref) => {
const inputRef = useRef();
useImperativeHandle(ref, () => {
return {
getValue: () => {
return inputRef.current.value;
}
};
});
useEffect(() => {
// https://github.com/facebook/react/issues/7835#issuecomment-395504863
setTimeout(() => inputRef.current.focus(), 10)
}, []);
return <input type="text" ref={inputRef} defaultValue={props.value}/>;
})

View File

@@ -1,18 +0,0 @@
import React, {forwardRef, useImperativeHandle, useRef} from "react";
export default forwardRef((props, ref) => {
const inputRef = useRef();
useImperativeHandle(ref, () => {
return {
isFilterActive() {
return inputRef.current.value !== '';
},
doesFilterPass: (params) => {
return params.data.price.toString() === inputRef.current.value;
}
};
});
return <input type="text" ref={inputRef} onChange={() => props.filterChangedCallback()}/>;
})

View File

@@ -1,21 +1,15 @@
import React from "react";
import PriceRenderer from "./PriceRenderer";
import PriceEditor from "./PriceEditor";
import PriceFilter from "./PriceFilter";
export const initialState = {
rowData: [],
columnDefs: [
{
field: 'symbol',
editable: true
field: 'symbol'
},
{
field: 'price',
cellClass: 'align-right',
editable: true,
cellEditorFramework: PriceEditor,
filterFramework: PriceFilter,
cellRendererFramework: PriceRenderer
}
]

View File

@@ -4,8 +4,8 @@ import ReactDOM from 'react-dom';
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-balham.css';
import 'ag-grid-community/dist/styles/ag-grid.css';
import 'ag-grid-community/dist/styles/ag-theme-fresh.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.

View File

@@ -1,12 +1,10 @@
import React, {Component} from 'react';
import SimpleCellRenderer from './simpleCellRenderer.jsx';
import {AgGridReact} from '@ag-grid-community/react';
// for community features
import {AllModules} from "@ag-grid-enterprise/all-modules";
import {AgGridReact} from 'ag-grid-react';
// for enterprise features
// import {AllModules} from "@ag-grid-enterprise/all-modules";
// put this line in to use ag-Grid enterprise
// import 'ag-grid-enterprise';
export default class MyApp extends Component {
@@ -63,8 +61,8 @@ export default class MyApp extends Component {
render() {
return (
<div style={{height: '100%'}} className="ag-theme-balham">
<AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData} modules={AllModules}/>
<div style={{height: '100%'}} className="ag-theme-fresh">
<AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData}/>
</div>
);
}

View File

@@ -1,9 +1,7 @@
import React, {Component} from "react";
import {connect} from "react-redux";
import {AgGridReact} from "@ag-grid-community/react";
import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules";
import {AgGridReact} from "ag-grid-react";
class FxQuoteMatrix extends Component {
constructor(props) {
@@ -61,7 +59,7 @@ class FxQuoteMatrix extends Component {
render() {
return (
<div style={{height: 410, width: 800}}
className="ag-theme-balham">
className="ag-theme-fresh">
<AgGridReact
// properties
columnDefs={this.state.columnDefs}
@@ -73,8 +71,6 @@ class FxQuoteMatrix extends Component {
// callbacks
getRowNodeId={this.getRowNodeId}
modules={[ClientSideRowModelModule]}
// events
onGridReady={this.onGridReady}>
</AgGridReact>
@@ -89,4 +85,4 @@ export default connect(
rowData: state ? state.fxData : null
}
}
)(FxQuoteMatrix);
)(FxQuoteMatrix);

View File

@@ -1,7 +1,6 @@
import React, {Component} from "react";
import {AgGridReact} from "@ag-grid-community/react";
import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules";
import {AgGridReact} from "ag-grid-react";
import map from "lodash/map";
import difference from "lodash/difference";
@@ -152,7 +151,7 @@ export default class extends Component {
render() {
return (
<div style={{height: 410, width: 800}}
className="ag-theme-balham">
className="ag-theme-fresh">
<AgGridReact
// properties
columnDefs={this.state.columnDefs}
@@ -161,8 +160,6 @@ export default class extends Component {
}}
rowSelection="single"
modules={[ClientSideRowModelModule]}
// callbacks
getRowNodeId={this.getRowNodeId}
@@ -173,4 +170,4 @@ export default class extends Component {
</div>
);
}
}
}

View File

@@ -1,8 +1,7 @@
import React, {Component} from "react";
import {connect} from "react-redux";
import {AgGridReact} from "@ag-grid-community/react";
import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules";
import {AgGridReact} from "ag-grid-react";
class TopMoversGrid extends Component {
constructor(props) {
@@ -63,7 +62,7 @@ class TopMoversGrid extends Component {
render() {
return (
<div style={{height: 410, width: 400}}
className="ag-theme-balham">
className="ag-theme-fresh">
<AgGridReact
// properties
columnDefs={this.state.columnDefs}
@@ -76,8 +75,6 @@ class TopMoversGrid extends Component {
deltaRowDataMode
getRowNodeId={this.getRowNodeId}
modules={[ClientSideRowModelModule]}
// events
onGridReady={this.onGridReady}>
</AgGridReact>

View File

@@ -5,12 +5,12 @@ import {render} from "react-dom";
import {Provider} from "react-redux";
import "ag-grid-community/dist/styles/ag-grid.css";
import "ag-grid-community/dist/styles/ag-theme-fresh.css";
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-balham.css";
let store = StoreService.STORE;
document.addEventListener('DOMContentLoaded', () => {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import {AgGridReact} from '@ag-grid-community/react';
import {AgGridReact} from 'ag-grid-react';
export const App: React.FunctionComponent = () => <AgGridReact invalidProperty columnDefs={[]} rowData={[]}/>;

View File

@@ -1,4 +1,4 @@
import React from 'react';
import {AgGridReact} from '@ag-grid-community/react';
import {AgGridReact} from 'ag-grid-react';
export const App: React.FunctionComponent = () => <AgGridReact columnDefs={[]} rowData={[]}/>;