Compare commits

..

1 Commits

Author SHA1 Message Date
rmc-software
296d4e165f release v19.1.0 2018-10-29 15:13:54 +00:00
14 changed files with 77 additions and 235 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "ag-grid-react-example", "name": "ag-grid-react-example",
"version": "20.1.0", "version": "19.1.0",
"description": "Example Reach applicaiton using ag-Grid.", "description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js", "main": "dist/ag-grid-react-example.js",
"scripts": { "scripts": {
@@ -37,36 +37,36 @@
}, },
"homepage": "http://www.ag-grid.com/", "homepage": "http://www.ag-grid.com/",
"devDependencies": { "devDependencies": {
"@babel/core": "7.3.3", "@babel/core": "7.1.2",
"babel-loader": "8.0.5", "babel-loader": "8.0.4",
"@babel/preset-env": "7.3.1", "@babel/preset-env": "7.1.0",
"@babel/preset-react": "7.0.0", "@babel/preset-react": "7.0.0",
"@babel/plugin-proposal-class-properties": "7.3.3", "@babel/plugin-proposal-class-properties": "7.1.0",
"@babel/plugin-proposal-function-bind": "7.2.0", "@babel/plugin-proposal-function-bind": "7.0.0",
"css-loader": "2.1.0", "css-loader": "1.0.0",
"file-loader": "3.0.1", "file-loader": "2.0.0",
"gulp": "3.9.1", "gulp": "3.9.1",
"merge2": "1.2.3", "merge2": "^1.2.3",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"ncp": "2.0.0", "ncp": "2.0.0",
"prop-types": "15.7.2", "prop-types": "15.6.2",
"rimraf": "2.6.3", "rimraf": "~2.6.2",
"style-loader": "0.23.1", "style-loader": "~0.23.0",
"webpack": "4.29.5", "webpack": "^4.16.1",
"webpack-cli": "3.2.3", "webpack-cli": "^3.0.8",
"webpack-dev-server": "3.2.0" "webpack-dev-server": "^3.1.4"
}, },
"dependencies": { "dependencies": {
"ag-grid-community": "^20.1.0", "ag-grid-community": "^19.1.0",
"ag-grid-enterprise": "^20.1.0", "ag-grid-enterprise": "^19.1.0",
"ag-grid-react": "^20.1.0", "ag-grid-react": "^19.1.0",
"bootstrap": "4.3.1", "bootstrap": "4.1.3",
"d3": "4.9.1", "d3": "4.9.1",
"lodash": "4.17.11", "lodash": "^4.17.11",
"react": "16.8.2", "react": "^16.5.2",
"react-dom": "16.8.2", "react-dom": "^16.5.2",
"react-redux": "6.0.1", "react-redux": "5.0.7",
"react-router-dom": "4.3.1", "react-router-dom": "4.3.1",
"redux": "4.0.1" "redux": "^4.0.1"
} }
} }

View File

