@bundle-stats/ui 3.3.0-alpha.1 → 3.3.1-beta.12

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

@@ -12,7 +12,8 @@ import styles from './metrics-table.module.css';
 
 const METRIC_TYPE_DATA = getGlobalMetricType(null, METRIC_TYPE_FILE_SIZE);
 
-const getRowsRunTotal = (rows, runIndex) => sum(rows.map((row) => get(row, `runs[${runIndex}].value`, 0)));
+const getRowsRunTotal = (rows, runIndex) =>
+  sum(rows.map((row) => get(row, `runs[${runIndex}].value`, 0)));
 
 const getHeaderLabelCells = (rows) => (run, runIndex, runs) => {
   const isBaseline = runIndex === runs.length - 1;
@@ -102,46 +103,58 @@ const getHeaderRows = (runs, items, showHeaderSum, title) => [
     : []),
 ];
 
-const generateRowCells = (item, index, items) => {
-  const isBaseline = index === items.length - 1;
+const MetricsTableRow = ({ item, renderRowHeader }) => (
+  <Table.Tr className={cx(!item.changed && styles.unchanged)}>
+    <Table.Th className={styles.metricName}>{renderRowHeader(item)}</Table.Th>
 
-  // eslint-disable-next-line react/destructuring-assignment
-  if (!item || typeof item.value === 'undefined') {
-    return ['-', ...(!isBaseline ? [''] : [])];
-  }
+    {item.runs.map((run, index) => {
+      const isBaseline = index === item.runs.length - 1;
+      const valueClassName = cx(styles.value, !isBaseline && styles.current);
 
-  const { displayValue, deltaPercentage, displayDeltaPercentage, deltaType } = item;
+      // Empty cells if no value
+      if (!run || typeof run.value === 'undefined') {
+        return (
+          <>
+            <Table.Td className={valueClassName}>-</Table.Td>
+            {!isBaseline && <Table.Td className={styles.delta} />}
+          </>
+        );
+      }
 
-  const cells = [<Metric value={displayValue} />];
+      const { displayValue, deltaPercentage, displayDeltaPercentage, deltaType } = run;
 
-  if (!isBaseline) {
-    cells.push(
-      typeof deltaPercentage === 'number' && (
-        <Delta displayValue={displayDeltaPercentage} deltaType={deltaType} />
-      ),
-    );
-  }
+      return (
+        <>
+          <Table.Td className={valueClassName}>
+            <Metric value={displayValue} />
+          </Table.Td>
+          {!isBaseline && typeof deltaPercentage === 'number' && (
+            <Table.Td className={styles.delta}>
+              <Delta displayValue={displayDeltaPercentage} deltaType={deltaType} />
+            </Table.Td>
+          )}
+        </>
+      );
+    })}
+  </Table.Tr>
+);
 
-  return cells;
+MetricsTableRow.propTypes = {
+  item: PropTypes.shape({
+    changed: PropTypes.bool,
+    runs: PropTypes.arrayOf(
+      PropTypes.shape({
+        value: PropTypes.number,
+        displayValue: PropTypes.string,
+        deltaPercentage: PropTypes.number,
+        displayDeltaPercentage: PropTypes.string,
+        deltaType: PropTypes.string,
+      }),
+    ),
+  }).isRequired,
+  renderRowHeader: PropTypes.func.isRequired,
 };
 
-const getRows = (runs, items, renderRowHeader) =>
-  items.map((item, index) => {
-    const { changed } = item;
-
-    return {
-      key: item?.key || index,
-      className: changed ? '' : styles.unchanged,
-      cells: [
-        // Metric name
-        renderRowHeader(item),
-
-        // Metric item values
-        ...item.runs.map(generateRowCells).flat(),
-      ],
-    };
-  });
-
 export const MetricsTable = ({
   className,
   renderRowHeader,
@@ -151,9 +164,11 @@ export const MetricsTable = ({
   showHeaderSum,
   headerRows,
   title,
+  ...restProps
 }) => {
   const { headers, columnClassNames } = useMemo(() => {
     const headerColumns = getHeaderRows(runs, items, showHeaderSum, title);
+
     return {
       headers: [...headerRows, ...headerColumns],
       // First header row has the column class names
@@ -161,8 +176,6 @@ export const MetricsTable = ({
     };
   }, [headerRows, runs, items, showHeaderSum, title]);
 
-  const rows = useMemo(() => getRows(runs, items, renderRowHeader), [runs, items, renderRowHeader]);
-
   const rootClassName = cx(
     styles.root,
     className,
@@ -171,7 +184,7 @@ export const MetricsTable = ({
   );
 
   return (
-    <Table className={rootClassName} compact>
+    <Table className={rootClassName} compact {...restProps}>
       <Table.THead>
         {headers.map((headerRow) => {
           const { cells, className: rowClassName } = headerRow.cells
@@ -188,13 +201,9 @@ export const MetricsTable = ({
         })}
       </Table.THead>
       <Table.TBody>
-        {!isEmpty(rows) ? (
-          rows.map(({ key, className: rowClassName, cells }) => (
-            <Table.Tr key={key} className={rowClassName}>
-              {cells.map((cell, index) => (
-                <Table.Td className={columnClassNames[index]}>{cell}</Table.Td>
-              ))}
-            </Table.Tr>
+        {!isEmpty(items) ? (
+          items.map((item) => (
+            <MetricsTableRow key={item.key} item={item} renderRowHeader={renderRowHeader} />
           ))
         ) : (
           <Table.Tr>

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

@@ -1,11 +1,11 @@
-.jobName a {
+.root a {
   color: inherit;
   text-decoration: none;
 }
 
-.jobName a:hover,
-.jobName a:active,
-.jobName a:focus {
+.root a:hover,
+.root a:active,
+.root a:focus {
   color: var(--color-primary);
   text-decoration: underline;
 }
@@ -15,21 +15,31 @@
   width: 100%;
 }
 
-.value {
+.root .value {
   padding-left: var(--space-large);
   text-align: right;
+  vertical-align: baseline;
 }
 
-.delta {
+.root .delta {
   padding-left: 0;
   text-align: left;
   font-size: var(--size-xsmall);
+  vertical-align: baseline;
 }
 
-.value.current {
+.root tbody .delta {
+  line-height: 1.6rem; /* baseline alignment with the value */
+}
+
+.root .value.current {
   padding-right: var(--space-xxsmall);
 }
 
+.jobName {
+  white-space: nowrap;
+}
+
 /* columns overrides for showHeaderSum */
 .showHeaderSum .headerRowColumns .value,
 .showHeaderSum .headerRowColumns .delta {
@@ -45,6 +55,7 @@
 }
 
 /** rows */
+.multipleRuns .unchanged th,
 .multipleRuns .unchanged td {
   color: var(--color-text-light);
 }

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

@@ -5,6 +5,7 @@
 }
 
 .input {
+  border-radius: var(--radius-small);
   height: var(--space-large);
   border-color: var(--color-outline);
 }
@@ -21,12 +22,12 @@
   cursor: pointer;
   border-radius: 50%;
   position: absolute;
-  right: 0;
+  right: 2px;
   top: 50%;
   transform: translateY(-50%);
-  padding: var(--space-xxsmall);
-  width: var(--space-large);
-  height: var(--space-large);
+  padding: var(--space-xxxsmall);
+  width: var(--space-medium);
+  height: var(--space-medium);
   background: radial-gradient(var(--color-background) 50%, transparent);
   color: var(--color-text-ultra-light);
   transition: var(--transition-in);

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

@@ -5,7 +5,8 @@ import cx from 'classnames';
 import I18N from '../../i18n';
 import { FlexStack } from '../../layout/flex-stack';
 import { Stack } from '../../layout/stack';
-import { Popover } from '../../ui/popover';
+import { Icon } from '../../ui/icon';
+import { HoverCard } from '../../ui/hover-card';
 import css from './metrics-table-title.module.css';
 
 export const MetricsTableTitle = (props) => {
@@ -13,26 +14,24 @@ export const MetricsTableTitle = (props) => {
   const rootClassName = cx(css.root, className);
 
   return (
-    <Stack space="xxxsmall" className={rootClassName}>
-      <FlexStack space="xxxsmall">
-        <span>{title}</span>
-        {info && <span className={css.info}>{info}</span>}
-        {(popoverInfo || popoverHref) && (
-          <Popover icon="help">
-            <Stack space="xxxsmall">
-              {popoverInfo && <p>{popoverInfo}</p>}
-              {popoverHref && (
-                <p>
-                  <a href={popoverHref} target="_blank" rel="noreferrer">
-                    {I18N.READ_MORE}
-                  </a>
-                </p>
-              )}
-            </Stack>
-          </Popover>
-        )}
-      </FlexStack>
-    </Stack>
+    <FlexStack space="xxxsmall" className={rootClassName}>
+      <span>{title}</span>
+      {info && <span className={css.info}>{info}</span>}
+      {(popoverInfo || popoverHref) && (
+        <HoverCard label={<Icon glyph="help" />}>
+          <Stack space="xxxsmall">
+            {popoverInfo && <p>{popoverInfo}</p>}
+            {popoverHref && (
+              <p>
+                <a href={popoverHref} target="_blank" rel="noreferrer">
+                  {I18N.READ_MORE}
+                </a>
+              </p>
+            )}
+          </Stack>
+        </HoverCard>
+      )}
+    </FlexStack>
   );
 };
 

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

@@ -1,5 +1,7 @@
 .root {
+  align-items: center;
   font-weight: bold;
+  line-height: var(--space-small);
   text-transform: uppercase;
   color: var(--color-text-light);
 }

package/src/components/module-info/module-info.jsx

@@ -20,7 +20,7 @@ export const ModuleInfo = (props) => {
   } = props;
 
   return (
-    <Stack space="small" className={className}>
+    <Stack space="xsmall" className={className}>
       {item.runs.map((run, index) => {
         const TitleComponent = index !== 0 ? 'h4' : 'h3';
         const key = `module-info-${run?.name || index}-${index}`;
@@ -30,7 +30,7 @@ export const ModuleInfo = (props) => {
             <TitleComponent>{labels[index]}</TitleComponent>
             {index === 0 && !isEmpty(run?.chunkIds) && (
               <div className={css.chunks}>
-                <strong className={css.chunksTitle}>Chunks:</strong>
+                <span className={css.chunksTitle}>Chunks:</span>
                 {run.chunkIds.map((chunkId) => {
                   const chunk = find(chunks, { id: chunkId });
 
@@ -51,11 +51,7 @@ export const ModuleInfo = (props) => {
               </div>
             )}
 
-            <FileName
-              className={css.fileName}
-              as="code"
-              name={run?.name || '-'}
-            />
+            <FileName className={css.fileName} as="code" name={run?.name || '-'} />
           </Stack>
         );
       })}

package/src/components/module-info/module-info.module.css

@@ -15,6 +15,7 @@
 }
 
 .fileName {
+  max-width: 100%;
   padding: 2px;
   background: var(--color-highlight-warning);
 }

package/src/components/summary/summary.jsx

@@ -12,14 +12,11 @@ import { ComponentLink } from '../component-link';
 import { SummaryItem } from '../summary-item';
 import css from './summary.module.css';
 
-const getSourceMetricId = (fullMetricId) => fullMetricId.split('.').slice(1).join('.');
-
 export const Summary = ({
   className,
   size,
   keys,
   data,
-  budgets,
   loading,
   showSummaryItemDelta,
   summaryItemLink: SummaryItemCustomLink,
@@ -27,14 +24,13 @@ export const Summary = ({
   <Box outline className={cx(css.root, className)}>
     <FlexStack className={css.items}>
       {Array.from(METRIC_COMPONENT_LINKS)
-        .filter(([metricId]) => keys.includes(getSourceMetricId(metricId)))
+        .filter(([metricId]) => keys.includes(metricId))
         .map(([metricId, metricOptions]) => (
           <div key={metricId} className={css.item}>
             <SummaryItem
               size={size}
               id={metricId}
               data={get(data, metricId)}
-              budget={get(budgets, metricId)}
               loading={loading}
               showMetricDescription
               showDelta={showSummaryItemDelta && metricOptions.showDelta !== false}
@@ -53,7 +49,6 @@ export const Summary = ({
 Summary.defaultProps = {
   className: '',
   data: null,
-  budgets: null,
   loading: false,
   size: '',
   keys: METRICS_WEBPACK_GENERAL,
@@ -65,8 +60,12 @@ Summary.propTypes = {
   className: PropTypes.string,
   size: PropTypes.string,
   keys: PropTypes.arrayOf(PropTypes.string),
-  data: PropTypes.object, // eslint-disable-line react/forbid-prop-types
-  budgets: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  data: PropTypes.shape({
+    [PropTypes.string]: PropTypes.shape({
+      baseline: PropTypes.number,
+      current: PropTypes.number,
+    }),
+  }),
   loading: PropTypes.bool,
   showSummaryItemDelta: PropTypes.bool,
   summaryItemLink: PropTypes.elementType,

package/src/components/summary/summary.module.css

@@ -4,7 +4,7 @@
 }
 
 .item {
-  padding: var(--space-small);
+  padding: var(--space-small) var(--space-xxlarge) var(--space-small) var(--space-small);
   flex: 1 0 25%; /* force equal sizes */
   position: relative;
   z-index: 1;

package/src/components/summary-item/summary-item.jsx

@@ -3,41 +3,34 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { getGlobalMetricType, getMetricRunInfo } from '@bundle-stats/utils';
 
-import { Popover } from '../../ui/popover';
+import { HoverCard } from '../../ui/hover-card';
+import { Icon } from '../../ui/icon';
 import { Skeleton } from '../../ui/skeleton';
 import { Stack } from '../../layout/stack';
 import { FlexStack } from '../../layout/flex-stack';
 import { Metric } from '../metric';
 import { Delta } from '../delta';
-import { BudgetInfo } from '../budget-info';
 import css from './summary-item.module.css';
 
-const MetricInfoPopover = ({ description, url }) => {
-  // Workaround cases where the parent is a link
-  const readMoreOnClick = () => {
-    window.open(url);
-  };
-
-  return (
-    <Stack space="xxxsmall">
-      <p>{description}</p>
-      {url && (
-        <p>
-          <button type="button" className={css.readMoreBtn} onClick={readMoreOnClick}>
-            Read more
-          </button>
-        </p>
-      )}
-    </Stack>
-  );
-};
-
-MetricInfoPopover.propTypes = {
+const MetricInfo = ({ description, url }) => (
+  <Stack space="xxxsmall">
+    <p>{description}</p>
+    {url && (
+      <p>
+        <a href={url} className={css.readMoreLink}>
+          Read more
+        </a>
+      </p>
+    )}
+  </Stack>
+);
+
+MetricInfo.propTypes = {
   description: PropTypes.string.isRequired,
   url: PropTypes.string,
 };
 
-MetricInfoPopover.defaultProps = {
+MetricInfo.defaultProps = {
   url: '',
 };
 
@@ -50,7 +43,6 @@ export const SummaryItem = ({
   loading,
   showDelta,
   showMetricDescription,
-  budget,
   ...props
 }) => {
   const { baseline, current } = data || { baseline: 0, current: 0 };
@@ -58,20 +50,19 @@ export const SummaryItem = ({
   const metric = getGlobalMetricType(id);
   const runInfo = getMetricRunInfo(metric, current, baseline);
   const showMetricDescriptionTooltip = showMetricDescription && metric?.description;
+
   const rootClassName = cx(css.root, className, css[size], showDelta && css.showDelta);
 
   return (
-    <Stack space="xxsmall" as={Component} className={rootClassName} {...props}>
+    <Stack space="xxxsmall" as={Component} className={rootClassName} {...props}>
       <FlexStack as="h3" space="xxxsmall" className={css.title}>
-        <span className={css.titleLabel}>{metric.label}</span>
+        <span>{metric.label}</span>
 
         {showMetricDescriptionTooltip && (
-          <Popover className={css.icon} icon="help">
-            <MetricInfoPopover {...metric} />
-          </Popover>
+          <HoverCard className={css.icon} label={<Icon glyph="help" />}>
+            <MetricInfo {...metric} />
+          </HoverCard>
         )}
-
-        {budget && <BudgetInfo className={css.budgetInfo} metricId={id} budgetInsight={budget} />}
       </FlexStack>
 
       {!loading ? (
@@ -111,7 +102,6 @@ SummaryItem.defaultProps = {
   loading: false,
   showMetricDescription: false,
   showDelta: true,
-  budget: undefined,
 };
 
 SummaryItem.propTypes = {
@@ -138,11 +128,4 @@ SummaryItem.propTypes = {
 
   /** Show delta */
   showDelta: PropTypes.bool,
-
-  /** Budget insight data */
-  budget: PropTypes.shape({
-    currentBalue: PropTypes.number,
-    budgetValue: PropTypes.number,
-    failed: PropTypes.bool,
-  }),
 };

package/src/components/summary-item/summary-item.module.css

@@ -1,9 +1,5 @@
-.root {
-  position: relative;
-  padding-right: var(--space-xlarge);
-}
-
 .title {
+  align-items: center;
   color: var(--color-text-ultra-light);
   font-weight: bold;
   font-size: var(--size-xsmall);
@@ -12,35 +8,6 @@
   white-space: nowrap;
 }
 
-.titleLabel {
-  flex: 0 0 auto;
-}
-
-.readMoreBtn {
-  appearance: none;
-  padding: 0;
-  border: 0;
-  background: none;
-  cursor: pointer;
-  /* simulate link */
-  color: var(--color-primary);
-  text-decoration: underline;
-  line-height: var(--space-small);
-}
-
-.readMoreBtn:hover,
-.readMoreBtn:active,
-.readMoreBtn:focus {
-  color: var(--color-primary-dark);
-  text-decoration: none;
-}
-
-.budgetInfo {
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
 .currentMetric {
   display: block;
   color: var(--color-heading);

package/src/components/total-size-type-title/total-size-type-title.jsx

@@ -1,31 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import cx from 'classnames'
+import cx from 'classnames';
 
 import config from '../../config.json';
 import I18N from '../../i18n';
 import { FlexStack } from '../../layout/flex-stack';
 import { Stack } from '../../layout/stack';
-import { Popover } from '../../ui/popover';
+import { Icon } from '../../ui/icon';
+import { HoverCard } from '../../ui/hover-card';
 import css from './total-size-type-title.module.css';
 
 export const TotalSizeTypeTitle = ({ className }) => (
   <FlexStack space="xxxsmall" className={cx(css.title, className)}>
     <span>{I18N.ASSET_TOTALS}</span>
-    <Popover icon="help">
+    <HoverCard label={<Icon glyph="help" />}>
       <Stack space="xxxsmall">
         <p>{I18N.ASSET_TOTALS_INFO}</p>
         <p>
-          <a
-            href={config.documentation.assets}
-            target="_blank"
-            rel="noreferrer"
-          >
+          <a href={config.documentation.assets} target="_blank" rel="noreferrer">
             {I18N.READ_MORE}
           </a>
         </p>
       </Stack>
-    </Popover>
+    </HoverCard>
   </FlexStack>
 );
 

package/src/constants.js

@@ -47,11 +47,15 @@ export const ASSETS_SIZES_FILE_TYPE_MAP = FILE_TYPES.reduce(
 );
 
 export const METRICS_WEBPACK_GENERAL = [
-  'totalSizeByTypeALL',
-  'totalInitialSizeJS',
-  'totalInitialSizeCSS',
-  'cacheInvalidation',
+  'webpack.totalSizeByTypeALL',
+  'webpack.totalInitialSizeJS',
+  'webpack.totalInitialSizeCSS',
+  'webpack.cacheInvalidation',
 ];
-export const METRICS_WEBPACK_ASSETS = ['assetCount', 'chunkCount'];
-export const METRICS_WEBPACK_MODULES = ['moduleCount'];
-export const METRICS_WEBPACK_PACKAGES = ['packageCount', 'duplicatePackagesCount'];
+export const METRICS_WEBPACK_ASSETS = ['webpack.assetCount', 'webpack.chunkCount'];
+export const METRICS_WEBPACK_MODULES = [
+  'webpack.moduleCount',
+  'webpack.duplicateModulesCount',
+  'webpack.duplicateCode',
+];
+export const METRICS_WEBPACK_PACKAGES = ['webpack.packageCount', 'webpack.duplicatePackagesCount'];

package/src/css/default.css

@@ -1,18 +1,29 @@
+@import url("~modern-css-reset/dist/reset.css");
+
 :root {
   --chart-height: 180px;
 }
 
+/** modern-css-reset updates */
+pre,
+ul,
+ol,
+button {
+  margin: 0;
+}
+
 html {
+  font-family: var(--font-family);
   font-size: 81.25%;
-  line-height: 1.8461;
+  line-height: 1.6;
 }
 
 body {
+  background: var(--color-background);
   color: var(--color-text);
 }
 
-h1, h2, h3, h4, h5 {
-  margin-bottom: var(--space-small);
+h1, h2, h3, h4, h5, h6 {
   color: var(--color-heading);
   font-weight: 500;
 }