miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

docs(nxdev): simplify header links & fix keys issues (#7724)

Browse Source
This commit is contained in:
Benjamin Cabanes 2021-11-12 15:14:26 -05:00 committed by GitHub
parent ee4cd5220b
commit d39c1c17e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nx-dev/feature-doc-viewer/src/lib/sidebar.tsx
View File

@ -75,7 +75,7 @@ export function Sidebar({ menu, navIsOpen }: SidebarProps) {
}))} }))}
selected={{ label: flavor.name, value: flavor.alias }} selected={{ label: flavor.name, value: flavor.alias }}
onChange={(item) => onChange={(item) =>
router.push( !!router.push(
createNextPath(version.alias, item.value, router.asPath) createNextPath(version.alias, item.value, router.asPath)
) && ) &&
item.data && item.data &&
@ -89,8 +89,8 @@ export function Sidebar({ menu, navIsOpen }: SidebarProps) {
data-testid="navigation" data-testid="navigation"
className="px-1 pt-1 font-medium text-base sm:px-3 xl:px-5 lg:text-sm pb-10 lg:pb-14 sticky?lg:h-(screen-18)" className="px-1 pt-1 font-medium text-base sm:px-3 xl:px-5 lg:text-sm pb-10 lg:pb-14 sticky?lg:h-(screen-18)"
> >
{menu.sections.map((section) => ( {menu.sections.map((section, index) => (
<SidebarSection key={section.id} section={section} /> <SidebarSection key={section.id + '-' + index} section={section} />
))} ))}
</nav> </nav>
</div> </div>
@ -111,8 +111,8 @@ function SidebarSection({ section }: { section: MenuSection }) {
)} )}
<ul> <ul>
<li className="mt-2"> <li className="mt-2">
{section.itemList.map((item) => ( {section.itemList.map((item, index) => (
<SidebarSectionItems key={item.id} item={item} /> <SidebarSectionItems key={item.id + '-' + index} item={item} />
))} ))}
</li> </li>
</ul> </ul>
@ -153,10 +153,13 @@ function SidebarSectionItems({ item }: { item: MenuItem }) {
)} )}
</h5> </h5>
<ul className={cx('mb-6', collapsed ? 'hidden' : '')}> <ul className={cx('mb-6', collapsed ? 'hidden' : '')}>
{(item.itemList as MenuItem[]).map((item) => { {(item.itemList as MenuItem[]).map((item, index) => {
const isActiveLink = item.url === withoutAnchors(router?.asPath); const isActiveLink = item.url === withoutAnchors(router?.asPath);
return ( return (
<li key={item.id} data-testid={`section-li:${item.id}`}> <li
key={item.id + '-' + index}
data-testid={`section-li:${item.id}`}
>
<Link href={item.url as string}> <Link href={item.url as string}>
<a <a
className={cx( className={cx(

17
nx-dev/ui/common/src/lib/header.tsx
View File

@ -24,7 +24,6 @@ export function Header(props: HeaderProps) {
'version' in props ? props.version : { name: 'Latest', value: 'l' }; 'version' in props ? props.version : { name: 'Latest', value: 'l' };
const flavor = const flavor =
'flavor' in props ? props.flavor : { name: 'React', value: 'r' }; 'flavor' in props ? props.flavor : { name: 'React', value: 'r' };
return ( return (
<header <header
className={cx( className={cx(
@ -79,24 +78,12 @@ export function Header(props: HeaderProps) {
{/*NAVIGATION*/} {/*NAVIGATION*/}
<div className="text-sm flex-shrink-0"> <div className="text-sm flex-shrink-0">
<nav className="flex items-justified justify-center space-x-1"> <nav className="flex items-justified justify-center space-x-1">
<Link <Link href="/getting-started/intro">
href={
version && flavor
? `/${version.value}/${flavor.value}/getting-started/intro`
: `/getting-started/intro`
}
>
<a className="font-bold px-3 py-2 text-white leading-tight"> <a className="font-bold px-3 py-2 text-white leading-tight">
Docs Docs
</a> </a>
</Link> </Link>
<Link <Link href="/core-concepts/nx-devkit">
href={
version && flavor
? `/${version.value}/${flavor.value}/core-concepts/nx-devkit`
: `/core-concepts/nx-devkit`
}
>
<a className="px-3 py-2 hidden md:inline-flex text-white leading-tight"> <a className="px-3 py-2 hidden md:inline-flex text-white leading-tight">
Plugins Plugins
</a> </a>