Skip to content
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

Add new prop to disable css transitions on expandable rows #1772

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add new prop to disable css transitions on expandable rows #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c26be0c
ESLint OS compatibility rule
dalmau Oct 20, 2022
544dc53
Setup and repo
dalmau Oct 20, 2022
65912f9
Added prop to hide css transitions
dalmau Oct 20, 2022
ef60150
Added prop to add style to table wrapper
dalmau Oct 23, 2022
30ca9b4
Added prop headerStyle to main table
dalmau Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"import/extensions": 0, // skip import extensions
"import/no-unresolved": [0, { "ignore": ["^react-bootstrap-table"] }], // monorepo setup
"import/prefer-default-export": 0,
"import/no-extraneous-dependencies": 0
"import/no-extraneous-dependencies": 0,
"linebreak-style": 0
},
"globals": {
"jest": false
Expand Down
7,374 changes: 7,374 additions & 0 deletions packages/react-bootstrap-table2-example/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions packages/react-bootstrap-table2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "react-bootstrap-table-next",
"version": "4.0.3",
"version": "4.0.7",
"description": "Next generation of react-bootstrap-table",
"main": "./lib/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/react-bootstrap-table/react-bootstrap-table2.git"
"url": "git+https://github.com/dalmau/react-bootstrap-table2.git"
},
"license": "MIT",
"keywords": [
Expand All @@ -24,6 +24,11 @@
],
"author": "AllenFang",
"contributors": [
{
"name": "Vicente Ferrer Dalmau",
"email": "",
"url": "https://github.com/dalmau"
},
{
"name": "Allen Fang",
"email": "[email protected]",
Expand Down
8 changes: 6 additions & 2 deletions 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 @@ -67,7 +67,9 @@ class BootstrapTable extends PropsBaseResolver(Component) {
selectRow,
expandRow,
cellEdit,
filterPosition
filterPosition,
/* VFD */
wrapperStyle = {}
} = this.props;

const tableWrapperClass = cs('react-bootstrap-table', wrapperClasses);
Expand All @@ -88,12 +90,13 @@ class BootstrapTable extends PropsBaseResolver(Component) {
);

return (
<div className={ tableWrapperClass }>
<div className={ tableWrapperClass } style={ { ...wrapperStyle } } >
<table id={ id } className={ tableClass }>
{ tableCaption }
<Header
columns={ columns }
className={ this.props.headerClasses }
style={ this.props.headerStyle }
wrapperClasses={ this.props.headerWrapperClasses }
sortField={ this.props.sortField }
sortOrder={ this.props.sortOrder }
Expand Down Expand Up @@ -166,6 +169,7 @@ BootstrapTable.propTypes = {
id: PropTypes.string,
classes: PropTypes.string,
headerClasses: PropTypes.string,
headerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.func]), /* VFD */
bodyClasses: PropTypes.string,
wrapperClasses: PropTypes.string,
headerWrapperClasses: PropTypes.string,
Expand Down
Loading