From 550f6c407746b64ba1f3747d3281f4fa47a9f326 Mon Sep 17 00:00:00 2001 From: Guilherme Lopes Date: Tue, 16 Oct 2018 12:09:53 +0100 Subject: [PATCH 1/5] updated dependencies and webpack config --- config/webpack.config.examples.js | 6 +++++- config/webpack.config.large.js | 6 +++++- config/webpack.config.trader.js | 6 +++++- package.json | 30 +++++++++++++++--------------- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/config/webpack.config.examples.js b/config/webpack.config.examples.js index edb81af..563a35f 100644 --- a/config/webpack.config.examples.js +++ b/config/webpack.config.examples.js @@ -20,7 +20,11 @@ module.exports = { include: SRC_DIR, loader: 'babel-loader', query: { - presets: ['react', 'es2015', 'stage-0'] + presets: ['@babel/preset-react', '@babel/preset-env'], + plugins: [ + require('@babel/plugin-proposal-function-bind'), + require('@babel/plugin-proposal-class-properties') + ] } }, { diff --git a/config/webpack.config.large.js b/config/webpack.config.large.js index ed9aa7e..efb9ee2 100644 --- a/config/webpack.config.large.js +++ b/config/webpack.config.large.js @@ -20,7 +20,11 @@ module.exports = { include: SRC_DIR, loader: 'babel-loader', query: { - presets: ['react', 'es2015', 'stage-0'] + presets: ['@babel/preset-react', '@babel/preset-env'], + plugins: [ + require('@babel/plugin-proposal-function-bind'), + require('@babel/plugin-proposal-class-properties') + ] } } ] diff --git a/config/webpack.config.trader.js b/config/webpack.config.trader.js index 650d840..b6a5b20 100644 --- a/config/webpack.config.trader.js +++ b/config/webpack.config.trader.js @@ -20,7 +20,11 @@ module.exports = { include: SRC_DIR, loader: 'babel-loader', query: { - presets: ['react', 'es2015', 'stage-0'] + presets: ['@babel/preset-react', '@babel/preset-env'], + plugins: [ + require('@babel/plugin-proposal-function-bind'), + require('@babel/plugin-proposal-class-properties') + ] } } ] diff --git a/package.json b/package.json index fa37cf2..e3fb1b6 100644 --- a/package.json +++ b/package.json @@ -37,21 +37,21 @@ }, "homepage": "http://www.ag-grid.com/", "devDependencies": { - "babel-core": "6.26.3", - "babel-loader": "7.1.5", - "babel-preset-es2015": "6.24.1", - "babel-preset-react": "6.24.1", - "babel-preset-stage-0": "6.24.1", - "babel-preset-stage-1": "6.24.1", + "@babel/core": "7.1.2", + "babel-loader": "8.0.4", + "@babel/preset-env": "7.1.0", + "@babel/preset-react": "7.0.0", + "@babel/plugin-proposal-class-properties": "7.1.0", + "@babel/plugin-proposal-function-bind": "7.0.0", "css-loader": "1.0.0", - "file-loader": "1.1.11", + "file-loader": "2.0.0", "gulp": "3.9.1", - "merge2": "1.0.x", + "merge2": "^1.2.3", "mkdirp": "0.5.1", "ncp": "2.0.0", "prop-types": "15.6.2", - "rimraf": "2.5.x", - "style-loader": "0.21.0", + "rimraf": "~2.6.2", + "style-loader": "~0.23.0", "webpack": "^4.16.1", "webpack-cli": "^3.0.8", "webpack-dev-server": "^3.1.4" @@ -60,13 +60,13 @@ "ag-grid-community": "^19.0.0", "ag-grid-enterprise": "^19.0.0", "ag-grid-react": "^19.0.0", - "bootstrap": "3.3.7", + "bootstrap": "4.1.3", "d3": "4.9.1", - "lodash": "4.17.4", - "react": "16.4.1", - "react-dom": "16.4.1", + "lodash": "^4.17.11", + "react": "^16.5.2", + "react-dom": "^16.5.2", "react-redux": "5.0.7", "react-router-dom": "4.3.1", - "redux": "4.0.0" + "redux": "^4.0.1" } } From 3debbabe28f169b0386f3fd5f9876d57f1ee1e62 Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Tue, 16 Oct 2018 15:50:21 +0100 Subject: [PATCH 2/5] Allow more flexibility with prop-types, fix trader example --- src-trader-dashboard/components/FxQuoteMatrix.jsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src-trader-dashboard/components/FxQuoteMatrix.jsx b/src-trader-dashboard/components/FxQuoteMatrix.jsx index 1d9a933..eaa0f83 100644 --- a/src-trader-dashboard/components/FxQuoteMatrix.jsx +++ b/src-trader-dashboard/components/FxQuoteMatrix.jsx @@ -3,9 +3,6 @@ import {connect} from "react-redux"; import {AgGridReact} from "ag-grid-react"; -import assign from "lodash/assign"; -import uniq from "lodash/uniq"; - class FxQuoteMatrix extends Component { constructor(props) { super(props); From 518a95ee898ed42e14a50f90bd499cf0e1fda20a Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Tue, 16 Oct 2018 16:07:35 +0100 Subject: [PATCH 3/5] AG-2177 React Example - allow force refresh (routing breaks) --- config/webpack.config.examples.js | 1 + src-examples/App.jsx | 2 +- src-examples/NavItem.jsx | 4 ++-- src-examples/index.html | 4 ++++ .../richGridDeclarativeExample/RichGridDeclarativeExample.jsx | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/webpack.config.examples.js b/config/webpack.config.examples.js index 563a35f..f8e7d1d 100644 --- a/config/webpack.config.examples.js +++ b/config/webpack.config.examples.js @@ -46,5 +46,6 @@ module.exports = { }, devServer: { port: 8080, + historyApiFallback: true } }; \ No newline at end of file diff --git a/src-examples/App.jsx b/src-examples/App.jsx index 4207bf1..c6cc744 100644 --- a/src-examples/App.jsx +++ b/src-examples/App.jsx @@ -8,7 +8,7 @@ import SimpleReduxDynamicExample from "./simpleReduxDynamicComponentExample/Simp const SideBar = () => (
-
    +
      Rich Grid with Declarative Markup Simple Redux Dynamic Component Example
    diff --git a/src-examples/NavItem.jsx b/src-examples/NavItem.jsx index f448d45..cde8fa0 100644 --- a/src-examples/NavItem.jsx +++ b/src-examples/NavItem.jsx @@ -6,8 +6,8 @@ import {Link, Route} from 'react-router-dom' export default function NavItem({children, to, exact}) { return ( ( -
  • - {children} +
  • + {children}
    • )}/> ) diff --git a/src-examples/index.html b/src-examples/index.html index 1fd70e2..eaf33bd 100644 --- a/src-examples/index.html +++ b/src-examples/index.html @@ -16,6 +16,10 @@ line-height: 1 } + h1 { + font-size: 1.5rem; + } + div.card-body > a { margin-top: 5px } diff --git a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx index 7e9f58f..8e76dc6 100644 --- a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx +++ b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx @@ -232,7 +232,7 @@ export default class RichGridDeclarativeExample extends Component {
-
+

Rich Grid with Declarative Markup Example

From 4998a51817053c7271b3db341de8b83458971edb Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Tue, 16 Oct 2018 17:42:29 +0100 Subject: [PATCH 4/5] AG-2178 Add docs and example on how to use Context API with React --- .../simpleReduxDynamicComponentExample/GridComponent.jsx | 2 ++ .../simpleReduxDynamicComponentExample/PriceRenderer.jsx | 8 ++++++-- .../SimpleReduxExample.jsx | 6 +++++- .../simpleReduxDynamicComponentExample/fontContext.js | 3 +++ 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 src-examples/simpleReduxDynamicComponentExample/fontContext.js diff --git a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx index 428284a..6fa1d1f 100644 --- a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx @@ -6,6 +6,8 @@ import {connect} from "react-redux"; import PriceRenderer from "./PriceRenderer"; +const ThemeContext = React.createContext('light'); + /* * This component serves to display the row data (provided by redux) */ diff --git a/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx b/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx index 07f7c75..a4ab2ff 100644 --- a/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx @@ -1,6 +1,8 @@ import React, {Component} from "react"; import {connect} from "react-redux"; +import FontContext from './fontContext' + class PriceRenderer extends Component { constructor(props) { super(props); @@ -18,7 +20,9 @@ class PriceRenderer extends Component { render() { return ( - {this.props.currencySymbol}{this.state.convertedValue} + + {fontWeight => {this.props.currencySymbol}{this.state.convertedValue} } + ); } @@ -36,5 +40,5 @@ export default connect( }, null, null, - { withRef: true } // must be supplied for react/redux when using GridOptions.reactNext + {withRef: true} // must be supplied for react/redux when using GridOptions.reactNext )(PriceRenderer); \ No newline at end of file diff --git a/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx b/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx index ab25600..e46a03e 100644 --- a/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx @@ -9,6 +9,8 @@ import GridComponent from "./GridComponent"; import gridData from "./gridDataReducer"; +import FontContext from './fontContext' + let store = createStore(gridData); /* @@ -26,7 +28,9 @@ export default class SimpleReduxExample extends Component {

Simple Redux Example using Connected React Components

- + + +
) diff --git a/src-examples/simpleReduxDynamicComponentExample/fontContext.js b/src-examples/simpleReduxDynamicComponentExample/fontContext.js new file mode 100644 index 0000000..661c581 --- /dev/null +++ b/src-examples/simpleReduxDynamicComponentExample/fontContext.js @@ -0,0 +1,3 @@ +import React from "react"; + +export default React.createContext('normal'); \ No newline at end of file From 30746397ef0dffee09c719674d3af4b19297839a Mon Sep 17 00:00:00 2001 From: rmc-software Date: Wed, 31 Oct 2018 13:10:02 +0000 Subject: [PATCH 5/5] Updated npm and bower versions for b19.1.1 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e3fb1b6..5010b48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-grid-react-example", - "version": "19.0.0", + "version": "19.1.1", "description": "Example Reach applicaiton using ag-Grid.", "main": "dist/ag-grid-react-example.js", "scripts": { @@ -57,9 +57,9 @@ "webpack-dev-server": "^3.1.4" }, "dependencies": { - "ag-grid-community": "^19.0.0", - "ag-grid-enterprise": "^19.0.0", - "ag-grid-react": "^19.0.0", + "ag-grid-community": "^19.1.0", + "ag-grid-enterprise": "^19.1.0", + "ag-grid-react": "^19.1.0", "bootstrap": "4.1.3", "d3": "4.9.1", "lodash": "^4.17.11",