Merge branch 'v4.0.0-dev' of https://github.com/yakirg/react-bootstrap-table into yakirg-v4.0.0-dev

Author: AllenFang

src/Editor.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-const editor = function(editable, attr, format, editorClass, defaultValue, ignoreEditable) {
+const editor = function(editable, attr, format, editorClass, defaultValue, ignoreEditable, row) {
   if (editable === true ||
     (editable === false && ignoreEditable) ||
     typeof editable === 'string') { // simple declare
@@ -50,7 +50,10 @@ const editor = function(editable, attr, format, editorClass, defaultValue, ignor
           return (
             <option key={ 'option' + i } value={ value }>{ text }</option>
           );
-        });
+        }
+        );
+      } else if (values && typeof values === 'function') {
+        options = values(row);
       }
       return (
         <select { ...attr } defaultValue={ defaultValue }>

src/TableEditColumn.js

@@ -192,7 +192,8 @@ class TableEditColumn extends Component {
       };
       cellEditor = customEditor.getElement(this.handleCustomUpdate, customEditorProps);
     } else {
-      cellEditor = editor(editable, attr, format, editorClass, this.valueShortCircuit(fieldValue));
+      cellEditor = editor(editable, attr, format, editorClass, this.valueShortCircuit(fieldValue),
+          null, row);
     }
 
     if (isFocus) {