From e44782f2224bfa7076679600bef26bcca76ef3d9 Mon Sep 17 00:00:00 2001
From: Norbert Nemeth <nnorb93@gmail.com>
Date: Sat, 9 Mar 2019 11:46:04 +0100
Subject: [PATCH] fix #863 - expanded row column span does not update (#837)

---
 packages/react-bootstrap-table2/src/body.js                   | 3 +--
 .../react-bootstrap-table2/src/row-expand/row-consumer.js     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/react-bootstrap-table2/src/body.js b/packages/react-bootstrap-table2/src/body.js
index 2d445fc..a14e1b8 100644
--- a/packages/react-bootstrap-table2/src/body.js
+++ b/packages/react-bootstrap-table2/src/body.js
@@ -17,7 +17,6 @@ class Body extends React.Component {
     super(props);
     const {
       keyField,
-      visibleColumnSize,
       cellEdit,
       selectRow,
       expandRow
@@ -34,7 +33,7 @@ class Body extends React.Component {
     const expandRowEnabled = !!expandRow.renderer;
 
     if (expandRowEnabled) {
-      RowComponent = withRowExpansion(RowAggregator, visibleColumnSize);
+      RowComponent = withRowExpansion(RowAggregator);
     }
 
     if (selectRowEnabled) {
diff --git a/packages/react-bootstrap-table2/src/row-expand/row-consumer.js b/packages/react-bootstrap-table2/src/row-expand/row-consumer.js
index 77f5e36..7578d6d 100644
--- a/packages/react-bootstrap-table2/src/row-expand/row-consumer.js
+++ b/packages/react-bootstrap-table2/src/row-expand/row-consumer.js
@@ -3,7 +3,7 @@ import React from 'react';
 import ExpandRow from './expand-row';
 import ExpansionContext from '../contexts/row-expand-context';
 
-export default (Component, visibleColumnSize) => {
+export default (Component) => {
   const renderWithExpansion = (props, expandRow) => {
     const key = props.value;
 
@@ -20,7 +20,7 @@ export default (Component, visibleColumnSize) => {
       />,
       expanded ? <ExpandRow
         key={ `${key}-expanding` }
-        colSpan={ visibleColumnSize }
+        colSpan={ props.visibleColumnSize }
       >
         { expandRow.renderer(props.row) }
       </ExpandRow> : null