Skip to content

Commit 0ca9af4

Browse files
committed
task list header changes
1 parent f091fc2 commit 0ca9af4

File tree

5 files changed

+7
-37
lines changed

5 files changed

+7
-37
lines changed

src/renderer/features/tasks/components/TaskFilterBadges.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export function TaskFilterBadges({
7171
};
7272

7373
return (
74-
<Flex gap="1" wrap="wrap" align="center" style={{ maxWidth: "60%" }}>
74+
<Flex gap="1" wrap="wrap" align="center">
7575
{badges.map((badge) => {
7676
const categoryConfig = filterCategories.find(
7777
(c) => c.category === badge.category,

src/renderer/features/tasks/components/TaskListHeader.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ export function TaskListHeader({
2424
return (
2525
<Box pl="2" py="4" className="border-gray-6 border-b">
2626
<Flex gap="2" align="start" justify="between">
27-
<TaskListFilter />
2827
<Flex align="center" justify="center" gap="2">
28+
<TaskListFilter />
2929
{totalActiveFilterCount > 0 && (
3030
<Flex gap="2" className="flex-shrink-0">
3131
<TaskFilterMatchToggle />
@@ -35,6 +35,8 @@ export function TaskListHeader({
3535
<TaskFilterClearButton />
3636
</Flex>
3737
)}
38+
</Flex>
39+
<Flex align="center" justify="center" gap="2">
3840
<TaskListDisplayOptions />
3941
<TaskSearch value={filter} onChange={onFilterChange} />
4042
</Flex>
Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { useTaskStore } from "@features/tasks/stores/taskStore";
21
import { Cross2Icon, MagnifyingGlassIcon } from "@radix-ui/react-icons";
32
import { IconButton, Kbd, TextField } from "@radix-ui/themes";
43
import { useEffect, useRef } from "react";
@@ -9,26 +8,14 @@ interface TaskSearchProps {
98
}
109

1110
export function TaskSearch({ value, onChange }: TaskSearchProps) {
12-
const isExpanded = useTaskStore((state) => state.isSearchExpanded);
13-
const setIsExpanded = useTaskStore((state) => state.setIsSearchExpanded);
1411
const inputRef = useRef<HTMLInputElement>(null);
15-
const shouldBeExpanded = isExpanded || value.length > 0;
16-
17-
const handleExpand = () => {
18-
setIsExpanded(true);
19-
setTimeout(() => inputRef.current?.focus(), 100);
20-
};
2112

2213
const handleClear = () => {
2314
onChange("");
2415
setTimeout(() => inputRef.current?.focus(), 0);
2516
};
2617

27-
const handleBlur = () => {
28-
if (value.length === 0) {
29-
setIsExpanded(false);
30-
}
31-
};
18+
3219

3320
useEffect(() => {
3421
const handleKeyDown = (e: KeyboardEvent) => {
@@ -43,39 +30,25 @@ export function TaskSearch({ value, onChange }: TaskSearchProps) {
4330
return;
4431
}
4532
e.preventDefault();
46-
setIsExpanded(true);
4733
setTimeout(() => inputRef.current?.focus(), 100);
4834
}
4935
};
5036

5137
window.addEventListener("keydown", handleKeyDown);
5238
return () => window.removeEventListener("keydown", handleKeyDown);
53-
}, [setIsExpanded]);
39+
}, []);
5440

5541
return (
5642
<div
5743
className="transition-all duration-200"
5844
style={{
59-
width: shouldBeExpanded ? "250px" : "32px",
45+
width: "250px",
6046
}}
6147
>
62-
{!shouldBeExpanded ? (
63-
<IconButton
64-
size="1"
65-
variant="outline"
66-
color="gray"
67-
onClick={handleExpand}
68-
type="button"
69-
title="Search tasks (⌘F)"
70-
>
71-
<MagnifyingGlassIcon />
72-
</IconButton>
73-
) : (
7448
<TextField.Root
7549
ref={inputRef}
7650
value={value}
7751
onChange={(e) => onChange(e.target.value)}
78-
onBlur={handleBlur}
7952
placeholder="Search tasks..."
8053
size="1"
8154
>
@@ -100,7 +73,6 @@ export function TaskSearch({ value, onChange }: TaskSearchProps) {
10073
</TextField.Slot>
10174
)}
10275
</TextField.Root>
103-
)}
10476
</div>
10577
);
10678
}

src/renderer/features/tasks/stores/taskStore.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export const useTaskStore = create<TaskState>()(
7272
filterMatchMode: "all",
7373
filterSearchQuery: "",
7474
filterMenuSelectedIndex: -1,
75-
isSearchExpanded: false,
7675
isFilterDropdownOpen: false,
7776
editingFilterBadgeKey: null,
7877

@@ -209,7 +208,6 @@ export const useTaskStore = create<TaskState>()(
209208
setFilterSearchQuery: (query) => set({ filterSearchQuery: query }),
210209
setFilterMenuSelectedIndex: (index) =>
211210
set({ filterMenuSelectedIndex: index }),
212-
setIsSearchExpanded: (expanded) => set({ isSearchExpanded: expanded }),
213211
setIsFilterDropdownOpen: (open) => set({ isFilterDropdownOpen: open }),
214212
setEditingFilterBadgeKey: (key) => set({ editingFilterBadgeKey: key }),
215213
}),

src/renderer/features/tasks/stores/taskStore.types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ export interface TaskState {
7171
filterMatchMode: FilterMatchMode;
7272
filterSearchQuery: string;
7373
filterMenuSelectedIndex: number;
74-
isSearchExpanded: boolean;
7574
isFilterDropdownOpen: boolean;
7675
editingFilterBadgeKey: string | null;
7776

@@ -118,7 +117,6 @@ export interface TaskState {
118117
setFilterMatchMode: (mode: FilterMatchMode) => void;
119118
setFilterSearchQuery: (query: string) => void;
120119
setFilterMenuSelectedIndex: (index: number) => void;
121-
setIsSearchExpanded: (expanded: boolean) => void;
122120
setIsFilterDropdownOpen: (open: boolean) => void;
123121
setEditingFilterBadgeKey: (key: string | null) => void;
124122
}

0 commit comments

Comments
 (0)