@primer/components 29.1.0 → 29.1.1-rc.cea79543

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "29.1.0",
+  "version": "29.1.1-rc.cea79543",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -52,7 +52,7 @@
     "@types/history": "4.7.8",
     "@types/styled-components": "5.1.11",
     "@types/styled-system": "5.1.12",
-    "@types/styled-system__css": "5.0.15",
+    "@types/styled-system__css": "5.0.16",
     "@types/styled-system__theme-get": "5.0.1",
     "classnames": "2.3.1",
     "deepmerge": "4.2.2",

package/rollup.config.js

@@ -0,0 +1,36 @@
+import babel from 'rollup-plugin-babel'
+import commonjs from '@rollup/plugin-commonjs'
+import resolve from '@rollup/plugin-node-resolve'
+import {terser} from 'rollup-plugin-terser'
+import visualizer from 'rollup-plugin-visualizer'
+
+const extensions = ['.js', '.jsx', '.ts', '.tsx']
+
+const formats = ['esm', 'umd']
+
+const plugins = [
+  babel({extensions, exclude: 'node_modules/**', runtimeHelpers: true}),
+  resolve({extensions}),
+  commonjs(),
+  terser(),
+  visualizer({sourcemap: true})
+]
+
+export default [
+  {
+    input: 'src/index.ts',
+    external: ['styled-components', 'react', 'react-dom'],
+    plugins,
+    output: formats.map(format => ({
+      file: `dist/browser.${format}.js`,
+      format,
+      sourcemap: true,
+      name: 'primer',
+      globals: {
+        react: 'React',
+        'react-dom': 'ReactDOM',
+        'styled-components': 'styled'
+      }
+    }))
+  }
+]

package/script/build

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Clean up
+rm -rf dist
+rm -rf lib
+rm -rf lib-esm
+
+# Bundle
+npx cross-env NODE_ENV=production rollup -c
+
+# Compile
+npx cross-env BABEL_MODULE=commonjs babel src --out-dir lib --extensions ".js,.ts,.jsx,.tsx"
+npx babel src --out-dir lib-esm --extensions ".js,.ts,.jsx,.tsx"
+
+# Type check
+npx tsc --project tsconfig.build.json
+
+# Copy type declarations
+npx copyfiles -u 1 "./lib/**/*.d.ts" ./lib-esm

package/script/setup

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Install dependencies
+npm install
+
+# Build
+npm run build
+
+# Install docs dependencies
+pushd docs
+npm install
+popd

package/src/ActionList/Divider.tsx

@@ -0,0 +1,25 @@
+import React from 'react'
+import styled from 'styled-components'
+import {get} from '../constants'
+
+export const StyledDivider = styled.div`
+  height: 1px;
+  background: ${get('colors.border.muted')};
+  margin-top: calc(${get('space.2')} - 1px);
+  margin-bottom: ${get('space.2')};
+`
+
+/**
+ * Visually separates `Item`s or `Group`s in an `ActionList`.
+ */
+export function Divider(): JSX.Element {
+  return <StyledDivider />
+}
+
+/**
+ * `Divider` fulfills the `ItemPropsWithCustomRenderer` contract,
+ * so it can be used inline in an `ActionList`’s `items` prop.
+ * In other words, `items={[ActionList.Divider]}` is supported as a concise
+ * alternative to `items={[{renderItem: () => <ActionList.Divider />}]}`.
+ */
+Divider.renderItem = Divider

package/src/ActionList/Group.tsx

@@ -0,0 +1,45 @@
+import React from 'react'
+import styled from 'styled-components'
+import sx, {SxProp} from '../sx'
+import {Header, HeaderProps} from './Header'
+
+/**
+ * Contract for props passed to the `Group` component.
+ */
+export interface GroupProps extends React.ComponentPropsWithoutRef<'div'>, SxProp {
+  /**
+   * Props for a `Header` to render in the `Group`.
+   */
+  header?: HeaderProps
+
+  /**
+   * The id of the group.
+   */
+  groupId?: string
+
+  /**
+   * `Items` to render in the `Group`.
+   */
+  items?: JSX.Element[]
+
+  /**
+   * Whether to display a divider above each `Item` in this `Group` when it does not follow a `Header` or `Divider`.
+   */
+  showItemDividers?: boolean
+}
+
+const StyledGroup = styled.div`
+  ${sx}
+`
+
+/**
+ * Collects related `Items` in an `ActionList`.
+ */
+export function Group({header, items, ...props}: GroupProps): JSX.Element {
+  return (
+    <StyledGroup {...props}>
+      {header && <Header {...header} />}
+      {items}
+    </StyledGroup>
+  )
+}

