Merge branch 'main' of github.com:primer/react into mp/segmented-cont…

…rol-use-component-primitives

.changeset/pretty-students-judge.md

@@ -0,0 +1,5 @@
+---
+'@primer/react': minor
+---
+
+Adds support for a responsive 'variant' prop to the SegmentedControl component

docs/content/SegmentedControl.mdx

@@ -43,7 +43,7 @@ description: Use a segmented control to let users select an option from a short
 ### With labels hidden on smaller viewports
 
 ```jsx live drafts
-<SegmentedControl aria-label="File view" variant={{narrow: 'hideLabels', regular: 'none'}}>
+<SegmentedControl aria-label="File view" variant={{narrow: 'hideLabels', regular: 'default'}}>
   <SegmentedControl.Button selected leadingIcon={EyeIcon}>
     Preview
   </SegmentedControl.Button>
@@ -55,7 +55,7 @@ description: Use a segmented control to let users select an option from a short
 ### Convert to a dropdown on smaller viewports
 
 ```jsx live drafts
-<SegmentedControl aria-label="File view" variant={{narrow: 'dropdown', regular: 'none'}}>
+<SegmentedControl aria-label="File view" variant={{narrow: 'dropdown', regular: 'default'}}>
   <SegmentedControl.Button selected leadingIcon={EyeIcon}>
     Preview
   </SegmentedControl.Button>
@@ -161,11 +161,11 @@ description: Use a segmented control to let users select an option from a short
   />
   <PropsTableRow
     name="variant"
-    type="{
-      narrow?: 'hideLabels' | 'dropdown',
-      regular?: 'hideLabels' | 'dropdown',
-      wide?: 'hideLabels' | 'dropdown'
+    type="'default' | {
+      narrow?: 'hideLabels' | 'dropdown' | 'default'
+      regular?: 'hideLabels' | 'dropdown' | 'default'
     }"
+    defaultValue="'default'"
     description="Configure alternative ways to render the control when it gets rendered in tight spaces"
   />
   <PropsTableSxRow />

package.json

@@ -163,6 +163,7 @@
     "jest": "27.4.5",
     "jest-axe": "5.0.1",
     "jest-styled-components": "6.3.4",
+    "jest-matchmedia-mock": "1.1.0",
     "jscodeshift": "0.13.0",
     "lint-staged": "12.1.2",
     "lodash.isempty": "4.4.0",

src/SegmentedControl/SegmentedControl.test.tsx

@@ -1,23 +1,35 @@
 import React from 'react'
 import '@testing-library/jest-dom/extend-expect'
-import {fireEvent, render} from '@testing-library/react'
+import MatchMediaMock from 'jest-matchmedia-mock'
+import {render, fireEvent, waitFor} from '@testing-library/react'
 import {EyeIcon, FileCodeIcon, PeopleIcon} from '@primer/octicons-react'
 import userEvent from '@testing-library/user-event'
 import {behavesAsComponent, checkExports, checkStoriesForAxeViolations} from '../utils/testing'
 import {SegmentedControl} from '.' // TODO: update import when we move this to the global index
+import theme from '../theme'
+import {BaseStyles, SSRProvider, ThemeProvider} from '..'
+import {act} from 'react-test-renderer'
+import {viewportRanges} from '../hooks/useMatchMedia'
 
 const segmentData = [
   {label: 'Preview', id: 'preview', iconLabel: 'EyeIcon', icon: () => <EyeIcon aria-label="EyeIcon" />},
   {label: 'Raw', id: 'raw', iconLabel: 'FileCodeIcon', icon: () => <FileCodeIcon aria-label="FileCodeIcon" />},
   {label: 'Blame', id: 'blame', iconLabel: 'PeopleIcon', icon: () => <PeopleIcon aria-label="PeopleIcon" />}
 ]
 
