Skip to content

Fix deprecated findDomNode for React 19 compatibility #31

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix deprecated findDomNode for React 19 compatibility #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76cb26f
add nodeRef prop to prevent usage of deprecated findDOMNode
SoprisAppsCI Mar 11, 2025
27a24b8
make necessary adjustments since onEnter and friends don't pass node …
SoprisAppsCI Mar 11, 2025
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
3 changes: 2 additions & 1 deletion src/js/components/FipDropDown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class FipDropDown extends React.PureComponent {
handleChangeCategory: PropTypes.func.isRequired,
handleChangePage: PropTypes.func.isRequired,
handleChangeSearch: PropTypes.func.isRequired,
domRef: PropTypes.object.isRequired, // eslint-disable-line
};

static defaultProps = {
Expand Down Expand Up @@ -96,7 +97,7 @@ class FipDropDown extends React.PureComponent {

render() {
return (
<div className="rfipdropdown__selector">
<div className="rfipdropdown__selector" ref={this.props.domRef}>
{this.props.showSearch ? (
<FipSearch
handleSearch={this.handleSearch}
Expand Down
29 changes: 16 additions & 13 deletions src/js/components/FontIconPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ class FontIconPicker extends React.PureComponent {
// some references we need for outside click
this.fipButtonRef = React.createRef();
this.fipDropDownRef = React.createRef();
this.fipDropDownPortalRef = React.createRef();

// create the state
this.state = {
Expand Down Expand Up @@ -236,8 +237,8 @@ class FontIconPicker extends React.PureComponent {
}
return (
this.fipButtonRef.current.contains(target) ||
(this.fipDropDownRef.current &&
this.fipDropDownRef.current.contains(target))
(this.fipDropDownPortalRef.current &&
this.fipDropDownPortalRef.current.contains(target))
);
};

Expand Down Expand Up @@ -374,8 +375,8 @@ class FontIconPicker extends React.PureComponent {
});
};

handlePortalEnter = /* istanbul ignore next */ node => {
const selectorNode = node.childNodes[0];
handlePortalEnter = /* istanbul ignore next */ () => {
const selectorNode = this.fipDropDownRef.current;
this.resetPortalStyle(selectorNode);
const computedStyle = getComputedStyle(selectorNode);
this.fipPortalComputedStyle = {
Expand All @@ -387,15 +388,15 @@ class FontIconPicker extends React.PureComponent {
selectorNode.style[key] = '0px';
});
};
handlePortalEntering = /* istanbul ignore next */ node => {
const selectorNode = node.childNodes[0];
handlePortalEntering = /* istanbul ignore next */ () => {
const selectorNode = this.fipDropDownRef.current;
selectorNode.style.maxHeight = this.fipPortalComputedStyle.height;
selectorNode.style.paddingTop = this.fipPortalComputedStyle.paddingTop;
selectorNode.style.paddingBottom = this.fipPortalComputedStyle.paddingBottom;
};
handlePortalEntered = /* istanbul ignore next */ node => {
handlePortalEntered = /* istanbul ignore next */ () => {
// reset style
const selectorNode = node.childNodes[0];
const selectorNode = this.fipDropDownRef.current;
this.resetPortalStyle(selectorNode);
// focus on search
// but only if not on mobile devices and search is shown
Expand All @@ -407,14 +408,14 @@ class FontIconPicker extends React.PureComponent {
selectorNode.querySelector('.rfipsearch__input').focus();
}
};
handlePortalExit = /* istanbul ignore next */ node => {
const selectorNode = node.childNodes[0];
handlePortalExit = /* istanbul ignore next */ () => {
const selectorNode = this.fipDropDownRef.current;
this.resetPortalStyle(selectorNode);
const { height } = getComputedStyle(selectorNode);
selectorNode.style.maxHeight = height;
};
handlePortalExiting = /* istanbul ignore next */ node => {
const selectorNode = node.childNodes[0];
handlePortalExiting = /* istanbul ignore next */ () => {
const selectorNode = this.fipDropDownRef.current;
selectorNode.style.maxHeight = '0px';
selectorNode.style.paddingTop = '0px';
selectorNode.style.paddingBottom = '0px';
Expand Down Expand Up @@ -457,6 +458,7 @@ class FontIconPicker extends React.PureComponent {
handleChangeCategory: this.handleChangeCategory,
handleChangePage: this.handleChangePage,
handleChangeSearch: this.handleChangeSearch,
domRef: this.fipDropDownRef,
};
return (
<div className={this.state.elemClass} ref={this.fipRef}>
Expand All @@ -481,10 +483,11 @@ class FontIconPicker extends React.PureComponent {
onEntered={this.handlePortalEntered}
onExit={this.handlePortalExit}
onExiting={this.handlePortalExiting}
nodeRef={this.fipDropDownPortalRef}
>
<FipDropDownPortal
appendRoot={this.props.appendTo}
domRef={this.fipDropDownRef}
domRef={this.fipDropDownPortalRef}
btnRef={this.fipButtonRef}
className={this.state.ddClass}
>
Expand Down