From 005a608369f74383821396cc9ef6a53b7ecbc965 Mon Sep 17 00:00:00 2001
From: MikiVL <mikivl@MikiVLdeMacBook-Air.local>
Date: Tue, 5 May 2026 04:52:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=E5=9B=9E=E6=94=B6=E7=AB=99=E5=85=A5=E5=8F=A3=E5=92=8C?=
 =?UTF-8?q?=20TrashView?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sidebar/Sidebar.tsx | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx
index 50b0829..192c96f 100644
--- a/src/components/sidebar/Sidebar.tsx
+++ b/src/components/sidebar/Sidebar.tsx
@@ -15,6 +15,7 @@ import {
 } from '@dnd-kit/core'
 import { CSS } from '@dnd-kit/utilities'
 import { useAppStore } from '../../stores/appStore'
+import { TrashView } from './TrashView'
 import { formatDate } from '../../lib/utils'
 import type { Folder as FolderType, Note } from '../../db'
 
@@ -25,6 +26,7 @@ export function Sidebar() {
     updateNote, updateFolder, setActiveNote, setActiveFolder, setSearch,
     toggleTheme, toggleStar, filteredNotes,
     activeTag, setActiveTag, sortBy, sortOrder, setSortBy, setSortOrder,
+    trashNotes,
   } = useAppStore()
 
   const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set())
@@ -229,6 +231,13 @@ export function Sidebar() {
           <NavItem icon={<BookOpen size={14} />} label="使用指南" active={activeNoteId === '__welcome__'} onClick={() => setActiveNote('__welcome__')} />
           <NavItem icon={<FileText size={14} />} label="所有笔记" count={notes.length} active={activeFolderId === 'all' && activeNoteId !== '__welcome__'} onClick={() => { setActiveFolder('all'); if (activeNoteId === '__welcome__') setActiveNote(null) }} />
           <NavItem icon={<Star size={14} />} label="收藏" count={notes.filter(n => n.starred).length} active={activeFolderId === 'starred'} onClick={() => { setActiveFolder('starred'); if (activeNoteId === '__welcome__') setActiveNote(null) }} />
+          <NavItem
+            icon={<Trash2 size={14} />}
+            label="回收站"
+            count={trashNotes().length || undefined}
+            active={activeFolderId === 'trash'}
+            onClick={() => { setActiveFolder('trash'); if (activeNoteId === '__welcome__') setActiveNote(null) }}
+          />
         </nav>
 
         {/* Folders section */}
@@ -264,6 +273,10 @@ export function Sidebar() {
 
         {/* Note list */}
         <div className="flex-1 overflow-y-auto mt-2" style={{ borderTop: '1px solid var(--border)' }}>
+          {activeFolderId === 'trash' ? (
+            <TrashView />
+          ) : (
+          <>
           <div className="px-3 py-2 flex items-center justify-between sticky top-0 z-10" style={{ background: 'var(--bg-subtle)' }}>
             <div className="flex items-center gap-1.5">
               <span className="text-xs font-semibold uppercase tracking-wider" style={{ color: 'var(--text-faint)' }}>
@@ -343,9 +356,9 @@ export function Sidebar() {
               />
             ))}
           </div>
+          </>
+          )}
         </div>
-
-        {/* Context menu */}
         {contextMenu && (          <div
             className="fixed z-50 rounded-lg py-1 shadow-xl"
             style={{ top: contextMenu.y, left: contextMenu.x, background: 'var(--bg)', border: '1px solid var(--border)', minWidth: 160 }}
@@ -436,8 +449,8 @@ export function Sidebar() {
             style={{ background: 'var(--bg)', border: '1px solid var(--border)', width: 320 }}
             onClick={e => e.stopPropagation()}
           >
-            <p className="text-sm font-semibold" style={{ color: 'var(--text)' }}>确认删除笔记？</p>
-            <p className="text-xs" style={{ color: 'var(--muted)' }}>此操作无法撤销。</p>
+            <p className="text-sm font-semibold" style={{ color: 'var(--text)' }}>将笔记移入回收站？</p>
+            <p className="text-xs" style={{ color: 'var(--muted)' }}>笔记将在 30 天后永久删除，期间可随时恢复。</p>
             <div className="flex justify-end gap-2">
               <button
                 onClick={() => setDeleteConfirm(null)}
@@ -450,7 +463,7 @@ export function Sidebar() {
                 onClick={async () => { await deleteNote(deleteConfirm); setDeleteConfirm(null) }}
                 className="px-3 py-1.5 rounded-lg text-sm font-medium"
                 style={{ background: '#ef4444', color: '#fff' }}
-              >删除</button>
+              >移入回收站</button>
             </div>
           </div>
         </div>