Skip to content

Have all nodes within a text-cells adhere to alignments #3175

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export async function RecordColumnValue<Tag extends React.ElementType = 'div'>(
return <Tag className={tcls(['w-full', verticalAlignment])}>{''}</Tag>;
}

const alignment = getColumnAlignment(definition);
const horizontalAlignment = `[&_*]:${getColumnAlignment(definition)} ${getColumnAlignment(definition)}`;

return (
<Blocks
Expand All @@ -130,8 +130,7 @@ export async function RecordColumnValue<Tag extends React.ElementType = 'div'>(
'lg:space-y-3',
'leading-normal',
verticalAlignment,
alignment === 'right' ? 'text-right' : null,
alignment === 'center' ? 'text-center' : null,
horizontalAlignment,
]}
context={context}
blockStyle={['w-full', 'max-w-[unset]']}
Expand Down
48 changes: 22 additions & 26 deletions packages/gitbook/src/components/DocumentView/Table/ViewGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,28 @@ export function ViewGrid(props: TableViewProps<DocumentTableViewGrid>) {
)}
>
<div role="row" className={tcls('flex', 'w-full')}>
{view.columns.map((column) => {
const alignment = getColumnAlignment(block.data.definition[column]);
return (
<div
key={column}
role="columnheader"
className={tcls(
styles.columnHeader,
alignment === 'right' ? 'text-right' : null,
alignment === 'center' ? 'text-center' : null
)}
style={{
width: getColumnWidth({
column,
columnWidths,
autoSizedColumns,
fixedColumns,
}),
minWidth: columnWidths?.[column] || '100px',
}}
title={block.data.definition[column].title}
>
{block.data.definition[column].title}
</div>
);
})}
{view.columns.map((column) => (
<div
key={column}
role="columnheader"
className={tcls(
styles.columnHeader,
getColumnAlignment(block.data.definition[column])
)}
style={{
width: getColumnWidth({
column,
columnWidths,
autoSizedColumns,
fixedColumns,
}),
minWidth: columnWidths?.[column] || '100px',
}}
title={block.data.definition[column].title}
>
{block.data.definition[column].title}
</div>
))}
</div>
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

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

.row {
Expand Down
20 changes: 17 additions & 3 deletions packages/gitbook/src/components/DocumentView/Table/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { ContentRef, DocumentTableDefinition, DocumentTableRecord } from '@gitbook/api';
import assertNever from 'assert-never';

/**
* Get the value for a column in a record.
Expand All @@ -14,11 +15,24 @@ export function getRecordValue<T extends number | string | boolean | string[] |
/**
* Get the text alignment for a column.
*/
export function getColumnAlignment(column: DocumentTableDefinition): 'left' | 'right' | 'center' {
export function getColumnAlignment(column: DocumentTableDefinition) {
const defaultAlignment = 'text-left';

if (column.type === 'text') {
return column.textAlignment ?? 'left';
switch (column.textAlignment) {
case undefined:
case 'left':
return defaultAlignment;
case 'center':
return 'text-center';
case 'right':
return 'text-right';
default:
assertNever(column.textAlignment);
}
}
return 'left';

return defaultAlignment;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/gitbook/src/components/primitives/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export function Button({
'contrast-more:hover:ring-2',
'contrast-more:hover:ring-tint-12',

'hover:scale-105',
'hover:scale-104',
'active:scale-100',
'transition-all',

Expand Down
1 change: 1 addition & 0 deletions packages/gitbook/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ const config: Config = {
scale: {
'98': '0.98',
'102': '1.02',
'104': '1.04',
},
},
opacity: opacity(),
Expand Down
Loading