Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat(web): select task ranges with shift-click

Tine04e81f4fff6
diff --git a/apps/web/src/components/backlog-list-view/backlog-task-row.test.tsx b/apps/web/src/components/backlog-list-view/backlog-task-row.test.tsx
index 453409ac1..4a350089b 100644
--- a/apps/web/src/components/backlog-list-view/backlog-task-row.test.tsx
+++ b/apps/web/src/components/backlog-list-view/backlog-task-row.test.tsx
@@ -105,6 +105,36 @@ beforeEach(() => {
afterEach(cleanup);
describe("backlog row subscriptions", () => {
+ it.each([
+ ["plain click", {}],
+ ["Ctrl+click", { ctrlKey: true }],
+ ])(
+ "selects the visible range after %s and Shift+click",
+ (_label, firstClick) => {
+ useBacklogBulkSelectionStore
+ .getState()
+ .setAvailableTasks([task.id, otherTask.id]);
+ render(
+ <>
+ <BacklogTaskRow task={task} />
+ <BacklogTaskRow task={otherTask} />
+ </>,
+ );
+
+ fireEvent.click(
+ screen.getByRole("button", { name: /First task/ }),
+ firstClick,
+ );
+ fireEvent.click(screen.getByRole("button", { name: /Second task/ }), {
+ shiftKey: true,
+ });
+
+ expect(useBacklogBulkSelectionStore.getState().selectedTaskIds).toEqual(
+ new Set([task.id, otherTask.id]),
+ );
+ },
+ );
+
it("only renders the row whose selection changes, including deselection", () => {
render(
<>
diff --git a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
index dd15400bb..4d2ab9472 100644
--- a/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
+++ b/apps/web/src/components/backlog-list-view/backlog-task-row.tsx
@@ -83,6 +83,12 @@ const BacklogTaskRow = memo(function BacklogTaskRow({
const toggleSelection = useBacklogBulkSelectionStore(
(state) => state.toggleSelection,
);
+ const selectRange = useBacklogBulkSelectionStore(
+ (state) => state.selectRange,
+ );
+ const setSelectionAnchor = useBacklogBulkSelectionStore(
+ (state) => state.setSelectionAnchor,
+ );
const isTaskSelected = useBacklogBulkSelectionStore((state) =>
state.selectedTaskIds.has(task.id),
);
@@ -126,12 +132,19 @@ const BacklogTaskRow = memo(function BacklogTaskRow({
if (!projectId || !task) return;
if (e.defaultPrevented) return;
+ if (e.type === "click" && e.shiftKey) {
+ e.preventDefault();
+ selectRange(task.id);
+ return;
+ }
+
if (e.metaKey || e.ctrlKey) {
e.preventDefault();
toggleSelection(task.id);
return;
}
+ setSelectionAnchor(task.id);
const currentParams = new URLSearchParams(window.location.search);
const currentTaskId = currentParams.get("taskId");
diff --git a/apps/web/src/components/kanban-board/index.tsx b/apps/web/src/components/kanban-board/index.tsx
index 4b5f04b93..284c4d697 100644
--- a/apps/web/src/components/kanban-board/index.tsx
+++ b/apps/web/src/components/kanban-board/index.tsx
@@ -42,13 +42,13 @@ function KanbanBoard({
}: KanbanBoardProps) {
const queryClient = useQueryClient();
const { project: storedProject, setProject } = useProjectStore();
- const {
- setAvailableTasks,
- focusNext,
- focusPrevious,
- focusedTaskId,
- clearFocus,
- } = useBulkSelectionStore();
+ const setAvailableTasks = useBulkSelectionStore(
+ (state) => state.setAvailableTasks,
+ );
+ const focusNext = useBulkSelectionStore((state) => state.focusNext);
+ const focusPrevious = useBulkSelectionStore((state) => state.focusPrevious);
+ const focusedTaskId = useBulkSelectionStore((state) => state.focusedTaskId);
+ const clearFocus = useBulkSelectionStore((state) => state.clearFocus);
const [activeId, setActiveId] = useState<UniqueIdentifier | null>(null);
const { mutate: updateTask } = useUpdateTask();
const background = useProjectBackground({
diff --git a/apps/web/src/components/kanban-board/task-card.tsx b/apps/web/src/components/kanban-board/task-card.tsx
index 745b04fb4..b7ba09e35 100644
--- a/apps/web/src/components/kanban-board/task-card.tsx
+++ b/apps/web/src/components/kanban-board/task-card.tsx
@@ -78,9 +78,19 @@ function TaskCard({ task, disableDragDrop = false }: TaskCardProps) {
showTaskNumbers,
} = useUserPreferencesStore();
const [isDeleteTaskModalOpen, setIsDeleteTaskModalOpen] = useState(false);
- const { toggleSelection, isSelected, isFocused } = useBulkSelectionStore();
- const isTaskSelected = isSelected(task.id);
- const isTaskFocused = isFocused(task.id);
+ const toggleSelection = useBulkSelectionStore(
+ (state) => state.toggleSelection,
+ );
+ const selectRange = useBulkSelectionStore((state) => state.selectRange);
+ const setSelectionAnchor = useBulkSelectionStore(
+ (state) => state.setSelectionAnchor,
+ );
+ const isTaskSelected = useBulkSelectionStore((state) =>
+ state.selectedTaskIds.has(task.id),
+ );
+ const isTaskFocused = useBulkSelectionStore(
+ (state) => state.focusedTaskId === task.id,
+ );
const pullRequests = useMemo(() => {
return (task.externalLinks ?? []).filter(
@@ -169,11 +179,19 @@ function TaskCard({ task, disableDragDrop = false }: TaskCardProps) {
) {
if (!project || !task || !workspace) return;
+ if (e.type === "click" && e.shiftKey) {
+ e.preventDefault();
+ selectRange(task.id);
+ return;
+ }
+
if ((e as React.MouseEvent).metaKey || (e as React.KeyboardEvent).ctrlKey) {
+ e.preventDefault();
toggleSelection(task.id);
return;
}
+ setSelectionAnchor(task.id);
const currentParams = new URLSearchParams(window.location.search);
const currentTaskId = currentParams.get("taskId");
diff --git a/apps/web/src/components/list-view/index.tsx b/apps/web/src/components/list-view/index.tsx
index 9246252a5..4d046f720 100644
--- a/apps/web/src/components/list-view/index.tsx
+++ b/apps/web/src/components/list-view/index.tsx
@@ -46,13 +46,13 @@ type ListViewProps = {
function ListView({ project, disableDragDrop = false }: ListViewProps) {
const { t } = useTranslation();
const { setProject } = useProjectStore();
- const {
- setAvailableTasks,
- focusNext,
- focusPrevious,
- focusedTaskId,
- clearFocus,
- } = useBulkSelectionStore();
+ const setAvailableTasks = useBulkSelectionStore(
+ (state) => state.setAvailableTasks,
+ );
+ const focusNext = useBulkSelectionStore((state) => state.focusNext);
+ const focusPrevious = useBulkSelectionStore((state) => state.focusPrevious);
+ const focusedTaskId = useBulkSelectionStore((state) => state.focusedTaskId);
+ const clearFocus = useBulkSelectionStore((state) => state.clearFocus);
const { mutate: updateTask } = useUpdateTask();
const navigate = useNavigate();
const [activeId, setActiveId] = useState<UniqueIdentifier | null>(null);
diff --git a/apps/web/src/components/list-view/task-row.test.tsx b/apps/web/src/components/list-view/task-row.test.tsx
index c36b6b9a8..a1af0307f 100644
--- a/apps/web/src/components/list-view/task-row.test.tsx
+++ b/apps/web/src/components/list-view/task-row.test.tsx
@@ -53,11 +53,22 @@ vi.mock(
);
vi.mock("@/store/bulk-selection", () => ({
- default: () => ({
- toggleSelection: vi.fn(),
- isSelected: () => false,
- isFocused: () => false,
- }),
+ default: (
+ selector: (state: {
+ toggleSelection: (taskId: string) => void;
+ selectRange: (taskId: string) => void;
+ setSelectionAnchor: (taskId: string) => void;
+ selectedTaskIds: Set<string>;
+ focusedTaskId: string | null;
+ }) => unknown,
+ ) =>
+ selector({
+ toggleSelection: vi.fn(),
+ selectRange: vi.fn(),
+ setSelectionAnchor: vi.fn(),
+ selectedTaskIds: new Set<string>(),
+ focusedTaskId: null,
+ }),
}));
vi.mock("@/store/project", () => ({
diff --git a/apps/web/src/components/list-view/task-row.tsx b/apps/web/src/components/list-view/task-row.tsx
index 2cc1c937d..c3b786276 100644
--- a/apps/web/src/components/list-view/task-row.tsx
+++ b/apps/web/src/components/list-view/task-row.tsx
@@ -78,9 +78,19 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
} = useUserPreferencesStore();
const [isDeleteTaskModalOpen, setIsDeleteTaskModalOpen] = useState(false);
const { mutateAsync: deleteTask } = useDeleteTask();
- const { toggleSelection, isSelected, isFocused } = useBulkSelectionStore();
- const isTaskSelected = isSelected(task.id);
- const isTaskFocused = isFocused(task.id);
+ const toggleSelection = useBulkSelectionStore(
+ (state) => state.toggleSelection,
+ );
+ const selectRange = useBulkSelectionStore((state) => state.selectRange);
+ const setSelectionAnchor = useBulkSelectionStore(
+ (state) => state.setSelectionAnchor,
+ );
+ const isTaskSelected = useBulkSelectionStore((state) =>
+ state.selectedTaskIds.has(task.id),
+ );
+ const isTaskFocused = useBulkSelectionStore(
+ (state) => state.focusedTaskId === task.id,
+ );
const { data: workspaceUsers } = useGetActiveWorkspaceUsers(
workspace?.id ?? "",
@@ -137,12 +147,19 @@ function TaskRow({ task, projectSlug }: TaskRowProps) {
if (!project || !task) return;
if (e.defaultPrevented) return;
+ if (e.type === "click" && e.shiftKey) {
+ e.preventDefault();
+ selectRange(task.id);
+ return;
+ }
+
if (e.metaKey || e.ctrlKey) {
e.preventDefault();
toggleSelection(task.id);
return;
}
+ setSelectionAnchor(task.id);
const currentParams = new URLSearchParams(window.location.search);
const currentTaskId = currentParams.get("taskId");
diff --git a/apps/web/src/store/backlog-bulk-selection.ts b/apps/web/src/store/backlog-bulk-selection.ts
index 9de981e37..14b5046e4 100644
--- a/apps/web/src/store/backlog-bulk-selection.ts
+++ b/apps/web/src/store/backlog-bulk-selection.ts
@@ -4,11 +4,14 @@ interface BacklogBulkSelectionState {
selectedTaskIds: Set<string>;
isSelectMode: boolean;
availableTaskIds: string[];
+ selectionAnchorId: string | null;
focusedTaskId: string | null;
selectTask: (taskId: string) => void;
deselectTask: (taskId: string) => void;
toggleSelection: (taskId: string) => void;
+ setSelectionAnchor: (taskId: string) => void;
+ selectRange: (taskId: string) => void;
clearSelection: () => void;
selectAll: () => void;
setAvailableTasks: (taskIds: string[]) => void;
@@ -26,12 +29,14 @@ const useBacklogBulkSelectionStore = create<BacklogBulkSelectionState>(
selectedTaskIds: new Set(),
isSelectMode: false,
availableTaskIds: [],
+ selectionAnchorId: null,
focusedTaskId: null,
selectTask: (taskId: string) =>
set((state) => ({
selectedTaskIds: new Set([...state.selectedTaskIds, taskId]),
isSelectMode: true,
+ selectionAnchorId: taskId,
})),
deselectTask: (taskId: string) =>
@@ -41,6 +46,7 @@ const useBacklogBulkSelectionStore = create<BacklogBulkSelectionState>(
return {
selectedTaskIds: newSet,
isSelectMode: newSet.size > 0,
+ selectionAnchorId: taskId,
};
}),
@@ -53,21 +59,49 @@ const useBacklogBulkSelectionStore = create<BacklogBulkSelectionState>(
}
},
+ setSelectionAnchor: (taskId: string) => set({ selectionAnchorId: taskId }),
+
+ selectRange: (taskId: string) =>
+ set((state) => {
+ const end = state.availableTaskIds.indexOf(taskId);
+ const start = state.availableTaskIds.indexOf(
+ state.selectionAnchorId ?? "",
+ );
+ const range =
+ start < 0 || end < 0
+ ? [taskId]
+ : state.availableTaskIds.slice(
+ Math.min(start, end),
+ Math.max(start, end) + 1,
+ );
+ return {
+ selectedTaskIds: new Set([...state.selectedTaskIds, ...range]),
+ isSelectMode: true,
+ selectionAnchorId:
+ start < 0 || end < 0 ? taskId : state.selectionAnchorId,
+ };
+ }),
+
clearSelection: () =>
set({
selectedTaskIds: new Set(),
isSelectMode: false,
+ selectionAnchorId: null,
}),
selectAll: () =>
set((state) => ({
selectedTaskIds: new Set(state.availableTaskIds),
isSelectMode: true,
+ selectionAnchorId: null,
})),
setAvailableTasks: (taskIds: string[]) =>
- set(() => ({
+ set((state) => ({
availableTaskIds: taskIds,
+ selectionAnchorId: taskIds.includes(state.selectionAnchorId ?? "")
+ ? state.selectionAnchorId
+ : null,
})),
getSelectedCount: () => {
diff --git a/apps/web/src/store/bulk-selection.test.ts b/apps/web/src/store/bulk-selection.test.ts
new file mode 100644
index 000000000..155ca52e4
--- /dev/null
+++ b/apps/web/src/store/bulk-selection.test.ts
@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it } from "vite-plus/test";
+import useBacklogBulkSelectionStore from "./backlog-bulk-selection";
+import useBulkSelectionStore from "./bulk-selection";
+
+const stores = [
+ ["board and list", useBulkSelectionStore],
+ ["backlog", useBacklogBulkSelectionStore],
+] as const;
+
+describe.each(stores)("%s range selection", (_name, store) => {
+ beforeEach(() => {
+ store.setState(store.getInitialState());
+ store.getState().setAvailableTasks(["a", "b", "c", "d", "e"]);
+ });
+
+ it("selects an inclusive range in either direction and keeps other selections", () => {
+ store.getState().toggleSelection("a");
+ store.getState().toggleSelection("d");
+ store.getState().selectRange("b");
+ expect([...store.getState().selectedTaskIds]).toEqual(["a", "d", "b", "c"]);
+
+ store.getState().selectRange("e");
+ expect(store.getState().selectedTaskIds).toEqual(
+ new Set(["a", "b", "c", "d", "e"]),
+ );
+ expect(store.getState().selectionAnchorId).toBe("d");
+ });
+
+ it("uses a plain clicked task as the anchor and falls back to the clicked task when the anchor disappears", () => {
+ store.getState().setSelectionAnchor("b");
+ store.getState().selectRange("d");
+ expect(store.getState().selectedTaskIds).toEqual(new Set(["b", "c", "d"]));
+
+ store.getState().clearSelection();
+ store.getState().setSelectionAnchor("b");
+ store.getState().setAvailableTasks(["d", "e"]);
+ store.getState().selectRange("e");
+ expect(store.getState().selectedTaskIds).toEqual(new Set(["e"]));
+ expect(store.getState().selectionAnchorId).toBe("e");
+ });
+
+ it("clears the anchor with the selection", () => {
+ store.getState().toggleSelection("b");
+ store.getState().clearSelection();
+ store.getState().selectRange("d");
+ expect(store.getState().selectedTaskIds).toEqual(new Set(["d"]));
+ });
+});
diff --git a/apps/web/src/store/bulk-selection.ts b/apps/web/src/store/bulk-selection.ts
index 1cdb4cf17..2ddf42a4d 100644
--- a/apps/web/src/store/bulk-selection.ts
+++ b/apps/web/src/store/bulk-selection.ts
@@ -4,11 +4,14 @@ interface BulkSelectionState {
selectedTaskIds: Set<string>;
isSelectMode: boolean;
availableTaskIds: string[];
+ selectionAnchorId: string | null;
focusedTaskId: string | null;
selectTask: (taskId: string) => void;
deselectTask: (taskId: string) => void;
toggleSelection: (taskId: string) => void;
+ setSelectionAnchor: (taskId: string) => void;
+ selectRange: (taskId: string) => void;
clearSelection: () => void;
selectAll: () => void;
setAvailableTasks: (taskIds: string[]) => void;
@@ -25,12 +28,14 @@ const useBulkSelectionStore = create<BulkSelectionState>((set, get) => ({
selectedTaskIds: new Set(),
isSelectMode: false,
availableTaskIds: [],
+ selectionAnchorId: null,
focusedTaskId: null,
selectTask: (taskId: string) =>
set((state) => ({
selectedTaskIds: new Set([...state.selectedTaskIds, taskId]),
isSelectMode: true,
+ selectionAnchorId: taskId,
})),
deselectTask: (taskId: string) =>
@@ -40,6 +45,7 @@ const useBulkSelectionStore = create<BulkSelectionState>((set, get) => ({
return {
selectedTaskIds: newSet,
isSelectMode: newSet.size > 0,
+ selectionAnchorId: taskId,
};
}),
@@ -52,21 +58,49 @@ const useBulkSelectionStore = create<BulkSelectionState>((set, get) => ({
}
},
+ setSelectionAnchor: (taskId: string) => set({ selectionAnchorId: taskId }),
+
+ selectRange: (taskId: string) =>
+ set((state) => {
+ const end = state.availableTaskIds.indexOf(taskId);
+ const start = state.availableTaskIds.indexOf(
+ state.selectionAnchorId ?? "",
+ );
+ const range =
+ start < 0 || end < 0
+ ? [taskId]
+ : state.availableTaskIds.slice(
+ Math.min(start, end),
+ Math.max(start, end) + 1,
+ );
+ return {
+ selectedTaskIds: new Set([...state.selectedTaskIds, ...range]),
+ isSelectMode: true,
+ selectionAnchorId:
+ start < 0 || end < 0 ? taskId : state.selectionAnchorId,
+ };
+ }),
+
clearSelection: () =>
set({
selectedTaskIds: new Set(),
isSelectMode: false,
+ selectionAnchorId: null,
}),
selectAll: () =>
set((state) => ({
selectedTaskIds: new Set(state.availableTaskIds),
isSelectMode: true,
+ selectionAnchorId: null,
})),
setAvailableTasks: (taskIds: string[]) =>
- set(() => ({
+ set((state) => ({
availableTaskIds: taskIds,
+ selectionAnchorId: taskIds.includes(state.selectionAnchorId ?? "")
+ ? state.selectionAnchorId
+ : null,
})),
getSelectedCount: () => {