@bundle-stats/ui 3.3.0-alpha.1 → 3.4.0-alpha.3

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

@@ -1,16 +1,22 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { get, map } from 'lodash';
-import { ASSET_ENTRY_TYPE, ASSET_FILE_TYPE, ASSET_FILTERS, FILE_TYPE_LABELS } from '@bundle-stats/utils';
+import {
+  ASSET_ENTRY_TYPE,
+  ASSET_FILE_TYPE,
+  ASSET_FILTERS,
+  FILE_TYPE_LABELS,
+} from '@bundle-stats/utils';
 
 import config from '../../config.json';
 import I18N from '../../i18n';
 import { FlexStack } from '../../layout/flex-stack';
 import { Icon } from '../../ui/icon';
 import { FileName } from '../../ui/file-name';
-import { Popover } from '../../ui/popover';
+import { HoverCard } from '../../ui/hover-card';
 import { Tooltip } from '../../ui/tooltip';
+import { Tag } from '../../ui/tag';
 import { Filters } from '../../ui/filters';
 import { SortDropdown } from '../../ui/sort-dropdown';
 import { EmptySet } from '../../ui/empty-set';
@@ -71,48 +77,91 @@ TooltipNotPredictive.propTypes = {
   runs: PropTypes.array, // eslint-disable-line react/forbid-prop-types
 };
 
