diff --git a/package.json b/package.json index 53d00d0..6345b17 100644 --- a/package.json +++ b/package.json @@ -63,9 +63,9 @@ "bootstrap": "4.1.3", "d3": "4.9.1", "lodash": "^4.17.11", - "react": "^16.5.2", - "react-dom": "^16.5.2", - "react-redux": "5.0.7", + "react": "^16.6.0", + "react-dom": "^16.6.0", + "react-redux": "^6.0.0", "react-router-dom": "4.3.1", "redux": "^4.0.1" } diff --git a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx index 6fa1d1f..319cbb4 100644 --- a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx @@ -1,12 +1,9 @@ import React, {Component} from "react"; -import * as PropTypes from "prop-types"; - -import {AgGridReact} from "ag-grid-react"; import {connect} from "react-redux"; -import PriceRenderer from "./PriceRenderer"; +import {AgGridReact} from "ag-grid-react"; -const ThemeContext = React.createContext('light'); +import PriceRenderer from "./PriceRenderer"; /* * This component serves to display the row data (provided by redux) @@ -49,7 +46,6 @@ class GridComponent extends Component { rowData={this.props.rowData} reactNext={true} - reduxStore={this.context.store} // must be supplied when using redux with reactNext // events onGridReady={this.onGridReady}> @@ -59,10 +55,6 @@ class GridComponent extends Component { } } -GridComponent.contextTypes = { - store: PropTypes.object // must be supplied when using redux with reactNext -}; - // pull off row data changes export default connect( (state) => { diff --git a/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx b/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx index a4ab2ff..1da323b 100644 --- a/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/PriceRenderer.jsx @@ -21,7 +21,8 @@ class PriceRenderer extends Component { render() { return ( - {fontWeight => {this.props.currencySymbol}{this.state.convertedValue} } + {fontWeight => {this.props.currencySymbol}{this.state.convertedValue}} ); } @@ -40,5 +41,5 @@ export default connect( }, null, null, - {withRef: true} // must be supplied for react/redux when using GridOptions.reactNext + {forwardRef: true} // must be supplied for react/redux when using GridOptions.reactNext )(PriceRenderer); \ No newline at end of file