From 3110d629ce62e6ce1f229b241dbc7727ca410d22 Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:26:34 +0200 Subject: [PATCH 1/2] progress --- .../data-table-root/data-table-root.tsx | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx b/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx index 99ebdf467423e..964094809954b 100644 --- a/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx +++ b/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx @@ -140,7 +140,7 @@ export const DataTableRoot = ({ ({ : 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 h-12 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, @@ -206,7 +206,7 @@ export const DataTableRoot = ({ 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, @@ -241,23 +241,26 @@ export const DataTableRoot = ({ ? 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 ( ({ : undefined, }} > - {to ? ( + {shouldRenderAsLink ? ( - {Inner} +
+ {Inner} +
) : ( Inner From 6adaecc7362d665be79779452997e0e1dc326855 Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:21:58 +0200 Subject: [PATCH 2/2] fix --- .../table/data-table/data-table-root/data-table-root.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx b/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx index 964094809954b..4eb520bb6b5d2 100644 --- a/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx +++ b/packages/admin-next/dashboard/src/components/table/data-table/data-table-root/data-table-root.tsx @@ -171,7 +171,7 @@ export const DataTableRoot = ({ : undefined, }} className={clx({ - "bg-ui-bg-base sticky inset-y-0 left-0 h-12 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, @@ -256,6 +256,7 @@ export const DataTableRoot = ({