Skip to content
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 @@ -95,6 +95,12 @@ ReactDOM.render((
<td></td>
<td>additional className added to popup</td>
</tr>
<tr>
<td>forceRender</td>
<td>boolean</td>
<td>false</td>
<td>whether render popup before first show</td>
</tr>
<tr>
<td>destroyPopupOnHide</td>
<td>boolean</td>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
"prop-types": "15.x",
"rc-align": "2.x",
"rc-animate": "2.x",
"rc-util": "^4.2.0"
"rc-util": "^4.3.0"
}
}
7 changes: 6 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ if (!IS_REACT_16) {
return instance.state.popupVisible;
},

isForceRender(instance) {
return instance.props.forceRender;
},

getContainer(instance) {
return instance.getContainer();
},
Expand Down Expand Up @@ -78,6 +82,7 @@ const Trigger = createReactClass({
blurDelay: PropTypes.number,
getPopupContainer: PropTypes.func,
getDocument: PropTypes.func,
forceRender: PropTypes.bool,
destroyPopupOnHide: PropTypes.bool,
mask: PropTypes.bool,
maskClosable: PropTypes.bool,
Expand Down Expand Up @@ -578,7 +583,7 @@ const Trigger = createReactClass({

let portal;
// prevent unmounting after it's rendered
if (popupVisible || this._component) {
if (popupVisible || this._component || props.forceRender) {
portal = (
<Portal
key="portal"
Expand Down
31 changes: 30 additions & 1 deletion tests/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint no-console:0 */
/* eslint no-console:0, react/no-multi-comp:0 */

import 'core-js/es6/map';
import 'core-js/es6/set';
Expand Down Expand Up @@ -573,6 +573,35 @@ describe('rc-trigger', function main() {
});
});

describe('forceRender', () => {
it('doesn\'t render at first time when forceRender=false', () => {
const trigger = ReactDOM.render(
<Trigger popup={<span>Hello!</span>}>
<span>Hey!</span>
</Trigger>
, div);
expect(trigger.getPopupDomNode()).not.to.be.ok();
});
it('render at first time when forceRender=true', () => {
class Test extends React.Component {
saveTrigger = (trigger) => this.trigger = trigger;
render() {
return (
<Trigger
ref={this.saveTrigger}
forceRender
popup={<span>Hello!</span>}
>
<span>Hey!</span>
</Trigger>
);
}
}
const test = ReactDOM.render(<Test />, div);
expect(test.trigger.getPopupDomNode()).to.be.ok();
});
});

describe('destroyPopupOnHide', () => {
it('defaults to false', () => {
const trigger = ReactDOM.render(
Expand Down