Skip to content

fix: Remove findDOMNode #28

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

Closed
wants to merge 1 commit into from
Closed

fix: Remove findDOMNode #28

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
27 changes: 14 additions & 13 deletions src/Align.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import ReactDOM from 'react-dom';
import { alignElement, alignPoint } from 'dom-align';
import addEventListener from 'rc-util/lib/Dom/addEventListener';

Expand Down Expand Up @@ -43,6 +42,11 @@ class Align extends Component {
disabled: false,
};

constructor(props) {
super(props);
this.alignRef = React.createRef();
}

componentDidMount() {
const props = this.props;
// if parent ref not attached .... use document.getElementById
Expand All @@ -57,7 +61,7 @@ class Align extends Component {
const props = this.props;

if (!props.disabled) {
const source = ReactDOM.findDOMNode(this);
const source = this.alignRef.current;
const sourceRect = source ? source.getBoundingClientRect() : null;

if (prevProps.disabled) {
Expand Down Expand Up @@ -127,7 +131,7 @@ class Align extends Component {
forceAlign = () => {
const { disabled, target, align, onAlign } = this.props;
if (!disabled && target) {
const source = ReactDOM.findDOMNode(this);
const source = this.alignRef.current;

let result;
const element = getElement(target);
Expand All @@ -154,16 +158,13 @@ class Align extends Component {
render() {
const { childrenProps, children } = this.props;
const child = React.Children.only(children);
if (childrenProps) {
const newProps = {};
const propList = Object.keys(childrenProps);
propList.forEach((prop) => {
newProps[prop] = this.props[childrenProps[prop]];
});

return React.cloneElement(child, newProps);
}
return child;
const newProps = {};
const propList = Object.keys(childrenProps || {});
propList.forEach((prop) => {
newProps[prop] = this.props[childrenProps[prop]];
});
newProps.ref = this.alignRef;
return React.cloneElement(child, newProps);
}
}

Expand Down