-// TODO: improve test coverage
+let matchMedia: MatchMediaMock
+
 describe('SegmentedControl', () => {
   const mockWarningFn = jest.fn()
 
   beforeAll(() => {
     jest.spyOn(global.console, 'warn').mockImplementation(mockWarningFn)
+    matchMedia = new MatchMediaMock()
+  })
+
+  afterAll(() => {
+    jest.clearAllMocks()
+    matchMedia.clear()
   })
 
   behavesAsComponent({
@@ -54,6 +66,47 @@ describe('SegmentedControl', () => {
     expect(selectedButton?.getAttribute('aria-current')).toBe('true')
   })
 
+  it('renders the dropdown variant', () => {
+    act(() => {
+      matchMedia.useMediaQuery(viewportRanges.narrow)
+    })
+
+    const {getByText} = render(
+      <SegmentedControl aria-label="File view" variant={{narrow: 'dropdown'}}>
+        {segmentData.map(({label}, index) => (
+          <SegmentedControl.Button selected={index === 1} key={label}>
+            {label}
+          </SegmentedControl.Button>
+        ))}
+      </SegmentedControl>
+    )
+    const button = getByText(segmentData[1].label)
+
+    expect(button).toBeInTheDocument()
+    expect(button.closest('button')?.getAttribute('aria-haspopup')).toBe('true')
+  })
+
+  it('renders the hideLabels variant', () => {
+    act(() => {
+      matchMedia.useMediaQuery(viewportRanges.narrow)
+    })
+
+    const {getByLabelText} = render(
+      <SegmentedControl aria-label="File view" variant={{narrow: 'hideLabels'}}>
+        {segmentData.map(({label, icon}, index) => (
+          <SegmentedControl.Button leadingIcon={icon} selected={index === 1} key={label}>
+            {label}
+          </SegmentedControl.Button>
+        ))}
+      </SegmentedControl>
+    )
+
+    for (const datum of segmentData) {
+      const labelledButton = getByLabelText(datum.label)
+      expect(labelledButton).toBeDefined()
+    }
+  })
+
   it('renders the first segment as selected if no child has the `selected` prop passed', () => {
     const {getByText} = render(
       <SegmentedControl aria-label="File view">
@@ -190,6 +243,83 @@ describe('SegmentedControl', () => {
     expect(document.activeElement?.id).toEqual(initialFocusButtonNode.id)
   })
 
+  it('calls onChange with index of clicked segment button when using the dropdown variant', async () => {
+    act(() => {
+      matchMedia.useMediaQuery(viewportRanges.narrow)
+    })
+    const handleChange = jest.fn()
+    const component = render(
+      <ThemeProvider theme={theme}>
+        <SSRProvider>
+          <BaseStyles>
+            <SegmentedControl aria-label="File view" onChange={handleChange} variant={{narrow: 'dropdown'}}>
+              {segmentData.map(({label}, index) => (
+                <SegmentedControl.Button selected={index === 0} key={label}>
+                  {label}
+                </SegmentedControl.Button>
+              ))}
+            </SegmentedControl>
+          </BaseStyles>
+        </SSRProvider>
+      </ThemeProvider>
+    )
+    const button = component.getByText(segmentData[0].label)
+
+    fireEvent.click(button)
+    expect(handleChange).not.toHaveBeenCalled()
+    const menuItems = await waitFor(() => component.getAllByRole('menuitemradio'))
+    fireEvent.click(menuItems[1])
+
+    expect(handleChange).toHaveBeenCalledWith(1)
+  })
+
+  it('calls segment button onClick if it is passed when using the dropdown variant', async () => {
+    act(() => {
+      matchMedia.useMediaQuery(viewportRanges.narrow)
+    })
+    const handleClick = jest.fn()
+    const component = render(
+      <ThemeProvider theme={theme}>
+        <SSRProvider>
+          <BaseStyles>
+            <SegmentedControl aria-label="File view" variant={{narrow: 'dropdown'}}>
+              {segmentData.map(({label}, index) => (
+                <SegmentedControl.Button selected={index === 0} key={label} onClick={handleClick}>
+                  {label}
+                </SegmentedControl.Button>
+              ))}
+            </SegmentedControl>
+          </BaseStyles>
+        </SSRProvider>
+      </ThemeProvider>
+    )
+    const button = component.getByText(segmentData[0].label)
+
+    fireEvent.click(button)
+    expect(handleClick).not.toHaveBeenCalled()
+    const menuItems = await waitFor(() => component.getAllByRole('menuitemradio'))
+    fireEvent.click(menuItems[1])
+
+    expect(handleClick).toHaveBeenCalled()
+  })
+
+  it('warns users if they try to use the hideLabels variant without a leadingIcon', () => {
+    act(() => {
+      matchMedia.useMediaQuery(viewportRanges.narrow)
+    })
+    const consoleSpy = jest.spyOn(global.console, 'warn')
+    render(
+      <SegmentedControl aria-label="File view" variant={{narrow: 'hideLabels'}}>
+        {segmentData.map(({label}, index) => (
+          <SegmentedControl.Button selected={index === 1} key={label}>
+            {label}
+          </SegmentedControl.Button>
+        ))}
+      </SegmentedControl>
+    )
+    expect(consoleSpy).toHaveBeenCalled()
+  })
+
   it('should warn the user if they neglect to specify a label for the segmented control', () => {
     render(
       <SegmentedControl>
@@ -205,5 +335,6 @@ describe('SegmentedControl', () => {
   })
 })
 
-checkStoriesForAxeViolations('examples', '../SegmentedControl/')
+// TODO: uncomment these tests after we fix a11y for the Tooltip component
+// checkStoriesForAxeViolations('examples', '../SegmentedControl/')
 checkStoriesForAxeViolations('fixtures', '../SegmentedControl/')