Skip to content

Commit 810ac5a

Browse files
authored
Merge pull request #461 from arty0928/feature/fix-table
Fix Table Component Scroll & Light Mode Color Issues
2 parents 178bc1f + 051eb24 commit 810ac5a

File tree

5 files changed

+49
-43
lines changed

5 files changed

+49
-43
lines changed

apps/landing/devup.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"text": "#2F2F2F",
99
"background": "#FFF",
1010
"containerBackground": "#FFF",
11+
"codeBackground": "#F5F5F5",
1112
"border": "#E0E0E0",
1213
"success": "#4CAF50",
1314
"warning": "#FF9800",
@@ -53,6 +54,7 @@
5354
"text": "#EDEDED",
5455
"background": "#131313",
5556
"containerBackground": "#373639",
57+
"codeBackground": "#2E2E2E",
5658
"border": "#333",
5759
"success": "#4CAF50",
5860
"warning": "#FF9800",
Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Text, VStack } from '@devup-ui/react'
1+
import { Box, Text, VStack } from '@devup-ui/react'
22
import Markdown from 'react-markdown'
33

44
import { _components } from '@/mdx-components'
@@ -41,50 +41,52 @@ export const PropsTable = async (props: PropTableProps) => {
4141
const { componentProps } = props
4242

4343
return (
44-
<Table border={0}>
45-
<TableHead>
46-
<TableRow>
47-
<TableHeaderCell>Prop</TableHeaderCell>
48-
<TableHeaderCell>description</TableHeaderCell>
49-
<TableHeaderCell>Type</TableHeaderCell>
50-
<TableHeaderCell>Default</TableHeaderCell>
51-
</TableRow>
52-
</TableHead>
53-
<TableBody>
54-
{componentProps.length === 0 && (
44+
<Box maxWidth="100%" overflow="auto" width="100%">
45+
<Table border={0} style={{ minWidth: '600px' }}>
46+
<TableHead>
5547
<TableRow>
56-
<TableCell colSpan={3}>
57-
<Text>No props to display</Text>
58-
</TableCell>
48+
<TableHeaderCell>Prop</TableHeaderCell>
49+
<TableHeaderCell>description</TableHeaderCell>
50+
<TableHeaderCell>Type</TableHeaderCell>
51+
<TableHeaderCell>Default</TableHeaderCell>
5952
</TableRow>
60-
)}
61-
{componentProps.map(
62-
({ property, description, type, default: defaultValue }) => (
63-
<TableRow key={property}>
64-
<TableCell>
65-
<Text typography="bodyBold">{property}</Text>
53+
</TableHead>
54+
<TableBody>
55+
{componentProps.length === 0 && (
56+
<TableRow>
57+
<TableCell colSpan={3}>
58+
<Text>No props to display</Text>
6659
</TableCell>
67-
<TableCell>
68-
<MdxComponentsWithCodeBlock>
69-
{description}
70-
</MdxComponentsWithCodeBlock>
71-
</TableCell>
72-
<TableCell>
73-
<VStack>
60+
</TableRow>
61+
)}
62+
{componentProps.map(
63+
({ property, description, type, default: defaultValue }) => (
64+
<TableRow key={property}>
65+
<TableCell>
66+
<Text typography="bodyBold">{property}</Text>
67+
</TableCell>
68+
<TableCell>
7469
<MdxComponentsWithCodeBlock>
75-
{type?.replaceAll('"', "'")}
70+
{description}
7671
</MdxComponentsWithCodeBlock>
77-
</VStack>
78-
</TableCell>
79-
<TableCell>
80-
<MdxComponentsWithCodeBlock>
81-
{defaultValue}
82-
</MdxComponentsWithCodeBlock>
83-
</TableCell>
84-
</TableRow>
85-
),
86-
)}
87-
</TableBody>
88-
</Table>
72+
</TableCell>
73+
<TableCell>
74+
<VStack>
75+
<MdxComponentsWithCodeBlock>
76+
{type?.replaceAll('"', "'")}
77+
</MdxComponentsWithCodeBlock>
78+
</VStack>
79+
</TableCell>
80+
<TableCell>
81+
<MdxComponentsWithCodeBlock>
82+
{defaultValue}
83+
</MdxComponentsWithCodeBlock>
84+
</TableCell>
85+
</TableRow>
86+
),
87+
)}
88+
</TableBody>
89+
</Table>
90+
</Box>
8991
)
9092
}

apps/landing/src/components/mdx/components/CustomCodeBlock.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export function CustomCodeBlock({ children }: { children: string }) {
44
return (
55
<Box
66
as="code"
7-
bg="$containerBackground"
7+
bg="$codeBackground"
88
borderRadius="0.25rem"
99
color="$text"
1010
padding="0.25rem"

apps/landing/src/components/mdx/components/Table/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { type ComponentProps } from 'react'
33

44
export const Table = ({ ...props }: ComponentProps<'table'>) => {
55
return (
6-
<Box borderRadius="0.5rem" overflow="hidden">
6+
<Box borderRadius="0.5rem" overflow="visible">
77
<Box {...props} as="table" borderCollapse="collapse" borderSpacing={0} />
88
</Box>
99
)

packages/components/devup.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"text": "#272727",
1212
"background": "#F5F5F5",
1313
"containerBackground": "#FFFFFF",
14+
"codeBackground": "#F5F5F5",
1415
"border": "#E4E4E4",
1516
"success": "#2CA353",
1617
"warning": "#FF9800",
@@ -74,6 +75,7 @@
7475
"text": "#F6F6F6",
7576
"background": "#202020",
7677
"containerBackground": "#1E1E1E",
78+
"codeBackground": "#2E2E2E",
7779
"border": "#434343",
7880
"success": "#4CAF50",
7981
"warning": "#FF9800",

0 commit comments

Comments
 (0)