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

package/src/hooks/search-params.js

@@ -7,8 +7,11 @@ const ACTION_RESET_DEFAULT = 'RESET_DEFAULT';
 const ACTION_RESET_ALL = 'RESET_ALL';
 const ACTION_SET = 'SET';
 
+const SEARCH_DEFAULT = '';
+const SEARCH_DEFAULT_PATTERN = /.*/;
+
 const getSearchPattern = (search) => {
-  let searchPattern = /.*/;
+  let searchPattern = SEARCH_DEFAULT_PATTERN;
 
   if (!search || !search.trim()) {
     return searchPattern;
@@ -25,57 +28,57 @@ const getSearchPattern = (search) => {
 };
 
 const getSearchReducer =
-  ({ defaultFilters, allEntriesFilters, setParentState }) => (state, action) => {
+  ({ defaultFilters, allEntriesFilters, setParentState }) =>
+  (state, action) => {
     const { type, payload } = action;
 
     switch (type) {
       case ACTION_SET_FILTERS: {
-        setParentState({
+        const newState = {
           filters: payload,
           search: state.search,
-        });
-
-        return {
-          ...state,
-          filters: payload,
         };
+        setParentState(newState);
+        return newState;
       }
 
       case ACTION_SET_SEARCH: {
-        setParentState({
+        const newState = {
           filters: state.filters,
           search: payload,
-        });
+        };
+
+        setParentState(newState);
 
         return {
-          ...state,
-          search: payload,
+          ...newState,
           searchPattern: getSearchPattern(payload),
         };
       }
 
       case ACTION_RESET_DEFAULT: {
-        setParentState({
+        const newState = {
           filters: defaultFilters,
-          search: '',
-        });
+          search: SEARCH_DEFAULT,
+        };
+
+        setParentState(newState);
 
         return {
-          filters: defaultFilters,
-          search: '',
+          ...newState,
           searchPattern: getSearchPattern(),
         };
       }
 
       case ACTION_RESET_ALL: {
-        setParentState({
+        const newState = {
           filters: allEntriesFilters,
-          search: '',
-        });
+          search: SEARCH_DEFAULT,
+        };
+        setParentState(newState);
 
         return {
-          filters: allEntriesFilters,
-          search: '',
+          ...newState,
           searchPattern: getSearchPattern(),
         };
       }
@@ -96,7 +99,7 @@ export const generateState = (filters, search) => ({
 });
 
 export const useSearchParams = ({
-  search: parentSearch,
+  search: parentSearch = SEARCH_DEFAULT,
 
   filters: parentFilters,
   defaultFilters,
@@ -116,29 +119,35 @@ export const useSearchParams = ({
   // Update state when the custom filters/search are changing - initial load or route updates
   useLayoutEffect(() => {
     // Run a deep comparison to prevent circular setState triggering
-    if (parentSearch === search || isEqual(parentFilters, filters)) {
+    if (parentSearch === search && isEqual(initialFilters, filters)) {
       return;
     }
 
     dispatch({ type: ACTION_SET, payload: generateState(initialFilters, parentSearch) });
-  }, [search, filters, parentFilters, parentSearch]);
+  }, [dispatch, search, filters, parentSearch, initialFilters]);
 
   /** Callbacks */
-  const handleUpdateSearch = useCallback((newValue) => {
-    dispatch({ type: ACTION_SET_SEARCH, payload: newValue });
-  }, []);
+  const handleUpdateSearch = useCallback(
+    (newValue) => {
+      dispatch({ type: ACTION_SET_SEARCH, payload: newValue });
+    },
+    [dispatch],
+  );
 
-  const handleUpdateFilters = useCallback((newFilters) => {
-    dispatch({ type: ACTION_SET_FILTERS, payload: newFilters });
-  }, []);
+  const handleUpdateFilters = useCallback(
+    (newFilters) => {
+      dispatch({ type: ACTION_SET_FILTERS, payload: newFilters });
+    },
+    [dispatch],
+  );
 
   const handleResetFilters = useCallback(() => {
     dispatch({ type: ACTION_RESET_DEFAULT });
-  }, []);
+  }, [dispatch]);
 
   const handleResetAllFilters = useCallback(() => {
     dispatch({ type: ACTION_RESET_ALL });
-  }, []);
+  }, [dispatch]);
 
   return {
     search,

package/src/layout/box/box.module.css

@@ -4,6 +4,15 @@
 
 .outline {
   border: 1px solid var(--color-outline);
+  border-radius: var(--radius-medium);
+}
+
+.outline > :first-child {
+  border-radius: var(--radius-medium) var(--radius-medium) 0 0;
+}
+
+.outline > :last-child {
+  border-radius: 0 0 var(--radius-medium) var(--radius-medium);
 }
 
 .padding-xxxsmall {

package/src/layout/footer/footer.module.css

@@ -3,7 +3,7 @@
 }
 
 .inner {
-  border-top: 2px solid var(--color-outline);
+  border-top: 1px solid var(--color-outline);
 }
 
 .navItem {

package/src/layout/index.js

@@ -1,6 +1,7 @@
 export { Box } from './box';
 export { Footer } from './footer';
 export { Header } from './header';
+export { Separator } from './separator';
 export { SubHeader } from './sub-header';
 export { Stack } from './stack';
 export { FlexStack } from './flex-stack';

package/src/layout/separator.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+
+import css from './separator.module.css';
+
+const propTypes = {
+  className: PropTypes.string,
+};
+
+const defaultProps = {
+  className: '',
+};
+
+/**
+ * @param {PropTypes.InferProps<typeof propTypes>} props
+ * @return {React.FunctionComponentElement}
+ */
+export const Separator = (props) => {
+  const { className, ...restProps } = props;
+  return <div className={cx(css.root, className)} {...restProps} />;
+};
+
+Separator.propTypes = propTypes;
+Separator.defaultProps = defaultProps;

package/src/layout/separator.module.css

@@ -0,0 +1,5 @@
+.root {
+  background: var(--color-outline);
+  width: 100%;
+  height: 1px;
+}

package/src/ui/dropdown/dropdown.jsx

@@ -1,54 +1,54 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { Menu, MenuItem, MenuButton, useMenuState } from 'reakit/Menu';
+import { Menu, MenuButton, MenuItem, useMenuState } from 'ariakit/menu';
 
 import { FlexStack } from '../../layout/flex-stack';
 import { Icon } from '../icon';
 import css from './dropdown.module.css';
 
 export const Dropdown = (props) => {
-  const { className, label, ariaLabel, glyph, activeLabel, children } = props;
-  const rootClassName = cx(css.root, activeLabel && css.activeLabel, className);
-
-  const menu = useMenuState({baseId: process.env.NODE_ENV === 'test' && 'id-test', modal: true });
+  const { className, buttonClassName, label, ariaLabel, glyph, children } = props;
+  const rootClassName = cx(css.root, className);
+  const menuState = useMenuState();
 
   return (
-    <>
-      <MenuButton {...menu} className={rootClassName} tabIndex={null}>
-        <FlexStack space="xxxsmall" className={css.label}>
+    <div className={rootClassName}>
+      <MenuButton state={menuState} className={cx(css.button, buttonClassName)} tabIndex={null}>
+        <FlexStack space="xxxsmall">
           {glyph && <Icon className={css.labelIcon} glyph={glyph} />}
           {label}
         </FlexStack>
       </MenuButton>
-      <Menu {...menu} aria-label={ariaLabel || label} className={css.dropdown}>
+      <Menu state={menuState} aria-label={ariaLabel || label} className={css.dropdown}>
         {typeof children === 'function'
-          ?
-            children({
+          ? children({
               MenuItem,
-              menu,
+              menu: menuState,
               menuItemClassName: css.menuItem,
               menuItemActiveClassName: css.menuItemActive,
             })
-          : children
-        }
+          : children}
       </Menu>
-    </>
+    </div>
   );
 };
 
 Dropdown.defaultProps = {
   className: '',
+  buttonClassName: '',
   label: null,
   ariaLabel: '',
   glyph: null,
-  activeLabel: false,
 };
 
 Dropdown.propTypes = {
   /** Adopted child class name */
   className: PropTypes.string,
 
+  /** Button adopted child class name */
+  buttonClassName: PropTypes.string,
+
   /** Button label */
   label: PropTypes.node,
 
@@ -58,12 +58,6 @@ Dropdown.propTypes = {
   /** Icon glyph */
   glyph: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
 
-  /** Dropdown open state */
-  open: PropTypes.bool.isRequired,
-
-  /** Active label flag */
-  activeLabel: PropTypes.bool,
-
   /** Content */
   children: PropTypes.oneOfType([PropTypes.string, PropTypes.element, PropTypes.func]).isRequired,
 };

package/src/ui/dropdown/dropdown.module.css

@@ -1,16 +1,14 @@
 .root {
+  display: inline-block;
+}
+
+.button {
   background: none;
   border: none;
   padding: 0;
-}
-
-.root:focus {
-  outline: none;
-  box-shadow: 0 0 var(--space-xxxsmall) var(--color-shadow);
-}
 
-.label {
   border: 1px solid var(--color-outline);
+  border-radius: var(--radius-small);
   padding: calc(var(--space-xxsmall) - 1px);
   display: flex;
   align-items: center;
@@ -24,7 +22,11 @@
   color: var(--color-text-light);
 }
 
-.label:hover {
+.button:hover,
+.button:focus,
+.button:active {
+  outline: none;
+  box-shadow: 0 0 var(--space-xxxsmall) var(--color-shadow);
   border-color: var(--color-outline-dark);
   color: var(--color-text);
 }
@@ -33,6 +35,7 @@
   position: absolute;
   left: 0;
   top: 100%;
+  border-radius: var(--radius-medium);
   box-shadow: 0 2px var(--space-xxsmall) var(--color-shadow);
   background: var(--color-background);
   min-width: 180px;
@@ -45,10 +48,6 @@
   box-shadow: 0 2px var(--space-xsmall) var(--color-shadow);
 }
 
-.activeLabel .label {
-  color: var(--color-text);
-}
-
 .menuItem {
   display: block;
   appearance: none;

package/src/ui/empty-set/empty-set.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { Stack } from '../../layout/stack';
 import I18N from '../../i18n';
 import css from './empty-set.module.css';
 
@@ -9,30 +10,33 @@ export const EmptySet = (props) => {
 
   const message = filtered ? `No ${resources} found.` : `No ${resources} available.`;
   const actions = [
-    ...handleResetFilters ? [
-      (
-        <button className={css.action} type="button" onClick={handleResetFilters}>
-          {I18N.RESET_FILTERS}
-        </button>
-      )
-    ] : [],
-    ...handleViewAll ? [(
-      <button className={css.action} type="button" onClick={handleViewAll}>
-        {I18N.VIEW_ALL}
-      </button>
-    )] : [],
+    ...(handleResetFilters
+      ? [
+          <button className={css.action} type="button" onClick={handleResetFilters}>
+            {I18N.RESET_FILTERS}
+          </button>,
+        ]
+      : []),
+    ...(handleViewAll
+      ? [
+          <button className={css.action} type="button" onClick={handleViewAll}>
+            {I18N.VIEW_ALL}
+          </button>,
+        ]
+      : []),
   ];
 
   return (
-    <div className={css.root}>
-      <p className={css.text}>{message}</p>
-      {filtered && actions.map((action, index) => (
-        <>
-          {index > 0 && ' or '}
-          {action}
-        </>
-      ))}
-    </div>
+    <Stack space="xxsmall" className={css.root}>
+      <p>{message}</p>
+      {filtered &&
+        actions.map((action, index) => (
+          <>
+            {index > 0 && ' or '}
+            {action}
+          </>
+        ))}
+    </Stack>
   );
 };
 

package/src/ui/empty-set/empty-set.module.css

@@ -1,5 +1,5 @@
-.text {
-  margin-bottom: 0;
+.root {
+  color: var(--color-text-light);
 }
 
 .action {

package/src/ui/filters/filters.jsx

@@ -9,7 +9,7 @@ import { getGroupFiltersLabelSuffix, LABELS } from './filters.utils';
 import css from './filters.module.css';
 
 const Filter = (props) => {
-  const { className, label, name, getOnOnlyClick, ...inputProps } = props;
+  const { className, buttonClassName, label, name, getOnOnlyClick, ...inputProps } = props;
   const id = `filter-${name}`;
 
   const rootClassName = cx(css.filter, className);
@@ -17,26 +17,16 @@ const Filter = (props) => {
   return (
     <div className={rootClassName}>
       {/* eslint-disable */}
-      <FlexStack space="xxxsmall" as="label" className={css.filterCheckbox}>
-      {/* eslint-enabled */}
-        <input
-          className={css.filterInput}
-          type="checkbox"
-          id={id}
-          name={name}
-          {...inputProps}
-        />
+      <FlexStack space="xxxsmall" as="label" className={cx(css.filterCheckbox, buttonClassName)}>
+        {/* eslint-enabled */}
+        <input className={css.filterInput} type="checkbox" id={id} name={name} {...inputProps} />
         <span className={css.filterLabel} title={label}>
           {label}
         </span>
       </FlexStack>
 
       {getOnOnlyClick && (
-        <button
-          className={css.filterOnlyButton}
-          type="button"
-          onClick={getOnOnlyClick(name)}
-        >
+        <button className={css.filterOnlyButton} type="button" onClick={getOnOnlyClick(name)}>
           only
         </button>
       )}
@@ -46,6 +36,7 @@ const Filter = (props) => {
 
 Filter.propTypes = {
   className: PropTypes.string,
+  buttonClassName: PropTypes.string,
   name: PropTypes.string.isRequired,
   label: PropTypes.string.isRequired,
   getOnOnlyClick: PropTypes.func,
@@ -53,17 +44,23 @@ Filter.propTypes = {
 
 Filter.defaultProps = {
   className: '',
+  buttonClassName: '',
   getOnOnlyClick: null,
 };
 
 const FilterGroup = (props) => {
-  const { groupKey, data, values, onCheckboxChange, toggleFilters } = props;
+  const { className, buttonClassName, groupKey, data, values, onCheckboxChange, toggleFilters } =
+    props;
 
   const { label: groupLabel, ...groupData } = data;
 
   const groupItems = Object.entries(groupData);
-  const groupCheckboxes = groupItems.filter(([itemKey, item]) => typeof item?.defaultValue !== 'undefined');
-  const isGroupChecked = groupCheckboxes.map(([itemKey]) => get(values, `${groupKey}.${itemKey}`)).reduce((agg, val) => agg && val, true);
+  const groupCheckboxes = groupItems.filter(
+    ([itemKey, item]) => typeof item?.defaultValue !== 'undefined',
+  );
+  const isGroupChecked = groupCheckboxes
+    .map(([itemKey]) => get(values, `${groupKey}.${itemKey}`))
+    .reduce((agg, val) => agg && val, true);
 
   const filterSuffix = getGroupFiltersLabelSuffix(groupItems);
   const hasCustomFilterSuffix = !Object.values(LABELS).includes(filterSuffix);
@@ -71,26 +68,34 @@ const FilterGroup = (props) => {
     <>
       {`${groupLabel}:`}
       &nbsp;
-      <span className={cx(hasCustomFilterSuffix && css.labelSuffixCustom)}>
-        {filterSuffix}
-      </span>
+      <span className={cx(hasCustomFilterSuffix && css.labelSuffixCustom)}>{filterSuffix}</span>
     </>
   );
 
-  const getOnGroupCheck = (value, overrides = {}) => () => {
-    const newFilters = groupCheckboxes.reduce((agg, [itemKey]) => ({
-      ...agg,
-      [`${groupKey}.${itemKey}`]: value,
-    }), {});
-
-    toggleFilters({
-      ...newFilters,
-      ...overrides,
-    });
-  };
+  const getOnGroupCheck =
+    (value, overrides = {}) =>
+    () => {
+      const newFilters = groupCheckboxes.reduce(
+        (agg, [itemKey]) => ({
+          ...agg,
+          [`${groupKey}.${itemKey}`]: value,
+        }),
+        {},
+      );
+
+      toggleFilters({
+        ...newFilters,
+        ...overrides,
+      });
+    };
 
   return (
-    <Dropdown label={dropdownLabel} ariaLabel={`${groupLabel}: ${filterSuffix}`}>
+    <Dropdown
+      className={className}
+      buttonClassName={buttonClassName}
+      label={dropdownLabel}
+      ariaLabel={`${groupLabel}: ${filterSuffix}`}
+    >
       {({ MenuItem, menu, menuItemClassName }) => {
         return (
           <>
@@ -100,7 +105,11 @@ const FilterGroup = (props) => {
                 const getOnOnlyClick = () => getOnGroupCheck(false, { [id]: true });
 
                 return (
-                  <MenuItem key={id} {...menu} className={cx(menuItemClassName, css.filterGroupItem)}>
+                  <MenuItem
+                    key={id}
+                    {...menu}
+                    className={cx(menuItemClassName, css.filterGroupItem)}
+                  >
                     <Filter
                       name={id}
                       label={itemData.label}
@@ -138,12 +147,14 @@ const FilterGroup = (props) => {
             </div>
           </>
         );
-    }}
+      }}
     </Dropdown>
   );
 };
 
 FilterGroup.propTypes = {
+  className: PropTypes.string,
+  buttonClassName: PropTypes.string,
   groupKey: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   values: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
@@ -151,27 +162,27 @@ FilterGroup.propTypes = {
   toggleFilters: PropTypes.func.isRequired,
 };
 
+FilterGroup.defaultProps = {
+  className: '',
+  buttonClassName: '',
+};
+
 export const Filters = (props) => {
-  const {
-    className,
-    values,
-    filters,
-    toggleFilter,
-    toggleFilters,
-  } = props;
+  const { className, values, filters, toggleFilter, toggleFilters } = props;
 
   const onCheckboxChange = ({ target }) => toggleFilter(target.name, target.checked);
   const rootClassName = cx(css.root, className);
 
   return (
     <form className={rootClassName}>
-      <FlexStack className={css.items}>
+      <FlexStack space="xxsmall" className={css.items}>
         {Object.entries(filters).map(([name, data]) => {
           if (typeof data?.defaultValue !== 'undefined') {
             return (
               <Filter
                 key={name}
                 className={cx(css.item, css.filterStandalone)}
+                buttonClassName={css.itemButton}
                 name={name}
                 label={data.label}
                 onChange={onCheckboxChange}
@@ -182,16 +193,16 @@ export const Filters = (props) => {
           }
 
           return (
-            <div className={css.item}>
-              <FilterGroup
-                key={name}
-                groupKey={name}
-                data={data}
-                values={values}
-                onCheckboxChange={onCheckboxChange}
-                toggleFilters={toggleFilters}
-              />
-            </div>
+            <FilterGroup
+              className={css.item}
+              buttonClassName={css.itemButton}
+              key={name}
+              groupKey={name}
+              data={data}
+              values={values}
+              onCheckboxChange={onCheckboxChange}
+              toggleFilters={toggleFilters}
+            />
           );
         })}
       </FlexStack>

package/src/ui/filters/filters.module.css

@@ -11,6 +11,7 @@
 }
 
 .filterInput {
+  border-radius: var(--radius-small) 0 0 var(--radius-small);
   flex: 0 0 auto;
   height: 1em;
   cursor: pointer;
@@ -131,9 +132,8 @@
 .item {
   position: relative;
   flex: 0 0 auto;
-  margin-right: -1px;
 }
 
-.item:hover {
-  z-index: var(--layer-low); /* show collapsed border */
+.itemButton {
+  border-radius: var(--radius-small);
 }