diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx index a35b5017..dd387bbb 100644 --- a/src/components/Tooltip/Tooltip.tsx +++ b/src/components/Tooltip/Tooltip.tsx @@ -646,7 +646,7 @@ const Tooltip = ({ useEffect(() => { let selector = imperativeOptions?.anchorSelect ?? anchorSelect ?? '' if (!selector && id) { - selector = `[data-tooltip-id='${id}']` + selector = `[data-tooltip-id='${id.replace(/'/g, "\\'")}']` } const documentObserverCallback: MutationCallback = (mutationList) => { const newAnchors: HTMLElement[] = [] @@ -798,7 +798,7 @@ const Tooltip = ({ useEffect(() => { let selector = imperativeOptions?.anchorSelect ?? anchorSelect if (!selector && id) { - selector = `[data-tooltip-id='${id}']` + selector = `[data-tooltip-id='${id.replace(/'/g, "\\'")}']` } if (!selector) { return diff --git a/src/components/TooltipController/TooltipController.tsx b/src/components/TooltipController/TooltipController.tsx index cfe88d58..f5d06e5a 100644 --- a/src/components/TooltipController/TooltipController.tsx +++ b/src/components/TooltipController/TooltipController.tsx @@ -220,7 +220,7 @@ const TooltipController = React.forwardRef( let selector = anchorSelect if (!selector && id) { - selector = `[data-tooltip-id='${id}']` + selector = `[data-tooltip-id='${id.replace(/'/g, "\\'")}']` } if (selector) { try {