@bundle-stats/ui 4.13.0-beta.0 → 4.13.0-beta.10

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

@@ -1,16 +1,9 @@
-import React, { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
+import React, { RefObject, forwardRef, useCallback, useMemo, useRef } from 'react';
+import { useDebounce, useHoverDirty, useMeasure, useMouseHovered } from 'react-use';
 import cx from 'classnames';
-import { useMeasure } from 'react-use';
 import type { ReportMetricRow, MetricRunInfo, MetricRunInfoBaseline } from '@bundle-stats/utils';
 import { hierarchy, treemap, treemapSquarify } from 'd3';
-import {
-  FloatingPortal,
-  useClientPoint,
-  useFloating,
-  useHover,
-  useInteractions,
-} from '@floating-ui/react';
-import { arrow, offset } from '@floating-ui/react-dom';
+import { Tooltip, TooltipArrow, TooltipAnchor, useTooltipState } from 'ariakit/tooltip';
 
 import { Stack } from '../../layout/stack';
 import { FileName } from '../../ui/file-name';
@@ -18,9 +11,9 @@ import { Delta } from '../delta';
 import { RunInfo } from '../run-info';
 import css from './metrics-treemap.module.css';
 
-const SQUARIFY_RATIO = 1.78;
+const SQUARIFY_RATIO = 1.33;
 const PADDING_OUTER = 0;
-const PADDING_INNER = 1;
+const PADDING_INNER = 2;
 
 type TileSizeDisplay = 'minimal' | 'small' | 'default';
 
@@ -36,10 +29,10 @@ const VERTICAL_SPACING = 4;
 const LINE_HEIGHT = 16;
 const LINE_HEIGHT_SMALL = 13.3;
 
-function resolveTileSizeDisplay(width: number, height: number): TileSizeDisplay {
+function resolveLeafSizeDisplay(width: number, height: number): TileSizeDisplay {
   if (
     height > PADDING_TOP + PADDING_BOTTOM + VERTICAL_SPACING + LINE_HEIGHT * 2 &&
-    width > PADDING_LEFT + PADDING_RIGHT + 96
+    width > PADDING_LEFT + PADDING_RIGHT + 128
   ) {
     return 'default';
   }
@@ -54,19 +47,20 @@ function resolveTileSizeDisplay(width: number, height: number): TileSizeDisplay
   return 'minimal';
 }
 
-interface TooltipContentProps {
-  data: ReportMetricRow;
+interface LeafTooltipContentProps {
+  item: ReportMetricRow;
 }
 
-const TooltipContent = (props: TooltipContentProps) => {
-  const { data } = props;
-  const currentRun = data.runs[0] as MetricRunInfo;
-  const baselineRun = data.runs[data.runs.length - 1] as MetricRunInfoBaseline;
+const LeafTooltipContent = (props: LeafTooltipContentProps) => {
+  const { item } = props;
+
+  const currentRun = item.runs[0] as MetricRunInfo;
+  const baselineRun = item.runs[item.runs.length - 1] as MetricRunInfoBaseline;
 
   return (
-    <Stack space="small" className={css.tooltipContent}>
-      <h3 className={css.tooltipContentTitle}>
-        <FileName as="code" name={data.label} />
+    <Stack space="small" className={css.leafTooltipContent}>
+      <h3 className={css.leafTooltipContentTitle}>
+        <FileName as="code" name={item.label} />
       </h3>
       <RunInfo
         current={currentRun.displayValue}
@@ -78,10 +72,75 @@ const TooltipContent = (props: TooltipContentProps) => {
   );
 };
 
-const TileButton = forwardRef((props: React.ComponentProps<'button'>, ref) => (
-  // @ts-expect-error
-  <button type="button" xmlns="http://www.w3.org/1999/xhtml" ref={ref} {...props} />
-));
+interface LeafContentProps {
+  sizeDisplay: 'minimal' | 'small' | 'default';
+  item: ReportMetricRow;
+  runInfo: MetricRunInfo;
+}
+
+const LeafContent = forwardRef((props: LeafContentProps, ref: React.Ref<HTMLDivElement>) => {
+  const { sizeDisplay, item, runInfo } = props;
+
+  if (sizeDisplay === 'minimal') {
+    return <div className={css.leafContent} ref={ref} />;
+  }
+
+  return (
+    <div className={css.leafContent} ref={ref}>
+      <FileName as="p" className={css.leadContentLabel} name={item.label} />
+      {sizeDisplay !== 'small' && (
+        <p className={css.leadContentValue}>
+          <span className={css.leadContentMetric}>{runInfo.displayValue}</span>
+          <Delta
+            className={css.leadContentDelta}
+            displayValue={runInfo.displayDeltaPercentage}
+            deltaType={runInfo.deltaType}
+          />
+        </p>
+      )}
+    </div>
+  );
+});
+
+const LeafContentWithTooltip = (props: LeafContentProps & { parentRef: RefObject<Element> }) => {
+  const { sizeDisplay, item, runInfo, parentRef } = props;
+
+  const pointer = useMouseHovered(parentRef, { whenHovered: true });
+
+  // Return custom rect based on the mouse 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) {
+      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]);
+
+  const tooltipState = useTooltipState({ gutter: 12, getAnchorRect, timeout: 120 });
+
+  // Update tooltip position when poiner values are changing
+  useDebounce(tooltipState.render, 5, [pointer.docX, pointer.docY]);
+
+  return (
+    <>
+      <TooltipAnchor state={tooltipState} className={css.leafContentTooltipAnchor}>
+        <LeafContent sizeDisplay={sizeDisplay} item={item} runInfo={runInfo} />
+      </TooltipAnchor>
+      <Tooltip state={tooltipState} className={css.tooltip}>
+        <TooltipArrow state={tooltipState} size={16} className={css.leafTooltipArrow} />
+        <LeafTooltipContent item={item} />
+      </Tooltip>
+    </>
+  );
+};
 
 interface TreeNode {
   id: string;
@@ -97,106 +156,70 @@ interface RootTree {
 }
 
 interface LeafProps {
-  x: number;
-  y: number;
+  left: number;
+  top: number;
   width: number;
   height: number;
   data: TreeNode;
   onClick?: (id: string) => void;
 }
 
-const Tile = (props: LeafProps) => {
-  const { x, y, width, height, data, onClick } = props;
+const Leaf = (props: LeafProps) => {
+  const { left, top, width, height, data, onClick } = props;
+
   const { item } = data;
   const runInfo = item.runs?.[0] as MetricRunInfo;
 
-  const [isOpen, setIsOpen] = useState(false);
-  const arrowRef = useRef(null);
-  const { refs, floatingStyles, context, middlewareData } = useFloating({
-    placement: 'top',
-    open: isOpen,
-    onOpenChange: setIsOpen,
-    middleware: [arrow({ element: arrowRef }), offset(16)],
-  });
-  const clientPoint = useClientPoint(context);
-  const hover = useHover(context);
-  const { getReferenceProps, getFloatingProps } = useInteractions([hover, clientPoint]);
-
-  const tileSizeDisplay = useMemo(() => resolveTileSizeDisplay(width, height), [width, height]);
-
-  const handleOnClick = useCallback(() => {
-    if (onClick) {
-      onClick(item.key);
-    }
-  }, [item.key]);
+  const sizeDisplay = useMemo(() => resolveLeafSizeDisplay(width, height), [width, height]);
+  const handleOnClick = useCallback(() => onClick?.(item.key), [item.key, onClick]);
+
+  const leafContentRef = useRef<HTMLButtonElement>(null);
+  const hover = useHoverDirty(leafContentRef);
+
+  const leafClassName = cx(
+    css.leaf,
+    css[`leaf-${runInfo.deltaType}`],
+    sizeDisplay === 'small' && css.leafSmall,
+    left === 0 && css.leafFirstCol,
+  );
 
   return (
-    <g
-      className={cx(
-        css.tile,
-        !item.changed && css['tile-NO_CHANGE'],
-        css[`tile-${runInfo.deltaType}`],
-        tileSizeDisplay === 'small' && css.tileSmall,
-      )}
+    <button
+      type="button"
+      onClick={handleOnClick}
+      ref={leafContentRef}
+      style={{ left, top, width, height }}
+      className={leafClassName}
     >
-      <rect x={x} y={y} width={width} height={height} className={css.tileOverlay} />
-      <foreignObject height={height} width={width} x={x} y={y}>
-        <TileButton
-          onClick={handleOnClick}
-          className={css.tileContent}
-          ref={refs.setReference}
-          {...getReferenceProps()}
-        >
-          {tileSizeDisplay !== 'minimal' && (
-            <div className={css.tileContentWrapper}>
-              <p className={css.tileContentLabel}>{item.label}</p>
-              <p className={css.tileContentValue}>
-                <span className={css.tileContentMetric}>{runInfo.displayValue}</span>
-                <Delta
-                  className={css.tileContentDelta}
-                  displayValue={runInfo.displayDeltaPercentage}
-                  deltaType={runInfo.deltaType}
-                />
-              </p>
-            </div>
-          )}
-        </TileButton>
-        {isOpen && (
-          <FloatingPortal>
-            <div
-              ref={refs.setFloating}
-              style={floatingStyles}
-              {...getFloatingProps()}
-              className={css.tooltip}
-            >
-              <div
-                ref={arrowRef}
-                style={{ left: middlewareData.arrow?.x }}
-                className={css.tooltipArrow}
-              />
-              <TooltipContent data={item} />
-            </div>
-          </FloatingPortal>
-        )}
-      </foreignObject>
-    </g>
+      {hover ? (
+        <LeafContentWithTooltip
+          sizeDisplay={sizeDisplay}
+          item={item}
+          runInfo={runInfo}
+          parentRef={leafContentRef}
+        />
+      ) : (
+        <LeafContent sizeDisplay={sizeDisplay} item={item} runInfo={runInfo} />
+      )}
+    </button>
   );
 };
 
-interface MetricsTreemapProps {
+interface UseMetricsTreemapHierarchyParams {
   items: Array<ReportMetricRow>;
-  emptyMessage?: React.ReactNode;
-  onItemClick?: (entryId: string) => void;
+  width: number;
+  height: number;
 }
 
-export const MetricsTreemap = (props: MetricsTreemapProps & React.ComponentProps<'div'>) => {
-  const { className = '', items, onItemClick, emptyMessage = 'No data', ...restProps } = props;
-
-  const [containerRef, { width, height }] = useMeasure<HTMLDivElement>();
+function useMetricsTreemapHierarchy(params: UseMetricsTreemapHierarchyParams) {
+  const { items, width, height } = params;
 
   const treemapHierarchy = useMemo(() => {
     const children = items.map((item) => {
-      // set tile value to the largest run value to display the impact of deleted items
+      /**
+       * Set leaf value to the largest run value to allow to
+       * display the impact of deleted / items
+       */
       const values = item.runs.map((run) => run?.value || 0);
       const value = Math.max(...values);
 
@@ -234,33 +257,43 @@ export const MetricsTreemap = (props: MetricsTreemapProps & React.ComponentProps
     return tremapLayout.leaves().filter((leaf) => Boolean(leaf.parent));
   }, [height, width, treemapHierarchy]);
 
+  return cells;
+}
+
+interface MetricsTreemapProps {
+  items: Array<ReportMetricRow>;
+  emptyMessage?: React.ReactNode;
+  onItemClick?: (entryId: string) => void;
+}
+
+export const MetricsTreemap = (props: MetricsTreemapProps & React.ComponentProps<'div'>) => {
+  const { className = '', items, onItemClick, emptyMessage = 'No data', ...restProps } = props;
+
+  const [containerRef, { width, height }] = useMeasure<HTMLDivElement>();
+  const cells = useMetricsTreemapHierarchy({ items, width, height });
+
   return (
     <div className={cx(css.root, className)} {...restProps} ref={containerRef}>
       {cells.length > 0 ? (
-        <svg
-          width={width}
-          height={height}
-          viewBox={`0 0 ${width} ${height}`}
-          className={css.canvas}
-        >
+        <div className={css.canvas}>
           {cells.map((leaf) => {
             if (!leaf.parent) {
               return null;
             }
 
             return (
-              <Tile
-                x={leaf.x0}
-                y={leaf.y0}
+              <Leaf
+                data={leaf.data as TreeNode}
+                left={leaf.x0}
+                top={leaf.y0}
                 width={leaf.x1 - leaf.x0}
                 height={leaf.y1 - leaf.y0}
-                data={leaf.data as TreeNode}
-                key={leaf.id}
                 onClick={onItemClick}
+                key={leaf.id}
               />
             );
           })}
-        </svg>
+        </div>
       ) : (
         <div className={css.emptyMessage}>
           <div className={css.emptyMessageWrapper}>{emptyMessage}</div>

package/src/components/sort-button/sort-button.module.css

@@ -3,6 +3,7 @@
   display: inline-block;
   border-radius: var(--radius-small);
   position: relative;
+  color: var(--color-text-ultra-light);
 }
 
 .toggle {

package/src/css/variables.css

@@ -29,20 +29,20 @@
   /*
    * Color scheme:
    * https://coolors.co/287acc-da444e-55b950-efcc1a-192339
-   * http://mcg.mbitson.com/#!?mcgpalette0=%23da444e&mcgpalette1=%2355b950&mcgpalette2=%23efcc1a&mcgpalette3=%23353138&mcgpalette4=%23287acc&themename=mcgtheme
+   * http://mcg.mbitson.com/#!?mcgpalette0=%23da444e&mcgpalette1=%2355b950&mcgpalette2=%23efcc1a&mcgpalette3=%233e3c49&mcgpalette4=%23287acc&themename=bundle-stats
    * https://hihayk.github.io/scale/#4/5/50/90/-51/0/0/14/353138/53/49/56/white
    */
   --color-gray-25: #f9f9fa;
   --color-gray-50: #e8e8e9;
-  --color-gray-100: #c6c5c7;
-  --color-gray-200: #a2a0a4;
-  --color-gray-300: #7e7b80;
-  --color-gray-400: #59565c;
-  --color-gray-500: #353138;
-  --color-gray-600: #302b31;
-  --color-gray-700: #2a252a;
-  --color-gray-800: #231e22;
-  --color-gray-900: #1c181b;
+  --color-gray-100: #c5c5c8;
+  --color-gray-200: #9f9ea4;
+  --color-gray-300: #787780;
+  --color-gray-400: #5b5964;
+  --color-gray-500: #3e3c49;
+  --color-gray-600: #383642;
+  --color-gray-700: #302e39;
+  --color-gray-800: #282731;
+  --color-gray-900: #1b1a21;
 
   --color-gray-ultra-light: var(--color-gray-200);
   --color-gray-light: var(--color-gray-300);
@@ -199,7 +199,7 @@
   --outline-hover: 0 0 0 3px var(--color-highlight);
 
   /** Layout */
-  --max-width: 88rem;
+  --max-width: 82rem;
   --entry-info-width: 64rem;
   --entry-info-top: var(--header-height);
 }

package/src/hooks/entry-info.ts

@@ -0,0 +1,19 @@
+import { useCallback } from 'react';
+
+interface UseEntryInfoParams {
+  setState: (data: { entryId: string }) => void;
+}
+
+type UseEntryInfo = [() => void, (entryId: string) => void];
+
+/**
+ * Show/hide side panel entry
+ */
+export function useEntryInfo(params: UseEntryInfoParams): UseEntryInfo {
+  const { setState } = params;
+
+  const hideEntryInfo = useCallback(() => setState({ entryId: '' }), [setState]);
+  const showEntryInfo = useCallback((entryId: string) => setState({ entryId }), [setState]);
+
+  return [hideEntryInfo, showEntryInfo];
+}

package/src/layout/flex-stack/flex-stack.module.css

@@ -1,48 +1,44 @@
 .root {
   display: flex;
-  align-items: stretch;
   justify-content: flex-start;
-}
-
-.root > .item:last-child {
-  margin-right: 0;
+  gap: 0;
 }
 
 /** Space variation */
-.space--xxxsmall > .item {
-  margin: 0 var(--space-xxxsmall) 0 0;
+.space--xxxsmall {
+  gap: var(--space-xxxsmall);
 }
 
-.space--xxsmall > .item {
-  margin: 0 var(--space-xxsmall) 0 0;
+.space--xxsmall {
+  gap: var(--space-xxsmall);
 }
 
-.space--xsmall > .item {
-  margin: 0 var(--space-xsmall) 0 0;
+.space--xsmall {
+  gap: var(--space-xsmall);
 }
 
-.space--small > .item {
-  margin: 0 var(--space-small) 0 0;
+.space--small {
+  gap: var(--space-small);
 }
 
-.space--medium > .item {
-  margin: 0 var(--space-medium) 0 0;
+.space--medium {
+  gap: var(--space-medium);
 }
 
-.space--large > .item {
-  margin: 0 var(--space-large) 0 0;
+.space--large {
+  gap: var(--space-large);
 }
 
-.space--xlarge > .item {
-  margin: 0 var(--space-xlarge) 0 0;
+.space--xlarge {
+  gap: var(--space-xlarge);
 }
 
-.space--xxlarge > .item {
-  margin: 0 var(--space-xxlarge) 0 0;
+.space--xxlarge {
+  gap: var(--space-xxlarge);
 }
 
-.space--xxxlarge > .item {
-  margin: 0 var(--space-xxxlarge) 0 0;
+.space--xxxlarge {
+  gap: var(--space-xxxlarge);
 }
 
 /** Align items variation */

package/src/layout/flex-stack/flex-stack.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import cx from 'classnames';
 
 import { NO_SPACE, SPACES } from '../../tokens';
-import { getRenderChildWithClassName } from '../../utils';
 import css from './flex-stack.module.css';
 
 type SpaceValue = (typeof SPACES)[number];
@@ -22,22 +21,17 @@ export const FlexStack = <T extends React.ElementType = 'div'>(
     className = '',
     space = NO_SPACE,
     inline = false,
-    children = null,
     alignItems = '',
     ...restProps
   } = props;
 
   const rootClassName = cx(
-    className,
     css.root,
     css[`space--${space}`],
     css[`align-items--${alignItems}`],
     inline && css.inline,
+    className,
   );
 
-  return (
-    <Component {...restProps} className={rootClassName}>
-      {React.Children.map(children, getRenderChildWithClassName(css.item))}
-    </Component>
-  );
+  return <Component {...restProps} className={rootClassName} />;
 };

package/src/query-state.tsx

@@ -30,7 +30,7 @@ export const useComponentQueryState = (componentName: string) => {
 
       setQueryState({ [componentName]: newState });
     },
-    [componentState],
+    [componentState, setQueryState],
   );
 
   return [componentState, setState];

package/src/ui/button/button.module.css

@@ -256,6 +256,7 @@ a.root {
 .small .glyph {
   width: calc(var(--space-xsmall) + 2px);
   height: calc(var(--space-xsmall) + 2px);
+  margin: 1px; /* compensate to keep the same height when the text is not provided */
 }
 
 .medium {

package/src/ui/dropdown/dropdown.stories.tsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import { Meta } from '@storybook/react';
+
+import { getWrapperDecorator } from '../../stories';
+import { Dropdown, DropdownItem } from '.';
+
+export default {
+  title: 'UI/Dropdown',
+  component: Dropdown,
+  decorators: [getWrapperDecorator()],
+} as Meta;
+
+export const Defualt = () => (
+  <Dropdown glyph="filter" label="Toggle">
+    <DropdownItem>Option 1</DropdownItem>
+    <DropdownItem>Option 2</DropdownItem>
+  </Dropdown>
+);
+
+export const Disabled = () => (
+  <Dropdown glyph="filter" label="Toggle" disabled>
+    <DropdownItem>Option 1</DropdownItem>
+    <DropdownItem>Option 2</DropdownItem>
+  </Dropdown>
+);

package/src/ui/dropdown/dropdown.tsx

@@ -0,0 +1,66 @@
+import React from 'react';
+import cx from 'classnames';
+import { Menu, MenuButton, MenuItem, useMenuState } from 'ariakit/menu';
+
+import { Button, BUTTON_SIZE } from '../button';
+import css from './dropdown.module.css';
+
+interface DropdownItemProps {
+  isActive?: boolean;
+}
+
+export const DropdownItem = (props: DropdownItemProps & React.ComponentProps<typeof MenuItem>) => {
+  const { className = '', isActive = false, ...restProps } = props;
+
+  return (
+    <MenuItem className={cx(css.item, className, isActive && css.itemActive)} {...restProps} />
+  );
+};
+
+interface DropdownProps {
+  dropdownClassName?: string;
+  label?: React.ReactNode;
+  ariaLabel?: string;
+  glyph?: string;
+  disabled?: boolean;
+}
+
+export const Dropdown = (props: DropdownProps & React.ComponentProps<'div'>) => {
+  const {
+    className = '',
+    dropdownClassName = '',
+    label = null,
+    ariaLabel = '',
+    glyph = '',
+    disabled = false,
+    children,
+  } = props;
+
+  const dropdownAriaLabel = ariaLabel || (typeof label === 'string' ? label : '');
+  const menuState = useMenuState();
+
+  return (
+    <>
+      <MenuButton
+        as={Button}
+        outline
+        size={BUTTON_SIZE.SMALL}
+        glyph={glyph}
+        disabled={disabled}
+        state={menuState}
+        tabIndex={null}
+        className={cx(css.button, className)}
+      >
+        {label}
+      </MenuButton>
+      <Menu
+        portal
+        state={menuState}
+        aria-label={dropdownAriaLabel}
+        className={cx(css.dropdown, dropdownClassName)}
+      >
+        {children}
+      </Menu>
+    </>
+  );
+};