@tuturuuu/ui 0.9.0 → 0.10.0

package/src/components/ui/tu-do/shared/task-edit-dialog/relationships/parent-section.tsx

@@ -16,9 +16,14 @@ export function ParentSection({
   onRemoveParent,
   onNavigateToTask,
   onAddParentTask,
+  searchOpen: controlledSearchOpen,
+  onSearchOpenChange,
   disabled,
 }: ParentSectionProps) {
-  const [searchOpen, setSearchOpen] = React.useState(false);
+  const [uncontrolledSearchOpen, setUncontrolledSearchOpen] =
+    React.useState(false);
+  const searchOpen = controlledSearchOpen ?? uncontrolledSearchOpen;
+  const setSearchOpen = onSearchOpenChange ?? setUncontrolledSearchOpen;
 
   const excludeIds = React.useMemo(() => {
     const ids = taskId ? [taskId, ...childTaskIds] : childTaskIds;

package/src/components/ui/tu-do/shared/task-edit-dialog/relationships/related-section.tsx

@@ -16,9 +16,14 @@ export function RelatedSection({
   onRemoveRelated,
   onNavigateToTask,
   onAddRelatedTaskDialog,
+  searchOpen: controlledSearchOpen,
+  onSearchOpenChange,
   disabled,
 }: RelatedSectionProps) {
-  const [searchOpen, setSearchOpen] = React.useState(false);
+  const [uncontrolledSearchOpen, setUncontrolledSearchOpen] =
+    React.useState(false);
+  const searchOpen = controlledSearchOpen ?? uncontrolledSearchOpen;
+  const setSearchOpen = onSearchOpenChange ?? setUncontrolledSearchOpen;
 
   const excludeIds = React.useMemo(() => {
     const ids = taskId ? [taskId] : [];

package/src/components/ui/tu-do/shared/task-edit-dialog/relationships/subtasks-section.tsx

@@ -16,9 +16,14 @@ export function SubtasksSection({
   onAddSubtask,
   onAddExistingAsSubtask,
   isSaving,
+  searchOpen: controlledSearchOpen,
+  onSearchOpenChange,
   disabled,
 }: SubtasksSectionProps) {
-  const [searchOpen, setSearchOpen] = React.useState(false);
+  const [uncontrolledSearchOpen, setUncontrolledSearchOpen] =
+    React.useState(false);
+  const searchOpen = controlledSearchOpen ?? uncontrolledSearchOpen;
+  const setSearchOpen = onSearchOpenChange ?? setUncontrolledSearchOpen;
 
   const excludeIds = React.useMemo(() => {
     const ids = taskId ? [taskId] : [];

package/src/components/ui/tu-do/shared/task-edit-dialog/relationships/types/task-relationships.types.ts

@@ -122,6 +122,8 @@ export interface ParentSectionProps {
   onRemoveParent: () => void;
   onNavigateToTask: (taskId: string) => void;
   onAddParentTask?: () => void; // Opens dialog to create new parent task
+  searchOpen?: boolean;
+  onSearchOpenChange?: (open: boolean) => void;
   disabled?: boolean;
 }
 
@@ -137,6 +139,8 @@ export interface SubtasksSectionProps {
   onAddSubtask?: () => void;
   onAddExistingAsSubtask?: (task: RelatedTaskInfo) => Promise<void>;
   isSaving: boolean;
+  searchOpen?: boolean;
+  onSearchOpenChange?: (open: boolean) => void;
   disabled?: boolean;
 }
 
@@ -168,6 +172,8 @@ export interface DependenciesSectionProps {
   onNavigateToTask: (taskId: string) => void;
   onAddBlockingTaskDialog?: () => void; // Opens dialog to create new blocking task
   onAddBlockedByTaskDialog?: () => void; // Opens dialog to create new blocked-by task
+  searchOpen?: boolean;
+  onSearchOpenChange?: (open: boolean) => void;
   disabled?: boolean;
 }
 
@@ -182,5 +188,7 @@ export interface RelatedSectionProps {
   onRemoveRelated: (taskId: string) => void;
   onNavigateToTask: (taskId: string) => void;
   onAddRelatedTaskDialog?: () => void; // Opens dialog to create new related task;
+  searchOpen?: boolean;
+  onSearchOpenChange?: (open: boolean) => void;
   disabled?: boolean;
 }

package/src/components/ui/tu-do/shared/task-edit-dialog/task-dialog-actions.tsx

@@ -48,6 +48,8 @@ interface TaskDialogActionsProps {
   onOpenShareDialog?: () => void;
   disabled?: boolean;
   controlsDisabled?: boolean;
+  moreMenuOpen?: boolean;
+  onMoreMenuOpenChange?: (open: boolean) => void;
 }
 
 export function TaskDialogActions({
@@ -66,10 +68,15 @@ export function TaskDialogActions({
   onOpenShareDialog,
   disabled = false,
   controlsDisabled = false,
+  moreMenuOpen,
+  onMoreMenuOpenChange,
 }: TaskDialogActionsProps) {
   const t = useTranslations();
   const tasksHref = useTasksHref();
-  const [isMoreMenuOpen, setIsMoreMenuOpen] = useState(false);
+  const [uncontrolledMoreMenuOpen, setUncontrolledMoreMenuOpen] =
+    useState(false);
+  const isMoreMenuOpen = moreMenuOpen ?? uncontrolledMoreMenuOpen;
+  const setIsMoreMenuOpen = onMoreMenuOpenChange ?? setUncontrolledMoreMenuOpen;
 
   // Determine if we should show the back button (create mode with a pending relationship)
   const showBackButton = isCreateMode && onNavigateBack && navigateBackTaskName;

package/src/components/ui/tu-do/shared/task-edit-dialog/task-properties-section.test.tsx

@@ -0,0 +1,150 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import '@testing-library/jest-dom';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { fireEvent, render, screen } from '@testing-library/react';
+import type { TaskList } from '@tuturuuu/types/primitives/TaskList';
+import { describe, expect, it, vi } from 'vitest';
+import { TaskPropertiesSection } from './task-properties-section';
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string) => key,
+}));
+
+vi.mock('@tuturuuu/ui/date-time-picker', () => ({
+  DateTimePicker: () => <button type="button">date-time-picker</button>,
+}));
+
+vi.mock('@tuturuuu/ui/hooks/use-calendar-preferences', () => ({
+  useCalendarPreferences: () => ({
+    weekStartsOn: 1,
+    timezone: 'UTC',
+    timeFormat: '24h',
+  }),
+}));
+
+function renderTaskPropertiesSection() {
+  const props = {
+    wsId: 'ws-1',
+    boardId: 'board-1',
+    taskId: 'task-1',
+    priority: null,
+    startDate: undefined,
+    endDate: undefined,
+    estimationPoints: null,
+    selectedLabels: [],
+    selectedProjects: [],
+    selectedListId: 'list-1',
+    selectedAssignees: [],
+    isLoading: false,
+    isPersonalWorkspace: false,
+    canUseBoardAssignees: true,
+    isCreateMode: false,
+    totalDuration: null,
+    isSplittable: false,
+    minSplitDurationMinutes: null,
+    maxSplitDurationMinutes: null,
+    calendarHours: null,
+    autoSchedule: false,
+    savedSchedulingSettings: undefined,
+    scheduledEvents: [],
+    availableLists: [
+      {
+        id: 'list-1',
+        board_id: 'board-1',
+        name: 'To Do',
+        status: 'not_started',
+        color: 'GRAY',
+        position: 0,
+        archived: false,
+        deleted: false,
+        created_at: '2026-01-01T00:00:00.000Z',
+        creator_id: 'user-1',
+      },
+    ] satisfies TaskList[],
+    availableLabels: [
+      {
+        id: 'label-1',
+        name: 'Bug',
+        color: '#ef4444',
+        created_at: '2026-01-01T00:00:00.000Z',
+      },
+    ],
+    taskProjects: [],
+    workspaceMembers: [
+      {
+        id: 'user-1',
+        user_id: 'user-1',
+        display_name: 'Taylor',
+        email: 'taylor@example.com',
+      },
+    ],
+    boardConfig: {},
+    onPriorityChange: vi.fn(),
+    onStartDateChange: vi.fn(),
+    onEndDateChange: vi.fn(),
+    onEstimationChange: vi.fn(),
+    onLabelToggle: vi.fn(),
+    onProjectToggle: vi.fn(),
+    onListChange: vi.fn(),
+    onAssigneeToggle: vi.fn(),
+    onQuickDueDate: vi.fn(),
+    onShowNewLabelDialog: vi.fn(),
+    onShowNewProjectDialog: vi.fn(),
+    onShowEstimationConfigDialog: vi.fn(),
+    onTotalDurationChange: vi.fn(),
+    onIsSplittableChange: vi.fn(),
+    onMinSplitDurationChange: vi.fn(),
+    onMaxSplitDurationChange: vi.fn(),
+    onCalendarHoursChange: vi.fn(),
+    onAutoScheduleChange: vi.fn(),
+    onSaveSchedulingSettings: vi.fn().mockResolvedValue(true),
+    schedulingSaving: false,
+    disabled: false,
+    isDraftMode: false,
+    variant: 'compact' as const,
+  };
+
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: { retry: false },
+      mutations: { retry: false },
+    },
+  });
+
+  render(
+    <QueryClientProvider client={queryClient}>
+      <TaskPropertiesSection {...props} />
+    </QueryClientProvider>
+  );
+
+  return props;
+}
+
+describe('TaskPropertiesSection', () => {
+  it('keeps only one property popover open at a time', () => {
+    renderTaskPropertiesSection();
+
+    fireEvent.click(screen.getByLabelText('common.priority'));
+    expect(screen.getByText('tasks.priority_critical')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByLabelText('common.labels'));
+    expect(
+      screen.queryByText('tasks.priority_critical')
+    ).not.toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText('common.search_labels')
+    ).toBeInTheDocument();
+
+    fireEvent.click(screen.getByLabelText('common.list_name_to_do'));
+    expect(
+      screen.queryByPlaceholderText('common.search_labels')
+    ).not.toBeInTheDocument();
+    expect(screen.getByLabelText('common.list_name_to_do')).toHaveAttribute(
+      'aria-expanded',
+      'true'
+    );
+  });
+});

package/src/components/ui/tu-do/shared/task-edit-dialog/task-properties-section.tsx

@@ -102,6 +102,7 @@ interface TaskPropertiesSectionProps {
   selectedAssignees: any[];
   isLoading: boolean;
   isPersonalWorkspace: boolean;
+  canUseBoardAssignees?: boolean;
   isCreateMode: boolean;
   // Scheduling state
   totalDuration: number | null;
@@ -151,6 +152,16 @@ interface TaskPropertiesSectionProps {
   variant?: 'default' | 'compact';
 }
 
+type TaskPropertyPopoverId =
+  | 'priority'
+  | 'list'
+  | 'dates'
+  | 'estimation'
+  | 'labels'
+  | 'projects'
+  | 'assignees'
+  | 'scheduling';
+
 function TaskPropertyPopoverTrigger({
   children,
   compact,
@@ -320,6 +331,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
     selectedAssignees,
     isLoading,
     isPersonalWorkspace,
+    canUseBoardAssignees = !isPersonalWorkspace,
     isCreateMode,
     // Scheduling state
     totalDuration,
@@ -399,17 +411,27 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
   const { weekStartsOn, timezone, timeFormat } = useCalendarPreferences();
 
   const [isMetadataExpanded, setIsMetadataExpanded] = useState(false);
-  const [isPriorityPopoverOpen, setIsPriorityPopoverOpen] = useState(false);
-  const [isDueDatePopoverOpen, setIsDueDatePopoverOpen] = useState(false);
-  const [isEstimationPopoverOpen, setIsEstimationPopoverOpen] = useState(false);
-  const [isLabelsPopoverOpen, setIsLabelsPopoverOpen] = useState(false);
-  const [isProjectsPopoverOpen, setIsProjectsPopoverOpen] = useState(false);
-  const [isAssigneesPopoverOpen, setIsAssigneesPopoverOpen] = useState(false);
-  const [isSchedulingPopoverOpen, setIsSchedulingPopoverOpen] = useState(false);
+  const [activePopover, setActivePopover] =
+    useState<TaskPropertyPopoverId | null>(null);
   const [labelSearchQuery, setLabelSearchQuery] = useState('');
   const [projectSearchQuery, setProjectSearchQuery] = useState('');
   const [assigneeSearchQuery, setAssigneeSearchQuery] = useState('');
 
+  const isPopoverOpen = useCallback(
+    (popoverId: TaskPropertyPopoverId) => activePopover === popoverId,
+    [activePopover]
+  );
+
+  const setPopoverOpen = useCallback(
+    (popoverId: TaskPropertyPopoverId, open: boolean) => {
+      setActivePopover((currentPopover) => {
+        if (open) return popoverId;
+        return currentPopover === popoverId ? null : currentPopover;
+      });
+    },
+    []
+  );
+
   const unselectedAvailableLabels = useMemo(
     () =>
       availableLabels.filter(
@@ -551,7 +573,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
     if (success) {
       // Update local saved state to reflect the successful save
       setLastSavedSettings(settings);
-      setIsSchedulingPopoverOpen(false);
+      setPopoverOpen('scheduling', false);
     }
   }, [
     totalDuration,
@@ -561,6 +583,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
     calendarHours,
     autoSchedule,
     onSaveSchedulingSettings,
+    setPopoverOpen,
   ]);
 
   // Handle clear and save scheduling settings
@@ -585,7 +608,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
     const success = await onSaveSchedulingSettings(clearedSettings);
     if (success) {
       setLastSavedSettings(clearedSettings);
-      setIsSchedulingPopoverOpen(false);
+      setPopoverOpen('scheduling', false);
     }
   }, [
     onTotalDurationChange,
@@ -595,6 +618,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
     onCalendarHoursChange,
     onAutoScheduleChange,
     onSaveSchedulingSettings,
+    setPopoverOpen,
   ]);
 
   // Note: Manual scheduling removed - handled by Smart Schedule button in Calendar
@@ -813,7 +837,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                         })}
                   </Badge>
                 )}
