Skip to content

Commit 864cf9e

Browse files
committed
Merge branch 'itajaja-fix-selected-classname'
2 parents 14768a6 + 2cb7056 commit 864cf9e

File tree

4 files changed

+65
-6
lines changed

4 files changed

+65
-6
lines changed

dist/react-bootstrap-table.js

Lines changed: 47 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/react-bootstrap-table.js.map

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/react-bootstrap-table.min.js

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/TableRow.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import classSet from 'classnames';
12
import React, { Component, PropTypes } from 'react';
23

34
class TableRow extends Component {
@@ -51,9 +52,10 @@ class TableRow extends Component {
5152
style: {
5253
backgroundColor: this.props.isSelected ? this.props.selectRow.bgColor : null
5354
},
54-
className: (
55-
this.props.isSelected && this.props.selectRow.className ?
56-
this.props.selectRow.className : '') + (this.props.className || '')
55+
className: classSet(
56+
this.props.isSelected ? this.props.selectRow.className : null,
57+
this.props.className
58+
)
5759
};
5860

5961
if (this.props.selectRow && (this.props.selectRow.clickToSelect ||

0 commit comments

Comments
 (0)