From 1d1356582461c6229ca77d03cb106310f20320e3 Mon Sep 17 00:00:00 2001
From: Ymbere Xavier <ymbere@gmail.com>
Date: Wed, 4 Dec 2019 01:50:26 -0200
Subject: [PATCH 1/2] Add new prop to Caption component

Add new prop of Caption component in order to check if
bootstrap is in use
---
 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 a69e3967e..9c2c79162 100644
--- a/packages/react-bootstrap-table2/src/bootstrap-table.js
+++ b/packages/react-bootstrap-table2/src/bootstrap-table.js
@@ -83,7 +83,9 @@ class BootstrapTable extends PropsBaseResolver(Component) {
 
     const hasFooter = _.filter(columns, col => _.has(col, 'footer')).length > 0;
 
-    const tableCaption = (caption && <Caption>{ caption }</Caption>);
+    const tableCaption = (
+      caption && <Caption bootstrap4={ bootstrap4 }>{ caption }</Caption>
+    );
 
     return (
       <div className={ tableWrapperClass }>

From b99a277595f2991ea5a4a6247e2f26f59eda86f2 Mon Sep 17 00:00:00 2001
From: Ymbere Xavier <ymbere@gmail.com>
Date: Wed, 4 Dec 2019 01:44:07 -0200
Subject: [PATCH 2/2] Fix issue with caption on bootstrap 4

Add new prop to check if bootstrap is used
Update component in order to return a custom caption when bootstrap4
is in use
---
 packages/react-bootstrap-table2/src/caption.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/react-bootstrap-table2/src/caption.js b/packages/react-bootstrap-table2/src/caption.js
index 972d9298d..79706a6b1 100644
--- a/packages/react-bootstrap-table2/src/caption.js
+++ b/packages/react-bootstrap-table2/src/caption.js
@@ -4,16 +4,22 @@ import PropTypes from 'prop-types';
 
 const Caption = (props) => {
   if (!props.children) return null;
-  return (
-    <caption>{ props.children }</caption>
+
+  const caption = props.bootstrap4 ? (
+    <caption style={ { captionSide: 'top' } }>{props.children}</caption>
+  ) : (
+    <caption>{props.children}</caption>
   );
+
+  return caption;
 };
 
 Caption.propTypes = {
   children: PropTypes.oneOfType([
     PropTypes.node,
     PropTypes.string
-  ])
+  ]),
+  bootstrap4: PropTypes.bool
 };
 
 export default Caption;