fix: aria-describedby

palantir · Jun 26, 2024 · 730d177 · bvandercar-vt · Jun 26, 2024 · 730d177
1 parent 8c44382
commit 730d177
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/packages/core/src/components/tooltip/tooltip.tsx b/packages/core/src/components/tooltip/tooltip.tsx
@@ -115,8 +115,14 @@ export class Tooltip<
 
  const tooltipId = Utils.uniqueId("tooltip");
 
- const childTarget = Utils.ensureElement(React.Children.toArray(children)[0], undefined, {
- "aria-describedby": tooltipId,
+ const childTarget = Utils.ensureElement(React.Children.toArray(children)[0]);
+
+ if (childTarget === undefined) {
+ return null;
+ }
+
+ const clonedTarget: React.JSX.Element = React.cloneElement(childTarget, {
+ "aria-describedby": [tooltipId, childTarget.props["aria-describedby"]].filter(Boolean).join(" "),
  });
 
  return (
@@ -149,7 +155,7 @@ export class Tooltip<
  portalContainer={this.props.portalContainer}
  ref={this.popoverRef}
  >
- {childTarget}
+ {clonedTarget}
  </Popover>
  );
  };