Skip to content
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

fix(dashboard): Add safe zone around link Table rows #8058

Merged
merged 3 commits into from
Jul 10, 2024
Merged

fix(dashboard): Add safe zone around link Table rows #8058

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3110d62
progress
kasperkristensen Jul 10, 2024
6adaecc
fix
kasperkristensen Jul 10, 2024
c42dc54
Merge branch 'develop' into fix/clickable-rows
kasperkristensen Jul 10, 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
33 changes: 23 additions & 10 deletions .../admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export const DataTableRoot = <TData,>({
<Table.Row
key={headerGroup.id}
className={clx({
"border-b-0 [&_th:last-of-type]:w-[1%] [&_th:last-of-type]:whitespace-nowrap":
"relative border-b-0 [&_th:last-of-type]:w-[1%] [&_th:last-of-type]:whitespace-nowrap":
hasActions,
"[&_th:first-of-type]:w-[1%] [&_th:first-of-type]:whitespace-nowrap":
hasSelect,
Expand Down Expand Up @@ -171,7 +171,7 @@ export const DataTableRoot = <TData,>({
: undefined,
}}
className={clx({
"bg-ui-bg-base sticky left-0 after:absolute after:inset-y-0 after:right-0 after:h-full after:w-px after:bg-transparent after:content-['']":
"bg-ui-bg-base sticky inset-y-0 left-0 after:absolute after:inset-y-0 after:right-0 after:h-full after:w-px after:bg-transparent after:content-['']":
isStickyHeader,
"left-[68px]":
isStickyHeader && hasSelect && !isSelectHeader,
Expand Down Expand Up @@ -206,7 +206,7 @@ export const DataTableRoot = <TData,>({
key={row.id}
data-selected={row.getIsSelected()}
className={clx(
"transition-fg group/row [&_td:last-of-type]:w-[1%] [&_td:last-of-type]:whitespace-nowrap",
"transition-fg group/row group relative [&_td:last-of-type]:w-[1%] [&_td:last-of-type]:whitespace-nowrap",
"has-[[data-row-link]:focus-visible]:bg-ui-bg-base-hover",
{
"bg-ui-bg-subtle hover:bg-ui-bg-subtle-hover": isOdd,
Expand Down Expand Up @@ -241,23 +241,27 @@ export const DataTableRoot = <TData,>({
? row.depth * 14 + 24
: undefined

const hasLeftOfsset =
isStickyCell && hasSelect && !isSelectCell

const Inner = flexRender(
cell.column.columnDef.cell,
cell.getContext()
)

const isTabableLink = index === 0 && !!to
const isTabableLink = isFirstCell && !!to
const shouldRenderAsLink = !!to && !isSelectCell

return (
<Table.Cell
key={cell.id}
className={clx({
"bg-ui-bg-base group-data-[selected=true]/row:bg-ui-bg-highlight group-data-[selected=true]/row:group-hover/row:bg-ui-bg-highlight-hover group-hover/row:bg-ui-bg-base-hover transition-fg has-[[data-row-link]:focus-visible]:bg-ui-bg-base-hover sticky left-0 after:absolute after:inset-y-0 after:right-0 after:h-full after:w-px after:bg-transparent after:content-['']":
"!pl-0 !pr-0": shouldRenderAsLink,
"bg-ui-bg-base group-data-[selected=true]/row:bg-ui-bg-highlight group-data-[selected=true]/row:group-hover/row:bg-ui-bg-highlight-hover group-hover/row:bg-ui-bg-base-hover transition-fg group-has-[[data-row-link]:focus-visible]:bg-ui-bg-base-hover sticky inset-y-0 left-0 after:absolute after:inset-y-0 after:right-0 after:h-full after:w-px after:bg-transparent after:content-['']":
isStickyCell,
"bg-ui-bg-subtle group-hover/row:bg-ui-bg-subtle-hover":
isOdd && isStickyCell,
"left-[68px]":
isStickyCell && hasSelect && !isSelectCell,
"bottom-0 left-[68px] top-0": hasLeftOfsset,
"after:bg-ui-border-base":
showStickyBorder && isStickyCell && !isSelectCell,
"!bg-ui-bg-disabled !hover:bg-ui-bg-disabled":
Expand All @@ -269,14 +273,23 @@ export const DataTableRoot = <TData,>({
: undefined,
}}
>
{to ? (
{shouldRenderAsLink ? (
<Link
to={to}
className="outline-none"
className="size-full outline-none"
data-row-link
tabIndex={isTabableLink ? 0 : -1}
>
{Inner}
<div
className={clx(
"flex size-full items-center pr-6",
{
"pl-6": isTabableLink && !hasLeftOfsset,
}
)}
>
{Inner}
</div>
</Link>
) : (
Inner
Expand Down
Loading