@bundle-stats/ui 4.23.0-beta.1 → 4.23.0-beta.3

package/src/components/metrics-treemap/metrics-treemap.tsx

@@ -2,17 +2,15 @@ import React, {
   type ComponentProps,
   type MouseEventHandler,
   type ReactNode,
-  type Ref,
-  type RefObject,
-  forwardRef,
   useCallback,
+  useEffect,
   useMemo,
   useRef,
 } from 'react';
-import { useHoverDirty, useMeasure } from 'react-use';
+import { useMeasure } from 'react-use';
 import cx from 'classnames';
 import { HierarchyRectangularNode, hierarchy, treemap, treemapSquarify } from 'd3';
-import { Tooltip, TooltipArrow, TooltipAnchor } from 'ariakit/tooltip';
+import { Tooltip, TooltipArrow } from 'ariakit/tooltip';
 import {
   type ReportMetricRow,
   type MetricRunInfo,
@@ -30,23 +28,43 @@ import {
   type TreeLeaf,
   type TreeNode,
   type Tree,
+  type TreeTotal,
   SQUARIFY_RATIO,
   PADDING_OUTER,
   PADDING_INNER,
   NESTED_PADDING,
   NESTED_PADDING_TOP,
   NESTED_PADDING_LEFT,
+  NODE_ID_SELECTOR,
   TileSizeDisplay,
 } from './metrics-treemap.constants';
 import * as I18N from './metrics-treemap.i18n';
 import css from './metrics-treemap.module.css';
 import {
+  getTreemapNodesIndex,
   resolveGroupDeltaType,
   resolveTileSizeDisplay,
   resolveTileGroupSizeDisplay,
-  useTooltipStateWithMouseFollow,
+  useTreemapTooltipState,
 } from './metrics-treemap.utils';
 
+/**
+ * Resolve the run info of a tile group from the children total
+ */
+function getGroupRunInfo(total: TreeTotal) {
+  const runInfo = getMetricRunInfo(
+    METRIC_TYPE_CONFIGS.METRIC_TYPE_FILE_SIZE,
+    total.current,
+    total.baseline,
+  ) as MetricRunInfo;
+
+  return {
+    runInfo,
+    baselineDisplayValue: formatFileSize(total.baseline),
+    deltaType: resolveGroupDeltaType(runInfo),
+  };
+}
+
 interface TileTooltipContentProps {
   item: ReportMetricRow;
 }
@@ -64,7 +82,8 @@ const TileTooltipContent = (props: TileTooltipContentProps) => {
       </h3>
       <RunInfo
         current={currentRun.displayValue}
-        delta={currentRun.displayDeltaPercentage}
+        delta={currentRun.displayDelta}
+        deltaPercentage={currentRun.displayDeltaPercentage}
         deltaType={currentRun.deltaType}
         baseline={baselineRun?.displayValue || '0B'}
       />
@@ -91,12 +110,12 @@ interface TileContentProps {
   runInfo: MetricRunInfo;
 }
 
-const TileContent = forwardRef((props: TileContentProps, ref: Ref<HTMLDivElement>) => {
+const TileContent = (props: TileContentProps) => {
   const { label, sizeDisplay, item, runInfo } = props;
 
   // Render only the container
   if (sizeDisplay === 'minimal') {
-    return <div className={css.tileContent} ref={ref} />;
+    return <div className={css.tileContent} />;
   }
 
   const resolvedLabel = label || item.label;
@@ -104,14 +123,14 @@ const TileContent = forwardRef((props: TileContentProps, ref: Ref<HTMLDivElement
   // Render only the label
   if (sizeDisplay === 'small') {
     return (
-      <div className={css.tileContent} ref={ref}>
+      <div className={css.tileContent}>
         <p className={css.tileContentLabel}>{resolvedLabel}</p>
       </div>
     );
   }
 
   return (
-    <div className={css.tileContent} ref={ref}>
+    <div className={css.tileContent}>
       <p className={css.tileContentLabel}>{label || item.label}</p>
       <p className={css.tileContentValue}>
         <span className={css.tileContentMetric}>{runInfo.displayValue}</span>
@@ -123,24 +142,6 @@ const TileContent = forwardRef((props: TileContentProps, ref: Ref<HTMLDivElement
       </p>
     </div>
   );
-});
-
-const TileContentWithTooltip = (props: TileContentProps & { parentRef: RefObject<Element> }) => {
-  const { label, sizeDisplay, item, runInfo, parentRef } = props;
-
-  const tooltipState = useTooltipStateWithMouseFollow({ parentRef });
-
-  return (
-    <>
-      <TooltipAnchor state={tooltipState} className={css.tileContentTooltipAnchor}>
-        <TileContent label={label} sizeDisplay={sizeDisplay} item={item} runInfo={runInfo} />
-      </TooltipAnchor>
-      <Tooltip state={tooltipState} className={css.tooltip}>
-        <TooltipArrow state={tooltipState} size={16} className={css.tileTooltipArrow} />
-        <TileTooltipContent item={item} />
-      </Tooltip>
-    </>
-  );
 };
 
 interface TileProps {
@@ -167,9 +168,6 @@ const Tile = (props: TileProps) => {
     [item.key, onClick],
   );
 
-  const contentRef = useRef<HTMLDivElement>(null);
-  const hover = useHoverDirty(contentRef);
-
   const className = cx(
     css.tile,
     css[`tile-${runInfo.deltaType}`],
@@ -184,51 +182,57 @@ const Tile = (props: TileProps) => {
       onClick={handleOnClick}
       role="button"
       aria-label={I18N.TILE_LABEL}
-      ref={contentRef}
+      data-treemap-id={data.id}
       style={{ left, top, width, height }}
       className={className}
     >
-      {hover ? (
-        <TileContentWithTooltip
-          label={label}
-          sizeDisplay={sizeDisplay}
-          item={item}
-          runInfo={runInfo}
-          parentRef={contentRef}
-        />
-      ) : (
-        <TileContent label={label} sizeDisplay={sizeDisplay} item={item} runInfo={runInfo} />
-      )}
+      <TileContent label={label} sizeDisplay={sizeDisplay} item={item} runInfo={runInfo} />
     </div>
   );
 };
 
-interface TileGroupTitleTooltipContentProps {
-  title: string;
-  runInfo?: MetricRunInfo;
-  baselineDisplayValue?: string;
+interface TileGroupTooltipContentProps {
+  node: Tree;
 }
 
-const TileGroupTitleTooltipContent = (props: TileGroupTitleTooltipContentProps) => {
-  const { title, runInfo, baselineDisplayValue } = props;
+const TileGroupTooltipContent = (props: TileGroupTooltipContentProps) => {
+  const { node } = props;
+
+  // by default show the node id (full path) as title
+  const title = node.id || node.label;
+  const groupRunInfo = node.total && getGroupRunInfo(node.total);
 
   return (
-    <Stack space="small" className={css.tileTooltip}>
+    <Stack space="small" className={css.tileTooltipContent}>
       <h3 className={css.tileTooltipContentTitle}>
         <FileName as="code" name={title} />
       </h3>
-      {runInfo && (
+      {groupRunInfo && (
         <RunInfo
-          current={runInfo.displayValue}
-          baseline={baselineDisplayValue}
-          delta={runInfo.displayDeltaPercentage}
-          deltaType={runInfo.deltaType}
+          current={groupRunInfo.runInfo.displayValue}
+          baseline={groupRunInfo.baselineDisplayValue}
+          delta={groupRunInfo.runInfo.displayDeltaPercentage}
+          deltaType={groupRunInfo.runInfo.deltaType}
         />
       )}
     </Stack>
   );
 };
 
+interface TreemapTooltipContentProps {
+  node: TreeNode;
+}
+
+const TreemapTooltipContent = (props: TreemapTooltipContentProps) => {
+  const { node } = props;
+
+  if ('item' in node) {
+    return <TileTooltipContent item={node.item} />;
+  }
+
+  return <TileGroupTooltipContent node={node} />;
+};
+
 interface TileGroupTitleContentProps {
   title?: string;
   runInfo?: MetricRunInfo;
@@ -250,47 +254,19 @@ const TileGroupTitleContent = (props: TileGroupTitleContentProps) => {
   );
 };
 
-type TileGroupTitleContentWithTooltipProps = {
-  parentRef: RefObject<Element>;
-  tooltipContent: TileGroupTitleTooltipContentProps;
-} & TileGroupTitleContentProps;
-
-const TileGroupTitleContentWithTooltip = (props: TileGroupTitleContentWithTooltipProps) => {
-  const { parentRef, tooltipContent, ...restProps } = props;
-
-  const tooltipState = useTooltipStateWithMouseFollow({ parentRef });
-
-  return (
-    <>
-      <TooltipAnchor state={tooltipState} className={css.tileContentTooltipAnchor}>
-        <TileGroupTitleContent {...restProps} />
-      </TooltipAnchor>
-      <Tooltip state={tooltipState} className={css.tooltip}>
-        <TooltipArrow state={tooltipState} size={16} className={css.tileTooltipArrow} />
-        <TileGroupTitleTooltipContent {...tooltipContent} />
-      </Tooltip>
-    </>
-  );
+type TileGroupTitleProps = TileGroupTitleContentProps & {
+  /**
+   * Node id - used to resolve the tooltip content on hover
+   */
+  id: string;
 };
 
-type TileGroupTitleProps = Omit<TileGroupTitleContentWithTooltipProps, 'parentRef'>;
-
 const TileGroupTitle = (props: TileGroupTitleProps) => {
-  const { tooltipContent, ...restProps } = props;
-  const contentRef = useRef<HTMLDivElement>(null);
-  const hover = useHoverDirty(contentRef);
+  const { id, ...restProps } = props;
 
   return (
-    <div className={css.tileGroupTitle} ref={contentRef}>
-      {hover ? (
-        <TileGroupTitleContentWithTooltip
-          parentRef={contentRef}
-          tooltipContent={tooltipContent}
-          {...restProps}
-        />
-      ) : (
-        <TileGroupTitleContent {...restProps} />
-      )}
+    <div className={css.tileGroupTitle} data-treemap-id={id}>
+      <TileGroupTitleContent {...restProps} />
     </div>
   );
 };
@@ -370,36 +346,14 @@ const TileGroup = (props: TileGroupProps) => {
   );
 
   // Prepare data
-  const [runInfo, baselineDisplayValue, deltaType] = useMemo(() => {
-    if (!total) {
-      return [];
-    }
-
-    const resolvedRunInfo = getMetricRunInfo(
-      METRIC_TYPE_CONFIGS.METRIC_TYPE_FILE_SIZE,
-      total.current,
-      total.baseline,
-    ) as MetricRunInfo;
-    const resolvedBaselineDisplayValue = formatFileSize(total.baseline);
-    const resolvedDeltaType = resolveGroupDeltaType(resolvedRunInfo);
-
-    return [resolvedRunInfo, resolvedBaselineDisplayValue, resolvedDeltaType];
-  }, [total]);
+  const groupRunInfo = useMemo(() => (total ? getGroupRunInfo(total) : undefined), [total]);
 
   const rootClassName = cx(
     css.tileGroup,
-    css[`tileGroup--${deltaType}`],
+    css[`tileGroup--${groupRunInfo?.deltaType}`],
     css[`tileGroup--${displaySize}`],
   );
 
-  // Tooltip data
-  // - by default show the node id (full path) as title
-  const tooltipContent = {
-    title: id || title,
-    runInfo,
-    baselineDisplayValue,
-  } as TileGroupTitleTooltipContentProps;
-
   if (title && displaySize === 'minimal') {
     return (
       <div
@@ -409,7 +363,7 @@ const TileGroup = (props: TileGroupProps) => {
         className={rootClassName}
         style={{ left, top, width, height }}
       >
-        <TileGroupTitle tooltipContent={tooltipContent} />
+        <TileGroupTitle id={id} />
       </div>
     );
   }
@@ -423,7 +377,7 @@ const TileGroup = (props: TileGroupProps) => {
         style={{ left, top, width, height }}
         className={rootClassName}
       >
-        <TileGroupTitle title={title} tooltipContent={tooltipContent} />
+        <TileGroupTitle id={id} title={title} />
       </div>
     );
   }
@@ -436,7 +390,7 @@ const TileGroup = (props: TileGroupProps) => {
       className={cx(rootClassName, css.tileGroupSizeDefault)}
       style={{ left, top, width, height }}
     >
-      <TileGroupTitle title={title} runInfo={runInfo} tooltipContent={tooltipContent} />
+      <TileGroupTitle id={id} title={title} runInfo={groupRunInfo?.runInfo} />
       {childNodes?.map((childNode) => {
         if ('children' in childNode) {
           const groupData = childNode.data as Tree;
@@ -542,34 +496,105 @@ export const MetricsTreemap = (props: MetricsTreemapProps & ComponentProps<'div'
   const [containerRef, { width, height }] = useMeasure<HTMLDivElement>();
   const rootNode = useMetricsTreemapHierarchy({ treeNodes, width, height, nested });
 
+  /**
+   * A single tooltip is shared by every tile and tile group title:
+   * - tiles are tagged with `data-treemap-id`
+   * - the pointer is tracked by one delegated handler on the canvas
+   * - hiding is deferred so that the tooltip stays up while the pointer
+   *   crosses the gutter between two tiles
+   */
+  const nodesIndex = useMemo(() => getTreemapNodesIndex(treeNodes), [treeNodes]);
+  const { tooltipState, setPointer, hoveredNodeId, setHoveredNode, clearHoveredNode } =
+    useTreemapTooltipState();
+  const canvasRef = useRef<HTMLDivElement>(null);
+
+  // Resolved on render so that the content cannot go stale when the data changes
+  const tooltipNode = hoveredNodeId === null ? null : nodesIndex.get(hoveredNodeId);
+
+  const handlePointerEvent = useCallback(
+    (event: MouseEvent) => {
+      // Anchor to the canvas to let ariakit track scrolling/resizing
+      tooltipState.anchorRef.current = canvasRef.current;
+
+      setPointer(event.clientX, event.clientY);
+
+      const target = (event.target as HTMLElement | null)?.closest<HTMLElement>(NODE_ID_SELECTOR);
+      setHoveredNode(target?.dataset.treemapId ?? null);
+    },
+    [tooltipState, setPointer, setHoveredNode],
+  );
+
+  const hasNodes = Boolean(rootNode.children && rootNode.children.length > 0);
+
+  useEffect(() => {
+    const canvas = canvasRef.current;
+
+    if (!canvas) {
+      return undefined;
+    }
+
+    /**
+     * `mouseover` is needed on top of `mousemove`: the hovered element can
+     * change without the pointer moving (scrolling, resizing, layout shifts),
+     * and the browser only emits boundary events in that case.
+     *
+     * Native listeners are used instead of the React props because React skips
+     * `mouseover` dispatch when `relatedTarget` is inside the same tree.
+     */
+    canvas.addEventListener('mousemove', handlePointerEvent);
+    canvas.addEventListener('mouseover', handlePointerEvent);
+    canvas.addEventListener('mouseleave', clearHoveredNode);
+
+    return () => {
+      canvas.removeEventListener('mousemove', handlePointerEvent);
+      canvas.removeEventListener('mouseover', handlePointerEvent);
+      canvas.removeEventListener('mouseleave', clearHoveredNode);
+    };
+  }, [hasNodes, handlePointerEvent, clearHoveredNode]);
+
+  // Keep the cells out of the tooltip render path
+  // (`rootNode` is mutated in place by d3, so the layout size drives the memo)
+  const canvasContent = useMemo(
+    () => (
+      <TileGroup
+        title={nested ? rootNode.data.label : undefined}
+        total={(rootNode.data as Tree).total}
+        id={rootNode.data.id}
+        childNodes={rootNode.children}
+        onItemClick={onItemClick}
+        onGroupClick={onGroupClick}
+        left={rootNode.x0}
+        top={rootNode.y0}
+        absoluteLeft={rootNode.x0}
+        absoluteTop={rootNode.y0}
+        width={rootNode.x1 - rootNode.x0}
+        height={rootNode.y1 - rootNode.y0}
+      />
+    ),
+    [rootNode, width, height, nested, onItemClick, onGroupClick],
+  );
+
   return (
     <div
       className={cx(css.root, nested && css.nested, className)}
       {...restProps}
       ref={containerRef}
     >
-      {rootNode.children && rootNode.children?.length > 0 ? (
-        <div className={css.canvas}>
-          <TileGroup
-            title={nested ? rootNode.data.label : undefined}
-            total={(rootNode.data as Tree).total}
-            id={rootNode.data.id}
-            childNodes={rootNode.children}
-            onItemClick={onItemClick}
-            onGroupClick={onGroupClick}
-            left={rootNode.x0}
-            top={rootNode.y0}
-            absoluteLeft={rootNode.x0}
-            absoluteTop={rootNode.y0}
-            width={rootNode.x1 - rootNode.x0}
-            height={rootNode.y1 - rootNode.y0}
-          />
+      {hasNodes ? (
+        <div className={css.canvas} ref={canvasRef}>
+          {canvasContent}
         </div>
       ) : (
         <div className={css.emptyMessage}>
           <div className={css.emptyMessageWrapper}>{emptyMessage}</div>
         </div>
       )}
+      {tooltipNode && (
+        <Tooltip state={tooltipState} className={css.tooltip}>
+          <TooltipArrow state={tooltipState} size={16} className={css.tileTooltipArrow} />
+          <TreemapTooltipContent node={tooltipNode} />
+        </Tooltip>
+      )}
     </div>
   );
 };

package/src/components/metrics-treemap/metrics-treemap.utils.ts

@@ -1,5 +1,4 @@
-import { type RefObject, useCallback } from 'react';
-import { useDebounce, useMouseHovered } from 'react-use';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTooltipState } from 'ariakit/tooltip';
 import {
   DeltaType,
@@ -10,6 +9,7 @@ import {
 
 import {
   type TreeLeaf,
+  type TreeNode,
   type TreeNodeChildren,
   type Tree,
   type TreeTotal,
@@ -158,6 +158,28 @@ export function getTreemapNodesGroupedByPath(items: Array<ReportMetricRow>): Tre
   };
 }
 
+/**
+ * Index every tree node by id, to allow resolving the hovered node from the
+ * `data-treemap-id` DOM marker without walking the tree on every pointer move
+ */
+export function getTreemapNodesIndex(
+  node: Tree,
+  index: Map<string, TreeNode> = new Map(),
+): Map<string, TreeNode> {
+  index.set(node.id, node);
+
+  node.children.forEach((childNode) => {
+    if ('children' in childNode) {
+      getTreemapNodesIndex(childNode, index);
+      return;
+    }
+
+    index.set(childNode.id, childNode);
+  });
+
+  return index;
+}
+
 export function resolveGroupDeltaType(
   metricRunInfo?: MetricRunInfo | MetricRunInfoBaseline,
 ): DeltaType.NO_CHANGE | DeltaType.NEGATIVE | DeltaType.POSITIVE {
@@ -225,50 +247,142 @@ export function resolveTileSizeDisplay(width: number, height: number): TileSizeD
   return 'default';
 }
 
-interface UseTooltipStateWithMouseFollowOptions {
-  /**
-   * React ref to parent div
-   */
-  parentRef: RefObject<Element>;
+interface UseTreemapTooltipStateOptions {
   /**
    * Tooltip gutter
    */
   gutter?: number;
   /**
-   * Tooltip timeout
+   * Delay before showing the tooltip
    */
   timeout?: number;
+  /**
+   * Delay before hiding the tooltip once the pointer is no longer over a cell.
+   *
+   * Tiles are separated by a gutter that belongs to no node, so without this
+   * grace period moving from one cell to another would close and reopen the
+   * tooltip every time the pointer crosses the gap.
+   */
+  hideTimeout?: number;
 }
 
 /**
- * Ariakit tooltip state hook with mouse follow functionality
+ * Ariakit tooltip state shared by every tile/tile group of a treemap.
+ *
+ * The tooltip is anchored to a virtual 1x1 rect that follows the pointer, so
+ * no `TooltipAnchor` is rendered per cell: the anchor position is stored on a
+ * ref and ariakit is asked to reposition at most once per animation frame,
+ * which keeps the treemap itself out of the pointer move render path.
+ *
+ * The hovered node id is owned here as well, so that all the tooltip timing
+ * lives in a single place.
  */
-export function useTooltipStateWithMouseFollow(options: UseTooltipStateWithMouseFollowOptions) {
-  const { parentRef, gutter = 16, timeout = 240 } = options;
+export function useTreemapTooltipState(options: UseTreemapTooltipStateOptions = {}) {
+  const { gutter = 16, timeout = 240, hideTimeout = timeout } = options;
 
-  const pointer = useMouseHovered(parentRef, { whenHovered: true });
+  const pointerRef = useRef<{ x: number; y: number } | null>(null);
+  const frameRef = useRef(0);
+  const hideTimeoutRef = useRef(0);
 
-  // Return custom rect based on the mouse position
+  // Return custom rect based on the pointer position
   const getAnchorRect = useCallback(() => {
-    // Skip custom component rect area if the pointer position is empty
-    if (pointer.docX === 0 && pointer.docY === 0 && pointer.elW === 0 && pointer.elH === 0) {
+    const pointer = pointerRef.current;
+
+    // Skip the custom rect until we have a pointer position
+    if (!pointer) {
       return null;
     }
 
-    const newRect = {
-      x: pointer.docX - (document?.defaultView?.scrollX ?? 0),
-      y: pointer.docY - (document?.defaultView?.scrollY ?? 0),
-      w: 1,
-      h: 1,
-    };
-
-    return newRect;
-  }, [pointer.docX, pointer.docY]);
+    return { x: pointer.x, y: pointer.y, w: 1, h: 1 };
+  }, []);
 
   const tooltipState = useTooltipState({ gutter, getAnchorRect, timeout });
+  const { mounted, render, show, hide } = tooltipState;
+
+  const [hoveredNodeId, setHoveredNodeId] = useState<string | null>(null);
+  const hoveredNodeIdRef = useRef<string | null>(null);
+
+  useEffect(
+    () => () => {
+      cancelAnimationFrame(frameRef.current);
+      window.clearTimeout(hideTimeoutRef.current);
+    },
+    [],
+  );
+
+  const setPointer = useCallback(
+    (x: number, y: number) => {
+      pointerRef.current = { x, y };
+
+      // Reposition only while the tooltip is visible, once per frame
+      if (!mounted || frameRef.current) {
+        return;
+      }
+
+      frameRef.current = requestAnimationFrame(() => {
+        frameRef.current = 0;
+        render();
+      });
+    },
+    [mounted, render],
+  );
+
+  const commitHoveredNode = useCallback(
+    (nodeId: string | null) => {
+      hoveredNodeIdRef.current = nodeId;
+      setHoveredNodeId(nodeId);
+
+      if (nodeId === null) {
+        hide();
+        return;
+      }
+
+      show();
+    },
+    [hide, show],
+  );
+
+  /**
+   * Set the hovered node. Showing another node is applied right away, while
+   * hiding is deferred so that the tooltip survives the gap between two cells.
+   */
+  const setHoveredNode = useCallback(
+    (nodeId: string | null) => {
+      window.clearTimeout(hideTimeoutRef.current);
+      hideTimeoutRef.current = 0;
+
+      // Guard against re-triggering `show`, which would restart the show timeout
+      if (nodeId === hoveredNodeIdRef.current) {
+        return;
+      }
+
+      if (nodeId !== null || !hideTimeout) {
+        commitHoveredNode(nodeId);
+        return;
+      }
+
+      hideTimeoutRef.current = window.setTimeout(() => {
+        hideTimeoutRef.current = 0;
+        commitHoveredNode(null);
+      }, hideTimeout);
+    },
+    [commitHoveredNode, hideTimeout],
+  );
+
+  /**
+   * Hide the tooltip right away, without the grace period - the pointer left
+   * the treemap, there is no next cell to move to.
+   */
+  const clearHoveredNode = useCallback(() => {
+    window.clearTimeout(hideTimeoutRef.current);
+    hideTimeoutRef.current = 0;
+
+    if (hoveredNodeIdRef.current === null) {
+      return;
+    }
 
-  // Update tooltip position when pointer values change
-  useDebounce(tooltipState.render, 10, [pointer.docX, pointer.docY]);
+    commitHoveredNode(null);
+  }, [commitHoveredNode]);
 
-  return tooltipState;
+  return { tooltipState, setPointer, hoveredNodeId, setHoveredNode, clearHoveredNode };
 }

package/src/ui/button/button.tsx

@@ -41,6 +41,7 @@ interface ButtonProps<T extends React.ElementType> {
 
 const ButtonComponent = <T extends React.ElementType = 'button'>(
   props: ButtonProps<T> & Omit<React.ComponentPropsWithoutRef<T>, keyof ButtonProps<T>>,
+  ref: React.Ref<HTMLButtonElement>,
 ) => {
   const {
     className = '',
@@ -86,7 +87,7 @@ const ButtonComponent = <T extends React.ElementType = 'button'>(
   );
 
   return (
-    <Component {...restProps} className={rootClassName}>
+    <Component {...restProps} ref={ref} className={rootClassName}>
       {glyph && <Icon glyph={glyph} className={css.glyph} />}
       {children && <span className={css.content}>{children}</span>}
       {rightGlyph && <Icon glyph={rightGlyph} className={css.glyph} />}