@bundle-stats/ui 4.13.0-beta.5 → 4.13.0-beta.7

package/src/components/bundle-assets-totals/bundle-assets-totals.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 import {
@@ -7,13 +7,17 @@ import {
 } from '@bundle-stats/utils';
 import * as webpack from '@bundle-stats/utils/lib-esm/webpack';
 
+import config from '../../config.json';
 import { ASSETS_SIZES_FILE_TYPE_MAP, SECTION_URLS, MetricsDisplayType } from '../../constants';
 import { useMetricsDisplayType } from '../../hooks/metrics-display-type';
+import I18N from '../../i18n';
 import { Toolbar } from '../../ui/toolbar';
-import { MetricsTreemap } from '../metrics-treemap';
+import { Table } from '../../ui/table';
 import { MetricsDisplaySelector } from '../metrics-display-selector';
-import { TotalSizeTypeTitle } from '../total-size-type-title';
 import { MetricsTable } from '../metrics-table';
+import { MetricsTableTitle } from '../metrics-table-title';
+import { MetricsTableHeader } from '../metrics-table-header';
+import { MetricsTreemap } from '../metrics-treemap';
 import { ComponentLink } from '../component-link';
 import css from './bundle-assets-totals.module.css';
 
@@ -52,6 +56,17 @@ export const BundleAssetsTotals = ({
     [history],
   );
 
+  const metricsTableTitle = useMemo(
+    () => (
+      <MetricsTableTitle
+        title={I18N.ASSET_TOTALS}
+        popoverInfo={I18N.ASSET_TOTALS_INFO}
+        popoverHref={config.documentation.assets}
+      />
+    ),
+    [],
+  );
+
   return (
     <div className={className}>
       <Toolbar
@@ -59,11 +74,10 @@ export const BundleAssetsTotals = ({
         renderActions={() => (
           <MetricsDisplaySelector onSelect={setDisplayType} value={displayType} />
         )}
-      >
-        <TotalSizeTypeTitle />
-      </Toolbar>
+      />
       {displayType === MetricsDisplayType.TABLE && (
         <MetricsTable
+          title={metricsTableTitle}
           runs={jobs}
           items={items}
           renderRowHeader={renderRowHeader}
@@ -72,10 +86,15 @@ export const BundleAssetsTotals = ({
         />
       )}
       {displayType === MetricsDisplayType.TREEMAP && (
-        <MetricsTreemap
-          items={items}
-          onItemClick={onTreemapItemClick || handleMetricsTreemapItemClick}
-        />
+        <>
+          <Table compact>
+            <MetricsTableHeader metricTitle={metricsTableTitle} showSum jobs={jobs} rows={items} />
+          </Table>
+          <MetricsTreemap
+            items={items}
+            onItemClick={onTreemapItemClick || handleMetricsTreemapItemClick}
+          />
+        </>
       )}
     </div>
   );

package/src/components/bundle-modules/bundle-modules.tsx

@@ -14,10 +14,12 @@ import { FileName } from '../../ui/file-name';
 import { Filters } from '../../ui/filters';
 import { InputSearch } from '../../ui/input-search';
 import { Tag } from '../../ui/tag';
+import { Table } from '../../ui/table';
 import { Toolbar } from '../../ui/toolbar';
 import { Tooltip } from '../../ui/tooltip';
 import { ComponentLink } from '../component-link';
 import { MetricsTable } from '../metrics-table';
+import { MetricsTableHeader } from '../metrics-table-header';
 import { MetricsTreemap } from '../metrics-treemap';
 import { MetricsTableOptions } from '../metrics-table-options';
 import { MetricsDisplaySelector } from '../metrics-display-selector';
@@ -230,7 +232,17 @@ export const BundleModules = (props: BundleModulesProps) => {
           />
         )}
         {displayType === MetricsDisplayType.TREEMAP && (
-          <MetricsTreemap emptyMessage={emptyMessage} items={items} onItemClick={showEntryInfo} />
+          <>
+            <Table compact>
+              <MetricsTableHeader
+                metricTitle={metricsTableTitle}
+                showSum
+                jobs={jobs}
+                rows={items}
+              />
+            </Table>
+            <MetricsTreemap emptyMessage={emptyMessage} items={items} onItemClick={showEntryInfo} />
+          </>
         )}
       </div>
       {entryItem && (

package/src/components/bundle-packages/bundle-packages.jsx

@@ -10,9 +10,11 @@ import { InputSearch } from '../../ui/input-search';
 import { EmptySet } from '../../ui/empty-set';
 import { Filters } from '../../ui/filters';
 import { Tag } from '../../ui/tag';
+import { Table } from '../../ui/table';
 import { Toolbar } from '../../ui/toolbar';
 import { ComponentLink } from '../component-link';
 import { MetricsTable } from '../metrics-table';
+import { MetricsTableHeader } from '../metrics-table-header';
 import { MetricsTableOptions } from '../metrics-table-options';
 import { MetricsTableTitle } from '../metrics-table-title';
 import { PackageInfo } from '../package-info';
@@ -231,7 +233,17 @@ export const BundlePackages = (props) => {
             />
           )}
           {displayType === MetricsDisplayType.TREEMAP && (
-            <MetricsTreemap emptyMessage={emptyMessage} items={items} onItemClick={showEntryInfo} />
+            <>
+              <Table compact>
+                <MetricsTableHeader
+                  metricTitle={metricsTableTitle}
+                  showSum
+                  jobs={jobs}
+                  rows={items}
+                />
+              </Table>
+              <MetricsTreemap emptyMessage={emptyMessage} items={items} onItemClick={showEntryInfo} />
+            </>
           )}
         </main>
       </section>

package/src/components/index.js

@@ -18,4 +18,3 @@ export { MetricsTableTitle } from './metrics-table-title';
 export { ModuleInfo } from './module-info';
 export { RunInfo, RunInfoProps } from './run-info';
 export { Summary } from './summary';
-export { TotalSizeTypeTitle } from './total-size-type-title';

package/src/components/metrics-table/metrics-table.i18n.ts

@@ -1,10 +1,3 @@
-export const BASELINE_TITLE = 'Baseline';
-export const CURRENT_TITLE = 'Current';
-
-export const SORT_VALUE = 'value';
-export const SORT_CHANGE = 'change';
-export const SORT_PERCENTUAL_CHANGE = 'percentual change';
-
 export const EMPTY_MESSAGE = 'No items found.';
 export const SHOW_ALL = 'Show all';
 export const SHOW_LESS = 'Show less';

package/src/components/metrics-table/metrics-table.module.css

@@ -10,52 +10,9 @@
   text-decoration: underline;
 }
 
-/* columns */
-.metricName {
-  width: 55%;
-}
-
-.root .jobCol {
-  text-align: right;
-}
-
-.root .value {
-  text-align: right;
-  vertical-align: baseline;
-  width: 15%;
-}
-
+.root .value,
 .root .delta {
   text-align: right;
-  font-size: var(--size-xsmall);
-  vertical-align: baseline;
-  width: 10%;
-  color: pink;
-}
-
-.root .deltaPercentage {
-  width: 5%;
-}
-
-.root tbody .delta {
-  line-height: 1.6rem; /* baseline alignment with the column value */
-}
-
-.jobName {
-  white-space: nowrap;
-}
-
-/* columns overrides for showHeaderSum */
-.showHeaderSum .headerRow .jobCol {
-  border-bottom: 0;
-  padding-bottom: 0;
-}
-
-.showHeaderSum .headerRow .sum {
-  padding-top: var(--space-xxxsmall);
-  font-size: var(--size-small);
-  vertical-align: middle;
-  text-transform: none;
 }
 
 /** rows */

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

@@ -1,13 +1,7 @@
 import React from 'react';
 import cx from 'classnames';
 import isEmpty from 'lodash/isEmpty';
-import sum from 'lodash/sum';
-import {
-  METRIC_TYPE_CONFIGS,
-  type MetricRunInfo,
-  MetricTypes,
-  getMetricRunInfo,
-} from '@bundle-stats/utils';
+import type { ReportMetricRow } from '@bundle-stats/utils';
 
 import { Button } from '../../ui/button';
 import { Icon } from '../../ui/icon';
@@ -15,128 +9,17 @@ import { Table } from '../../ui/table';
 import { Stack } from '../../layout/stack';
 import { Metric } from '../metric';
 import { Delta } from '../delta';
-import { JobName } from '../job-name';
-import { SortButton } from '../sort-button';
+import { MetricsTableHeader } from '../metrics-table-header';
 import * as I18N from './metrics-table.i18n';
 import css from './metrics-table.module.css';
 
-const METRIC_TYPE = METRIC_TYPE_CONFIGS[MetricTypes.FileSize];
 const VISIBLE_COUNT = 500;
 const BASELINE_COLUMN_SPAN = 1;
 const CURRENT_COLUMN_SPAN = 3;
 
-interface Run {
-  /**
-   * Run job label
-   */
-  label?: React.ReactNode;
-  /**
-   * Job internal build number
-   */
-  internalBuildNumber: number;
-}
-
-interface Item {
-  key: string;
-  label?: string;
-  changed: boolean;
-  biggerIsBetter: boolean;
-  runs: Array<MetricRunInfo | null>;
-}
-
-const getRowsRunTotal = (rows: Array<Item>, runIndex: number): number =>
-  sum(rows.map((row) => row?.runs?.[runIndex]?.value || 0));
-
-interface JobColumnProps {
-  run: Run;
-  isBaseline: boolean;
-}
-
-const JobColumn = ({ run, isBaseline }: JobColumnProps) => {
-  const colSpan = isBaseline ? BASELINE_COLUMN_SPAN : CURRENT_COLUMN_SPAN;
-  const { label, internalBuildNumber } = run;
-
-  if (!run) {
-    return <Table.Th colSpan={colSpan}>-</Table.Th>;
-  }
-
-  return (
-    <Table.Th className={css.jobCol} colSpan={colSpan}>
-      <JobName
-        title={isBaseline ? I18N.BASELINE_TITLE : I18N.CURRENT_TITLE}
-        internalBuildNumber={internalBuildNumber}
-        className={css.jobName}
-      >
-        {label}
-      </JobName>
-    </Table.Th>
-  );
-};
-
-interface ColumnSumProps {
-  rows: Array<Item>;
-  isBaseline: boolean;
-  runIndex: number;
-  sort?: any;
-  updateSort?: (val: any) => void;
-}
-
-const SumColumn = ({ rows, isBaseline, runIndex, updateSort, sort }: ColumnSumProps) => {
-  const currentRunTotal = getRowsRunTotal(rows, runIndex);
-  const baselineRunTotal = !isBaseline ? getRowsRunTotal(rows, runIndex + 1) : 0;
-  const total = getMetricRunInfo(METRIC_TYPE, currentRunTotal, baselineRunTotal);
-  const fieldPath = `runs[${runIndex}]`;
-
-  return (
-    <>
-      <Table.Th className={cx(css.value, css.sum)}>
-        <SortButton
-          fieldPath={fieldPath}
-          fieldName="value"
-          label={I18N.SORT_VALUE}
-          updateSort={updateSort}
-          sort={sort}
-        >
-          <Metric value={total.displayValue} />
-        </SortButton>
-      </Table.Th>
-      {!isBaseline && (
-        <>
-          <Table.Th className={cx(css.delta, css.sum)}>
-            <SortButton
-              fieldPath={fieldPath}
-              fieldName="delta"
-              label={I18N.SORT_CHANGE}
-              updateSort={updateSort}
-              sort={sort}
-            >
-              {'delta' in total && (
-                <Delta displayValue={total.displayDelta} deltaType={total.deltaType} />
-              )}
-            </SortButton>
-          </Table.Th>
-          <Table.Th className={cx(css.delta, css.deltaPercentage, css.sum)}>
-            <SortButton
-              fieldPath={fieldPath}
-              fieldName="deltaPercentage"
-              label={I18N.SORT_PERCENTUAL_CHANGE}
-              updateSort={updateSort}
-              sort={sort}
-            >
-              {'delta' in total && (
-                <Delta displayValue={total.displayDeltaPercentage} deltaType={total.deltaType} />
-              )}
-            </SortButton>
-          </Table.Th>
-        </>
-      )}
-    </>
-  );
-};
-
 interface RowProps extends React.ComponentProps<typeof Table.Tr> {
-  item: Item;
-  renderHeader: (item: Item) => React.ReactNode;
+  item: ReportMetricRow;
+  renderHeader: (item: ReportMetricRow) => React.ReactNode;
 }
 
 const Row = ({ className = '', item, renderHeader, ...restProps }: RowProps) => (
@@ -185,14 +68,15 @@ const Row = ({ className = '', item, renderHeader, ...restProps }: RowProps) =>
 
 interface MetricsTableProps extends Omit<React.ComponentProps<typeof Table>, 'title'> {
   runs: Array<{
+    label: string;
     internalBuildNumber: number;
   }>;
-  items: Array<Item>;
+  items: Array<ReportMetricRow>;
   title?: React.ReactNode;
   showHeaderSum?: boolean;
   sort?: any;
   updateSort?: (val: any) => void;
-  renderRowHeader?: (item: Item) => React.ReactNode;
+  renderRowHeader?: (item: ReportMetricRow) => React.ReactNode;
   emptyMessage?: React.ReactNode;
   showAllItems: boolean;
   setShowAllItems: (value: boolean) => void;
@@ -203,7 +87,7 @@ export const MetricsTable = ({
   runs,
   items,
   showHeaderSum = false,
-  title = '',
+  title,
   sort,
   updateSort,
   renderRowHeader = (item: any) => item.label,
@@ -214,12 +98,7 @@ export const MetricsTable = ({
 }: MetricsTableProps) => {
   const columnCount = (runs.length - 1) * CURRENT_COLUMN_SPAN + BASELINE_COLUMN_SPAN + 1;
 
-  const rootClassName = cx(
-    css.root,
-    className,
-    runs.length > 1 && css.multipleRuns,
-    showHeaderSum && css.showHeaderSum,
-  );
+  const rootClassName = cx(css.root, className, runs.length > 1 && css.multipleRuns);
 
   const showEmpty = isEmpty(items);
   const showItems = !showEmpty;
@@ -228,29 +107,14 @@ export const MetricsTable = ({
 
   return (
     <Table className={rootClassName} compact {...restProps}>
-      <Table.THead>
-        <Table.Tr className={css.headerRow}>
-          <Table.Th className={css.metricName} rowSpan={showHeaderSum ? 2 : 1}>
-            {title || ' '}
-          </Table.Th>
-          {runs.map((run, runIndex) => (
-            <JobColumn run={run} isBaseline={runIndex === runs.length - 1} />
-          ))}
-        </Table.Tr>
-        {showHeaderSum && (
-          <Table.Tr className={css.headerRow}>
-            {runs.map((_, runIndex) => (
-              <SumColumn
-                rows={items}
-                isBaseline={runIndex === runs.length - 1}
-                runIndex={runIndex}
-                updateSort={updateSort}
-                sort={sort}
-              />
-            ))}
-          </Table.Tr>
-        )}
-      </Table.THead>
+      <MetricsTableHeader
+        metricTitle={title}
+        showSum={showHeaderSum}
+        jobs={runs}
+        rows={items}
+        sort={sort}
+        updateSort={updateSort}
+      />
       <Table.TBody>
         {showEmpty && (
           <Table.Tr>

package/src/components/metrics-table-header/index.ts

@@ -0,0 +1 @@
+export * from './metrics-table-header';

package/src/components/metrics-table-header/metrics-table-header.i18n.ts

@@ -0,0 +1,6 @@
+export const BASELINE_TITLE = 'Baseline';
+export const CURRENT_TITLE = 'Current';
+
+export const SORT_VALUE = 'value';
+export const SORT_CHANGE = 'change';
+export const SORT_PERCENTUAL_CHANGE = 'percentual change';

package/src/components/metrics-table-header/metrics-table-header.module.css

@@ -0,0 +1,44 @@
+/* columns */
+.root .metricName {
+  width: 55%;
+}
+
+.root .job {
+  text-align: right;
+}
+
+.root .value {
+  text-align: right;
+  vertical-align: baseline;
+  width: 15%;
+}
+
+.root .delta {
+  text-align: right;
+  font-size: var(--size-xsmall);
+  vertical-align: baseline;
+  width: 10%;
+  color: pink;
+}
+
+.root .deltaPercentage {
+  width: 5%;
+}
+
+.jobName {
+  white-space: nowrap;
+}
+
+/* columns overrides for showHeaderSum */
+.showHeaderSum .headerRow .job {
+  border-bottom: 0;
+  padding-bottom: 0;
+}
+
+.showHeaderSum .headerRow .sum {
+  padding-top: var(--space-xxxsmall);
+  font-size: var(--size-small);
+  vertical-align: middle;
+  text-transform: none;
+}
+

package/src/components/metrics-table-header/metrics-table-header.tsx

@@ -0,0 +1,172 @@
+import React from 'react';
+import cx from 'classnames';
+import sum from 'lodash/sum';
+import {
+  METRIC_TYPE_CONFIGS,
+  MetricTypes,
+  type ReportMetricRow,
+  getMetricRunInfo,
+} from '@bundle-stats/utils';
+
+import { Table } from '../../ui/table';
+import { Delta } from '../delta';
+import { JobName } from '../job-name';
+import { Metric } from '../metric';
+import { SortButton } from '../sort-button';
+import * as I18N from './metrics-table-header.i18n';
+import css from './metrics-table-header.module.css';
+
+const METRIC_TYPE = METRIC_TYPE_CONFIGS[MetricTypes.FileSize];
+const BASELINE_COLUMN_SPAN = 1;
+const CURRENT_COLUMN_SPAN = 3;
+
+interface JobColumnProps {
+  job: { label: string; internalBuildNumber: number };
+  isBaseline: boolean;
+}
+
+const JobColumn = ({ job, isBaseline }: JobColumnProps) => {
+  const colSpan = isBaseline ? BASELINE_COLUMN_SPAN : CURRENT_COLUMN_SPAN;
+  const { label, internalBuildNumber } = job;
+
+  if (!job) {
+    return <Table.Th colSpan={colSpan}>-</Table.Th>;
+  }
+
+  return (
+    <Table.Th className={css.job} colSpan={colSpan}>
+      <JobName
+        title={isBaseline ? I18N.BASELINE_TITLE : I18N.CURRENT_TITLE}
+        internalBuildNumber={internalBuildNumber}
+        className={css.jobName}
+      >
+        {label}
+      </JobName>
+    </Table.Th>
+  );
+};
+
+const getRowsRunTotal = (rows: Array<ReportMetricRow>, runIndex: number): number =>
+  sum(rows.map((row) => row?.runs?.[runIndex]?.value || 0));
+
+interface ColumnSumProps {
+  rows: Array<ReportMetricRow>;
+  isBaseline: boolean;
+  runIndex: number;
+  sort?: any;
+  updateSort?: (val: any) => void;
+}
+
+const SumColumn = ({ rows, isBaseline, runIndex, updateSort, sort }: ColumnSumProps) => {
+  const currentRunTotal = getRowsRunTotal(rows, runIndex);
+  const baselineRunTotal = !isBaseline ? getRowsRunTotal(rows, runIndex + 1) : 0;
+  const total = getMetricRunInfo(METRIC_TYPE, currentRunTotal, baselineRunTotal);
+  const fieldPath = `runs[${runIndex}]`;
+
+  return (
+    <>
+      <Table.Th className={cx(css.value, css.sum)}>
+        <SortButton
+          fieldPath={fieldPath}
+          fieldName="value"
+          label={I18N.SORT_VALUE}
+          updateSort={updateSort}
+          sort={sort}
+        >
+          <Metric value={total.displayValue} />
+        </SortButton>
+      </Table.Th>
+      {!isBaseline && (
+        <>
+          <Table.Th className={cx(css.delta, css.sum)}>
+            <SortButton
+              fieldPath={fieldPath}
+              fieldName="delta"
+              label={I18N.SORT_CHANGE}
+              updateSort={updateSort}
+              sort={sort}
+            >
+              {'delta' in total && (
+                <Delta displayValue={total.displayDelta} deltaType={total.deltaType} />
+              )}
+            </SortButton>
+          </Table.Th>
+          <Table.Th className={cx(css.delta, css.deltaPercentage, css.sum)}>
+            <SortButton
+              fieldPath={fieldPath}
+              fieldName="deltaPercentage"
+              label={I18N.SORT_PERCENTUAL_CHANGE}
+              updateSort={updateSort}
+              sort={sort}
+            >
+              {'delta' in total && (
+                <Delta displayValue={total.displayDeltaPercentage} deltaType={total.deltaType} />
+              )}
+            </SortButton>
+          </Table.Th>
+        </>
+      )}
+    </>
+  );
+};
+
+interface MetricsTableHeaderProps {
+  /**
+   * Metric column title
+   */
+  metricTitle?: React.ReactNode;
+  /**
+   * Show column sum flag
+   */
+  showSum?: boolean;
+  /**
+   * Array of jobs
+   */
+  jobs: Array<{ label: string; internalBuildNumber: number }>;
+  /**
+   * Report rows
+   */
+  rows: Array<ReportMetricRow>;
+  /**
+   * Sort field data
+   */
+  sort?: any;
+  /**
+   * Update sort field
+   */
+  updateSort?: (val: any) => void;
+}
+
+export const MetricsTableHeader = (
+  props: MetricsTableHeaderProps & React.ComponentProps<'thead'>,
+) => {
+  const { className = '', metricTitle = '', showSum = false, jobs, rows, sort, updateSort } = props;
+
+  const rootClassName = cx(css.root, showSum && css.showHeaderSum, className);
+
+  return (
+    <Table.THead className={rootClassName}>
+      <Table.Tr className={css.headerRow}>
+        <Table.Th className={css.metricName} rowSpan={showSum ? 2 : 1}>
+          {metricTitle || ' '}
+        </Table.Th>
+        {jobs.map((job, runIndex) => (
+          <JobColumn job={job} isBaseline={runIndex === jobs.length - 1} />
+        ))}
+      </Table.Tr>
+      {showSum && (
+        <Table.Tr className={css.headerRow}>
+          {jobs.map((_, runIndex) => (
+            <SumColumn
+              rows={rows}
+              isBaseline={runIndex === jobs.length - 1}
+              runIndex={runIndex}
+              updateSort={updateSort}
+              sort={sort}
+            />
+          ))}
+        </Table.Tr>
+      )}
+    </Table.THead>
+  );
+};

package/src/components/metrics-table-title/metrics-table-title.jsx

@@ -15,7 +15,7 @@ export const MetricsTableTitle = (props) => {
   const rootClassName = cx(css.root, className);
 
   return (
-    <Stack space="xxsmall" className={rootClassName}>
+    <Stack space="xxxsmall" className={rootClassName}>
       <FlexStack space="xxxsmall" alignItems="center" as="h3" className={css.title}>
         <span>{title}</span>
 

package/src/components/metrics-table-title/metrics-table-title.module.css

@@ -1,8 +1,9 @@
 .root {
+  color: var(--color-text-ultra-light);
 }
 
 .title {
-  color: var(--color-text-light);
+  color: inherit;
   font-size: 1em;
   font-weight: bold;
   text-transform: uppercase;
@@ -18,8 +19,6 @@
 }
 
 .info {
-  color: var(--color-text-light);
   font-family: var(--font-family-fixed);
-  font-size: var(--size-xsmall);
-  font-weight: bold;
+  font-weight: normal;
 }