Skip to content

20180513 release #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 14, 2018
Merged

20180513 release #336

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
028834d
add release command
AllenFang May 8, 2018
888aa1d
fix #303 (#330)
AllenFang May 10, 2018
43e7331
implement wrapperClasses(#325)
MikeSha May 12, 2018
f87fe3e
patch docs, example and test for wrapperClasses
AllenFang May 12, 2018
ed2ba2a
fix #334
AllenFang May 14, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
implement wrapperClasses(#325)
  • Loading branch information
@MikeSha @AllenFang
MikeSha authored and AllenFang committed May 12, 2018
commit 43e73313e651c448e99fc6ce2e24896a7d26c060
6 changes: 5 additions & 1 deletion packages/react-bootstrap-table2/src/bootstrap-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ class BootstrapTable extends PropsBaseResolver(Component) {
caption,
rowStyle,
rowClasses,
wrapperClasses,
rowEvents
} = this.props;

const tableWrapperClass = cs('react-bootstrap-table', wrapperClasses);

const tableClass = cs('table', {
'table-striped': striped,
'table-hover': hover,
Expand All @@ -75,7 +78,7 @@ class BootstrapTable extends PropsBaseResolver(Component) {
const tableCaption = (caption && <Caption>{ caption }</Caption>);

return (
<div className="react-bootstrap-table">
<div className={ tableWrapperClass }>
<table id={ id } className={ tableClass }>
{ tableCaption }
<Header
Expand Down Expand Up @@ -120,6 +123,7 @@ BootstrapTable.propTypes = {
hover: PropTypes.bool,
id: PropTypes.string,
classes: PropTypes.string,
wrapperClasses: PropTypes.string,
condensed: PropTypes.bool,
caption: PropTypes.oneOfType([
PropTypes.node,
Expand Down