From 28422eea5812c06e2b01ae336b21bf241377959b Mon Sep 17 00:00:00 2001
From: iCrawl <buechler.noel@outlook.com>
Date: Tue, 23 Aug 2022 09:15:33 +0200
Subject: [PATCH] fix: spacing of footer and affix

---
 .../src/DocModel/ApiNodeJSONEncoder.ts        |  4 +--
 .../website/src/components/SidebarLayout.tsx  |  2 +-
 packages/website/src/pages/docs/[...slug].tsx | 28 ++++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/website/src/DocModel/ApiNodeJSONEncoder.ts b/packages/website/src/DocModel/ApiNodeJSONEncoder.ts
index 36e4a57c4..a7a97dc0b 100644
--- a/packages/website/src/DocModel/ApiNodeJSONEncoder.ts
+++ b/packages/website/src/DocModel/ApiNodeJSONEncoder.ts
@@ -221,7 +221,7 @@ export class ApiNodeJSONEncoder {
 		model: ApiModel,
 		item: ApiTypeParameterListMixin & ApiDeclaredItem,
 		version: string,
-	) {
+	): ApiTypeParameterListJSON {
 		return {
 			typeParameters: item.typeParameters.map((param) => generateTypeParamData(model, param, version, item.parent)),
 		};
@@ -259,7 +259,7 @@ export class ApiNodeJSONEncoder {
 		};
 	}
 
-	public static encodeFunction(model: ApiModel, item: ApiFunction, version: string) {
+	public static encodeFunction(model: ApiModel, item: ApiFunction, version: string): ApiFunctionJSON {
 		return {
 			...this.encodeItem(model, item, version),
 			...this.encodeParameterList(model, item, version),
diff --git a/packages/website/src/components/SidebarLayout.tsx b/packages/website/src/components/SidebarLayout.tsx
index f928f9030..5acef0f86 100644
--- a/packages/website/src/components/SidebarLayout.tsx
+++ b/packages/website/src/components/SidebarLayout.tsx
@@ -304,7 +304,7 @@ export function SidebarLayout({
 						height: 200,
 						background: theme.colorScheme === 'dark' ? theme.colors.dark![7] : theme.colors.gray![0],
 						paddingLeft: 324,
-						paddingRight: 324,
+						paddingRight: data?.member?.kind !== 'Class' && data?.member?.kind !== 'Interface' ? 24 : 324,
 
 						[theme.fn.smallerThan('lg')]: {
 							paddingRight: 24,
diff --git a/packages/website/src/pages/docs/[...slug].tsx b/packages/website/src/pages/docs/[...slug].tsx
index d63a6fe7a..858d4ebdf 100644
--- a/packages/website/src/pages/docs/[...slug].tsx
+++ b/packages/website/src/pages/docs/[...slug].tsx
@@ -226,19 +226,6 @@ export default function SlugPage(props: Partial<SidebarLayoutProps & { error?: s
 							<title key="title">{name}</title>
 						</Head>
 						{member(props.data.member)}
-						<Affix position={{ bottom: 20, right: matches ? 20 : 280 }}>
-							<Transition transition="slide-up" mounted={scroll.y > 250}>
-								{(transitionStyles) => (
-									<Button
-										leftIcon={<VscChevronUp size={20} />}
-										style={transitionStyles}
-										onClick={() => scrollTo({ y: 0 })}
-									>
-										Scroll to top
-									</Button>
-								)}
-							</Transition>
-						</Affix>
 					</>
 				) : props.data?.source ? (
 					<Box
@@ -259,6 +246,21 @@ export default function SlugPage(props: Partial<SidebarLayoutProps & { error?: s
 						<MDXRemote {...props.data.source} />
 					</Box>
 				) : null}
+				<Affix
+					position={{
+						bottom: 20,
+						right:
+							matches || (props.data?.member?.kind !== 'Class' && props.data?.member?.kind !== 'Interface') ? 20 : 280,
+					}}
+				>
+					<Transition transition="slide-up" mounted={scroll.y > 200}>
+						{(transitionStyles) => (
+							<Button leftIcon={<VscChevronUp size={20} />} style={transitionStyles} onClick={() => scrollTo({ y: 0 })}>
+								Scroll to top
+							</Button>
+						)}
+					</Transition>
+				</Affix>
 			</SidebarLayout>
 		</MemberProvider>
 	);