Merge pull request mbrn#2296 from sujay-gandham-by/fix/filter-alignme…

…nt-details-panel Filter row misaligns when details panel column is to the right.
DanRowe · Aug 16, 2020 · 490d95b · 490d95b
2 parents 78fb50e + 355f721
commit 490d95b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/m-table-body.js b/src/components/m-table-body.js
@@ -217,6 +217,9 @@ class MTableBody extends React.Component {
                 .dateTimePickerLocalization,
             }}
             hasDetailPanel={!!this.props.detailPanel}
+            detailPanelColumnAlignment={
+              this.props.options.detailPanelColumnAlignment
+            }
             isTreeData={this.props.isTreeData}
             filterCellStyle={this.props.options.filterCellStyle}
             filterRowStyle={this.props.options.filterRowStyle}

diff --git a/src/components/m-table-filter-row.js b/src/components/m-table-filter-row.js
@@ -246,8 +246,10 @@ class MTableFilterRow extends React.Component {
     }
 
     if (this.props.hasDetailPanel) {
+      const alignment = this.props.detailPanelColumnAlignment;
+      const index = alignment === "left" ? 0 : columns.length;
       columns.splice(
-        0,
+        index,
         0,
         <TableCell padding="none" key="key-detail-panel-column" />
       );
@@ -284,6 +286,7 @@ class MTableFilterRow extends React.Component {
 
 MTableFilterRow.defaultProps = {
   columns: [],
+  detailPanelColumnAlignment: "left",
   selection: false,
   hasActions: false,
   localization: {
@@ -295,6 +298,7 @@ MTableFilterRow.defaultProps = {
 MTableFilterRow.propTypes = {
   columns: PropTypes.array.isRequired,
   hasDetailPanel: PropTypes.bool.isRequired,
+  detailPanelColumnAlignment: PropTypes.string,
   isTreeData: PropTypes.bool.isRequired,
   onFilterChanged: PropTypes.func.isRequired,
   filterCellStyle: PropTypes.object,