From a57b9ba5c4c7dcff09caf8f59cc6f7a480932355 Mon Sep 17 00:00:00 2001 From: iCrawl Date: Tue, 23 Aug 2022 12:54:40 +0200 Subject: [PATCH] refactor: mobile layout for badges --- .../website/src/components/CodeListing.tsx | 50 ++++++++++++------ .../website/src/components/DocContainer.tsx | 3 +- .../website/src/components/MethodItem.tsx | 52 +++++++++++++------ packages/website/tsconfig.eslint.json | 1 + 4 files changed, 72 insertions(+), 34 deletions(-) diff --git a/packages/website/src/components/CodeListing.tsx b/packages/website/src/components/CodeListing.tsx index 53e26fd08..e3eeb3287 100644 --- a/packages/website/src/components/CodeListing.tsx +++ b/packages/website/src/components/CodeListing.tsx @@ -1,4 +1,4 @@ -import { ActionIcon, Badge, Group, MediaQuery, Stack, Title } from '@mantine/core'; +import { ActionIcon, Badge, Box, Group, MediaQuery, Stack, Title } from '@mantine/core'; import { useMediaQuery } from '@mantine/hooks'; import type { ReactNode } from 'react'; import { FiLink } from 'react-icons/fi'; @@ -41,28 +41,44 @@ export function CodeListing({ return ( - + ({ + display: 'flex', + gap: 16, + + [theme.fn.smallerThan('sm')]: { + flexDirection: 'column', + }, + })} + ml={matches ? 0 : -45} + > - {deprecation ? ( - - Deprecated - + {deprecation || readonly || optional ? ( + + {deprecation ? ( + + Deprecated + + ) : null} + {readonly ? Readonly : null} + {optional ? Optional : null} + ) : null} - {readonly ? Readonly : null} - {optional ? Optional : null} - - {name} - {optional ? '?' : ''} - - {separator} - - <HyperlinkedText tokens={typeTokens} /> - - + + + {name} + {optional ? '?' : ''} + + {separator} + + <HyperlinkedText tokens={typeTokens} /> + + + {deprecation ? : null} diff --git a/packages/website/src/components/DocContainer.tsx b/packages/website/src/components/DocContainer.tsx index afc8e4f6f..ca83728b0 100644 --- a/packages/website/src/components/DocContainer.tsx +++ b/packages/website/src/components/DocContainer.tsx @@ -1,4 +1,4 @@ -import { Group, Stack, Title, Text, Box, MediaQuery, Aside, ScrollArea, Skeleton } from '@mantine/core'; +import { Group, Stack, Title, Text, Box, MediaQuery, Aside, ScrollArea, Skeleton, Divider } from '@mantine/core'; import { useMediaQuery } from '@mantine/hooks'; import { useRouter } from 'next/router'; import { Fragment, type ReactNode } from 'react'; @@ -80,6 +80,7 @@ export function DocContainer({
} padded dense={matches}> {summary ? : No summary provided.} +
diff --git a/packages/website/src/components/MethodItem.tsx b/packages/website/src/components/MethodItem.tsx index 8219d7808..82b84feef 100644 --- a/packages/website/src/components/MethodItem.tsx +++ b/packages/website/src/components/MethodItem.tsx @@ -1,4 +1,4 @@ -import { ActionIcon, Badge, Group, MediaQuery, Stack, Title } from '@mantine/core'; +import { ActionIcon, Badge, Box, Group, MediaQuery, Stack, Title } from '@mantine/core'; import { useMediaQuery } from '@mantine/hooks'; import { FiLink } from 'react-icons/fi'; import { HyperlinkedText } from './HyperlinkedText'; @@ -27,27 +27,47 @@ export function MethodItem({ data }: { data: ApiMethodJSON | ApiMethodSignatureJ - + ({ + display: 'flex', + gap: 16, + + [theme.fn.smallerThan('sm')]: { + flexDirection: 'column', + }, + })} + ml={matches ? 0 : -45} + > - {data.deprecated ? ( - - Deprecated - + {data.deprecated || + (data.kind === 'Method' && method.visibility === Visibility.Protected) || + (data.kind === 'Method' && method.static) ? ( + + {data.deprecated ? ( + + Deprecated + + ) : null} + {data.kind === 'Method' && method.visibility === Visibility.Protected ? ( + Protected + ) : null} + {data.kind === 'Method' && method.static ? Static : null} + ) : null} - {data.kind === 'Method' && method.visibility === Visibility.Protected ? ( - Protected - ) : null} - {data.kind === 'Method' && method.static ? Static : null} - {`${getShorthandName(data)}`} - : - - <HyperlinkedText tokens={data.returnTypeTokens} /> - - + + {`${getShorthandName( + data, + )}`} + : + + <HyperlinkedText tokens={data.returnTypeTokens} /> + + + diff --git a/packages/website/tsconfig.eslint.json b/packages/website/tsconfig.eslint.json index d04d4be3a..63e703d90 100644 --- a/packages/website/tsconfig.eslint.json +++ b/packages/website/tsconfig.eslint.json @@ -7,6 +7,7 @@ "**/*.ts", "**/*.tsx", "**/*.js", + "**/*.cjs", "**/*.mjs", "**/*.jsx", "**/*.test.ts",