Skip to content

Commit 3e370e5

Browse files
authored
Merge pull request #27612 from github/repo-sync
Repo sync
2 parents cc86e8d + 91fe04f commit 3e370e5

File tree

1 file changed

+29
-40
lines changed

1 file changed

+29
-40
lines changed

src/rest/components/RestCodeSamples.tsx

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useState, useEffect, useRef, FormEvent } from 'react'
2-
import { FormControl, Select, Tooltip, UnderlineNav } from '@primer/react'
2+
import { FormControl, Select, Tooltip, TabNav } from '@primer/react'
33
import { CheckIcon, CopyIcon } from '@primer/octicons-react'
44
import Cookies from 'components/lib/cookies'
55
import cx from 'classnames'
@@ -246,31 +246,28 @@ export function RestCodeSamples({ operation, slug, heading }: Props) {
246246
<div className="my-0 p-3">
247247
<RestMethod verb={operation.verb} requestPath={operation.requestPath} />
248248
</div>
249-
<div className="border-top d-inline-flex flex-justify-between width-full flex-items-center">
249+
<div className="border-top d-inline-flex flex-justify-between width-full flex-items-center pt-2">
250250
<div className="d-inline-flex ml-2">
251-
<UnderlineNav aria-label="Example language selector">
251+
<TabNav aria-label="Example language selector">
252252
{languageSelectOptions.map((optionKey) => (
253-
<UnderlineNav.Link
253+
<TabNav.Link
254254
key={optionKey}
255-
onClick={() => {
255+
selected={optionKey === selectedLanguage}
256+
onClick={(e) => {
257+
e.preventDefault()
256258
handleLanguageSelection(optionKey)
257259
}}
258260
onKeyDown={(event) => {
259261
if (event.key === 'Enter') {
260262
handleLanguageSelection(optionKey)
261263
}
262264
}}
263-
tabIndex={0}
264-
aria-current={optionKey === selectedLanguage}
265-
className={cx('pr-3 mr-0', optionKey === selectedLanguage && 'PRC-selected')}
266-
sx={{
267-
cursor: 'pointer',
268-
}}
265+
href="#"
269266
>
270267
{t(`rest.reference.code_sample_options.${optionKey}`)}
271-
</UnderlineNav.Link>
268+
</TabNav.Link>
272269
))}
273-
</UnderlineNav>
270+
</TabNav>
274271
</div>
275272
<div className="mr-2">
276273
<Tooltip
@@ -309,36 +306,28 @@ export function RestCodeSamples({ operation, slug, heading }: Props) {
309306
__html: displayedExample.response.description || t('rest.reference.response'),
310307
}}
311308
></h4>
312-
313309
<div className="border rounded-1">
314310
{displayedExample.response.schema ? (
315-
<UnderlineNav aria-label="Example response format selector">
316-
{responseSelectOptions.map((optionKey) => {
317-
if (!displayedExample.response.schema) return null
318-
319-
return (
320-
<UnderlineNav.Link
321-
key={optionKey}
322-
onClick={() => {
311+
<TabNav className="pt-2 mx-2" aria-label="Example response format selector">
312+
{responseSelectOptions.map((optionKey) => (
313+
<TabNav.Link
314+
key={optionKey}
315+
selected={optionKey === selectedResponse}
316+
onClick={(e) => {
317+
e.preventDefault()
318+
handleResponseSelection(optionKey)
319+
}}
320+
onKeyDown={(event) => {
321+
if (event.key === 'Enter') {
323322
handleResponseSelection(optionKey)
324-
}}
325-
onKeyDown={(event) => {
326-
if (event.key === 'Enter') {
327-
handleResponseSelection(optionKey)
328-
}
329-
}}
330-
tabIndex={0}
331-
aria-current={optionKey === selectedResponse}
332-
className={cx('pr-3 mr-0 ml-2', optionKey === selectedResponse && 'PRC-selected')}
333-
sx={{
334-
cursor: 'pointer',
335-
}}
336-
>
337-
{t(`rest.reference.response_options.${optionKey}`)}
338-
</UnderlineNav.Link>
339-
)
340-
})}
341-
</UnderlineNav>
323+
}
324+
}}
325+
href="#"
326+
>
327+
{t(`rest.reference.response_options.${optionKey}`)}
328+
</TabNav.Link>
329+
))}
330+
</TabNav>
342331
) : null}
343332
<div className="">
344333
{/* Status code */}

0 commit comments

Comments
 (0)