@nypl/design-system-react-components 0.25.12 → 0.26.1

package/src/components/Label/__snapshots__/Label.test.tsx.snap

@@ -2,7 +2,7 @@
 
 exports[`Label Renders the UI snapshot correctly 1`] = `
 <label
-  className="css-0"
+  className="css-1xdhyk6"
   htmlFor="some-input-id"
   id="label"
 >
@@ -12,30 +12,34 @@ exports[`Label Renders the UI snapshot correctly 1`] = `
 
 exports[`Label Renders the UI snapshot correctly 2`] = `
 <label
-  className="css-0"
+  className="css-1xdhyk6"
   htmlFor="some-input-id"
-  id="label2"
+  id="label3"
 >
   Cupcakes
-  <div
-    className="css-0"
-  >
-    Optional
-  </div>
+  <span>
+     (Required)
+  </span>
 </label>
 `;
 
 exports[`Label Renders the UI snapshot correctly 3`] = `
 <label
-  className="css-0"
+  className="css-kle7zy"
   htmlFor="some-input-id"
-  id="label3"
+  id="chakra"
+>
+  Cupcakes
+</label>
+`;
+
+exports[`Label Renders the UI snapshot correctly 4`] = `
+<label
+  className="css-1xdhyk6"
+  data-testid="props"
+  htmlFor="some-input-id"
+  id="props"
 >
   Cupcakes
-  <div
-    className="css-0"
-  >
-    Required
-  </div>
 </label>
 `;

package/src/components/Link/Link.stories.mdx

@@ -52,10 +52,23 @@ export const enumValues = getStorybookEnumValues(LinkTypes, "LinkTypes");
 | Component Version | DS Version |
 | ----------------- | ---------- |
 | Added             | `0.0.4`    |
