Let Grid and Grid Cell render any structural tag

packages/react/src/Grid/Grid.test.tsx

@@ -1,7 +1,8 @@
-import { render } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import { createRef } from 'react'
-import { Grid } from './Grid'
+import { Grid, gridTags } from './Grid'
 import type { GridPaddingSize } from './Grid'
+import { ariaRoleForTag } from '../common/accessibility'
 import '@testing-library/jest-dom'
 
 const paddingSizes = ['small', 'medium', 'large']
@@ -87,8 +88,23 @@ describe('Grid', () => {
     })
   })
 
+  gridTags.forEach((tag) => {
+    it(`renders with a custom ${tag} tag`, () => {
+      const { container } = render(<Grid as={tag} aria-label={tag === 'section' ? 'Accessible name' : undefined} />)
+
+      let component: HTMLElement | null
+      if (tag === 'div') {
+        component = container.querySelector(tag)
+      } else {
+        component = screen.queryByRole(ariaRoleForTag[tag])
+      }
+
+      expect(component).toBeInTheDocument()
+    })
+  })
+
   it('supports ForwardRef in React', () => {
-    const ref = createRef<HTMLDivElement>()
+    const ref = createRef<HTMLElement>()
 
     const { container } = render(<Grid ref={ref} />)
 

packages/react/src/Grid/Grid.tsx

@@ -5,14 +5,17 @@
 
 import clsx from 'clsx'
 import { forwardRef } from 'react'
-import type { ForwardedRef, HTMLAttributes, PropsWithChildren } from 'react'
+import type { HTMLAttributes, PropsWithChildren } from 'react'
 import { GridCell } from './GridCell'
 import { paddingClasses } from './paddingClasses'
 
 export type GridColumnNumber = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12
 export type GridColumnNumbers = { narrow: GridColumnNumber; medium: GridColumnNumber; wide: GridColumnNumber }
 export type GridPaddingSize = 'small' | 'medium' | 'large'
 
+export const gridTags = ['article', 'aside', 'div', 'footer', 'header', 'main', 'nav', 'section'] as const
+export type GridTag = (typeof gridTags)[number]
+
 type GridPaddingVerticalProp = {
   paddingBottom?: never
   paddingTop?: never
@@ -29,17 +32,28 @@ type GridPaddingTopAndBottomProps = {
 }
 
 export type GridProps = {
+  /** The HTML tag to use. */
+  as?: GridTag
   /** The amount of space between rows. */
   gapVertical?: 'none' | 'small' | 'large'
 } & (GridPaddingVerticalProp | GridPaddingTopAndBottomProps) &
   PropsWithChildren<HTMLAttributes<HTMLDivElement>>
 
 const GridRoot = forwardRef(
   (
-    { children, className, gapVertical, paddingBottom, paddingTop, paddingVertical, ...restProps }: GridProps,
-    ref: ForwardedRef<HTMLDivElement>,
+    {
+      as: Tag = 'div',
+      children,
+      className,
+      gapVertical,
+      paddingBottom,
+      paddingTop,
+      paddingVertical,
+      ...restProps
+    }: GridProps,
+    ref: any,
   ) => (
-    <div
+    <Tag
       {...restProps}
       ref={ref}
       className={clsx(
@@ -50,7 +64,7 @@ const GridRoot = forwardRef(
       )}
     >
       {children}
-    </div>
+    </Tag>
   ),
 )
 

packages/react/src/Grid/GridCell.test.tsx

@@ -1,6 +1,8 @@
 import { render, screen } from '@testing-library/react'
 import { createRef } from 'react'
 import { Grid } from './Grid'
+import { gridCellTags } from './GridCell'
+import { ariaRoleForTag } from '../common/accessibility'
 import '@testing-library/jest-dom'
 
 describe('Grid cell', () => {
@@ -29,16 +31,6 @@ describe('Grid cell', () => {
     expect(component).toHaveClass('ams-grid__cell extra')
   })
 
-  it('supports ForwardRef in React', () => {
-    const ref = createRef<HTMLDivElement>()
-
-    const { container } = render(<Grid.Cell ref={ref} />)
-
-    const component = container.querySelector(':only-child')
-
-    expect(ref.current).toBe(component)
-  })
-
   it('renders no class names for undefined values for start and span', () => {
     const { container } = render(<Grid.Cell />)
 
@@ -113,11 +105,30 @@ describe('Grid cell', () => {
     expect(component).toHaveClass('ams-grid__cell--span-all')
   })
 
-  it('renders a custom tag', () => {
-    render(<Grid.Cell as="article" />)
+  gridCellTags.forEach((tag) => {
+    it(`renders with a custom ${tag} tag`, () => {
+      const { container } = render(
+        <Grid.Cell as={tag} aria-label={tag === 'section' ? 'Accessible name' : undefined} />,
+      )
+
+      let component: HTMLElement | null
+      if (tag === 'div') {
+        component = container.querySelector(tag)
+      } else {
+        component = screen.queryByRole(ariaRoleForTag[tag])
+      }
+
+      expect(component).toBeInTheDocument()
+    })
+  })
+
+  it('supports ForwardRef in React', () => {
+    const ref = createRef<HTMLElement>()
+
+    const { container } = render(<Grid.Cell ref={ref} />)
 
-    const cell = screen.getByRole('article')
+    const component = container.querySelector(':only-child')
 
-    expect(cell).toBeInTheDocument()
+    expect(ref.current).toBe(component)
   })
 })

packages/react/src/Grid/GridCell.tsx

@@ -2,12 +2,16 @@
  * @license EUPL-1.2+
  * Copyright Gemeente Amsterdam
  */
+
 import clsx from 'clsx'
 import { forwardRef } from 'react'
 import type { HTMLAttributes, PropsWithChildren } from 'react'
 import type { GridColumnNumber, GridColumnNumbers } from './Grid'
 import { gridCellClasses } from './gridCellClasses'
 
+export const gridCellTags = ['article', 'aside', 'div', 'footer', 'header', 'main', 'nav', 'section'] as const
+export type GridCellTag = (typeof gridCellTags)[number]
+
 type GridCellSpanAllProp = {
   /** Lets the cell span the full width of all grid variants. */
   span: 'all'
@@ -22,8 +26,8 @@ type GridCellSpanAndStartProps = {
 }
 
 export type GridCellProps = {
-  /** The HTML element to use. */
-  as?: 'article' | 'div' | 'section'
+  /** The HTML tag to use. */
+  as?: GridCellTag
 } & (GridCellSpanAllProp | GridCellSpanAndStartProps) &
   PropsWithChildren<HTMLAttributes<HTMLElement>>
 

packages/react/src/common/accessibility.ts

@@ -0,0 +1,14 @@
+/**
+ * @license EUPL-1.2+
+ * Copyright Gemeente Amsterdam
+ */
+
+export const ariaRoleForTag: Record<string, string> = {
+  article: 'article',
+  aside: 'complementary',
+  footer: 'contentinfo',
+  header: 'banner',
+  main: 'main',
+  nav: 'navigation',
+  section: 'region',
+}

storybook/src/components/Grid/Grid.docs.mdx

@@ -71,8 +71,8 @@ Use the `start` prop with 3 values, e.g. `start={{ narrow: 2, medium: 4, wide: 6
 
 ### Improve semantics
 
-By default, a Grid Cell renders a `<div>` element in HTML.
-Use the `as` prop to make your markup more semantic.
+By default, both Grid and Grid Cell render a `<div>` element in HTML.
+Use the `as` prop on either to make your markup more semantic.
 
 <Canvas of={GridStories.ImproveSemantics} />
 

storybook/src/components/Grid/Grid.stories.tsx

@@ -58,10 +58,6 @@ export default meta
 const cellMeta = {
   component: Grid.Cell,
   argTypes: {
-    as: {
-      control: { type: 'radio' },
-      options: ['article', 'div', 'section'],
-    },
     span: {
       control: { type: 'number', min: 1, max: 12 },
     },