fix up merge issues

primer · Jan 27, 2023 · e3f9bbf · e3f9bbf
1 parent 7863d42
commit e3f9bbf
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/docs/content/drafts/PageHeader.mdx b/docs/content/drafts/PageHeader.mdx
@@ -127,20 +127,20 @@ import {PageHeader} from '@primer/react/drafts'
     <PageHeader.Title>Pull request title</PageHeader.Title>
   </PageHeader.TitleArea>
   <PageHeader.Navigation>
-    <UnderlineNav2 aria-label="Pull Request">
-      <UnderlineNav2.Item icon={CommentDiscussionIcon} counter="12" aria-current="page">
+    <UnderlineNav aria-label="Pull Request">
+      <UnderlineNav.Item icon={CommentDiscussionIcon} counter="12" aria-current="page">
         Conversation
-      </UnderlineNav2.Item>
-      <UnderlineNav2.Item counter={3} icon={CommitIcon}>
+      </UnderlineNav.Item>
+      <UnderlineNav.Item counter={3} icon={CommitIcon}>
         Commits
-      </UnderlineNav2.Item>
-      <UnderlineNav2.Item counter={7} icon={ChecklistIcon}>
+      </UnderlineNav.Item>
+      <UnderlineNav.Item counter={7} icon={ChecklistIcon}>
         Checks
-      </UnderlineNav2.Item>
-      <UnderlineNav2.Item counter={4} icon={FileDiffIcon}>
+      </UnderlineNav.Item>
+      <UnderlineNav.Item counter={4} icon={FileDiffIcon}>
         Files Changes
-      </UnderlineNav2.Item>
-    </UnderlineNav2>
+      </UnderlineNav.Item>
+    </UnderlineNav>
   </PageHeader.Navigation>
 </PageHeader>
 ```

diff --git a/script/props-mdx-to-json.mjs b/script/props-mdx-to-json.mjs
@@ -24,7 +24,7 @@ const srcMap = new Map([
   ['docs/content/ActionList.mdx', 'src/ActionList/List.tsx'],
   ['docs/content/deprecated/ActionList.mdx', 'src/deprecated/ActionList/List.tsx'],
   ['docs/content/deprecated/Buttons.mdx', 'src/deprecated/Button/Button.tsx'],
-  ['docs/content/drafts/UnderlineNav2.mdx', 'src/UnderlineNav2/UnderlineNav.tsx'],
+  ['docs/content/UnderlineNav.mdx', 'src/UnderlineNav/UnderlineNav.tsx'],
 ])
 
 // Get all source code files

diff --git a/src/PageHeader/features.stories.tsx b/src/PageHeader/features.stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import {Meta} from '@storybook/react'
-import {IconButton, Breadcrumbs, Text, Link, Button, Box, Label, UnderlineNav2} from '..'
+import {IconButton, Breadcrumbs, Text, Link, Button, Box, Label, UnderlineNav} from '..'
 import {
   PencilIcon,
   SidebarExpandIcon,
@@ -128,20 +128,20 @@ export const WithNavigationSlot = () => (
         <PageHeader.Title>Pull request title</PageHeader.Title>
       </PageHeader.TitleArea>
       <PageHeader.Navigation>
-        <UnderlineNav2 aria-label="Pull Request">
-          <UnderlineNav2.Item icon={CommentDiscussionIcon} counter="12" aria-current="page">
+        <UnderlineNav aria-label="Pull Request">
+          <UnderlineNav.Item icon={CommentDiscussionIcon} counter="12" aria-current="page">
             Conversation
-          </UnderlineNav2.Item>
-          <UnderlineNav2.Item counter={3} icon={CommitIcon}>
+          </UnderlineNav.Item>
+          <UnderlineNav.Item counter={3} icon={CommitIcon}>
             Commits
-          </UnderlineNav2.Item>
-          <UnderlineNav2.Item counter={7} icon={ChecklistIcon}>
+          </UnderlineNav.Item>
+          <UnderlineNav.Item counter={7} icon={ChecklistIcon}>
             Checks
-          </UnderlineNav2.Item>
-          <UnderlineNav2.Item counter={4} icon={FileDiffIcon}>
+          </UnderlineNav.Item>
+          <UnderlineNav.Item counter={4} icon={FileDiffIcon}>
             Files Changes
-          </UnderlineNav2.Item>
-        </UnderlineNav2>
+          </UnderlineNav.Item>
+        </UnderlineNav>
       </PageHeader.Navigation>
     </PageHeader>
   </Box>

diff --git a/src/__tests__/__snapshots__/exports.test.ts.snap b/src/__tests__/__snapshots__/exports.test.ts.snap
@@ -72,7 +72,6 @@ exports[`@primer/react should not update exports without a semver change 1`] = `
   "Tooltip",
   "Truncate",
   "UnderlineNav",
-  "UnderlineNav2",
   "merge",
   "registerPortalRoot",
   "sx",

diff --git a/src/index.ts b/src/index.ts
@@ -179,8 +179,6 @@ export type {CheckboxProps} from './Checkbox'
 export {default as Textarea} from './Textarea'
 export type {TextareaProps} from './Textarea'
 
-export {UnderlineNav as UnderlineNav2} from './UnderlineNav2'
-
 export {SSRProvider, useSSRSafeId} from './utils/ssr'
 export {default as sx, merge} from './sx'
 export type {SxProp} from './sx'