@@ -5,14 +5,12 @@ import NavItem from "./NavItem";
import RichGridDeclarativeExample from "./richGridDeclarativeExample/RichGridDeclarativeExample"; import RichGridDeclarativeExample from "./richGridDeclarativeExample/RichGridDeclarativeExample";
import SimpleReduxDynamicExample from "./simpleReduxDynamicComponentExample/SimpleReduxExample"; import SimpleReduxDynamicExample from "./simpleReduxDynamicComponentExample/SimpleReduxExample";
import SimpleReduxHookExample from "./simpleReduxHooksExample/SimpleReduxHookExample";
const SideBar = () => ( const SideBar = () => (
<div style={{float: "left", width: 335, marginRight: 25}}> <div style={{float: "left", width: 335, marginRight: 25}}>
<ul className="nav nav-pills"> <ul className="nav nav-pills">
<NavItem to='/rich-grid-declarative'>Rich Grid with Declarative Markup</NavItem> <NavItem to='/rich-grid-declarative'>Rich Grid with Declarative Markup</NavItem>
<NavItem to='/simple-redux-dynamic'>Simple Redux Dynamic Component Example</NavItem> <NavItem to='/simple-redux-dynamic'>Simple Redux Dynamic Component Example</NavItem>
<NavItem to='/simple-redux-hook'>Simple React Hook Component Example</NavItem>
</ul> </ul>
</div> </div>
); );
@@ -27,7 +25,6 @@ class App extends Component {
<Redirect from="/" exact to="/rich-grid-declarative"/> <Redirect from="/" exact to="/rich-grid-declarative"/>
<Route exact path='/rich-grid-declarative' component={RichGridDeclarativeExample}/> <Route exact path='/rich-grid-declarative' component={RichGridDeclarativeExample}/>
<Route exact path='/simple-redux-dynamic' component={SimpleReduxDynamicExample}/> <Route exact path='/simple-redux-dynamic' component={SimpleReduxDynamicExample}/>
<Route exact path='/simple-redux-hook' component={SimpleReduxHookExample}/>
</Switch> </Switch>
</div> </div>
</div> </div>

View File

@@ -51,11 +51,11 @@ export default class DateComponent extends React.Component {
return ( return (
<div style={filterStyle}> <div style={filterStyle}>
<span style={resetStyle} onClick={this.resetDate.bind(this)}>x</span> <span style={resetStyle} onClick={this.resetDate.bind(this)}>x</span>
<input onChange={this.onDateChanged.bind(this)} ref="dd" placeholder="dd" style={ddStyle} <input onInput={this.onDateChanged.bind(this)} ref="dd" placeholder="dd" style={ddStyle}
value={this.state.textBoxes.dd} maxLength="2"/>/ value={this.state.textBoxes.dd} maxLength="2"/>/
<input onChange={this.onDateChanged.bind(this)} ref="mm" placeholder="mm" style={mmStyle} <input onInput={this.onDateChanged.bind(this)} ref="mm" placeholder="mm" style={mmStyle}
value={this.state.textBoxes.mm} maxLength="2"/>/ value={this.state.textBoxes.mm} maxLength="2"/>/
<input onChange={this.onDateChanged.bind(this)} ref="yyyy" placeholder="yyyy" style={yyyyStyle} <input onInput={this.onDateChanged.bind(this)} ref="yyyy" placeholder="yyyy" style={yyyyStyle}
value={this.state.textBoxes.yyyy} maxLength="4"/> value={this.state.textBoxes.yyyy} maxLength="4"/>
</div> </div>
); );

View File

@@ -140,28 +140,26 @@ export default class RichGridDeclarativeExample extends Component {
</span> </span>
</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"}}>
<button onClick={this.onRefreshData} className="btn btn-primary">Refresh Data</button>
</div>
<div style={{float: "right"}}>
Filter API:
<button onClick={this.invokeSkillsFilterMethod}
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={{float: "left"}}>
<label> <label>
<input type="checkbox" onChange={this.onToggleSidebar} style={{marginRight: 5}}/> <input type="checkbox" onChange={this.onToggleSidebar} style={{marginRight: 5}}/>
Show Side Bar Show Side Bar
</label> </label>
</div> </div>
<div style={{float: "left", marginLeft: 20}}>
<button onClick={this.onRefreshData} className="btn btn-primary">Refresh Data</button>
</div>
<div style={{float: "left", marginLeft: 20}}> <div style={{float: "left", marginLeft: 20}}>
<input type="text" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/> <input type="text" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/>
</div> </div>
<div style={{float: "right"}}>
Filter API:
<button onClick={this.invokeSkillsFilterMethod}
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>
<div style={{height: 400, width: 900}} className="ag-theme-balham"> <div style={{height: 400, width: 900}} className="ag-theme-balham">
<AgGridReact <AgGridReact
@@ -181,9 +179,12 @@ export default class RichGridDeclarativeExample extends Component {
rowData={this.state.rowData} rowData={this.state.rowData}
// no binding, just providing hard coded strings for the properties // no binding, just providing hard coded strings for the properties
// boolean properties will default to true if provided (ie suppressRowClickSelection => suppressRowClickSelection="true") // boolean properties will default to true if provided (ie enableColResize => enableColResize="true")
suppressRowClickSelection suppressRowClickSelection
rowSelection="multiple" rowSelection="multiple"
enableColResize
enableSorting
enableFilter
floatingFilter floatingFilter
groupHeaders groupHeaders
@@ -192,9 +193,6 @@ export default class RichGridDeclarativeExample extends Component {
// setting default column properties // setting default column properties
defaultColDef={{ defaultColDef={{
resizable: true,
sortable: true,
filter: true,
headerComponentFramework: SortableHeaderComponent, headerComponentFramework: SortableHeaderComponent,
headerComponentParams: { headerComponentParams: {
menuIcon: 'fa-bars' menuIcon: 'fa-bars'
@@ -202,7 +200,7 @@ export default class RichGridDeclarativeExample extends Component {
}} }}
> >
<AgGridColumn headerName="#" width={30} <AgGridColumn headerName="#" width={30}
checkboxSelection sortable={false} suppressMenu filter={false} pinned> checkboxSelection suppressSorting suppressMenu suppressFilter pinned>
</AgGridColumn> </AgGridColumn>
<AgGridColumn headerName="Employee" headerGroupComponentFramework={HeaderGroupComponent}> <AgGridColumn headerName="Employee" headerGroupComponentFramework={HeaderGroupComponent}>
<AgGridColumn field="name" width={150} <AgGridColumn field="name" width={150}
@@ -220,10 +218,10 @@ export default class RichGridDeclarativeExample extends Component {
cellRenderer={RichGridDeclarativeExample.dateCellRenderer}/> cellRenderer={RichGridDeclarativeExample.dateCellRenderer}/>
</AgGridColumn> </AgGridColumn>
<AgGridColumn headerName="IT Skills"> <AgGridColumn headerName="IT Skills">
<AgGridColumn field="skills" width={120} enableRowGroup enablePivot sortable={false} <AgGridColumn field="skills" width={120} enableRowGroup enablePivot suppressSorting
cellRendererFramework={SkillsCellRenderer} cellRendererFramework={SkillsCellRenderer}
filterFramework={SkillsFilter}/> filterFramework={SkillsFilter}/>
<AgGridColumn field="proficiency" width={160} enableValue <AgGridColumn field="proficiency" width={135} enableValue
cellRendererFramework={ProficiencyCellRenderer} cellRendererFramework={ProficiencyCellRenderer}
filterFramework={ProficiencyFilter}/> filterFramework={ProficiencyFilter}/>
</AgGridColumn> </AgGridColumn>

View File

@@ -1,10 +1,13 @@
import React, {Component} from "react"; import React, {Component} from "react";
import {connect} from "react-redux"; import * as PropTypes from "prop-types";
import {AgGridReact} from "ag-grid-react"; import {AgGridReact} from "ag-grid-react";
import {connect} from "react-redux";
import PriceRenderer from "./PriceRenderer"; import PriceRenderer from "./PriceRenderer";
const ThemeContext = React.createContext('light');
/* /*
* This component serves to display the row data (provided by redux) * This component serves to display the row data (provided by redux)
*/ */
@@ -46,6 +49,7 @@ class GridComponent extends Component {
rowData={this.props.rowData} rowData={this.props.rowData}
reactNext={true} reactNext={true}
reduxStore={this.context.store} // must be supplied when using redux with reactNext
// events // events
onGridReady={this.onGridReady}> onGridReady={this.onGridReady}>
@@ -55,6 +59,10 @@ class GridComponent extends Component {
} }
} }
GridComponent.contextTypes = {
store: PropTypes.object // must be supplied when using redux with reactNext
};
// pull off row data changes // pull off row data changes
export default connect( export default connect(
(state) => { (state) => {

View File

@@ -21,8 +21,7 @@ class PriceRenderer extends Component {
render() { render() {
return ( return (
<FontContext.Consumer> <FontContext.Consumer>
{fontWeight => <span {fontWeight => <span style={{fontWeight}}> {this.props.currencySymbol}{this.state.convertedValue}</span> }
style={{fontWeight}}> {this.props.currencySymbol}{this.state.convertedValue}</span>}
</FontContext.Consumer> </FontContext.Consumer>
); );
} }
@@ -41,5 +40,5 @@ export default connect(
}, },
null, null,
null, null,
{forwardRef: true} // must be supplied for react/redux when using GridOptions.reactNext {withRef: true} // must be supplied for react/redux when using GridOptions.reactNext
)(PriceRenderer); )(PriceRenderer);

View File

@@ -1,32 +0,0 @@
import React, { useContext } from "react";
import {Context} from "./store";
import {AgGridReact} from "ag-grid-react";
/*
* This component serves to display the row data (provided by redux)
*/
export default function GridComponent() {
const {store, dispatch} = useContext(Context);
const {columnDefs, rowData} = store;
const onGridReady = (params) => {
params.api.sizeColumnsToFit();
};
// row data will be provided via redux on this.props.rowData
return (
<div style={{height: 400, width: 900, marginTop: 15}}
className="ag-theme-balham">
<AgGridReact
// properties
columnDefs={columnDefs}
rowData={rowData}
reactNext={true}
// events
onGridReady={onGridReady}>
</AgGridReact>
</div>
)
}

View File

@@ -1,13 +0,0 @@
import React, {Component} from "react";
export default class PriceRenderer extends Component {
constructor(props) {
super(props);
}
render() {
return (
<span>{this.props.value}</span>
);
}
}

View File

@@ -1,18 +0,0 @@
import React, {useReducer} from "react";
import GridComponent from "./GridComponent";
import {Context, initialState, reducer} from "./store";
export default function SimpleReduxHookExample() {
const [store, dispatch] = useReducer(reducer, initialState);
return (
<Context.Provider value={{store, dispatch}}>
<div>
<h1>Simple Example using Hooks (with useContext and useReducer)</h1>
<button onClick={() => dispatch({type: "SET_ROW_DATA"})}>Populate Row Data</button>
<GridComponent/>
</div>
</Context.Provider>
)
}

View File

@@ -1,14 +0,0 @@
export function updateRowData(rowData) {
return {
type: 'ROW_DATA_CHANGED',
rowData
}
}
export function setCurrency(currencySymbol, exchangeRate) {
return {
type: 'CURRENCY_CHANGED',
currencySymbol,
exchangeRate
}
}

View File

@@ -1,75 +0,0 @@
import React from "react";
import PriceRenderer from "./PriceRenderer";
export const initialState = {
rowData: [],
columnDefs: [
{
field: 'symbol'
},
{
field: 'price',
cellClass: 'align-right',
cellRendererFramework: PriceRenderer
}
]
};
export const reducer = (state = {rowData: []}, action) => {
switch (action.type) {
case 'SET_ROW_DATA':
return {
...state,
rowData: createRowData()
};
default:
return state;
}
};
export const Context = React.createContext();
// for test data
// the following methods are for creating dummy row data
const createRowData = () => {
let rowData = [];
for (let i = 0; i < 14; i++) {
let newItem = createItem(rowData);
rowData.push(newItem);
}
return rowData;
};
const createItem = (rowData) => {
return {
symbol: createUniqueRandomSymbol(rowData),
price: Math.floor(Math.random() * 100)
};
};
// creates a unique symbol, eg 'ADG' or 'ZJD'
const createUniqueRandomSymbol = (rowData) => {
let symbol;
let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
let isUnique = false;
while (!isUnique) {
symbol = '';
// create symbol
for (let i = 0; i < 3; i++) {
symbol += possible.charAt(Math.floor(Math.random() * possible.length));
}
// check uniqueness
isUnique = true;
rowData.forEach(function (oldItem) {
if (oldItem.symbol === symbol) {
isUnique = false;
}
});
}
return symbol;
};

View File

@@ -32,28 +32,26 @@ class FxQuoteMatrix extends Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (this.gridApi) { const newRowData = nextProps.rowData;
const newRowData = nextProps.rowData;
const updatedRows = []; const updatedRows = [];
for (let i = 0; i < newRowData.length; i++) { for (let i = 0; i < newRowData.length; i++) {
let newRow = newRowData[i]; let newRow = newRowData[i];
let currentRowNode = this.gridApi.getRowNode(newRow.symbol); let currentRowNode = this.gridApi.getRowNode(newRow.symbol);
const {data} = currentRowNode; const {data} = currentRowNode;
for (const def of this.state.columnDefs) { for (const def of this.state.columnDefs) {
if (data[def.field] !== newRow[def.field]) { if (data[def.field] !== newRow[def.field]) {
updatedRows.push(newRow); updatedRows.push(newRow);
break; break;
}
} }
} }
this.gridApi.updateRowData({update: updatedRows});
} }
this.gridApi.updateRowData({update: updatedRows});
} }
render() { render() {
@@ -63,10 +61,8 @@ class FxQuoteMatrix extends Component {
<AgGridReact <AgGridReact
// properties // properties
columnDefs={this.state.columnDefs} columnDefs={this.state.columnDefs}
defaultColDef={{ enableSorting="false"
sortable: false, enableFilter="false"
filter: false
}}
// callbacks // callbacks
getRowNodeId={this.getRowNodeId} getRowNodeId={this.getRowNodeId}
@@ -82,7 +78,7 @@ class FxQuoteMatrix extends Component {
export default connect( export default connect(
(state) => { (state) => {
return { return {
rowData: state ? state.fxData : null rowData: state.fxData
} }
} }
)(FxQuoteMatrix); )(FxQuoteMatrix);

View File

@@ -155,9 +155,7 @@ export default class extends Component {
<AgGridReact <AgGridReact
// properties // properties
columnDefs={this.state.columnDefs} columnDefs={this.state.columnDefs}
defaultColDef={{ enableSorting="true"
sortable: true
}}
rowSelection="single" rowSelection="single"
// callbacks // callbacks

View File

@@ -67,10 +67,8 @@ class TopMoversGrid extends Component {
// properties // properties
columnDefs={this.state.columnDefs} columnDefs={this.state.columnDefs}
rowData={this.props.rowData} rowData={this.props.rowData}
defaultColDef={{ enableSorting
sortable: true, enableFilter="false"
filter: false
}}
animateRows animateRows
deltaRowDataMode deltaRowDataMode
getRowNodeId={this.getRowNodeId} getRowNodeId={this.getRowNodeId}
@@ -86,7 +84,7 @@ class TopMoversGrid extends Component {
export default connect( export default connect(
(state) => { (state) => {
return { return {
rowData: state ? state.fxTopMovers : null rowData: state.fxTopMovers
} }
} }
)(TopMoversGrid); )(TopMoversGrid);