Skip to content
This repository was archived by the owner on Aug 19, 2024. It is now read-only.

Commit 8aa7ab5

Browse files
committed
Merge branch 'b25.1.0' into master
2 parents 2b1e66f + 34b94cd commit 8aa7ab5

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ag-Grid React Example
1+
AG Grid React Example
22
==============
33

44
## Examples
55

6-
1. standard - shows a typical grid demonstrating many ag-Grid features
6+
1. standard - shows a typical grid demonstrating many AG Grid features
77

88
2. large - shows a very large grid (767 columns and 1,000 rows) using React cell renderers
99

Diff for: package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ag-grid-react-example",
3-
"version": "25.0.0",
4-
"description": "Example Reach applicaiton using ag-Grid.",
3+
"version": "25.1.0",
4+
"description": "Example Reach applicaiton using AG Grid.",
55
"main": "dist/ag-grid-react-example.js",
66
"scripts": {
77
"trader": "webpack-dev-server --content-base src-trader-dashboard/ --config config/webpack.config.trader.js --mode development --open",
@@ -39,16 +39,16 @@
3939
},
4040
"homepage": "http://www.ag-grid.com/",
4141
"devDependencies": {
42-
"@ag-grid-community/core": "~25.0.0",
43-
"@babel/core": "7.12.10",
44-
"@babel/plugin-proposal-class-properties": "7.12.1",
45-
"@babel/plugin-proposal-function-bind": "7.12.1",
46-
"@babel/preset-env": "7.12.11",
47-
"@babel/preset-react": "7.12.10",
42+
"@ag-grid-community/core": "~25.1.0",
43+
"@babel/core": "7.12.16",
44+
"@babel/plugin-proposal-class-properties": "7.12.13",
45+
"@babel/plugin-proposal-function-bind": "7.12.13",
46+
"@babel/preset-env": "7.12.16",
47+
"@babel/preset-react": "7.12.13",
4848
"@types/react": "17.0.0",
4949
"@types/react-dom": "17.0.0",
5050
"babel-loader": "8.2.2",
51-
"css-loader": "5.0.1",
51+
"css-loader": "5.0.2",
5252
"file-loader": "6.2.0",
5353
"gulp": "3.9.1",
5454
"merge2": "1.4.1",
@@ -57,17 +57,17 @@
5757
"prop-types": "15.7.2",
5858
"rimraf": "3.0.2",
5959
"style-loader": "2.0.0",
60-
"typescript": "4.1.3",
61-
"webpack": "4.44.1",
60+
"typescript": "4.1.5",
61+
"webpack": "4.46.0",
6262
"webpack-cli": "3.3.12",
63-
"webpack-dev-server": "3.11.0"
63+
"webpack-dev-server": "3.11.2"
6464
},
6565
"dependencies": {
66-
"@ag-grid-enterprise/all-modules": "~25.0.0",
67-
"@ag-grid-community/react": "~25.0.0",
66+
"@ag-grid-enterprise/all-modules": "~25.1.0",
67+
"@ag-grid-community/react": "~25.1.0",
6868
"bootstrap": "4.5.0",
6969
"d3": "4.9.1",
70-
"lodash": "4.17.15",
70+
"lodash": "4.17.20",
7171
"react": "17.0.1",
7272
"react-dom": "17.0.1",
7373
"react-redux": "7.2.2",

Diff for: src-examples/richGridDeclarativeExample/DateComponent.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default class DateComponent extends React.Component {
1313
// The current date it holds, null by default, null if the date typed by the user is not valid or fields are blank
1414
// The current values that the user types in the input boxes, by default ''
1515

16-
//The textBoxes state is necessary since it can be set from ag-Grid. This can be seen in this example through
16+
//The textBoxes state is necessary since it can be set from AG Grid. This can be seen in this example through
1717
// the usage of the button DOB equals to 01/01/2000 in the example page.
1818
this.state = {
1919
date: null,
@@ -93,7 +93,7 @@ export default class DateComponent extends React.Component {
9393
textBoxes: textBoxes
9494
},
9595
//Callback after the state is set. This is where we tell ag-grid that the date has changed so
96-
//it will proceed with the filtering and we can then expect ag-Grid to call us back to getDate
96+
//it will proceed with the filtering and we can then expect AG Grid to call us back to getDate
9797
this.props.onDateChanged
9898
);
9999
}
@@ -168,4 +168,4 @@ export default class DateComponent extends React.Component {
168168
// props, so little need for adding this validation meta-data.
169169
DateComponent.propTypes = {
170170
params: PropTypes.object
171-
};
171+
};

Diff for: src-examples/richGridDeclarativeExample/NameCellEditor.jsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ export default class NameCellEditor extends React.Component {
1010

1111
constructor(props) {
1212
super(props);
13-
// the entire ag-Grid properties are passed as one single object inside the params
13+
// the entire AG Grid properties are passed as one single object inside the params
1414
this.state = this.createInitialState(props);
1515
}
1616

1717
// work out how to present the data based on what the user hit. you don't need to do any of
18-
// this for your ag-Grid cellEditor to work, however it makes sense to do this so the user
18+
// this for your AG Grid cellEditor to work, however it makes sense to do this so the user
1919
// experience is similar to Excel
2020
createInitialState(props) {
2121

@@ -63,13 +63,13 @@ export default class NameCellEditor extends React.Component {
6363
this.setState(newState);
6464
}
6565

66-
// called by ag-Grid, to get the final value
66+
// called by AG Grid, to get the final value
6767
getValue() {
6868
return this.state.value;
6969
}
7070

7171
// cannot use componentDidMount because although the component might be ready from React's point of
72-
// view, it may not yet be in the browser (put in by ag-Grid) so focus will not work
72+
// view, it may not yet be in the browser (put in by AG Grid) so focus will not work
7373
afterGuiAttached() {
7474
// get ref from React component
7575
const eInput = this.refs.textField;
@@ -114,4 +114,4 @@ export default class NameCellEditor extends React.Component {
114114
// props, so little need for adding this validation meta-data.
115115
NameCellEditor.propTypes = {
116116
params: PropTypes.object
117-
};
117+
};

Diff for: src-examples/richGridDeclarativeExample/ProficiencyCellRenderer.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
// cell renderer for the proficiency column. this is a very basic cell renderer,
44
// it is arguable that we should not of used React and just returned a string of
5-
// html as a normal ag-Grid cellRenderer.
5+
// html as a normal AG Grid cellRenderer.
66
export default class ProficiencyCellRenderer extends React.Component {
77

88
getReactContainerClasses() {

Diff for: src-examples/richGridDeclarativeExample/ProficiencyFilter.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from 'react';
33
const PROFICIENCY_NAMES = ['No Filter', 'Above 40%', 'Above 60%', 'Above 80%'];
44

55
// the proficiency filter component. this demonstrates how to integrate
6-
// a React filter component with ag-Grid.
6+
// a React filter component with AG Grid.
77
export default class ProficiencyFilter extends React.Component {
88

99
constructor(props) {

Diff for: src-examples/richGridDeclarativeExample/SkillsFilter.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import RefData from './RefData';
33

44
// the skills filter component. this can be laid out much better in a 'React'
55
// way. there are design patterns you can apply to layout out your React classes.
6-
// however, i'm not worried, as the intention here is to show you ag-Grid
6+
// however, i'm not worried, as the intention here is to show you AG Grid
77
// working with React, and that's all. i'm not looking for any awards for my
88
// React design skills.
99
export default class SkillsFilter extends React.Component {

0 commit comments

Comments
 (0)