diff options
| author | Armand Philippot <git@armandphilippot.com> | 2022-05-09 18:19:38 +0200 | 
|---|---|---|
| committer | Armand Philippot <git@armandphilippot.com> | 2022-05-09 19:41:02 +0200 | 
| commit | 0d59a6d2995b4119865271ed1908ede0bb96497c (patch) | |
| tree | 67688e41b7aa253aa58cc08aa360431b07382f9d /src/components/atoms/lists | |
| parent | 339c6957fe92c4ec1809159f09c55201d3794c18 (diff) | |
refactor: rewrite DescriptionList and Meta components
The meta can have different layout. The previous implementation was not
enough to easily change the layout. Also, I prefer to restrict the meta
types and it prevents me to repeat myself for the labels.
Diffstat (limited to 'src/components/atoms/lists')
8 files changed, 373 insertions, 95 deletions
| diff --git a/src/components/atoms/lists/description-list-item.module.scss b/src/components/atoms/lists/description-list-item.module.scss new file mode 100644 index 0000000..60cad57 --- /dev/null +++ b/src/components/atoms/lists/description-list-item.module.scss @@ -0,0 +1,38 @@ +.term { +  color: var(--color-fg-light); +  font-weight: 600; +} + +.description { +  margin: 0; +  word-break: break-all; +} + +.wrapper { +  display: flex; +  width: fit-content; + +  &--has-separator { +    .description:not(:first-of-type) { +      &::before { +        content: "/\0000a0"; +      } +    } +  } + +  &--inline, +  &--inline-values { +    flex-flow: row wrap; +    column-gap: var(--spacing-2xs); +  } + +  &--inline-values { +    .term { +      flex: 1 1 100%; +    } +  } + +  &--stacked { +    flex-flow: column wrap; +  } +} diff --git a/src/components/atoms/lists/description-list-item.stories.tsx b/src/components/atoms/lists/description-list-item.stories.tsx new file mode 100644 index 0000000..e05493c --- /dev/null +++ b/src/components/atoms/lists/description-list-item.stories.tsx @@ -0,0 +1,132 @@ +import { ComponentMeta, ComponentStory } from '@storybook/react'; +import DescriptionListItemComponent from './description-list-item'; + +export default { +  title: 'Atoms/Typography/Lists/DescriptionList/Item', +  component: DescriptionListItemComponent, +  args: { +    layout: 'stacked', +    withSeparator: false, +  }, +  argTypes: { +    className: { +      control: { +        type: 'text', +      }, +      description: 'Set additional classnames to the list item wrapper.', +      table: { +        category: 'Styles', +      }, +      type: { +        name: 'string', +        required: false, +      }, +    }, +    descriptionClassName: { +      control: { +        type: 'text', +      }, +      description: 'Set additional classnames to the list item description.', +      table: { +        category: 'Styles', +      }, +      type: { +        name: 'string', +        required: false, +      }, +    }, +    label: { +      control: { +        type: 'text', +      }, +      description: 'The item label.', +      type: { +        name: 'string', +        required: true, +      }, +    }, +    layout: { +      control: { +        type: 'select', +      }, +      description: 'The item layout.', +      options: ['inline', 'inline-values', 'stacked'], +      table: { +        category: 'Styles', +        defaultValue: { summary: 'stacked' }, +      }, +      type: { +        name: 'string', +        required: false, +      }, +    }, +    termClassName: { +      control: { +        type: 'text', +      }, +      description: 'Set additional classnames to the list item term.', +      table: { +        category: 'Styles', +      }, +      type: { +        name: 'string', +        required: false, +      }, +    }, +    value: { +      description: 'The item value.', +      type: { +        name: 'object', +        required: true, +        value: {}, +      }, +    }, +    withSeparator: { +      control: { +        type: 'boolean', +      }, +      description: 'Add a slash as separator between multiple values.', +      table: { +        category: 'Options', +        defaultValue: { summary: false }, +      }, +      type: { +        name: 'boolean', +        required: false, +      }, +    }, +  }, +} as ComponentMeta<typeof DescriptionListItemComponent>; + +const Template: ComponentStory<typeof DescriptionListItemComponent> = ( +  args +) => <DescriptionListItemComponent {...args} />; + +export const SingleValueStacked = Template.bind({}); +SingleValueStacked.args = { +  label: 'Recusandae vitae tenetur', +  value: ['praesentium'], +  layout: 'stacked', +}; + +export const SingleValueInlined = Template.bind({}); +SingleValueInlined.args = { +  label: 'Recusandae vitae tenetur', +  value: ['praesentium'], +  layout: 'inline', +}; + +export const MultipleValuesStacked = Template.bind({}); +MultipleValuesStacked.args = { +  label: 'Recusandae vitae tenetur', +  value: ['praesentium', 'voluptate', 'tempore'], +  layout: 'stacked', +}; + +export const MultipleValuesInlined = Template.bind({}); +MultipleValuesInlined.args = { +  label: 'Recusandae vitae tenetur', +  value: ['praesentium', 'voluptate', 'tempore'], +  layout: 'inline-values', +  withSeparator: true, +}; diff --git a/src/components/atoms/lists/description-list-item.test.tsx b/src/components/atoms/lists/description-list-item.test.tsx new file mode 100644 index 0000000..730a52f --- /dev/null +++ b/src/components/atoms/lists/description-list-item.test.tsx @@ -0,0 +1,17 @@ +import { render, screen } from '@test-utils'; +import DescriptionListItem from './description-list-item'; + +const itemLabel = 'Repellendus corporis facilis'; +const itemValue = ['quos', 'eum']; + +describe('DescriptionListItem', () => { +  it('renders a couple of label', () => { +    render(<DescriptionListItem label={itemLabel} value={itemValue} />); +    expect(screen.getByRole('term')).toHaveTextContent(itemLabel); +  }); + +  it('renders the right number of values', () => { +    render(<DescriptionListItem label={itemLabel} value={itemValue} />); +    expect(screen.getAllByRole('definition')).toHaveLength(itemValue.length); +  }); +}); diff --git a/src/components/atoms/lists/description-list-item.tsx b/src/components/atoms/lists/description-list-item.tsx new file mode 100644 index 0000000..9505d01 --- /dev/null +++ b/src/components/atoms/lists/description-list-item.tsx @@ -0,0 +1,73 @@ +import { FC, ReactNode, useId } from 'react'; +import styles from './description-list-item.module.scss'; + +export type ItemLayout = 'inline' | 'inline-values' | 'stacked'; + +export type DescriptionListItemProps = { +  /** +   * Set additional classnames to the list item wrapper. +   */ +  className?: string; +  /** +   * Set additional classnames to the list item description. +   */ +  descriptionClassName?: string; +  /** +   * The item label. +   */ +  label: string; +  /** +   * The item layout. +   */ +  layout?: ItemLayout; +  /** +   * Set additional classnames to the list item term. +   */ +  termClassName?: string; +  /** +   * The item value. +   */ +  value: ReactNode | ReactNode[]; +  /** +   * If true, use a slash to delimitate multiple values. +   */ +  withSeparator?: boolean; +}; + +/** + * DescriptionListItem component + * + * Render a couple of dt/dd wrapped in a div. + */ +const DescriptionListItem: FC<DescriptionListItemProps> = ({ +  className = '', +  descriptionClassName = '', +  label, +  termClassName = '', +  value, +  layout = 'stacked', +  withSeparator = false, +}) => { +  const id = useId(); +  const layoutStyles = styles[`wrapper--${layout}`]; +  const separatorStyles = withSeparator ? styles['wrapper--has-separator'] : ''; +  const itemValues = Array.isArray(value) ? value : [value]; + +  return ( +    <div +      className={`${styles.wrapper} ${layoutStyles} ${separatorStyles} ${className}`} +    > +      <dt className={`${styles.term} ${termClassName}`}>{label}</dt> +      {itemValues.map((currentValue, index) => ( +        <dd +          key={`${id}-${index}`} +          className={`${styles.description} ${descriptionClassName}`} +        > +          {currentValue} +        </dd> +      ))} +    </div> +  ); +}; + +export default DescriptionListItem; diff --git a/src/components/atoms/lists/description-list.module.scss b/src/components/atoms/lists/description-list.module.scss index caa2711..9e913d4 100644 --- a/src/components/atoms/lists/description-list.module.scss +++ b/src/components/atoms/lists/description-list.module.scss @@ -2,53 +2,16 @@  .list {    display: flex; -  flex-flow: column wrap; -  gap: var(--spacing-2xs); +  column-gap: var(--spacing-md); +  row-gap: var(--spacing-2xs);    margin: 0; -  &__term { -    flex: 0 0 max-content; -    color: var(--color-fg-light); -    font-weight: 600; +  &--inline { +    flex-flow: row wrap; +    align-items: baseline;    } -  &__description { -    flex: 0 0 auto; -    margin: 0; -  } - -  &__item { -    display: flex; -  } - -  &--inline &__item { -    flex-flow: column wrap; - -    @include mix.media("screen") { -      @include mix.dimensions("xs") { -        flex-flow: row wrap; -        gap: var(--spacing-2xs); - -        .list__description:not(:first-of-type) { -          &::before { -            content: "/"; -            margin-right: var(--spacing-2xs); -          } -        } -      } -    } -  } - -  &--column#{&}--responsive { -    @include mix.media("screen") { -      @include mix.dimensions("xs") { -        flex-flow: row wrap; -        gap: var(--spacing-lg); -      } -    } -  } - -  &--column &__item { +  &--column {      flex-flow: column wrap;    }  } diff --git a/src/components/atoms/lists/description-list.stories.tsx b/src/components/atoms/lists/description-list.stories.tsx index 43ee66e..347fd78 100644 --- a/src/components/atoms/lists/description-list.stories.tsx +++ b/src/components/atoms/lists/description-list.stories.tsx @@ -1,16 +1,15 @@  import { ComponentMeta, ComponentStory } from '@storybook/react'; -import DescriptionListComponent, { -  DescriptionListItem, -} from './description-list'; +import DescriptionList, { DescriptionListItem } from './description-list';  /**   * DescriptionList - Storybook Meta   */  export default { -  title: 'Atoms/Typography/Lists', -  component: DescriptionListComponent, +  title: 'Atoms/Typography/Lists/DescriptionList', +  component: DescriptionList,    args: {      layout: 'column', +    withSeparator: false,    },    argTypes: {      className: { @@ -26,6 +25,19 @@ export default {          required: false,        },      }, +    groupClassName: { +      control: { +        type: 'text', +      }, +      description: 'Set additional classnames to the item wrapper.', +      table: { +        category: 'Styles', +      }, +      type: { +        name: 'string', +        required: false, +      }, +    },      items: {        control: {          type: null, @@ -37,6 +49,19 @@ export default {          value: {},        },      }, +    labelClassName: { +      control: { +        type: 'text', +      }, +      description: 'Set additional classnames to the label wrapper.', +      table: { +        category: 'Styles', +      }, +      type: { +        name: 'string', +        required: false, +      }, +    },      layout: {        control: {          type: 'select', @@ -52,28 +77,55 @@ export default {          required: false,        },      }, +    valueClassName: { +      control: { +        type: 'text', +      }, +      description: 'Set additional classnames to the value wrapper.', +      table: { +        category: 'Styles', +      }, +      type: { +        name: 'string', +        required: false, +      }, +    }, +    withSeparator: { +      control: { +        type: 'boolean', +      }, +      description: 'Add a slash as separator between multiple values.', +      table: { +        category: 'Options', +        defaultValue: { summary: false }, +      }, +      type: { +        name: 'boolean', +        required: false, +      }, +    },    }, -} as ComponentMeta<typeof DescriptionListComponent>; +} as ComponentMeta<typeof DescriptionList>; -const Template: ComponentStory<typeof DescriptionListComponent> = (args) => ( -  <DescriptionListComponent {...args} /> +const Template: ComponentStory<typeof DescriptionList> = (args) => ( +  <DescriptionList {...args} />  );  const items: DescriptionListItem[] = [ -  { id: 'term-1', term: 'Term 1:', value: ['Value for term 1'] }, -  { id: 'term-2', term: 'Term 2:', value: ['Value for term 2'] }, +  { id: 'term-1', label: 'Term 1:', value: ['Value for term 1'] }, +  { id: 'term-2', label: 'Term 2:', value: ['Value for term 2'] },    {      id: 'term-3', -    term: 'Term 3:', +    label: 'Term 3:',      value: ['Value 1 for term 3', 'Value 2 for term 3', 'Value 3 for term 3'],    }, -  { id: 'term-4', term: 'Term 4:', value: ['Value for term 4'] }, +  { id: 'term-4', label: 'Term 4:', value: ['Value for term 4'] },  ];  /**   * List Stories - Description list   */ -export const DescriptionList = Template.bind({}); -DescriptionList.args = { +export const List = Template.bind({}); +List.args = {    items,  }; diff --git a/src/components/atoms/lists/description-list.test.tsx b/src/components/atoms/lists/description-list.test.tsx index d3f7045..83e405f 100644 --- a/src/components/atoms/lists/description-list.test.tsx +++ b/src/components/atoms/lists/description-list.test.tsx @@ -2,14 +2,14 @@ import { render } from '@test-utils';  import DescriptionList, { DescriptionListItem } from './description-list';  const items: DescriptionListItem[] = [ -  { id: 'term-1', term: 'Term 1:', value: ['Value for term 1'] }, -  { id: 'term-2', term: 'Term 2:', value: ['Value for term 2'] }, +  { id: 'term-1', label: 'Term 1:', value: ['Value for term 1'] }, +  { id: 'term-2', label: 'Term 2:', value: ['Value for term 2'] },    {      id: 'term-3', -    term: 'Term 3:', +    label: 'Term 3:',      value: ['Value 1 for term 3', 'Value 2 for term 3', 'Value 3 for term 3'],    }, -  { id: 'term-4', term: 'Term 4:', value: ['Value for term 4'] }, +  { id: 'term-4', label: 'Term 4:', value: ['Value for term 4'] },  ];  describe('DescriptionList', () => { diff --git a/src/components/atoms/lists/description-list.tsx b/src/components/atoms/lists/description-list.tsx index a60a6a1..a8e2d53 100644 --- a/src/components/atoms/lists/description-list.tsx +++ b/src/components/atoms/lists/description-list.tsx @@ -1,4 +1,7 @@  import { FC } from 'react'; +import DescriptionListItem, { +  type DescriptionListItemProps, +} from './description-list-item';  import styles from './description-list.module.scss';  export type DescriptionListItem = { @@ -7,13 +10,17 @@ export type DescriptionListItem = {     */    id: string;    /** -   * A list term. +   * The list item layout.     */ -  term: string; +  layout?: DescriptionListItemProps['layout'];    /** -   * An array of values for the list term. +   * A list label.     */ -  value: any[]; +  label: DescriptionListItemProps['label']; +  /** +   * An array of values for the list item. +   */ +  value: DescriptionListItemProps['value'];  };  export type DescriptionListProps = { @@ -22,10 +29,6 @@ export type DescriptionListProps = {     */    className?: string;    /** -   * Set additional classnames to the `dd` element. -   */ -  descriptionClassName?: string; -  /**     * Set additional classnames to the `dt`/`dd` couple wrapper.     */    groupClassName?: string; @@ -34,17 +37,21 @@ export type DescriptionListProps = {     */    items: DescriptionListItem[];    /** -   * The list items layout. Default: column. +   * Set additional classnames to the `dt` element. +   */ +  labelClassName?: string; +  /** +   * The list layout. Default: column.     */    layout?: 'inline' | 'column';    /** -   * Define if the layout should automatically create rows/columns. +   * Set additional classnames to the `dd` element.     */ -  responsiveLayout?: boolean; +  valueClassName?: string;    /** -   * Set additional classnames to the `dt` element. +   * If true, use a slash to delimitate multiple values.     */ -  termClassName?: string; +  withSeparator?: DescriptionListItemProps['withSeparator'];  };  /** @@ -54,44 +61,40 @@ export type DescriptionListProps = {   */  const DescriptionList: FC<DescriptionListProps> = ({    className = '', -  descriptionClassName = '',    groupClassName = '',    items, +  labelClassName = '',    layout = 'column', -  responsiveLayout = false, -  termClassName = '', +  valueClassName = '', +  withSeparator,  }) => {    const layoutModifier = `list--${layout}`; -  const responsiveModifier = responsiveLayout ? 'list--responsive' : '';    /** -   * Retrieve the description list items wrapped in a div element. +   * Retrieve the description list items.     * -   * @param {DescriptionListItem[]} listItems - An array of term and description couples. +   * @param {DescriptionListItem[]} listItems - An array of items.     * @returns {JSX.Element[]} The description list items.     */    const getItems = (listItems: DescriptionListItem[]): JSX.Element[] => { -    return listItems.map(({ id, term, value }) => { +    return listItems.map(({ id, layout: itemLayout, label, value }) => {        return ( -        <div key={id} className={`${styles.list__item} ${groupClassName}`}> -          <dt className={`${styles.list__term} ${termClassName}`}>{term}</dt> -          {value.map((currentValue, index) => ( -            <dd -              key={`${id}-${index}`} -              className={`${styles.list__description} ${descriptionClassName}`} -            > -              {currentValue} -            </dd> -          ))} -        </div> +        <DescriptionListItem +          key={id} +          label={label} +          value={value} +          layout={itemLayout} +          className={groupClassName} +          descriptionClassName={valueClassName} +          termClassName={labelClassName} +          withSeparator={withSeparator} +        />        );      });    };    return ( -    <dl -      className={`${styles.list} ${styles[layoutModifier]} ${styles[responsiveModifier]} ${className}`} -    > +    <dl className={`${styles.list} ${styles[layoutModifier]} ${className}`}>        {getItems(items)}      </dl>    ); | 
