From a8083ac17d4a19e9feb25e32ceb33177998d270f Mon Sep 17 00:00:00 2001
From: Parth Prajapati <prajapati-parth@users.noreply.github.com>
Date: Sat, 24 Feb 2018 20:23:52 +0530
Subject: [PATCH 1/2] Fixes #186 (#219)

* Fixes #186

* Solved lint error
---
 packages/react-bootstrap-table2/src/bootstrap-table.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-bootstrap-table2/src/bootstrap-table.js b/packages/react-bootstrap-table2/src/bootstrap-table.js
index 4834ec0..dae3893 100644
--- a/packages/react-bootstrap-table2/src/bootstrap-table.js
+++ b/packages/react-bootstrap-table2/src/bootstrap-table.js
@@ -70,10 +70,12 @@ class BootstrapTable extends PropsBaseResolver(Component) {
       allRowsSelected: isSelectedAll(store)
     });
 
+    const tableCaption = (caption && <Caption>{ caption }</Caption>);
+
     return (
       <div className="react-bootstrap-table">
         <table className={ tableClass }>
-          <Caption>{ caption }</Caption>
+          { tableCaption }
           <Header
             columns={ columns }
             sortField={ store.sortField }

From 5dd1f1e9ea90cdf5775b5d08a504c0e2e141a686 Mon Sep 17 00:00:00 2001
From: AllenFang <ayu780129@hotmail.com>
Date: Sat, 24 Feb 2018 23:03:09 +0800
Subject: [PATCH 2/2] fix #221

---
 packages/react-bootstrap-table2-editor/src/text-editor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react-bootstrap-table2-editor/src/text-editor.js b/packages/react-bootstrap-table2-editor/src/text-editor.js
index 52233e7..7937282 100644
--- a/packages/react-bootstrap-table2-editor/src/text-editor.js
+++ b/packages/react-bootstrap-table2-editor/src/text-editor.js
@@ -32,9 +32,10 @@ TextEditor.propTypes = {
   defaultValue: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.number
-  ]).isRequired
+  ])
 };
 TextEditor.defaultProps = {
-  className: null
+  className: null,
+  defaultValue: ''
 };
 export default TextEditor;