Fix merge conflict issues and clean up

primer · Jul 28, 2023 · 60c533c · 60c533c
1 parent 4b6487c
commit 60c533c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.changeset/early-timers-speak.md b/.changeset/early-timers-speak.md
@@ -11,8 +11,6 @@ Remove components from draft bundle
 + import {UnderlineNav} from '@primer/react'
 ```
 
-TODO: Add a note about how to switch to the new version of UnderlineNav (codemode)
-
 ....
 * Remove TreeView from drafts
 
@@ -42,4 +40,4 @@ TODO: Add a note about how to switch to the new version of UnderlineNav (codemod
 + import {SplitPageLayout} from '@primer/react'
 ```
 
-<!-- Changed components: UnderlineNav, TreeView, SegmentedControl, NavList, SplitPageLayout--!>
+<!-- Changed components: UnderlineNav, TreeView, SegmentedControl, NavList, SplitPageLayout -->
diff --git a/docs/content/UnderlineNav.mdx b/docs/content/UnderlineNav.mdx
@@ -1,7 +1,7 @@
 ---
 title: UnderlineNav
 componentId: underline_nav
-status: Beta
+status: Alpha
 a11yReviewed: true
 description: Use an underlined nav to allow tab like navigation with overflow behaviour in your UI.
 source: https://github.com/primer/react/tree/main/src/UnderlineNav

diff --git a/src/UnderlineNav/UnderlineNav.stories.tsx b/src/UnderlineNav/UnderlineNav.stories.tsx
@@ -38,7 +38,7 @@ export default {
 export const Default: ComponentStory<typeof UnderlineNav> = () => {
   const children = ['Code', 'Pull requests', 'Actions', 'Projects', 'Wiki']
   return (
-    <UnderlineNav>
+    <UnderlineNav aria-label="Repository">
       {children.map((child: string, index: number) => (
         <UnderlineNavItem key={index} href="#" aria-current={index === 0 ? 'page' : undefined}>
           {child}

diff --git a/src/UnderlineNav/UnderlineNav.tsx b/src/UnderlineNav/UnderlineNav.tsx
@@ -80,7 +80,7 @@ const overflowEffect = (
     // if we can't fit all the items without their icons, we keep the icons hidden and show the ones that doesn't fit into the list in the overflow menu
     iconsVisible = false
 
-    /* Below is an accessibiility requirement. Never show only one item in the overflow menu.
+    /* Below is an accessibility requirement. Never show only one item in the overflow menu.
      * If there is only one item left to display in the overflow menu according to the calculation,
      * we need to pull another item from the list into the overflow menu.
      */