-                {selectedAssignees.length > 0 && !isPersonalWorkspace && (
+                {selectedAssignees.length > 0 && canUseBoardAssignees && (
                   <Badge
                     variant="secondary"
                     className="h-5 shrink-0 gap-1 border border-dynamic-cyan/30 bg-dynamic-cyan/15 px-2 font-medium text-[10px] text-dynamic-cyan"
@@ -869,8 +893,8 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
           >
             {/* Priority Badge */}
             <Popover
-              open={isPriorityPopoverOpen}
-              onOpenChange={setIsPriorityPopoverOpen}
+              open={isPopoverOpen('priority')}
+              onOpenChange={(open) => setPopoverOpen('priority', open)}
             >
               <TaskPropertyPopoverTrigger
                 compact={isCompact}
@@ -937,7 +961,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                       type="button"
                       onClick={() => {
                         onPriorityChange(opt.value as TaskPriority);
-                        setIsPriorityPopoverOpen(false);
+                        setPopoverOpen('priority', false);
                       }}
                       className={cn(
                         'flex w-full items-center gap-2.5 rounded-md px-2 py-2 text-left text-sm transition-colors hover:bg-muted',
@@ -959,7 +983,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                       label={t('ws-task-boards.dialog.clear_priority')}
                       onClick={() => {
                         onPriorityChange(null);
-                        setIsPriorityPopoverOpen(false);
+                        setPopoverOpen('priority', false);
                       }}
                     />
                   )}
@@ -974,13 +998,15 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
               availableLists={availableLists}
               disabled={disabled}
               compact={isCompact}
+              open={isPopoverOpen('list')}
+              onOpenChange={(open) => setPopoverOpen('list', open)}
               onListChange={onListChange}
             />
 
             {/* Dates Badge */}
             <Popover
-              open={isDueDatePopoverOpen}
-              onOpenChange={setIsDueDatePopoverOpen}
+              open={isPopoverOpen('dates')}
+              onOpenChange={(open) => setPopoverOpen('dates', open)}
             >
               <TaskPropertyPopoverTrigger
                 compact={isCompact}
@@ -1126,8 +1152,8 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
 
             {/* Estimation Points Badge */}
             <Popover
-              open={isEstimationPopoverOpen}
-              onOpenChange={setIsEstimationPopoverOpen}
+              open={isPopoverOpen('estimation')}
+              onOpenChange={(open) => setPopoverOpen('estimation', open)}
             >
               <TaskPropertyPopoverTrigger
                 compact={isCompact}
@@ -1175,7 +1201,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                     actionLabel={t('common.configure')}
                     ActionIcon={Pen}
                     onAction={() => {
-                      setIsEstimationPopoverOpen(false);
+                      setPopoverOpen('estimation', false);
                       onShowEstimationConfigDialog();
                     }}
                   />
@@ -1187,7 +1213,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                         type="button"
                         onClick={() => {
                           onEstimationChange(idx);
-                          setIsEstimationPopoverOpen(false);
+                          setPopoverOpen('estimation', false);
                         }}
                         className={cn(
                           'flex w-full items-center gap-2 rounded-md px-2 py-2 text-left text-sm transition-colors hover:bg-muted',
@@ -1211,7 +1237,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                         label={t('ws-task-boards.dialog.clear_estimate')}
                         onClick={() => {
                           onEstimationChange(null);
-                          setIsEstimationPopoverOpen(false);
+                          setPopoverOpen('estimation', false);
                         }}
                       />
                     )}
@@ -1222,9 +1248,9 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
 
             {/* Labels Badge */}
             <Popover
-              open={isLabelsPopoverOpen}
+              open={isPopoverOpen('labels')}
               onOpenChange={(open) => {
-                setIsLabelsPopoverOpen(open);
+                setPopoverOpen('labels', open);
                 if (!open) setLabelSearchQuery('');
               }}
             >
@@ -1274,7 +1300,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                     actionLabel={t('ws-task-boards.dialog.create_label')}
                     ActionIcon={Plus}
                     onAction={() => {
-                      setIsLabelsPopoverOpen(false);
+                      setPopoverOpen('labels', false);
                       onShowNewLabelDialog();
                     }}
                   />
@@ -1355,7 +1381,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                         size="sm"
                         variant="ghost"
                         onClick={() => {
-                          setIsLabelsPopoverOpen(false);
+                          setPopoverOpen('labels', false);
                           onShowNewLabelDialog();
                         }}
                         className="h-8 w-full justify-start"
@@ -1372,9 +1398,9 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
             {/* Projects Badge — not available for drafts */}
             {!isDraftMode && (
               <Popover
-                open={isProjectsPopoverOpen}
+                open={isPopoverOpen('projects')}
                 onOpenChange={(open) => {
-                  setIsProjectsPopoverOpen(open);
+                  setPopoverOpen('projects', open);
                   if (!open) setProjectSearchQuery('');
                 }}
               >
@@ -1424,7 +1450,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                       actionLabel={t('ws-task-boards.dialog.create_project')}
                       ActionIcon={Plus}
                       onAction={() => {
-                        setIsProjectsPopoverOpen(false);
+                        setPopoverOpen('projects', false);
                         onShowNewProjectDialog();
                       }}
                     />
@@ -1494,7 +1520,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                           size="sm"
                           variant="ghost"
                           onClick={() => {
-                            setIsProjectsPopoverOpen(false);
+                            setPopoverOpen('projects', false);
                             onShowNewProjectDialog();
                           }}
                           className="h-8 w-full justify-start"
@@ -1510,11 +1536,11 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
             )}
 
             {/* Assignees Badge */}
-            {!isPersonalWorkspace && (
+            {canUseBoardAssignees && (
               <Popover
-                open={isAssigneesPopoverOpen}
+                open={isPopoverOpen('assignees')}
                 onOpenChange={(open) => {
-                  setIsAssigneesPopoverOpen(open);
+                  setPopoverOpen('assignees', open);
                   if (!open) setAssigneeSearchQuery('');
                 }}
               >
@@ -1643,8 +1669,8 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
             {/* Scheduling Badge — not available for drafts */}
             {!isDraftMode && (
               <Popover
-                open={isSchedulingPopoverOpen}
-                onOpenChange={setIsSchedulingPopoverOpen}
+                open={isPopoverOpen('scheduling')}
+                onOpenChange={(open) => setPopoverOpen('scheduling', open)}
               >
                 <TaskPropertyPopoverTrigger
                   compact={isCompact}
@@ -2006,7 +2032,7 @@ export function TaskPropertiesSection(props: TaskPropertiesSectionProps) {
                             label={t('ws-task-boards.dialog.clear_duration')}
                             onClick={() => {
                               onTotalDurationChange(null);
-                              setIsSchedulingPopoverOpen(false);
+                              setPopoverOpen('scheduling', false);
                             }}
                           />
                         )}

package/src/components/ui/tu-do/shared/task-edit-dialog/task-relationships-properties.tsx

@@ -22,6 +22,8 @@ import type {
   TaskRelationshipsPropertiesProps,
 } from './relationships/types/task-relationships.types';
 
+type RelationshipSearchPopoverId = RelationshipTab;
+
 export function TaskRelationshipsProperties({
   wsId,
   taskId,
@@ -59,6 +61,24 @@ export function TaskRelationshipsProperties({
   const [activeTab, setActiveTab] = React.useState<RelationshipTab>(
     initialActiveTab ?? 'parent'
   );
+  const [activeSearchPopover, setActiveSearchPopover] =
+    React.useState<RelationshipSearchPopoverId | null>(null);
+
+  const isSearchPopoverOpen = React.useCallback(
+    (popoverId: RelationshipSearchPopoverId) =>
+      activeSearchPopover === popoverId,
+    [activeSearchPopover]
+  );
+
+  const setSearchPopoverOpen = React.useCallback(
+    (popoverId: RelationshipSearchPopoverId, open: boolean) => {
+      setActiveSearchPopover((currentPopover) => {
+        if (open) return popoverId;
+        return currentPopover === popoverId ? null : currentPopover;
+      });
+    },
+    []
+  );
 
   // Tab configuration
   const tabs = React.useMemo(
@@ -111,7 +131,10 @@ export function TaskRelationshipsProperties({
       {/* Header with toggle button */}
       <button
         type="button"
-        onClick={() => setIsExpanded(!isExpanded)}
+        onClick={() => {
+          setIsExpanded((current) => !current);
+          setActiveSearchPopover(null);
+        }}
         className="flex w-full items-center justify-between px-4 py-3 text-left transition-colors hover:bg-background/40 md:px-8"
       >
         <div className="flex min-w-0 flex-1 items-center gap-2">
@@ -185,7 +208,10 @@ export function TaskRelationshipsProperties({
               <TabButton
                 key={tab.id}
                 active={activeTab === tab.id}
-                onClick={() => setActiveTab(tab.id)}
+                onClick={() => {
+                  setActiveTab(tab.id);
+                  setActiveSearchPopover(null);
+                }}
                 icon={tab.icon}
                 label={tab.label}
                 count={tab.count}
@@ -208,6 +234,10 @@ export function TaskRelationshipsProperties({
                 onRemoveParent={onRemoveParent}
                 onNavigateToTask={onNavigateToTask}
                 onAddParentTask={onAddParentTask}
+                searchOpen={isSearchPopoverOpen('parent')}
+                onSearchOpenChange={(open) =>
+                  setSearchPopoverOpen('parent', open)
+                }
                 disabled={disabled}
               />
             )}
@@ -224,6 +254,10 @@ export function TaskRelationshipsProperties({
                 onAddSubtask={onAddSubtask}
                 onAddExistingAsSubtask={onAddExistingAsSubtask}
                 isSaving={isSaving}
+                searchOpen={isSearchPopoverOpen('subtasks')}
+                onSearchOpenChange={(open) =>
+                  setSearchPopoverOpen('subtasks', open)
+                }
                 disabled={disabled}
               />
             )}
@@ -244,6 +278,10 @@ export function TaskRelationshipsProperties({
                 onNavigateToTask={onNavigateToTask}
                 onAddBlockingTaskDialog={onAddBlockingTaskDialog}
                 onAddBlockedByTaskDialog={onAddBlockedByTaskDialog}
+                searchOpen={isSearchPopoverOpen('dependencies')}
+                onSearchOpenChange={(open) =>
+                  setSearchPopoverOpen('dependencies', open)
+                }
                 disabled={disabled}
               />
             )}
@@ -259,6 +297,10 @@ export function TaskRelationshipsProperties({
                 onRemoveRelated={onRemoveRelatedTask}
                 onNavigateToTask={onNavigateToTask}
                 onAddRelatedTaskDialog={onAddRelatedTaskDialog}
+                searchOpen={isSearchPopoverOpen('related')}
+                onSearchOpenChange={(open) =>
+                  setSearchPopoverOpen('related', open)
+                }
                 disabled={disabled}
               />
             )}