package/src/ActionList/Header.tsx

@@ -0,0 +1,74 @@
+import React from 'react'
+import styled, {css} from 'styled-components'
+import {get} from '../constants'
+import sx, {SxProp} from '../sx'
+
+/**
+ * Contract for props passed to the `Header` component.
+ */
+export interface HeaderProps extends React.ComponentPropsWithoutRef<'div'>, SxProp {
+  /**
+   * Style variations. Usage is discretionary.
+   *
+   * - `"filled"` - Superimposed on a background, offset from nearby content
+   * - `"subtle"` - Relatively less offset from nearby content
+   */
+  variant?: 'subtle' | 'filled'
+
+  /**
+   * Primary text which names a `Group`.
+   */
+  title: string
+
+  /**
+   * Secondary text which provides additional information about a `Group`.
+   */
+  auxiliaryText?: string
+}
+
+export const StyledHeader = styled.div<{variant: HeaderProps['variant']} & SxProp>`
+   {
+    /* 6px vertical padding + 20px line height = 32px total height
+     *
+     * TODO: When rem-based spacing on a 4px scale lands, replace
+     * hardcoded '6px' with 'calc((${get('space.s32')} - ${get('space.20')}) / 2)'.
+     */
+  }
+  padding: 6px ${get('space.3')};
+  font-size: ${get('fontSizes.0')};
+  font-weight: ${get('fontWeights.bold')};
+  color: ${get('colors.fg.muted')};
+
+  ${({variant}) =>
+    variant === 'filled' &&
+    css`
+      background: ${get('colors.canvas.subtle')};
+      margin: ${get('space.2')} 0;
+      border-top: 1px solid ${get('colors.neutral.muted')};
+      border-bottom: 1px solid ${get('colors.neutral.muted')};
+
+      &:first-child {
+        margin-top: 0;
+      }
+    `}
+
+  ${sx}
+`
+
+/**
+ * Displays the name and description of a `Group`.
+ */
+export function Header({
+  variant = 'subtle',
+  title,
+  auxiliaryText,
+  children: _children,
+  ...props
+}: HeaderProps): JSX.Element {
+  return (
+    <StyledHeader role="heading" variant={variant} {...props}>
+      {title}
+      {auxiliaryText && <span>auxiliaryText</span>}
+    </StyledHeader>
+  )
+}

package/src/ActionList/Item.tsx

@@ -0,0 +1,460 @@
+import {CheckIcon, IconProps} from '@primer/octicons-react'
+import React, {useCallback} from 'react'
+import {get} from '../constants'
+import sx, {SxProp} from '../sx'
+import Truncate from '../Truncate'
+import {ItemInput} from './List'
+import styled from 'styled-components'
+import {StyledHeader} from './Header'
+import {StyledDivider} from './Divider'
+import {useColorSchemeVar, useTheme} from '../ThemeProvider'
+import {
+  activeDescendantActivatedDirectly,
+  activeDescendantActivatedIndirectly,
+  isActiveDescendantAttribute
+} from '../behaviors/focusZone'
+import {useSSRSafeId} from '@react-aria/ssr'
+
+/**
+ * These colors are not yet in our default theme.  Need to remove this once they are added.
+ */
+const customItemThemes = {
+  default: {
+    hover: {
+      light: 'rgba(46, 77, 108, 0.06)',
+      dark: 'rgba(201, 206, 212, 0.12)',
+      dark_dimmed: 'rgba(201, 206, 212, 0.12)'
+    },
+    focus: {
+      light: 'rgba(54, 77, 100, 0.16)',
+      dark: 'rgba(201, 206, 212, 0.24)',
+      dark_dimmed: 'rgba(201, 206, 212, 0.24)'
+    }
+  },
+  danger: {
+    hover: {
+      light: 'rgba(234, 74, 90, 0.08)',
+      dark: 'rgba(248, 81, 73, 0.16)',
+      dark_dimmed: 'rgba(248, 81, 73, 0.16)'
+    },
+    focus: {
+      light: 'rgba(234, 74, 90, 0.14)',
+      dark: 'rgba(248, 81, 73, 0.24)',
+      dark_dimmed: 'rgba(248, 81, 73, 0.24)'
+    }
+  }
+} as const
+
+/**
+ * Contract for props passed to the `Item` component.
+ */
+export interface ItemProps extends Omit<React.ComponentPropsWithoutRef<'div'>, 'id'>, SxProp {
+  /**
+   * Primary text which names an `Item`.
+   */
+  text?: string
+
+  /**
+   * Secondary text which provides additional information about an `Item`.
+   */
+  description?: string
+
+  /**
+   * Secondary text style variations. Usage is discretionary.
+   *
+   * - `"inline"` - Secondary text is positioned beside primary text.
+   * - `"block"` - Secondary text is positioned below primary text.
+   */
+  descriptionVariant?: 'inline' | 'block'
+
+  /**
+   * Icon (or similar) positioned before `Item` text.
+   */
+  leadingVisual?: React.FunctionComponent<IconProps>
+
+  /**
+   * Icon (or similar) positioned after `Item` text.
+   */
+  trailingIcon?: React.FunctionComponent<IconProps>
+
+  /**
+   * Text positioned after `Item` text and optional trailing icon.
+   */
+  trailingText?: string
+
+  /**
+   * Style variations associated with various `Item` types.
+   *
+   * - `"default"` - An action `Item`.
+   * - `"danger"` - A destructive action `Item`.
+   */
+  variant?: 'default' | 'danger'
+
+  /**
+   * Whether to display a divider above the `Item` when it does not follow a `Header` or `Divider`.
+   */
+  showDivider?: boolean
+
+  /**
+   * For `Item`s which can be selected, whether the `Item` is currently selected.
+   */
+  selected?: boolean
+
+  /**
+   *  For `Item`s which can be selected, whether `multiple` `Item`s or a `single` `Item` can be selected
+   */
+  selectionVariant?: 'single' | 'multiple'
+
+  /**
+   * Designates the group that an item belongs to.
+   */
+  groupId?: string
+
+  /**
+   * Items that are disabled can not be clicked, selected, or navigated through.
+   */
+  disabled?: boolean
+
+  /**
+   * Callback that will trigger both on click selection and keyboard selection.
+   */
+  onAction?: (item: ItemProps, event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>) => void
+
+  /**
+   * An id associated with this item.  Should be unique between items
+   */
+  id?: number | string
+}
+
+const getItemVariant = (variant = 'default', disabled?: boolean) => {
+  if (disabled) {
+    return {
+      color: get('colors.fg.muted'),
+      iconColor: get('colors.fg.muted'),
+      annotationColor: get('colors.fg.muted'),
+      hoverCursor: 'default'
+    }
+  }
+
+  switch (variant) {
+    case 'danger':
+      return {
+        color: get('colors.danger.fg'),
+        iconColor: get('colors.danger.fg'),
+        annotationColor: get('colors.fg.muted'),
+        hoverCursor: 'pointer'
+      }
+    default:
+      return {
+        color: 'inherit',
+        iconColor: get('colors.fg.muted'),
+        annotationColor: get('colors.fg.muted'),
+        hoverCursor: 'pointer'
+      }
+  }
+}
+
+const DividedContent = styled.div`
+  display: flex;
+  min-width: 0;
+
+  /* Required for dividers */
+  position: relative;
+  flex-grow: 1;
+`
+
+const MainContent = styled.div`
+  align-items: baseline;
+  display: flex;
+  min-width: 0;
+  flex-direction: var(--main-content-flex-direction);
+  flex-grow: 1;
+`
+
+const StyledItem = styled.div<
+  {
+    variant: ItemProps['variant']
+    showDivider: ItemProps['showDivider']
+    item?: ItemInput
+    hoverBackground: string
+    focusBackground: string
+  } & SxProp
+>`
+  /* 6px vertical padding + 20px line height = 32px total height
+   *
+   * TODO: When rem-based spacing on a 4px scale lands, replace
+   * hardcoded '6px' with 'calc((${get('space.s32')} - ${get('space.20')}) / 2)'.
+   */
+  padding: 6px ${get('space.2')};
+  display: flex;
+  border-radius: ${get('radii.2')};
+  color: ${({variant, item}) => getItemVariant(variant, item?.disabled).color};
+  // 2 frames on a 60hz monitor
+  transition: background 33.333ms linear;
+
+  @media (hover: hover) and (pointer: fine) {
+    :hover {
+      // allow override in case another item in the list is active/focused
+      background: var(--item-hover-bg-override, ${({hoverBackground}) => hoverBackground});
+      cursor: ${({variant, item}) => getItemVariant(variant, item?.disabled).hoverCursor};
+    }
+  }
+
+  // Item dividers
+  :not(:first-of-type):not(${StyledDivider} + &):not(${StyledHeader} + &) {
+    margin-top: ${({showDivider}) => (showDivider ? `1px` : '0')};
+
+    ${DividedContent}::before {
+      content: ' ';
+      display: block;
+      position: absolute;
+      width: 100%;
+      top: -7px;
+      // NB: This 'get' won’t execute if it’s moved into the arrow function below.
+      border: 0 solid ${get('colors.border.muted')};
+      border-top-width: ${({showDivider}) => (showDivider ? `1px` : '0')};
+    }
+  }
+
+  // Item dividers should not be visible:
+  // - above Hovered
+  &:hover ${DividedContent}::before,
+  // - below Hovered
+  // '*' instead of '&' because '&' maps to separate class names depending on 'variant'
+  :hover + * ${DividedContent}::before {
+    // allow override in case another item in the list is active/focused
+    border-color: var(--item-hover-divider-border-color-override, transparent) !important;
+  }
+
+  // - above Focused
+  &:focus ${DividedContent}::before,
+  // - below Focused
+  // '*' instead of '&' because '&' maps to separate class names depending on 'variant'
+  :focus + * ${DividedContent}::before,
+  // - above Active Descendent
+  &[${isActiveDescendantAttribute}] ${DividedContent}::before,
+  // - below Active Descendent
+  [${isActiveDescendantAttribute}] + & ${DividedContent}::before {
+    // '!important' because all the ':not's above give higher specificity
+    border-color: transparent !important;
+  }
+
+  // Active Descendant
+  &[${isActiveDescendantAttribute}='${activeDescendantActivatedDirectly}'] {
+    background: ${({focusBackground}) => focusBackground};
+  }
+  &[${isActiveDescendantAttribute}='${activeDescendantActivatedIndirectly}'] {
+    background: ${({hoverBackground}) => hoverBackground};
+  }
+
+  &:focus {
+    background: ${({focusBackground}) => focusBackground};
+    outline: none;
+  }
+
+  &:active {
+    background: ${({focusBackground}) => focusBackground};
+  }
+
+  ${sx}
+`
+
+export const TextContainer = styled.span<{
+  dangerouslySetInnerHtml?: React.DOMAttributes<HTMLDivElement>['dangerouslySetInnerHTML']
+}>``
+
+const BaseVisualContainer = styled.div<{variant?: ItemProps['variant']; disabled?: boolean}>`
+  // Match visual height to adjacent text line height.
+  // TODO: When rem-based spacing on a 4px scale lands, replace
+  // hardcoded '20px' with '${get('space.s20')}'.
+  height: 20px;
+  width: ${get('space.3')};
+  margin-right: ${get('space.2')};
+`
+
+const ColoredVisualContainer = styled(BaseVisualContainer)`
+  svg {
+    fill: ${({variant, disabled}) => getItemVariant(variant, disabled).iconColor};
+    font-size: ${get('fontSizes.0')};
+  }
+`
+
+const LeadingVisualContainer = styled(ColoredVisualContainer)`
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+`
+
+const TrailingContent = styled(ColoredVisualContainer)`
+  color: ${({variant, disabled}) => getItemVariant(variant, disabled).annotationColor}};
+  margin-left: ${get('space.2')};
+  margin-right: 0;
+  width: auto;
+  div:nth-child(2) {
+    margin-left: ${get('space.2')};
+  }
+`
+
+const DescriptionContainer = styled.span`
+  color: ${get('colors.fg.muted')};
+  font-size: ${get('fontSizes.0')};
+  // TODO: When rem-based spacing on a 4px scale lands, replace
+  // hardcoded '16px' with '${get('lh-12')}'.
+  line-height: 16px;
+  margin-left: var(--description-container-margin-left);
+  min-width: 0;
+  flex-grow: 1;
+  flex-basis: var(--description-container-flex-basis);
+`
+
+const MultiSelectInput = styled.input`
+  pointer-events: none;
+`
+
+/**
+ * An actionable or selectable `Item` with an optional icon and description.
+ */
+export function Item(itemProps: Partial<ItemProps> & {item?: ItemInput}): JSX.Element {
+  const {
+    text,
+    description,
+    descriptionVariant = 'inline',
+    selected,
+    selectionVariant,
+    leadingVisual: LeadingVisual,
+    trailingIcon: TrailingIcon,
+    trailingText,
+    variant = 'default',
+    showDivider,
+    disabled,
+    onAction,
+    onKeyPress,
+    children,
+    onClick,
+    id,
+    ...props
+  } = itemProps
+
+  const labelId = useSSRSafeId()
+  const descriptionId = useSSRSafeId()
+
+  const keyPressHandler = useCallback(
+    event => {
+      if (disabled) {
+        return
+      }
+      onKeyPress?.(event)
+      const isCheckbox = event.target instanceof HTMLInputElement && event.target.type === 'checkbox'
+      if (isCheckbox && event.key === ' ') {
+        // space key on a checkbox will also trigger a click event.  Ignore the space key so we don't get double events
+        return
+      }
+
+      if (!event.defaultPrevented && [' ', 'Enter'].includes(event.key)) {
+        onAction?.(itemProps as ItemProps, event)
+      }
+    },
+    [onAction, disabled, itemProps, onKeyPress]
+  )
+
+  const clickHandler = useCallback(
+    event => {
+      if (disabled) {
+        return
+      }
+      onClick?.(event)
+      if (!event.defaultPrevented) {
+        onAction?.(itemProps as ItemProps, event)
+      }
+    },
+    [onAction, disabled, itemProps, onClick]
+  )
+
+  const customItemTheme = customItemThemes[variant]
+  const hoverBackground = useColorSchemeVar(customItemTheme.hover, 'inherit')
+  const focusBackground = useColorSchemeVar(customItemTheme.focus, 'inherit')
+
+  const {theme} = useTheme()
+
+  return (
+    <StyledItem
+      tabIndex={disabled ? undefined : -1}
+      variant={variant}
+      showDivider={showDivider}
+      aria-selected={selected}
+      aria-labelledby={text ? labelId : undefined}
+      aria-describedby={description ? descriptionId : undefined}
+      {...props}
+      data-id={id}
+      onKeyPress={keyPressHandler}
+      onClick={clickHandler}
+      hoverBackground={disabled ? 'inherit' : hoverBackground}
+      focusBackground={disabled ? 'inherit' : focusBackground}
+    >
+      {!!selected === selected && (
+        <BaseVisualContainer>
+          {selectionVariant === 'multiple' ? (
+            <>
+              {/*
+               * readOnly is required because we are doing a one-way bind to `checked`.
+               * aria-readonly="false" tells screen that they can still interact with the checkbox
+               */}
+              <MultiSelectInput
+                disabled={disabled}
+                tabIndex={-1}
+                type="checkbox"
+                checked={selected}
+                aria-label={text}
+                readOnly
+                aria-readonly="false"
+              />
+            </>
+          ) : (
+            selected && <CheckIcon fill={theme?.colors.text.primary} />
+          )}
+        </BaseVisualContainer>
+      )}
+      {LeadingVisual && (
+        <LeadingVisualContainer variant={variant} disabled={disabled}>
+          <LeadingVisual />
+        </LeadingVisualContainer>
+      )}
+      <DividedContent>
+        <MainContent
+          style={
+            {'--main-content-flex-direction': descriptionVariant === 'inline' ? 'row' : 'column'} as React.CSSProperties
+          }
+        >
+          {children}
+          {text ? <TextContainer id={labelId}>{text}</TextContainer> : null}
+          {description ? (
+            <DescriptionContainer
+              id={descriptionId}
+              style={
+                {
+                  '--description-container-margin-left': descriptionVariant === 'inline' ? get('space.2')(theme) : 0,
+                  '--description-container-flex-basis': descriptionVariant === 'inline' ? 0 : 'auto'
+                } as React.CSSProperties
+              }
+            >
+              {descriptionVariant === 'block' ? (
+                description
+              ) : (
+                <Truncate title={description} inline={true} maxWidth="100%">
+                  {description}
+                </Truncate>
+              )}
+            </DescriptionContainer>
+          ) : null}
+        </MainContent>
+        {TrailingIcon || trailingText ? (
+          <TrailingContent variant={variant} disabled={disabled}>
+            {trailingText}
+            {TrailingIcon && <TrailingIcon />}
+          </TrailingContent>
+        ) : null}
+      </DividedContent>
+    </StyledItem>
+  )
+}