-| Latest            | `0.25.9`   |
+| Latest            | `0.26.0`   |
+
+## Table of Contents
+
+- [Overview](#overview)
+- [Component Props](#component-props)
+- [Accessibility](#accessibility)
+- [Links With Icons](#links-with-icons)
+- [Anchor Element Rendering](#anchor-element-rendering)
+- [Link with Routers](#link-with-routers)
+
+## Overview
 
 <Description of={Link} />
 
+## Component Props
+
 <Canvas withToolbar>
   <Story
     name="Link with Controls"
@@ -81,6 +94,17 @@ export const enumValues = getStorybookEnumValues(LinkTypes, "LinkTypes");
 
 <ArgsTable story="Link with Controls" />
 
+## Accessibility
+
+The `Link` component should be used for navigation. If an `onClick` user
+interface action is required, a `Button` component should be used instead. The
+`Link` component renders an `<a>` element with the `href` attribute.
+
+Resources:
+
+- [W3C WAI Link Examples](https://www.w3.org/TR/wai-aria-practices-1.1/examples/link/link.html)
+- [Yale Usability & Web Accessibility Links](https://usability.yale.edu/web-accessibility/articles/links)
+
 ## Links With Icons
 
 To render an `Icon` as part of the link, make sure that the `Link` component

package/src/components/Link/Link.test.tsx

@@ -229,6 +229,25 @@ describe("Link", () => {
         </Link>
       )
       .toJSON();
+    const withChakraProps = renderer
+      .create(
+        <Link
+          href="#passed-in-link"
+          id="chakra"
+          p="20px"
+          color="ui.error.primary"
+        >
+          Standard
+        </Link>
+      )
+      .toJSON();
+    const withOtherProps = renderer
+      .create(
+        <Link href="#passed-in-link" id="props" data-testid="props">
+          Standard
+        </Link>
+      )
+      .toJSON();
 
     expect(standard).toMatchSnapshot();
     expect(typeForwards).toMatchSnapshot();
@@ -238,6 +257,8 @@ describe("Link", () => {
     expect(withIconChild).toMatchSnapshot();
     expect(withAchorChild).toMatchSnapshot();
     expect(withAchorChildAndIcon).toMatchSnapshot();
+    expect(withChakraProps).toMatchSnapshot();
+    expect(withOtherProps).toMatchSnapshot();
   });
 
   // TODO:

package/src/components/Link/Link.tsx

@@ -1,11 +1,14 @@
+import { Box, chakra, useStyleConfig } from "@chakra-ui/react";
 import * as React from "react";
-import { Box, useStyleConfig } from "@chakra-ui/react";
 
 import { LinkTypes } from "./LinkTypes";
 import Icon from "../Icons/Icon";
-import { IconRotationTypes, IconNames, IconAlign } from "../Icons/IconTypes";
-import generateUUID from "../../helpers/generateUUID";
-
+import {
+  IconRotationTypes,
+  IconNames,
+  IconAlign,
+  IconSizes,
+} from "../Icons/IconTypes";
 export interface LinkProps {
   /** Optionally pass in additional Chakra-based styles. */
   additionalStyles?: { [key: string]: any };
@@ -51,6 +54,7 @@ function getWithDirectionIcon(children, type: LinkTypes, linkId) {
       iconRotation={iconRotation}
       id={iconId}
       name={IconNames.Arrow}
+      size={IconSizes.Medium}
     />
   );
 
@@ -71,6 +75,7 @@ function getExternalIcon(children, linkId) {
       className="more-link"
       id={iconId}
       name={IconNames.ActionLaunch}
+      size={IconSizes.Medium}
     />
   );
 
@@ -86,16 +91,17 @@ function getExternalIcon(children, linkId) {
  * A component that uses an `href` prop or a child anchor element, to create
  * an anchor element with added styling and conventions.
  */
-const Link = React.forwardRef<HTMLAnchorElement, LinkProps>(
-  (props, ref: any) => {
+export const Link = chakra(
+  React.forwardRef<HTMLAnchorElement, LinkProps>((props, ref: any) => {
     const {
       additionalStyles = {},
       attributes,
       children,
       className,
       href,
-      id = generateUUID(),
+      id,
       type = LinkTypes.Default,
+      ...rest
     } = props;
 
     // Merge the necessary props alongside any extra props for the
@@ -145,7 +151,7 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkProps>(
       const childrenToClone: any = children[0] ? children[0] : children;
       const childProps = childrenToClone.props;
       return (
-        <Box as="span" __css={style}>
+        <Box as="span" __css={style} {...rest}>
           {React.cloneElement(
             childrenToClone,
             {
@@ -173,12 +179,13 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkProps>(
           target={target}
           {...linkProps}
           __css={{ ...style, ...additionalStyles }}
+          {...rest}
         >
           {newChildren}
         </Box>
       );
     }
-  }
+  })
 );
 
 export default Link;

package/src/components/Link/__snapshots__/Link.test.tsx.snap

@@ -2,7 +2,7 @@
 
 exports[`Link renders the UI snapshot correctly 1`] = `
 <a
-  className="css-0"
+  className="css-1xdhyk6"
   href="#passed-in-link"
   id="standard-link"
   rel={null}
@@ -14,7 +14,7 @@ exports[`Link renders the UI snapshot correctly 1`] = `
 
 exports[`Link renders the UI snapshot correctly 2`] = `
 <a
-  className="css-0"
+  className="css-1xdhyk6"
   href="#passed-in-link"
   id="forwards-link"
   rel={null}
@@ -23,7 +23,7 @@ exports[`Link renders the UI snapshot correctly 2`] = `
   Forwards
   <svg
     aria-hidden={true}
-    className="chakra-icon more-link css-onkibi"
+    className="chakra-icon more-link css-1grhd2q"
     focusable={false}
     id="forwards-link-icon"
     role="img"
@@ -58,7 +58,7 @@ exports[`Link renders the UI snapshot correctly 2`] = `
 
 exports[`Link renders the UI snapshot correctly 3`] = `
 <a
-  className="css-0"
+  className="css-1xdhyk6"
   href="#passed-in-link"
   id="backwards-link"
   rel={null}
@@ -66,7 +66,7 @@ exports[`Link renders the UI snapshot correctly 3`] = `
 >
   <svg
     aria-hidden={true}
-    className="chakra-icon more-link css-onkibi"
+    className="chakra-icon more-link css-1grhd2q"
     focusable={false}
     id="backwards-link-icon"
     role="img"
@@ -102,7 +102,7 @@ exports[`Link renders the UI snapshot correctly 3`] = `
 
 exports[`Link renders the UI snapshot correctly 4`] = `
 <a
-  className="css-0"
+  className="css-1xdhyk6"
   href="#passed-in-link"
   id="external-link"
   rel="nofollow"
@@ -111,7 +111,7 @@ exports[`Link renders the UI snapshot correctly 4`] = `
   External
   <svg
     aria-hidden={true}
-    className="chakra-icon more-link css-onkibi"
+    className="chakra-icon more-link css-1grhd2q"
     focusable={false}
     id="external-link-icon"
     role="img"
@@ -146,7 +146,7 @@ exports[`Link renders the UI snapshot correctly 4`] = `
 
 exports[`Link renders the UI snapshot correctly 5`] = `
 <a
-  className="css-0"
+  className="css-1xdhyk6"
   href="#passed-in-link"
   id="button-link"
   rel={null}
@@ -158,7 +158,7 @@ exports[`Link renders the UI snapshot correctly 5`] = `
 
 exports[`Link renders the UI snapshot correctly 6`] = `
 <a
-  className="css-0"
+  className="css-1xdhyk6"
   href="#passed-in-link"
   id="icon-link"
   rel={null}
@@ -166,7 +166,7 @@ exports[`Link renders the UI snapshot correctly 6`] = `
 >
   <svg
     aria-hidden={true}
-    className="chakra-icon more-link css-onkibi"
+    className="chakra-icon more-link css-1grhd2q"
     focusable={false}
     id="link-icon"
     role="img"
@@ -205,6 +205,7 @@ exports[`Link renders the UI snapshot correctly 7`] = `
   className="css-0"
 >
   <a
+    className="css-0"
     href="#existing-anchor-tag"
     id="anchor-link"
     rel={null}
@@ -222,7 +223,7 @@ exports[`Link renders the UI snapshot correctly 8`] = `
 >
   <svg
     aria-hidden={true}
-    className="chakra-icon css-onkibi"
+    className="chakra-icon css-1grhd2q"
     focusable={false}
     id="link-icon"
     role="img"
@@ -259,3 +260,28 @@ exports[`Link renders the UI snapshot correctly 8`] = `
   </a>
 </span>
 `;
+
+exports[`Link renders the UI snapshot correctly 9`] = `
+<a
+  className="css-kle7zy"
+  href="#passed-in-link"
+  id="chakra"
+  rel={null}
+  target={null}
+>
+  Standard
+</a>
+`;
+
+exports[`Link renders the UI snapshot correctly 10`] = `
+<a
+  className="css-1xdhyk6"
+  data-testid="props"
+  href="#passed-in-link"
+  id="props"
+  rel={null}
+  target={null}
+>
+  Standard
+</a>
+`;

package/src/components/List/List.stories.mdx

@@ -51,19 +51,30 @@ export const enumValues = getStorybookEnumValues(ListTypes, "ListTypes");
 | Component Version | DS Version |
 | ----------------- | ---------- |
 | Added             | `0.7.0`    |
-| Latest            | `0.25.12`  |
+| Latest            | `0.26.0`   |
+
+## Table of Contents
+
+- [Overview](#overview)
+- [Component Props](#component-props)
+- [Accessibility](#accessibility)
+- [Description List](#description-list)
+- [Description List of Links](#description-list-of-links)
+- [Lists with Data Props](#lists-with-data-props)
+
+## Overview
 
 <Description of={List} />
 
-export const animalCrossingDefinitions = [
+export const animalCrossingDescriptions = [
   {
     term: "Mahi-mahi",
-    definition:
+    description:
       'The mahi-mahi is an ocean fish known for its wide, somewhat-cute face. It can reach over six feet long. It is known by different names including "dolphinfish," even though it has no relation to dolphins. They live in only in warm, tropical waters...which perhaps explains the relaxed, happy look on their faces.',
   },
   {
     term: "Golden trout",
-    definition: (
+    description: (
       <p>
         The golden trout is a <b>beautifully</b> colored fish that can only live
         in very clean waters. They are difficult to come across since they are
@@ -75,12 +86,12 @@ export const animalCrossingDefinitions = [
   },
   {
     term: "Rainbowfish",
-    definition:
+    description:
       'The rainbowfish is a tropical fish known for its metallic colors and beautiful fins. There are over 50 different species, each unique and pleasing color. I must say, it does make me wish for feathers of a more exciting hue than "underbaked brownie."',
   },
   {
     term: "Suckerfish",
-    definition: (
+    description: (
       <p>
         The{" "}
         <Link href="https://animalcrossing.fandom.com/wiki/Suckerfish">
@@ -111,30 +122,30 @@ export const itemGroups = [
   "Tools",
   "Villagers",
 ];
-export const definitions = [
+export const descriptions = [
   {
     term: "Balrogs",
-    definition:
+    description:
       'Demonic creatures of fire and shadow, Balrogs were fallen Maiar, loyal to the first Dark Lord, Morgoth. They participated in the wars of the First Age of Middle-earth but were mostly destroyed during the War of Wrath which ended the Age. By the Third Age, the only remaining Balrog was "Durin\'s Bane," the Balrog of Moria, killed by Gandalf.',
   },
   {
     term: "Dwarves",
-    definition:
+    description:
       "The race of Dwarves preferred to live in mountains and caves, settling in places such as Erebor (the Lonely Mountain), the Iron Hills, the Blue Mountains, and Moria (Khazad-dûm) in the Misty Mountains. Aulë the Smith created Dwarves; he also invented the Dwarven language, known as Khuzdul. Dwarves mined and worked precious metals throughout the mountains of Middle-earth. The seven different groups of Dwarf-folk originated in the locations where the Seven Fathers of the Dwarves first awoke before the First Age.",
   },
   {
     term: "Elves",
-    definition:
+    description:
       'The Elves, or Firstborn, were the first of Eru\'s Children to awaken. Born under the stars before the ascension of the Moon and the Sun, they retain a special love for light and an inner spirit endowed with unique gifts. They call themselves the Quendi, or "Speakers", for they were the first to utter words; and, even now, no race understands language and song like the Firstborn. Fair and fine featured, brilliant and proud, immortal and strong, tall and agile, they are the most blessed of the Free Peoples. They can see as well under moon or starlight as a man at the height of day. They cannot become sick or scarred, but if an Elf should die, from violence or losing the will to live from grief, their spirit goes to the halls of Mandos, and as they are bound to Arda and cannot leave until the world is broken and remade. Elven skill and agility is legendary: for instance, walking atop freshly fallen snow without leaving a trace of their passing. On a clear day they can see ten miles with perfect clarity and detail up to 100 miles. These gifts come at great cost, though: they are strongly bound to Fate (see Mandos) and hated by Morgoth. No other race has been blessed and cursed more than the Quendi.',
   },
   {
     term: "Ents",
-    definition:
+    description:
       "Ents were an ancient race of tree-like creatures, having become like the trees that they shepherd. They were created by Yavanna and given life by Ilúvatar. By the Third Age, they were a dwindling race, having long ago lost their mates, the Entwives.",
   },
   {
     term: "Hobbits",
-    definition:
+    description:
       'Hobbits are a race of Middle-earth, also known as "halflings" on account of their short stature, roughly half the size of men. They are characterized by curly hair on their heads and leathery feet that have furry insteps, for which they did not wear shoes. Many hobbits live in the Shire as well as Bree, and they once lived in the vales of the Anduin. They are fond of an unadventurous life of farming, eating, and socializing. There were three types of Hobbits: The Harfoots were the most numerous. The Stoors had an affinity for water, boats and swimming; the Fallohides were an adventurous people. The origin of hobbits is unclear, but of all the races they have the closest affinity to men, and in the Prologue to The Lord of the Rings Tolkien calls them relatives of men.',
   },
 ];
@@ -155,11 +166,11 @@ export const definitions = [
   >
     {(args) => (
       <List {...args} type={enumValues.getValue(args.type)}>
-        {args.type !== "ListTypes.Definition"
+        {args.type !== "ListTypes.Description"
           ? itemGroups.map((item, i) => <li key={i}>{item}</li>)
-          : definitions.map((item, i) => [
+          : descriptions.map((item, i) => [
               <dt key={`dt_${i}`}>{item.term}</dt>,
-              <dd key={`dd_${i}`}>{item.definition}</dd>,
+              <dd key={`dd_${i}`}>{item.description}</dd>,
             ])}
       </List>
     )}
@@ -168,22 +179,46 @@ export const definitions = [
 
 <ArgsTable story="List with Controls" />
 
-## Definition List
+## Accessibility
+
+Internally, the `List` component implements native HTML markup for unordered,
+ordered, and description lists. This includes `ul`, `ol`, and `dl` elements.
+When data is passed into the `listItems` data prop, the appropriate children
+HTML elements are used. This includes `li` for unorder and ordered lists, and
+`dt` and `dd` elements for description lists.
+
+The description type for the `List` component is wrapped in a `section` element
+with an `h2` header. Keep that in mind when ordering headings on the page.
+
+Resources:
+
+- [W3C WAI Content Structure](https://www.w3.org/WAI/tutorials/page-structure/content/)
+- [Deque University Appropriate Semantic Markup for Lists](https://dequeuniversity.com/tips/list-markup)
+
+## Description List
+
+_Note: This element is officially called the "Description List" element in HTML5.
+Before HTML5, it was called the "Definition List" element and some online resources
+may still use this name. In the Reservoir Design System, we will use the
+"Description List" name._
+
+- [W3C Using description lists](https://www.w3.org/WAI/WCAG21/Techniques/html/H40.html)
+- [MDN dl: The Description List element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dl)
 
-To render a definition list, pass in `ListTypes.Definition` to the `type` prop.
-The optional `title` prop will now render above the definition list element.
+To render a description list, pass in `ListTypes.Description` to the `type` prop.
+The optional `title` prop will now render above the description list element.
 This type of list renders `dt` and `dd` elements.
 
 ```jsx
-<List type={ListTypes.Definition}>
+<List type={ListTypes.Description}>
   <dt>Term</dt>
-  <dd>Definition</dd>
+  <dd>Description</dd>
 </List>
 ```
 
 <Canvas>
   <Story
-    name="Definition List"
+    name="Description List"
     args={{
       id: "nypl-list2",
       noStyling: false,
@@ -202,23 +237,23 @@ This type of list renders `dt` and `dd` elements.
     }}
   >
     {(args) => (
-      <List {...args} type={ListTypes.Definition}>
-        {definitions.map((item, i) => [
+      <List {...args} type={ListTypes.Description}>
+        {descriptions.map((item, i) => [
           <dt key={`dt_${i}`}>{item.term}</dt>,
-          <dd key={`dd_${i}`}>{item.definition}</dd>,
+          <dd key={`dd_${i}`}>{item.description}</dd>,
         ])}
       </List>
     )}
   </Story>
 </Canvas>
 
-## Definition List of Links
+## Description List of Links
 
 An example with HTML elements inside of the `dd` elements.
 
 <Canvas>
   <Story
-    name="Definition List of Links"
+    name="Description List of Links"
     args={{
       noStyling: false,
       title: "Details",
@@ -236,7 +271,7 @@ An example with HTML elements inside of the `dd` elements.
     }}
   >
     {(args) => (
-      <List {...args} type={ListTypes.Definition}>
+      <List {...args} type={ListTypes.Description}>
         <dt>Authors</dt>
         <dd>
           <a href="#">Chirwa, Ephraim Wadonda, author</a>
@@ -304,16 +339,16 @@ const fishArray = ["Mahi-mahi", "Golden trout", "Rainbowfish", "Suckerfish"];
 <List type={ListTypes.Unordered} listItems={fishArray} />
 ```
 
-### Definition
+### Description
 
-For lists of type `ListTypes.Definition` (dl), `dt` and `dd` elements can be
+For lists of type `ListTypes.Description` (dl), `dt` and `dd` elements can be
 passed as children. If that's not possible but the data to render is stored as
 an array of objects, then that data array can be passed into `listItems`. The
-object must have two keys, `term` and `definition`.
+object must have two keys, `term` and `description`.
 
 ```jsx
 // With `dt`/`dd` elements
-<List type={ListTypes.Definition} title="Animal Corssing Fish">
+<List type={ListTypes.Description} title="Animal Crossing Fish">
   <dt>Mahi-mahi</dt>
   <dd>The mahi-mahi is an ocean fish known...</dd>
   <dt>Golden trout</dt>
@@ -325,28 +360,28 @@ object must have two keys, `term` and `definition`.
 </List>
 
 // With `itemList` data prop
-const fishDefinitions = [
+const fishDescriptions = [
   {
     term: "Mahi-mahi",
-    definition: "The mahi-mahi is an ocean fish known..."
+    description: "The mahi-mahi is an ocean fish known..."
   },
   {
     term: "Golden trout",
-    definition: "The golden trout is a beautifully colored fish..."
+    description: "The golden trout is a beautifully colored fish..."
   },
   {
     term: "Rainbowfish",
-    definition: "The rainbowfish is a tropical fish known..."
+    description: "The rainbowfish is a tropical fish known..."
   },
   {
     term: "Suckerfish"
-    definition: "he suckerfish is a curious fish that..."
+    description: "he suckerfish is a curious fish that..."
   }
 ];
 <List
-  listItems={fishDefinitions}
+  listItems={fishDescriptions}
   title="Animal Crossing Fish"
-  type={ListTypes.Definition}
+  type={ListTypes.Description}
 />
 ```
 
@@ -354,7 +389,7 @@ const fishDefinitions = [
   <Story
     name="List with Data Props"
     args={{
-      listItems: animalCrossingDefinitions,
+      listItems: animalCrossingDescriptions,
       noStyling: false,
       title: "Animal Crossing Fish",
     }}
@@ -364,6 +399,6 @@ const fishDefinitions = [
       type: { control: false },
     }}
   >
-    {(args) => <List {...args} type={ListTypes.Definition} />}
+    {(args) => <List {...args} type={ListTypes.Description} />}
   </Story>
 </Canvas>