Skip to content

Improve styles of Tables #2623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 13, 2024
Merged

Improve styles of Tables #2623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23cd156
Refactor Table to use flex layouts
viktorrenkema Dec 11, 2024
a178d76
Use more classes in module.css
viktorrenkema Dec 11, 2024
ad30f20
Iterate on styles of Tables
viktorrenkema Dec 11, 2024
eeeeecc
Add more table tests
viktorrenkema Dec 12, 2024
eb07014
Merge branch 'main' into viktor/rnd-5815/table-styles
viktorrenkema Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions packages/gitbook/e2e/pages.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,90 @@ const testCases: TestsCase[] = [
},
],
},
{
name: 'Tables',
baseUrl: 'https://gitbook.gitbook.io/test-gitbook-open/',
tests: [
{
name: 'Default table',
url: 'blocks/tables',
run: waitForCookiesDialog,
fullPage: true,
},
{
name: 'Table with straight corners',
url:
'blocks/tables' +
getCustomizationURL({
styling: {
corners: CustomizationCorners.Straight,
},
}),
run: waitForCookiesDialog,
fullPage: true,
},
{
name: 'Table with primary color',
url:
'blocks/tables' +
getCustomizationURL({
styling: {
tint: { color: { light: '#346DDB', dark: '#346DDB' } },
},
}),
run: waitForCookiesDialog,
fullPage: true,
},
// Test dark mode for each variant
...allThemeModes.flatMap((theme) => [
{
name: `Table in ${theme} mode`,
url:
'blocks/tables' +
getCustomizationURL({
themes: {
default: theme,
toggeable: false,
},
}),
run: waitForCookiesDialog,
fullPage: true,
},
{
name: `Table with straight corners in ${theme} mode`,
url:
'blocks/tables' +
getCustomizationURL({
styling: {
corners: CustomizationCorners.Straight,
},
themes: {
default: theme,
toggeable: false,
},
}),
run: waitForCookiesDialog,
fullPage: true,
},
{
name: `Table with primary color in ${theme} mode`,
url:
'blocks/tables' +
getCustomizationURL({
styling: {
tint: { color: { light: '#346DDB', dark: '#346DDB' } },
},
themes: {
default: theme,
toggeable: false,
},
}),
run: waitForCookiesDialog,
fullPage: true,
},
]),
],
},
];

for (const testCase of testCases) {
Expand Down
11 changes: 9 additions & 2 deletions packages/gitbook/src/components/DocumentView/Table/ViewGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,15 @@ export function ViewGrid(props: TableViewProps<DocumentTableViewGrid>) {
<div role="table" className={tcls('flex', 'flex-col')}>
{/* Header */}
{withHeader && (
<div role="rowgroup" className={tcls('flex flex-col', tableWidth)}>
<div role="row" className={tcls('flex', 'w-full', '[&>*+*]:border-l')}>
<div
role="rowgroup"
className={tcls(
tableWidth,
styles.rowGroup,
'straight-corners:rounded-none',
)}
>
<div role="row" className={tcls('flex', 'w-full')}>
{view.columns.map((column) => {
const alignment = getColumnAlignment(block.data.definition[column]);
return (
Expand Down
30 changes: 23 additions & 7 deletions packages/gitbook/src/components/DocumentView/Table/table.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,37 @@
}

:global(.dark) .tableWrapper {
@apply border-light/2;
@apply border-tint-50;
}

.columnHeader {
@apply text-sm font-medium py-3 px-4 text-tint-900;
}

:global(.dark) .columnHeader {
@apply text-white;
}

.row {
@apply flex border-dark/3 dark:border-light/2;
@apply flex border-tint-700/2;
}

.row > * + * {
@apply border-l;
:global(.dark) .row {
@apply border-tint-300/3;
}

.rowGroup {
@apply flex flex-col border rounded-lg bg-tint-800/1 border-tint-700/2;
}

:global(.dark) .rowGroup {
@apply bg-tint-300/2 border-tint-300/3;
}

.cell {
@apply flex-1 align-middle border-dark/2 py-2 px-3 text-sm lg:text-base dark:border-light/2;
@apply flex-1 align-middle border-dark/2 py-2 px-4 text-sm;
}

.columnHeader {
@apply align-middle text-left text-base font-medium border-b dark:border-l-light/2 dark:border-b-light/4 py-2 px-3;
:global(.dark) .cell {
@apply border-light/2;
}
Loading