Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdec2c4c

Browse files
authored
fix(site): fix task table links in Safari (#20663)
This change makes the TableRow clickable rather than having anabsolutely positioned RouterLink. In Safari the entire table was brokenbecause all links spanned across the whole table, and the bottom mostrow shadowed all others, resulting in only the bottom row beinghighlighted and all rows leading to the bottom most task.
1 parentb3f651d commitdec2c4c

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

‎site/src/pages/TasksPage/TasksTable.tsx‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import {
2323
TooltipProvider,
2424
TooltipTrigger,
2525
}from"components/Tooltip/Tooltip";
26+
import{useClickableTableRow}from"hooks";
2627
import{RotateCcwIcon,TrashIcon}from"lucide-react";
2728
import{TaskDeleteDialog}from"modules/tasks/TaskDeleteDialog/TaskDeleteDialog";
2829
import{TaskStatus}from"modules/tasks/TaskStatus/TaskStatus";
2930
import{typeFC,typeReactNode,useState}from"react";
30-
import{LinkasRouterLink}from"react-router";
31+
import{useNavigate}from"react-router";
3132
import{relativeTime}from"utils/time";
3233

3334
typeTasksTableProps={
@@ -116,24 +117,27 @@ type TaskRowProps = { task: Task };
116117
constTaskRow:FC<TaskRowProps>=({ task})=>{
117118
const[isDeleteDialogOpen,setIsDeleteDialogOpen]=useState(false);
118119
consttemplateDisplayName=task.template_display_name??task.template_name;
120+
constnavigate=useNavigate();
121+
122+
consttaskPageLink=`/tasks/${task.owner_name}/${task.id}`;
123+
// Discard role, breaks Chromatic.
124+
const{ role, ...clickableRowProps}=useClickableTableRow({
125+
onClick:()=>navigate(taskPageLink),
126+
});
119127

120128
return(
121129
<>
122-
<TableRowclassName="relative"hover>
130+
<TableRow
131+
key={task.id}
132+
data-testid={`task-${task.id}`}
133+
{...clickableRowProps}
134+
>
123135
<TableCell>
124136
<AvatarData
125137
title={
126-
<>
127-
<spanclassName="block max-w-[520px] overflow-hidden text-ellipsis whitespace-nowrap">
128-
{task.initial_prompt}
129-
</span>
130-
<RouterLink
131-
to={`/tasks/${task.owner_name}/${task.id}`}
132-
className="absolute inset-0"
133-
>
134-
<spanclassName="sr-only">Access task</span>
135-
</RouterLink>
136-
</>
138+
<spanclassName="block max-w-[520px] overflow-hidden text-ellipsis whitespace-nowrap">
139+
{task.initial_prompt}
140+
</span>
137141
}
138142
subtitle={templateDisplayName}
139143
avatar={
@@ -171,8 +175,10 @@ const TaskRow: FC<TaskRowProps> = ({ task }) => {
171175
<Button
172176
size="icon"
173177
variant="outline"
174-
className="relative z-50"
175-
onClick={()=>setIsDeleteDialogOpen(true)}
178+
onClick={(e)=>{
179+
e.stopPropagation();
180+
setIsDeleteDialogOpen(true);
181+
}}
176182
>
177183
<spanclassName="sr-only">Delete task</span>
178184
<TrashIcon/>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp