Skip to content

Commit 9892089

Browse files
committed
fix(sidebar): gate pointer-events on lock and more button visibility
1 parent 802d013 commit 9892089

2 files changed

Lines changed: 26 additions & 48 deletions

File tree

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { generateId } from '@sim/utils/id'
66
import clsx from 'clsx'
77
import { ChevronRight, Folder, FolderOpen, MoreHorizontal } from 'lucide-react'
88
import { useParams, useRouter } from 'next/navigation'
9-
import { Tooltip } from '@/components/emcn'
109
import { Lock } from '@/components/emcn/icons'
1110
import { SIM_RESOURCES_DRAG_TYPE } from '@/lib/copilot/resource-types'
1211
import { getNextWorkflowColor } from '@/lib/workflows/colors'
@@ -556,36 +555,26 @@ export function FolderItem({
556555
</div>
557556
<div className='relative h-[18px] w-[18px] flex-shrink-0'>
558557
{folder.locked && (
559-
<Tooltip.Root>
560-
<Tooltip.Trigger asChild>
561-
<span
562-
aria-label='Folder is locked'
563-
className={clsx(
564-
'absolute inset-0 flex items-center justify-center transition-opacity',
565-
!isAnyDragActive && 'group-hover:opacity-0',
566-
isContextMenuOpen && 'opacity-0'
567-
)}
568-
>
569-
<Lock
570-
className='h-[14px] w-[14px] text-[var(--text-icon)]'
571-
aria-hidden='true'
572-
/>
573-
</span>
574-
</Tooltip.Trigger>
575-
<Tooltip.Content side='bottom'>
576-
<span>Locked</span>
577-
</Tooltip.Content>
578-
</Tooltip.Root>
558+
<span
559+
aria-label='Folder is locked'
560+
className={clsx(
561+
'pointer-events-none absolute inset-0 flex items-center justify-center transition-opacity',
562+
!isAnyDragActive && 'group-hover:opacity-0',
563+
isContextMenuOpen && 'opacity-0'
564+
)}
565+
>
566+
<Lock className='h-[14px] w-[14px] text-[var(--text-icon)]' aria-hidden='true' />
567+
</span>
579568
)}
580569
<button
581570
type='button'
582571
aria-label='Folder options'
583572
onPointerDown={handleMorePointerDown}
584573
onClick={handleMoreClick}
585574
className={clsx(
586-
'absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity',
587-
!isAnyDragActive && 'group-hover:opacity-100',
588-
isContextMenuOpen && 'opacity-100'
575+
'pointer-events-none absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity',
576+
!isAnyDragActive && 'group-hover:pointer-events-auto group-hover:opacity-100',
577+
isContextMenuOpen && 'pointer-events-auto opacity-100'
589578
)}
590579
>
591580
<MoreHorizontal className='h-[16px] w-[16px] text-[var(--text-icon)]' />

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import clsx from 'clsx'
55
import { MoreHorizontal } from 'lucide-react'
66
import Link from 'next/link'
77
import { useParams } from 'next/navigation'
8-
import { Tooltip } from '@/components/emcn'
98
import { Lock } from '@/components/emcn/icons'
109
import { SIM_RESOURCES_DRAG_TYPE } from '@/lib/copilot/resource-types'
1110
import { workflowBorderColor } from '@/lib/workspaces/colors'
@@ -475,36 +474,26 @@ export function WorkflowItem({
475474
{!isEditing && (
476475
<div className='relative h-[18px] w-[18px] flex-shrink-0'>
477476
{workflow.locked && (
478-
<Tooltip.Root>
479-
<Tooltip.Trigger asChild>
480-
<span
481-
aria-label='Workflow is locked'
482-
className={clsx(
483-
'absolute inset-0 flex items-center justify-center transition-opacity',
484-
!isAnyDragActive && 'group-hover:opacity-0',
485-
isContextMenuOpen && 'opacity-0'
486-
)}
487-
>
488-
<Lock
489-
className='h-[14px] w-[14px] text-[var(--text-icon)]'
490-
aria-hidden='true'
491-
/>
492-
</span>
493-
</Tooltip.Trigger>
494-
<Tooltip.Content side='bottom'>
495-
<span>Locked</span>
496-
</Tooltip.Content>
497-
</Tooltip.Root>
477+
<span
478+
aria-label='Workflow is locked'
479+
className={clsx(
480+
'pointer-events-none absolute inset-0 flex items-center justify-center transition-opacity',
481+
!isAnyDragActive && 'group-hover:opacity-0',
482+
isContextMenuOpen && 'opacity-0'
483+
)}
484+
>
485+
<Lock className='h-[14px] w-[14px] text-[var(--text-icon)]' aria-hidden='true' />
486+
</span>
498487
)}
499488
<button
500489
type='button'
501490
aria-label='Workflow options'
502491
onPointerDown={handleMorePointerDown}
503492
onClick={handleMoreClick}
504493
className={clsx(
505-
'absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity',
506-
!isAnyDragActive && 'group-hover:opacity-100',
507-
isContextMenuOpen && 'opacity-100'
494+
'pointer-events-none absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity',
495+
!isAnyDragActive && 'group-hover:pointer-events-auto group-hover:opacity-100',
496+
isContextMenuOpen && 'pointer-events-auto opacity-100'
508497
)}
509498
>
510499
<MoreHorizontal className='h-[16px] w-[16px] text-[var(--text-icon)]' />

0 commit comments

Comments
 (0)