Skip to content

Small table cell refactor #2166

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
charliepark merged 4 commits into from
Apr 19, 2024
Merged

Small table cell refactor #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d360979
a small bit of className cleanup
charliepark Apr 18, 2024
2a03730
no need to declare const
charliepark Apr 18, 2024
419fcaf
Merge branch 'main' into small-table-cell-refactor
charliepark Apr 19, 2024
429ccc1
increase row height on sled instances table as well
charliepark Apr 19, 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
2 changes: 1 addition & 1 deletion app/pages/project/vpcs/VpcPage/tabs/VpcSubnetsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const VpcSubnetsTab = () => {
{creating && <CreateSubnetForm onDismiss={() => setCreating(false)} />}
{editing && <EditSubnetForm editing={editing} onDismiss={() => setEditing(null)} />}
</div>
<Table columns={columns} emptyState={emptyState} />
<Table columns={columns} emptyState={emptyState} rowHeight="large" />
</>
)
}
2 changes: 1 addition & 1 deletion app/pages/system/inventory/sled/SledInstancesTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ export function SledInstancesTab() {

const columns = useColsWithActions(staticCols, makeActions)

return <Table columns={columns} emptyState={<EmptyState />} />
return <Table columns={columns} emptyState={<EmptyState />} rowHeight="large" />
}
34 changes: 15 additions & 19 deletions app/ui/lib/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,24 @@ Table.Body = ({ className, children, ...props }: TableBodyProps) => {
}

export type TableCellProps = JSX.IntrinsicElements['td'] & { height?: 'small' | 'large' }
Table.Cell = ({ height = 'small', className, children, ...props }: TableCellProps) => {
const heightClasses = { 'h-12': height === 'small', 'h-16': height === 'large' }
return (
<td
Table.Cell = ({ height = 'small', className, children, ...props }: TableCellProps) => (
<td
className={cn(
className,
'pl-0 text-default border-default children:first:border-l-0 children:last:-mr-[1px]'
)}
{...props}
>
<div
className={cn(
className,
'pl-0 text-default border-default children:first:border-l-0 children:last:-mr-[1px]',
heightClasses
'relative -my-[1px] -mr-[2px] flex items-center border-b border-l p-3 border-secondary',
{ 'h-12': height === 'small', 'h-16': height === 'large' }
)}
{...props}
>
<div
className={cn(
'relative -my-[1px] -mr-[2px] flex items-center border-b border-l py-3 pl-3 pr-3 border-secondary',
heightClasses
)}
>
{children}
</div>
</td>
)
}
{children}
</div>
</td>
)

/**
* Used _outside_ of the `Table`, this element wraps buttons that sit on top
Expand Down