Skip to content

fix(canvas): correct z-index layering for selected blocks and connected edges #3698

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
waleedlatif1 merged 5 commits into from
Mar 21, 2026
Merged

fix(canvas): correct z-index layering for selected blocks and connected edges #3698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6307e0e
fix(canvas): correct z-index layering for selected blocks and connect…
waleedlatif1 Mar 21, 2026
86ef8eb
fix(canvas): derive subflow edge z-index from connected node z-index
waleedlatif1 Mar 21, 2026
818f245
fix(canvas): fix nodesForRender early-return guard for regular blocks
waleedlatif1 Mar 21, 2026
a7fe890
lint
waleedlatif1 Mar 21, 2026
80b269f
fix(canvas): ensure elevated edges and last-interacted nodes sit abov…
waleedlatif1 Mar 21, 2026
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
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/files/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 6
export default function FilesLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[12px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -18,7 +18,7 @@ export default function FilesLoading() {
</div>
</div>
</div>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
<Skeleton className='ml-[10px] h-[14px] w-[120px] rounded-[4px]' />
Expand All @@ -27,7 +27,7 @@ export default function FilesLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -40,7 +40,7 @@ export default function FilesLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 4
export default function DocumentLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[16px] py-[8.5px]'>
<div className='border-[var(--border)] border-b px-[16px] py-[8.5px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -18,7 +18,7 @@ export default function DocumentLoading() {
</div>
</div>
</div>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -32,7 +32,7 @@ export default function DocumentLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -45,7 +45,7 @@ export default function DocumentLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/knowledge/[id]/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 7
export default function KnowledgeBaseLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[16px] py-[8.5px]'>
<div className='border-[var(--border)] border-b px-[16px] py-[8.5px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -19,7 +19,7 @@ export default function KnowledgeBaseLoading() {
</div>
</div>
</div>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -34,7 +34,7 @@ export default function KnowledgeBaseLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -47,7 +47,7 @@ export default function KnowledgeBaseLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/knowledge/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 6
export default function KnowledgeLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[12px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -18,7 +18,7 @@ export default function KnowledgeLoading() {
</div>
</div>

<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
<Skeleton className='ml-[10px] h-[14px] w-[160px] rounded-[4px]' />
Expand All @@ -28,7 +28,7 @@ export default function KnowledgeLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -41,7 +41,7 @@ export default function KnowledgeLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/logs/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 6
export default function LogsLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[12px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -21,7 +21,7 @@ export default function LogsLoading() {
</div>
</div>
</div>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -36,7 +36,7 @@ export default function LogsLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -49,7 +49,7 @@ export default function LogsLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/scheduled-tasks/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 4
export default function ScheduledTasksLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[12px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -17,7 +17,7 @@ export default function ScheduledTasksLoading() {
</div>
</div>
</div>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
<Skeleton className='ml-[10px] h-[14px] w-[160px] rounded-[4px]' />
Expand All @@ -26,7 +26,7 @@ export default function ScheduledTasksLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -39,7 +39,7 @@ export default function ScheduledTasksLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/workspace/[workspaceId]/tables/[tableId]/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 5
export default function TableDetailLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[16px] py-[8.5px]'>
<div className='border-[var(--border)] border-b px-[16px] py-[8.5px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -22,7 +22,7 @@ export default function TableDetailLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
{Array.from({ length: COLUMN_COUNT }).map((_, i) => (
<th key={i} className='px-[12px] py-[8px] text-left'>
<Skeleton className='h-[12px] w-[72px] rounded-[4px]' />
Expand All @@ -32,7 +32,7 @@ export default function TableDetailLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
{Array.from({ length: COLUMN_COUNT }).map((_, colIndex) => (
<td key={colIndex} className='px-[12px] py-[10px]'>
<Skeleton
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/tables/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const COLUMN_COUNT = 6
export default function TablesLoading() {
return (
<div className='flex h-full flex-1 flex-col overflow-hidden bg-[var(--bg)]'>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center justify-between'>
<div className='flex items-center gap-[12px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
Expand All @@ -17,7 +17,7 @@ export default function TablesLoading() {
</div>
</div>
</div>
<div className='border-b border-[var(--border)] px-[24px] py-[10px]'>
<div className='border-[var(--border)] border-b px-[24px] py-[10px]'>
<div className='flex items-center'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
<Skeleton className='ml-[10px] h-[14px] w-[120px] rounded-[4px]' />
Expand All @@ -26,7 +26,7 @@ export default function TablesLoading() {
<div className='min-h-0 flex-1 overflow-auto'>
<table className='w-full'>
<thead>
<tr className='border-b border-[var(--border)]'>
<tr className='border-[var(--border)] border-b'>
<th className='w-[40px] px-[12px] py-[8px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</th>
Expand All @@ -39,7 +39,7 @@ export default function TablesLoading() {
</thead>
<tbody>
{Array.from({ length: SKELETON_ROW_COUNT }).map((_, rowIndex) => (
<tr key={rowIndex} className='border-b border-[var(--border)]'>
<tr key={rowIndex} className='border-[var(--border)] border-b'>
<td className='w-[40px] px-[12px] py-[10px]'>
<Skeleton className='h-[14px] w-[14px] rounded-[2px]' />
</td>
Expand Down
Loading
Loading