From 5ebe525c5c465ec0904b8902d7843daa9a0e494c Mon Sep 17 00:00:00 2001
From: JamesPortelli <james.aportelli@gmail.com>
Date: Tue, 1 May 2018 15:11:21 +0100
Subject: [PATCH 1/2] fix editor refs

---
 .../src/editors/ContainerEditorWrapper.js             | 10 +++++++---
 packages/react-data-grid-examples/package.json        |  2 +-
 .../react-data-grid/src/editors/EditorContainer.js    | 11 +++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js b/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js
index 4316bb43e6..67f1759122 100644
--- a/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js
+++ b/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js
@@ -7,16 +7,20 @@ import React, { Component } from 'react';
 // to the required methods.
 module.exports = (ContainerEditor) => {
   return class ContainerEditorWrapper extends Component {
-    getInputNode() {
+    getInputNode = () => {
       return this.editorRef.getInputNode();
     }
 
-    getValue() {
+    getValue = () => {
       return this.editorRef.getValue();
     }
 
+    createRef = (ref) => {
+      this.editorRef = ref;
+    }
+
     render() {
-      return (<ContainerEditor refCallback={(ref) => { this.editorRef = ref; }} {...this.props} />);
+      return (<ContainerEditor refCallback={this.createRef} {...this.props} />);
     }
   };
 };
diff --git a/packages/react-data-grid-examples/package.json b/packages/react-data-grid-examples/package.json
index eb1462c2b0..a618ae34f3 100644
--- a/packages/react-data-grid-examples/package.json
+++ b/packages/react-data-grid-examples/package.json
@@ -17,7 +17,7 @@
   "author": "Adazzle",
   "license": "MIT",
   "dependencies": {
-    "immutability-helper": "^2.4.0",
+    "immutability-helper": "^2.7.0",
     "react-data-grid": "^4.0.7",
     "react-data-grid-addons": "^4.0.7",
     "react-router-dom": "^4.2.2"
diff --git a/packages/react-data-grid/src/editors/EditorContainer.js b/packages/react-data-grid/src/editors/EditorContainer.js
index daf3a8fb94..44f8ec4c2e 100644
--- a/packages/react-data-grid/src/editors/EditorContainer.js
+++ b/packages/react-data-grid/src/editors/EditorContainer.js
@@ -78,10 +78,13 @@ class EditorContainer extends React.Component {
     }
   };
 
+  createEditorRef = (ref) => {
+    this.editor = ref;
+  }
+
   createEditor = (): ReactElement => {
-    let editorRef = (c) => this.editor = c;
     let editorProps = {
-      ref: editorRef,
+      ref: this.createEditorRef,
       column: this.props.column,
       value: this.getInitialValue(),
       onCommit: this.commit,
@@ -99,10 +102,10 @@ class EditorContainer extends React.Component {
       return React.cloneElement(CustomEditor, editorProps);
     }
     if (isFunction(CustomEditor)) {
-      return <CustomEditor ref={editorRef} {...editorProps} />;
+      return <CustomEditor ref={this.createEditorRef} {...editorProps} />;
     }
 
-    return <SimpleTextEditor ref={editorRef} column={this.props.column} value={this.getInitialValue()} onBlur={this.commit} rowMetaData={this.getRowMetaData()} onKeyDown={() => {}} commit={() => {}}/>;
+    return <SimpleTextEditor ref={this.createEditorRef} column={this.props.column} value={this.getInitialValue()} onBlur={this.commit} rowMetaData={this.getRowMetaData()} onKeyDown={() => {}} commit={() => {}}/>;
   };
 
   onPressEnter = () => {

From 9c0866b7f163856fb7036a347fd380c057fe568e Mon Sep 17 00:00:00 2001
From: JamesPortelli <james.aportelli@gmail.com>
Date: Fri, 4 May 2018 11:23:10 +0100
Subject: [PATCH 2/2] address aman comments

---
 .../src/editors/ContainerEditorWrapper.js                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js b/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js
index 67f1759122..3e51e8d286 100644
--- a/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js
+++ b/packages/react-data-grid-addons/src/editors/ContainerEditorWrapper.js
@@ -7,11 +7,11 @@ import React, { Component } from 'react';
 // to the required methods.
 module.exports = (ContainerEditor) => {
   return class ContainerEditorWrapper extends Component {
-    getInputNode = () => {
+    getInputNode() {
       return this.editorRef.getInputNode();
     }
 
-    getValue = () => {
+    getValue() {
       return this.editorRef.getValue();
     }