-const getRenderRowHeader = ({ labels, CustomComponentLink, chunks }) => (item) => {
-  const { label, isNotPredictive, runs, isChunk, isEntry, isInitial } = item;
+const RowHeader = ({ row, labels, chunks, CustomComponentLink }) => {
+  const { label, isNotPredictive, runs, isChunk, isEntry, isInitial } = row;
+  const [showHoverCard, setHoverCard] = useState(false);
+  const handleOnMouseEnter = useCallback(() => setHoverCard(true), [showHoverCard]);
 
-  return (
-    <Popover
-      label={<FileName name={label} />}
-      icon={
-        <div className={css.assetInfoFlags}>
+  const content = useMemo(
+    () => (
+      <span className={css.assetName}>
+        <span className={css.assetNameTags}>
           {isNotPredictive && (
             <Tooltip className={css.notPredictive} title={<TooltipNotPredictive runs={runs} />}>
               <Icon className={css.notPredictiveIcon} glyph="warning" />
             </Tooltip>
           )}
           {isChunk && (
-            <span title="Chunk" className={css.flagChunk}>
-              c
-            </span>
+            <Tag
+              className={cx(css.assetNameTag, css.assetNameTagChunk)}
+              title="Chunk"
+              size={Tag.SIZES.SMALL}
+              kind={Tag.KINDS.INFO}
+            />
           )}
           {isEntry && (
-            <span title="Entrypoint" className={css.flagEntry}>
-              e
-            </span>
+            <Tag
+              className={cx(css.assetNameTag, css.assetNameTagEntry)}
+              title="Entrypoint"
+              size={Tag.SIZES.SMALL}
+              kind={Tag.KINDS.INFO}
+            />
           )}
           {isInitial && (
-            <span title="Initial" className={css.flagInitial}>
-              i
-            </span>
+            <Tag
+              className={cx(css.assetNameTag, css.assetNameTagInitial)}
+              title="Initial"
+              size={Tag.SIZES.SMALL}
+              kind={Tag.KINDS.INFO}
+            />
           )}
-        </div>
-      }
-    >
+        </span>
+        <FileName className={css.assetNameText} name={label} />
+      </span>
+    ),
+    [isChunk, isEntry, isInitial, isNotPredictive, runs],
+  );
+
+  if (!showHoverCard) {
+    return <span onMouseEnter={handleOnMouseEnter}>{content}</span>;
+  }
+
+  return (
+    <HoverCard label={content}>
       <AssetInfo
         className={css.assetInfo}
-        item={item}
+        item={row}
         labels={labels}
         chunks={chunks}
         CustomComponentLink={CustomComponentLink}
       />
-    </Popover>
+    </HoverCard>
   );
 };
 
+RowHeader.propTypes = {
+  row: PropTypes.shape({
+    label: PropTypes.string,
+    isNotPredictive: PropTypes.bool,
+    isChunk: PropTypes.bool,
+    isInitial: PropTypes.bool,
+    isEntry: PropTypes.bool,
+    runs: PropTypes.arrayOf(PropTypes.object),
+  }).isRequired,
+  chunks: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string,
+      name: PropTypes.string,
+    }),
+  ),
+  labels: PropTypes.arrayOf(PropTypes.string).isRequired,
+  CustomComponentLink: PropTypes.elementType.isRequired,
+};
+
+RowHeader.defaultProps = {
+  chunks: [],
+};
+
 export const BundleAssets = (props) => {
   const {
     className,
@@ -141,11 +190,16 @@ export const BundleAssets = (props) => {
     />
   );
 
-  const chunks = jobs[0]?.meta?.webpack?.chunks || [];
-
-  const renderRowHeader = useMemo(
-    () => getRenderRowHeader({ labels: map(jobs, 'label'), CustomComponentLink, chunks }),
-    [jobs, chunks],
+  const renderRowHeader = useCallback(
+    (row) => (
+      <RowHeader
+        row={row}
+        labels={map(jobs, 'label')}
+        chunks={jobs[0]?.meta?.webpack?.chunks || []}
+        CustomComponentLink={CustomComponentLink}
+      />
+    ),
+    [jobs, CustomComponentLink],
   );
 
   return (
@@ -153,7 +207,7 @@ export const BundleAssets = (props) => {
       <Toolbar
         className={css.toolbar}
         renderActions={({ actionClassName }) => (
-          <FlexStack space="xsmall" className={cx(css.dropdown, actionClassName)}>
+          <FlexStack space="xxsmall" className={cx(css.dropdown, actionClassName)}>
             <SortDropdown fields={sortFields} {...sort} onChange={updateSort} />
             <MetricsTableOptions
               handleViewAll={resetAllFilters}
@@ -162,7 +216,7 @@ export const BundleAssets = (props) => {
           </FlexStack>
         )}
       >
-        <FlexStack>
+        <FlexStack space="xxsmall">
           <MetricsTableSearch
             className={css.toolbarSearch}
             placeholder="Search by name"

package/src/components/bundle-assets/bundle-assets.module.css

@@ -8,6 +8,8 @@
   margin-right: -1px; /** collapse border */
 }
 
+.assetName {}
+
 .notPredictive {
   margin-right: var(--space-xxsmall);
   display: inline-block;
@@ -21,50 +23,46 @@
   vertical-align: top;
 }
 
-.assetInfoFlags {
-  display: inline-block;
+.assetNameTags {
+  display: inline;
   margin-right: var(--space-xxxsmall);
 }
 
-.assetInfoFlags:empty {
+.assetNameTags:empty {
   display: none;
 }
 
-.flag {
-  display: inline-block;
-  width: var(--space-xsmall);
-  height: var(--space-xsmall);
-  font-family: var(--font-family);
-  font-size: 8px;
-  font-weight: bold;
-  background: var(--color-highlight);
-  color: var(--color-text-light);
-  line-height: var(--space-xsmall);
-  text-align: center;
-  text-transform: uppercase;
+.assetNameTag {
   vertical-align: middle;
 }
 
-.flag + .flag {
+.assetNameTag + .assetNameTag {
   margin-left: 2px;
 }
 
-.flagEntry {
-  composes: flag;
+.assetNameTagEntry {
   background: var(--color-info-light);
-  color: var(--color-background);
 }
 
-.flagInitial {
-  composes: flag;
+.assetNameTagEntry::before {
+  content: 'e';
+}
+
+.assetNameTagInitial {
   background: var(--color-info-light);
-  color: var(--color-background);
 }
 
-.flagChunk {
-  composes: flag;
-  background: var(--color-info);
-  color: var(--color-background);
+.assetNameTagInitial::before {
+  content: 'i';
+}
+
+.assetNameTagChunk::before {
+  content: 'c';
+}
+
+.assetNameText {
+  display: inline;
+  vertical-align: middle;
 }
 
 /* Tooltip not predictive */

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

@@ -15,6 +15,7 @@ export const BundleAssetsTotalsTable = ({
   className,
   jobs,
   customComponentLink: CustomComponentLink,
+  ...restProps
 }) => {
   const items = useMemo(() => webpack.compareBySection.sizes(jobs), [jobs]);
   const budgets = jobs[0].insights?.webpack?.budgets;
@@ -46,6 +47,7 @@ export const BundleAssetsTotalsTable = ({
       items={items}
       renderRowHeader={renderRowHeader}
       showHeaderSum
+      {...restProps}
     />
   );
 };

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

@@ -18,8 +18,9 @@ import { FlexStack } from '../../layout/flex-stack';
 import { EmptySet } from '../../ui/empty-set';
 import { FileName } from '../../ui/file-name';
 import { Filters } from '../../ui/filters';
-import { Popover } from '../../ui/popover';
+import { HoverCard } from '../../ui/hover-card';
 import { SortDropdown } from '../../ui/sort-dropdown';
+import { Tag } from '../../ui/tag';
 import { Toolbar } from '../../ui/toolbar';
 import { MetricsTable } from '../metrics-table';
 import { MetricsTableSearch } from '../metrics-table-search';
@@ -31,36 +32,42 @@ import css from './bundle-modules.module.css';
 const RowHeader = ({ row, chunks, labels, CustomComponentLink }) => {
   const chunkIds = map(chunks, 'id');
 
-  const [showPopopver, setPopover] = useState(false);
-  const handleOnMouseEnter = useCallback(() => setPopover(true), [showPopopver]);
-  const content = <FileName name={row.label} />;
+  const [showHoverCard, setHoverCard] = useState(false);
+  const handleOnMouseEnter = useCallback(() => setHoverCard(true), [showHoverCard]);
+  const content = useMemo(
+    () => (
+      <span className={css.name}>
+        {row.duplicated && (
+          <Tag className={css.nameTagDuplicated} size="small" kind={Tag.KINDS.DANGER} />
+        )}
+        <FileName className={css.nameText} name={row.label} />
+      </span>
+    ),
+    [row],
+  );
+
+  if (!showHoverCard) {
+    return <div onMouseEnter={handleOnMouseEnter}>{content}</div>;
+  }
 
   return (
-    <div onMouseEnter={handleOnMouseEnter}>
-      {!showPopopver ?
-        content
-        : (
-        <Popover ariaLabel="View module info" label={content}>
-          {({ popoverToggle }) => (
-            <ModuleInfo
-              className={css.namePopover}
-              item={row}
-              chunks={chunks}
-              chunkIds={chunkIds}
-              labels={labels}
-              customComponentLink={CustomComponentLink}
-              onClick={popoverToggle}
-            />
-          )}
-        </Popover>
-      )}
-    </div>
+    <HoverCard label={content}>
+      <ModuleInfo
+        className={css.namePopover}
+        item={row}
+        chunks={chunks}
+        chunkIds={chunkIds}
+        labels={labels}
+        customComponentLink={CustomComponentLink}
+      />
+    </HoverCard>
   );
 };
 
 RowHeader.propTypes = {
   row: PropTypes.shape({
     label: PropTypes.string,
+    duplicated: PropTypes.bool,
   }).isRequired,
   chunks: PropTypes.arrayOf(
     PropTypes.shape({
@@ -76,10 +83,6 @@ RowHeader.defaultProps = {
   chunks: [],
 };
 
-const getRenderRowHeader = ({ labels, chunks, CustomComponentLink }) => (row) => (
-  <RowHeader row={row} chunks={chunks} labels={labels} CustomComponentLink={CustomComponentLink} />
-);
-
 export const BundleModules = ({
   className,
   jobs,
@@ -100,11 +103,18 @@ export const BundleModules = ({
 }) => {
   const rootClassName = cx(css.root, className);
 
-  const labels = useMemo(() => map(jobs, 'label'), [jobs]);
-  const renderRowHeader = useMemo(
-    () => getRenderRowHeader({ labels, chunks, CustomComponentLink }),
-    [labels, chunks],
+  const renderRowHeader = useCallback(
+    (row) => (
+      <RowHeader
+        row={row}
+        chunks={chunks}
+        labels={map(jobs, 'label')}
+        CustomComponentLink={CustomComponentLink}
+      />
+    ),
+    [jobs, chunks, CustomComponentLink],
   );
+
   const emptyMessage = (
     <EmptySet
       resources="modules"
@@ -120,6 +130,11 @@ export const BundleModules = ({
       defaultValue: filters.changed,
       disabled: jobs.length <= 1,
     },
+    [MODULE_FILTERS.DUPLICATED]: {
+      label: 'Duplicated',
+      defaultValue: filters[MODULE_FILTERS.DUPLICATED],
+      disabled: jobs.length <= 1,
+    },
     [MODULE_SOURCE_TYPE]: {
       label: 'Source',
       [MODULE_FILTERS.FIRST_PARTY]: {
@@ -184,7 +199,7 @@ export const BundleModules = ({
           </FlexStack>
         )}
       >
-        <FlexStack>
+        <FlexStack space="xxsmall">
           <MetricsTableSearch
             className={css.toolbarSearch}
             search={search}
@@ -240,10 +255,12 @@ BundleModules.propTypes = {
   jobs: PropTypes.array, // eslint-disable-line react/forbid-prop-types
 
   /** Chunks data */
-  chunks: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string,
-    name: PropTypes.string,
-  })).isRequired,
+  chunks: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string,
+      name: PropTypes.string,
+    }),
+  ).isRequired,
 
   /** total row count */
   totalRowCount: PropTypes.number,

package/src/components/bundle-modules/bundle-modules.module.css

@@ -12,6 +12,15 @@
   margin-right: -1px; /** collapse border */
 }
 
-.namePopover {
-  min-width: 280px;
+.nameTagDuplicated {
+  margin-right: var(--space-xxxsmall);
+  vertical-align: baseline;
+}
+
+.nameTagDuplicated::before {
+  content: 'D';
+}
+
+.nameText {
+  vertical-align: middle;
 }

package/src/components/bundle-modules/bundle-modules.utils.js

@@ -12,9 +12,15 @@ import {
 import { SORT_BY_NAME, SORT_BY_SIZE, SORT_BY_DELTA } from './bundle-modules.constants';
 
 export const addRowSourceFlag = (row) => {
-  const { key } = row;
-  const thirdParty = Boolean(key.match(MODULE_PATH_PACKAGES));
-  return { ...row, thirdParty };
+  const { key, runs } = row;
+
+  // @NOTE Assign instead destructuring for perf reasons
+  // eslint-disable-next-line no-param-reassign
+  row.thirdParty = Boolean(key.match(MODULE_PATH_PACKAGES));
+  // eslint-disable-next-line no-param-reassign
+  row.duplicated = Boolean(runs.find((run) => run?.duplicated === true));
+
+  return row;
 };
 
 export const getCustomSort = (sortBy) => (item) => {
@@ -39,10 +45,16 @@ export const getRowFilter = (filters) => (row) => {
     return false;
   }
 
+  // Skip not duplicated rows
+  if (filters[MODULE_FILTERS.DUPLICATED] && !row.duplicated) {
+    return false;
+  }
+
   // Skip not matching source type
   if (
     !(
-      (filters[`${MODULE_SOURCE_TYPE}.${MODULE_FILTERS.FIRST_PARTY}`] && row.thirdParty === false) ||
+      (filters[`${MODULE_SOURCE_TYPE}.${MODULE_FILTERS.FIRST_PARTY}`] &&
+        row.thirdParty === false) ||
       (filters[`${MODULE_SOURCE_TYPE}.${MODULE_FILTERS.THIRD_PARTY}`] && row.thirdParty === true)
     )
   ) {

package/src/components/bundle-modules/index.jsx

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { uniqBy, map } from 'lodash';
 import {
+  MODULE_FILTERS,
   getModuleChunkFilters,
   getModuleSourceTypeFilters,
   getModuleFileTypeFilters,
@@ -33,12 +34,14 @@ export const BundleModules = (props) => {
         ...getModuleSourceTypeFilters(true),
         ...getModuleChunkFilters(chunkIds, true),
         ...getModuleFileTypeFilters(true),
+        [MODULE_FILTERS.DUPLICATED]: false,
       },
       allEntriesFilters: {
         changed: false,
         ...getModuleSourceTypeFilters(true),
         ...getModuleChunkFilters(chunkIds, true),
         ...getModuleFileTypeFilters(true),
+        [MODULE_FILTERS.DUPLICATED]: false,
       },
     }),
     [jobs],