From 2158b1cc255baf3ff5e4e1a5806d85b7df64bd55 Mon Sep 17 00:00:00 2001 From: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:21:32 +0800 Subject: [PATCH] feat: multi select with shift close #1256 --- .../renderer/src/modules/feed-column/list.tsx | 54 +++++++++++++++++-- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/apps/renderer/src/modules/feed-column/list.tsx b/apps/renderer/src/modules/feed-column/list.tsx index b83494e25..d36d0ff9c 100644 --- a/apps/renderer/src/modules/feed-column/list.tsx +++ b/apps/renderer/src/modules/feed-column/list.tsx @@ -6,7 +6,7 @@ import { stopPropagation } from "@follow/utils/dom" import { cn, isKeyForMultiSelectPressed } from "@follow/utils/utils" import * as HoverCard from "@radix-ui/react-hover-card" import { AnimatePresence, m } from "framer-motion" -import { memo, useCallback, useMemo, useRef, useState } from "react" +import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react" import { useTranslation } from "react-i18next" import { Link } from "react-router-dom" import Selecto from "react-selecto" @@ -140,6 +140,12 @@ function FeedListImpl({ className, view }: { className?: string; view: number }) const scrollerRef = useRef(null) const selectoRef = useRef(null) const [selectedFeedIds, setSelectedFeedIds] = useSelectedFeedIds() + const [currentStartFeedId, setCurrentStartFeedId] = useState(null) + useEffect(() => { + if (selectedFeedIds.length <= 1) { + setCurrentStartFeedId(null) + } + }, [selectedFeedIds]) const { attributes, listeners, setNodeRef, transform } = useDraggable({ id: "selected-feed", @@ -230,11 +236,51 @@ function FeedListImpl({ className, view }: { className?: string; view: number }) const allChanged = [...e.added, ...e.removed] .map((el) => el.dataset.feedId) .filter((id) => id !== undefined) + const added = allChanged.filter((id) => !selectedFeedIds.includes(id)) + const removed = allChanged.filter((id) => selectedFeedIds.includes(id)) + + if (isKeyForMultiSelectPressed(e.inputEvent as MouseEvent)) { + const allVisible = Array.from(document.querySelectorAll("[data-feed-id]")).map( + (el) => (el as HTMLElement).dataset.feedId, + ) + const currentSelected = + added.length === 1 ? added[0] : removed.length === 1 ? removed[0] : null + const currentIndex = currentSelected ? allVisible.indexOf(currentSelected) : -1 + + // command or ctrl with click, update start feed id + if (!(e.inputEvent as MouseEvent).shiftKey && currentSelected) { + setCurrentStartFeedId(currentSelected) + } + + // shift with click, select all between + if ((e.inputEvent as MouseEvent).shiftKey && currentSelected) { + const firstSelected = currentStartFeedId ?? selectedFeedIds[0] + if (firstSelected) { + const firstIndex = allVisible.indexOf(firstSelected) + + const order = + firstIndex < currentIndex + ? [firstIndex, currentIndex] + : [currentIndex, firstIndex] + const between = allVisible.slice(order[0], order[1] + 1) as string[] + + setSelectedFeedIds((prev) => { + // with intersection, we need to update selected ids as between + // otherwise, we need to add between to selected ids + const hasIntersection = between.slice(1, -1).some((id) => prev.includes(id)) + + return [ + ...(hasIntersection ? prev.filter((id) => between.includes(id)) : prev), + ...between, + ] + }) + return + } + } + } setSelectedFeedIds((prev) => { - const added = allChanged.filter((id) => !prev.includes(id)) - const removed = new Set(allChanged.filter((id) => prev.includes(id))) - return [...prev.filter((id) => !removed.has(id)), ...added] + return [...prev.filter((id) => !removed.includes(id)), ...added] }) }} scrollOptions={{