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.

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 forceRender attribute to Collapse.Panel #82

Merged
merged 1 commit into from
Jan 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ If `accordion` is true, only one panel can be open. Opening another panel will
<th>false</th>
<td>whether the panel is collapsible</td>
</tr>
<tr>
<td>forceRender</td>
<td>boolean</td>
<th>false</th>
<td>forced render of content in panel, not lazy render after clicking on header</td>
</tr>
</tbody>
</table>

Expand Down
4 changes: 4 additions & 0 deletions src/Panel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class CollapsePanel extends Component {
showArrow,
destroyInactivePanel,
disabled,
forceRender,
} = this.props;
const headerCls = classNames(`${prefixCls}-header`, {
[headerClass]: headerClass,
Expand Down Expand Up @@ -54,6 +55,7 @@ class CollapsePanel extends Component {
prefixCls={prefixCls}
isActive={isActive}
destroyInactivePanel={destroyInactivePanel}
forceRender={forceRender}
>
{children}
</PanelContent>
Expand Down Expand Up @@ -84,6 +86,7 @@ CollapsePanel.propTypes = {
style: PropTypes.object,
destroyInactivePanel: PropTypes.bool,
disabled: PropTypes.bool,
forceRender: PropTypes.bool,
};

CollapsePanel.defaultProps = {
Expand All @@ -92,6 +95,7 @@ CollapsePanel.defaultProps = {
destroyInactivePanel: false,
onItemClick() {},
headerClass: '',
forceRender: false,
};

export default CollapsePanel;
7 changes: 4 additions & 3 deletions src/PanelContent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ class PanelContent extends Component {
}

render() {
this._isActived = this._isActived || this.props.isActive;
this._isActived = this.props.forceRender || this._isActived || this.props.isActive;
if (!this._isActived) {
return null;
}
const { prefixCls, isActive, children, destroyInactivePanel } = this.props;
const { prefixCls, isActive, children, destroyInactivePanel, forceRender } = this.props;
const contentCls = classnames({
[`${prefixCls}-content`]: true,
[`${prefixCls}-content-active`]: isActive,
[`${prefixCls}-content-inactive`]: !isActive,
});
const child = !isActive && destroyInactivePanel ? null :
const child = !forceRender && !isActive && destroyInactivePanel ? null :
<div className={`${prefixCls}-content-box`}>{children}</div>;
return (
<div
Expand All @@ -34,6 +34,7 @@ PanelContent.propTypes = {
isActive: PropTypes.bool,
children: PropTypes.any,
destroyInactivePanel: PropTypes.bool,
forceRender: PropTypes.bool,
};

export default PanelContent;
52 changes: 52 additions & 0 deletions tests/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,56 @@ describe('collapse', () => {
}, 500);
});
});

describe('forceRender', () => {
let node;
let collapse;

beforeEach(() => {
node = document.createElement('div');
document.body.appendChild(node);
});

const renderCollapse = (element) => {
ReactDOM.render(element, node, function init() {
collapse = this;
});
};

afterEach(() => {
ReactDOM.unmountComponentAtNode(node);
changeHook = null;
});

it('when forceRender is not supplied it should lazy render the panel content', () => {
renderCollapse(
<Collapse>
<Panel header="collapse 1" key="1" disabled>first</Panel>
<Panel header="collapse 2" key="2">second</Panel>
</Collapse>
);
expect(findDOMNode(collapse, 'rc-collapse-content').length).to.be(0);
});

it('when forceRender is FALSE it should lazy render the panel content', () => {
renderCollapse(
<Collapse>
<Panel header="collapse 1" key="1" forceRender={false} disabled>first</Panel>
<Panel header="collapse 2" key="2">second</Panel>
</Collapse>
);
expect(findDOMNode(collapse, 'rc-collapse-content').length).to.be(0);
});

it('when forceRender is TRUE then it should render all the panel content to the DOM', () => {
renderCollapse(
<Collapse>
<Panel header="collapse 1" key="1" forceRender disabled>first</Panel>
<Panel header="collapse 2" key="2">second</Panel>
</Collapse>
);
expect(findDOMNode(collapse, 'rc-collapse-content').length).to.be(1);
expect(findDOMNode(collapse, 'rc-collapse-content-active').length).to.be(0);
});
});
});