Skip to content

Refactor string refs to callback #68

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
yesmeck merged 1 commit into from
Nov 3, 2017
Merged

Refactor string refs to callback #68

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
40 changes: 22 additions & 18 deletions src/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
this.openTime = Date.now();
this.lastOutSideFocusNode = document.activeElement;
this.addScrollingEffect();
this.refs.wrap.focus();
const dialogNode = ReactDOM.findDOMNode(this.refs.dialog);
this.wrap.focus();
const dialogNode = ReactDOM.findDOMNode(this.dialog);
if (mousePosition) {
const elOffset = offset(dialogNode);
setTransformOrigin(dialogNode,
Expand Down Expand Up @@ -107,8 +107,8 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
onAnimateLeave = () => {
// need demo?
// https://github.com/react-component/dialog/pull/28
if (this.refs.wrap) {
this.refs.wrap.style.display = 'none';
if (this.wrap) {
this.wrap.style.display = 'none';
}
this.inTransition = false;
this.removeScrollingEffect();
Expand All @@ -132,13 +132,12 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
if (props.visible) {
if (e.keyCode === KeyCode.TAB) {
const activeElement = document.activeElement;
const dialogRoot = this.refs.wrap;
const sentinel = this.refs.sentinel;
const dialogRoot = this.wrap;
if (e.shiftKey) {
if (activeElement === dialogRoot) {
sentinel.focus();
this.sentinel.focus();
}
} else if (activeElement === this.refs.sentinel) {
} else if (activeElement === this.sentinel) {
dialogRoot.focus();
}
}
Expand Down Expand Up @@ -194,7 +193,7 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
<LazyRenderBox
key="dialog-element"
role="document"
ref="dialog"
ref={this.saveRef('dialog')}
style={style}
className={`${prefixCls} ${props.className || ''}`}
visible={props.visible}
Expand All @@ -212,7 +211,7 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
</div>
{footer}
</div>
<div tabIndex={0} ref="sentinel" style={{ width: 0, height: 0, overflow: 'hidden' }}>
<div tabIndex={0} ref={this.saveRef('sentinel')} style={{ width: 0, height: 0, overflow: 'hidden' }}>
sentinel
</div>
</LazyRenderBox>
Expand Down Expand Up @@ -294,7 +293,7 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
return transitionName;
}
getElement = (part) => {
return this.refs[part];
return this[part];
}
setScrollbar = () => {
if (this.bodyIsOverflowing && this.scrollbarWidth !== undefined) {
Expand Down Expand Up @@ -338,20 +337,25 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
document.body.style.paddingRight = '';
}
adjustDialog = () => {
if (this.refs.wrap && this.scrollbarWidth !== undefined) {
if (this.wrap && this.scrollbarWidth !== undefined) {
const modalIsOverflowing =
this.refs.wrap.scrollHeight > document.documentElement.clientHeight;
this.refs.wrap.style.paddingLeft =
this.wrap.scrollHeight > document.documentElement.clientHeight;
this.wrap.style.paddingLeft =
`${!this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : ''}px`;
this.refs.wrap.style.paddingRight =
this.wrap.style.paddingRight =
`${this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''}px`;
}
}
resetAdjustments = () => {
if (this.refs.wrap) {
this.refs.wrap.style.paddingLeft = this.refs.wrap.style.paddingLeft = '';
if (this.wrap) {
this.wrap.style.paddingLeft = this.wrap.style.paddingLeft = '';
}
}

saveRef = (name) => (node) => {
this[name] = node;
}

render() {
const { props } = this;
const { prefixCls, maskClosable } = props;
Expand All @@ -368,7 +372,7 @@ export default class Dialog extends React.Component<IDialogPropTypes, any> {
tabIndex={-1}
onKeyDown={this.onKeyDown}
className={`${prefixCls}-wrap ${props.wrapClassName || ''}`}
ref="wrap"
ref={this.saveRef('wrap')}
onClick={maskClosable ? this.onMaskClick : undefined}
role="dialog"
aria-labelledby={props.title ? this.titleId : null}
Expand Down