Skip to content

Check if there is internal ref to prevent calling getBoundingClientRect on undefined. #622

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 5 commits into from
Closed

Check if there is internal ref to prevent calling getBoundingClientRect on undefined. #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3652b8c
fix: prevent tooltip action when there is no ref element
Baael Aug 3, 2020
ad070e4
Merge pull request #1 from medwing/CDT-1382-tooltip-not-disappear-aft…
Baael Aug 3, 2020
67742da
chore: build script in prepare to allows us to use github install
Baael Aug 5, 2020
b67c527
Merge pull request #2 from medwing/CDT-1382-build-script
Baael Aug 5, 2020
815735b
chore: [CDT-1379] update package.json
Baael Aug 5, 2020
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
9 changes: 5 additions & 4 deletions package.json
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tooltip",
"version": "4.2.5",
"name": "@medwing/react-tooltip",
"version": "4.2.6",
"description": "react tooltip component",
"main": "dist/index.js",
"types": "dist/react-tooltip.d.ts",
Expand All @@ -25,7 +25,8 @@
"github-changes": "github-changes -o wwayne -r react-tooltip -a --only-pulls --use-commit-body",
"copy:types": "cpy './react-tooltip.d.ts' './dist' --parents --dot",
"cm": "git cz",
"semantic-release": "semantic-release"
"semantic-release": "semantic-release",
"prepare": "npm run build"
},
"config": {
"commitizen": {
Expand All @@ -34,7 +35,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/wwayne/react-tooltip"
"url": "https://github.com/medwing/react-tooltip"
},
"keywords": [
"react",
Expand Down
114 changes: 76 additions & 38 deletions src/index.js
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@ class ReactTooltip extends React.Component {
* When mouse enter, show the tooltip
*/
showTooltip(e, isGlobalCall) {
if (!this.tooltipRef) {
return;
}

if (isGlobalCall) {
// Don't trigger other elements belongs to other ReactTooltip
const targetArray = this.getTargetArray(this.props.id);
Expand Down Expand Up @@ -397,60 +401,68 @@ class ReactTooltip extends React.Component {

const target = e.currentTarget;

const reshowDelay = this.state.show ? (target.getAttribute("data-delay-update") || this.props.delayUpdate) : 0;
const reshowDelay = this.state.show
? target.getAttribute("data-delay-update") || this.props.delayUpdate
: 0;

const self = this;

const updateState = function updateState() {
self.setState({
self.setState(
{
originTooltip: originTooltip,
isMultiline: isMultiline,
desiredPlace: desiredPlace,
place: place,
type: target.getAttribute("data-type") ||
self.props.type ||
"dark",
type: target.getAttribute("data-type") || self.props.type || "dark",
customColors: {
text: target.getAttribute("data-text-color") ||
text:
target.getAttribute("data-text-color") ||
self.props.textColor ||
null,
background: target.getAttribute("data-background-color") ||
background:
target.getAttribute("data-background-color") ||
self.props.backgroundColor ||
null,
border: target.getAttribute("data-border-color") ||
border:
target.getAttribute("data-border-color") ||
self.props.borderColor ||
null,
arrow: target.getAttribute("data-arrow-color") ||
arrow:
target.getAttribute("data-arrow-color") ||
self.props.arrowColor ||
null
},
effect: effect,
offset: offset,
html: (target.getAttribute("data-html") ? target.getAttribute("data-html") === "true" : self.props.html) ||
false,
delayShow: target.getAttribute("data-delay-show") ||
self.props.delayShow ||
0,
delayHide: target.getAttribute("data-delay-hide") ||
self.props.delayHide ||
0,
delayUpdate: target.getAttribute("data-delay-update") ||
html:
(target.getAttribute("data-html")
? target.getAttribute("data-html") === "true"
: self.props.html) || false,
delayShow:
target.getAttribute("data-delay-show") || self.props.delayShow || 0,
delayHide:
target.getAttribute("data-delay-hide") || self.props.delayHide || 0,
delayUpdate:
target.getAttribute("data-delay-update") ||
self.props.delayUpdate ||
0,
border: (target.getAttribute("data-border") ?
target.getAttribute("data-border") === "true" :
self.props.border) ||
false,
extraClass: target.getAttribute("data-class") ||
border:
(target.getAttribute("data-border")
? target.getAttribute("data-border") === "true"
: self.props.border) || false,
extraClass:
target.getAttribute("data-class") ||
self.props.class ||
self.props.className ||
"",
disable: (target.getAttribute("data-tip-disable") ?
target.getAttribute("data-tip-disable") === "true" :
self.props.disable) ||
false,
disable:
(target.getAttribute("data-tip-disable")
? target.getAttribute("data-tip-disable") === "true"
: self.props.disable) || false,
currentTarget: target
}, () => {
},
() => {
if (scrollHide) {
self.addScrollListener(self.state.currentTarget);
}
Expand All @@ -461,7 +473,12 @@ class ReactTooltip extends React.Component {
self.intervalUpdateContent = setInterval(() => {
if (self.mount) {
const { getContent } = self.props;
const placeholder = getTipContent(originTooltip, "", getContent[0](), isMultiline);
const placeholder = getTipContent(
originTooltip,
"",
getContent[0](),
isMultiline
);
const isEmptyTip = self.isEmptyTip(placeholder);
self.setState({ isEmptyTip });
self.updatePosition();
Expand Down Expand Up @@ -501,13 +518,18 @@ class ReactTooltip extends React.Component {
}

const updateState = () => {
if ((Array.isArray(placeholder) && placeholder.length > 0) || placeholder) {
if (
(Array.isArray(placeholder) && placeholder.length > 0) ||
placeholder
) {
const isInvisible = !this.state.show;
this.setState({
this.setState(
{
currentEvent: e,
currentTarget: eventTarget,
show: true
}, () => {
},
() => {
this.updatePosition();
if (isInvisible && afterShow) {
afterShow(e);
Expand Down Expand Up @@ -606,11 +628,18 @@ class ReactTooltip extends React.Component {

removeScrollListener(currentTarget) {
const isCaptureMode = this.isCapture(currentTarget);
window.removeEventListener("scroll", this.hideTooltipOnScroll, isCaptureMode);
window.removeEventListener(
"scroll",
this.hideTooltipOnScroll,
isCaptureMode
);
}

// Calculation the position
updatePosition() {
if (!this.tooltipRef) {
return;
}
const {
currentEvent,
currentTarget,
Expand Down Expand Up @@ -666,24 +695,31 @@ class ReactTooltip extends React.Component {

hasCustomColors() {
return Boolean(
Object.keys(this.state.customColors).find(color => color !== "border" && this.state.customColors[color]) ||
(this.state.border && this.state.customColors["border"])
Object.keys(this.state.customColors).find(
color => color !== "border" && this.state.customColors[color]
) ||
(this.state.border && this.state.customColors["border"])
);
}

render() {
const { extraClass, html, ariaProps, disable } = this.state;
const content = this.getTooltipContent();
const isEmptyTip = this.isEmptyTip(content);
const style = generateTooltipStyle(this.state.uuid, this.state.customColors, this.state.type, this.state.border);
const style = generateTooltipStyle(
this.state.uuid,
this.state.customColors,
this.state.type,
this.state.border
);

const tooltipClass =
"__react_component_tooltip" +
` ${this.state.uuid}` +
(this.state.show && !disable && !isEmptyTip ? " show" : "") +
(this.state.border ? " border" : "") +
` place-${this.state.place}` + // top, bottom, left, right
` type-${(this.hasCustomColors() ? "custom" : this.state.type)}` + // dark, success, warning, error, info, light, custom
` type-${this.hasCustomColors() ? "custom" : this.state.type}` + // dark, success, warning, error, info, light, custom
(this.props.delayUpdate ? " allow_hover" : "") +
(this.props.clickable ? " allow_click" : "");

Expand All @@ -693,7 +729,9 @@ class ReactTooltip extends React.Component {
Wrapper = ReactTooltip.defaultProps.wrapper;
}

const wrapperClassName = [tooltipClass, extraClass].filter(Boolean).join(" ");
const wrapperClassName = [tooltipClass, extraClass]
.filter(Boolean)
.join(" ");

if (html) {
const htmlContent = `${content}\n<style>${style}</style>`;
Expand Down