From 9b40a79b3efbb2419f31021849494443d2c6f676 Mon Sep 17 00:00:00 2001 From: iCrawl Date: Wed, 21 Sep 2022 15:46:44 +0200 Subject: [PATCH] fix: focus-ring styles --- packages/website/src/components/CmdK.tsx | 4 +- .../website/src/components/CodeListing.tsx | 8 +- .../src/components/HyperlinkedText.tsx | 4 +- .../src/components/InheritanceText.tsx | 4 +- .../website/src/components/MethodItem.tsx | 12 ++- packages/website/src/components/Section.tsx | 2 +- .../website/src/components/SidebarItems.tsx | 2 +- .../website/src/components/SidebarLayout.tsx | 75 ++++++++++++++----- .../src/components/TableOfContentItems.tsx | 4 +- .../website/src/components/model/Function.tsx | 6 +- .../website/src/components/tsdoc/TSDoc.tsx | 8 +- packages/website/src/pages/404.tsx | 2 +- .../pages/docs/packages/[package]/index.tsx | 4 +- .../website/src/pages/docs/packages/index.tsx | 8 +- packages/website/src/pages/index.tsx | 7 +- 15 files changed, 101 insertions(+), 49 deletions(-) diff --git a/packages/website/src/components/CmdK.tsx b/packages/website/src/components/CmdK.tsx index baa09182f..93b56ba91 100644 --- a/packages/website/src/components/CmdK.tsx +++ b/packages/website/src/components/CmdK.tsx @@ -47,7 +47,7 @@ export function CmdKDialog({ currentPackageName }: { currentPackageName?: string searchResults?.map((item) => ( { void router.push(item.path); dialog!.setOpen(false); @@ -115,7 +115,7 @@ export function CmdKDialog({ currentPackageName }: { currentPackageName?: string shouldFilter={false} > ) { return (
-
- +
+ {deprecation || readonly || optional ? ( diff --git a/packages/website/src/components/HyperlinkedText.tsx b/packages/website/src/components/HyperlinkedText.tsx index b1fa9d7fd..32b2e68b2 100644 --- a/packages/website/src/components/HyperlinkedText.tsx +++ b/packages/website/src/components/HyperlinkedText.tsx @@ -8,7 +8,9 @@ export function HyperlinkedText({ tokens }: { tokens: TokenDocumentation[] }) { if (token.path) { return ( - {token.text} + + {token.text} + ); } diff --git a/packages/website/src/components/InheritanceText.tsx b/packages/website/src/components/InheritanceText.tsx index c76ea6a7a..9d396de39 100644 --- a/packages/website/src/components/InheritanceText.tsx +++ b/packages/website/src/components/InheritanceText.tsx @@ -6,7 +6,9 @@ export function InheritanceText({ data }: { data: InheritanceData }) { Inherited from{' '} - {data.parentName} + + {data.parentName} + ); diff --git a/packages/website/src/components/MethodItem.tsx b/packages/website/src/components/MethodItem.tsx index 2ce66e55a..01f7028ce 100644 --- a/packages/website/src/components/MethodItem.tsx +++ b/packages/website/src/components/MethodItem.tsx @@ -35,7 +35,11 @@ export function MethodItem({ data }: { data: ApiMethodJSON | ApiMethodSignatureJ
- + {data.deprecated || @@ -72,7 +76,7 @@ export function MethodItem({ data }: { data: ApiMethodJSON | ApiMethodSignatureJ
@@ -88,12 +92,12 @@ export function MethodItem({ data }: { data: ApiMethodJSON | ApiMethodSignatureJ {data.mergedSiblings.map((_, idx) => ( setOverloadIndex(idx + 1)} >{`Overload ${idx + 1}`} ))} diff --git a/packages/website/src/components/Section.tsx b/packages/website/src/components/Section.tsx index 8a36db8b4..539c07f55 100644 --- a/packages/website/src/components/Section.tsx +++ b/packages/website/src/components/Section.tsx @@ -21,7 +21,7 @@ export function Section({ return (
diff --git a/packages/website/src/components/SidebarItems.tsx b/packages/website/src/components/SidebarItems.tsx index 8d1b1ff0e..75aa75d36 100644 --- a/packages/website/src/components/SidebarItems.tsx +++ b/packages/website/src/components/SidebarItems.tsx @@ -89,7 +89,7 @@ export function SidebarItems({ {groupItems[group].map((member, index) => ( [ packageMenu.setOpen(false)} > @@ -94,7 +94,7 @@ export function SidebarLayout({ ...PACKAGES.map((pkg) => ( packageMenu.setOpen(false)} @@ -114,7 +114,7 @@ export function SidebarLayout({ ?.map((item) => ( versionMenu.setOpen(false)} @@ -130,17 +130,30 @@ export function SidebarLayout({ const pathElements = useMemo( () => - asPathWithoutQueryAndAnchor.split('/').map((path, idx, original) => ( - - {path} - - )), + asPathWithoutQueryAndAnchor + .split('/') + .slice(1) + .map((path, idx, original) => ( + + {path} + + )), [asPathWithoutQueryAndAnchor], ); const breadcrumbs = useMemo( () => pathElements.flatMap((el, idx, array) => { + if (idx === 0) { + return ( + +
/
+ {el} +
/
+
+ ); + } + if (idx !== array.length - 1) { return ( @@ -161,7 +174,7 @@ export function SidebarLayout({