Skip to content

fix: add ref only when support #174

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 1 commit into from
Mar 6, 2020
Merged

fix: add ref only when support #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 35 additions & 17 deletions examples/simple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,27 @@ function getPopupContainer(trigger) {
return trigger.parentNode;
}

const InnerTarget = React.forwardRef((props, ref) => {
const InnerTarget = props => (
<div
style={{
margin: 20,
display: 'inline-block',
background: 'rgba(255, 0, 0, 0.05)',
}}
tabIndex={0}
role="button"
{...props}
>
<p>This is a example of trigger usage.</p>
<p>You can adjust the value above</p>
<p>which will also change the behaviour of popup.</p>
</div>
);

const RefTarget = React.forwardRef((props, ref) => {
React.useImperativeHandle(ref, () => ({}));

return (
<div
style={{ margin: 20, display: 'inline-block', background: 'rgba(255, 0, 0, 0.05)' }}
tabIndex={0}
role="button"
{...props}
>
<p>This is a example of trigger usage.</p>
<p>You can adjust the value above</p>
<p>which will also change the behaviour of popup.</p>
</div>
);
return <InnerTarget {...props} />;
});

class Test extends React.Component {
Expand Down Expand Up @@ -243,7 +249,11 @@ class Test extends React.Component {
</label>
&nbsp;&nbsp;&nbsp;&nbsp;
<label>
<input checked={!!this.state.mask} type="checkbox" onChange={this.onMask} />
<input
checked={!!this.state.mask}
type="checkbox"
onChange={this.onMask}
/>
mask
</label>
&nbsp;&nbsp;&nbsp;&nbsp;
Expand All @@ -258,12 +268,20 @@ class Test extends React.Component {
<br />
<label>
offsetX:
<input type="text" onChange={this.onOffsetXChange} style={{ width: 50 }} />
<input
type="text"
onChange={this.onOffsetXChange}
style={{ width: 50 }}
/>
</label>
&nbsp;&nbsp;&nbsp;&nbsp;
<label>
offsetY:
<input type="text" onChange={this.onOffsetYChange} style={{ width: 50 }} />
<input
type="text"
onChange={this.onOffsetYChange}
style={{ width: 50 }}
/>
</label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button type="button" onClick={this.destroy}>
Expand Down Expand Up @@ -294,7 +312,7 @@ class Test extends React.Component {
popup={<div>i am a popup</div>}
popupTransitionName={state.transitionName}
>
<InnerTarget />
<RefTarget />
</Trigger>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"raf": "^3.4.1",
"rc-align": "^3.0.0-rc.0",
"rc-animate": "^2.10.2",
"rc-util": "^4.15.2"
"rc-util": "^4.20.0"
}
}
12 changes: 8 additions & 4 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { HTMLAttributes } from 'react';
import ReactDOM from 'react-dom';
import contains from 'rc-util/lib/Dom/contains';
import findDOMNode from 'rc-util/lib/Dom/findDOMNode';
import { composeRef } from 'rc-util/lib/ref';
import { composeRef, supportRef } from 'rc-util/lib/ref';
import addEventListener from 'rc-util/lib/Dom/addEventListener';
import Portal from 'rc-util/lib/Portal';
import classNames from 'classnames';
Expand Down Expand Up @@ -779,10 +779,14 @@ export function generateTrigger(
if (childrenClassName) {
newChildProps.className = childrenClassName;
}
const trigger = React.cloneElement(child, {

const cloneProps: any = {
...newChildProps,
ref: composeRef(this.triggerRef, (child as any).ref),
});
};
if (supportRef(child)) {
cloneProps.ref = composeRef(this.triggerRef, (child as any).ref);
}
const trigger = React.cloneElement(child, cloneProps);

let portal: React.ReactElement;
// prevent unmounting after it's rendered
Expand Down