fix trash behavior

Author: ntietje1

convex/sidebarItems/functions/getSidebarItemBySlug.ts

@@ -15,30 +15,14 @@ export const getSidebarItemBySlug = async (
 ): Promise<AnySidebarItemWithContent | null> => {
   await requireCampaignMembership(ctx, campaignId)
 
-  const filter = (q: any) => q.eq(q.field('deletionTime'), null)
   const idx = (q: any) => q.eq('campaignId', campaignId).eq('slug', slug)
 
+  // specifically don't filter out deleted items, as they are still viewable in this context
   const [note, folder, map, file] = await Promise.all([
-    ctx.db
-      .query('notes')
-      .withIndex('by_campaign_slug', idx)
-      .filter(filter)
-      .unique(),
-    ctx.db
-      .query('folders')
-      .withIndex('by_campaign_slug', idx)
-      .filter(filter)
-      .unique(),
-    ctx.db
-      .query('gameMaps')
-      .withIndex('by_campaign_slug', idx)
-      .filter(filter)
-      .unique(),
-    ctx.db
-      .query('files')
-      .withIndex('by_campaign_slug', idx)
-      .filter(filter)
-      .unique(),
+    ctx.db.query('notes').withIndex('by_campaign_slug', idx).unique(),
+    ctx.db.query('folders').withIndex('by_campaign_slug', idx).unique(),
+    ctx.db.query('gameMaps').withIndex('by_campaign_slug', idx).unique(),
+    ctx.db.query('files').withIndex('by_campaign_slug', idx).unique(),
   ])
 
   if (note) {

src/features/sidebar/components/trash-button.tsx

@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { Trash2 } from 'lucide-react'
 import { SIDEBAR_ITEM_LOCATION } from 'convex/sidebarItems/types/baseTypes'
 import { TrashPopoverContent } from './trash-popover-content'
@@ -9,6 +9,7 @@ import {
   PopoverTrigger,
 } from '~/features/shadcn/components/popover'
 import { useDndDropTarget } from '~/features/dnd/hooks/useDndDropTarget'
+import { useDndStore } from '~/features/dnd/stores/dnd-store'
 import { useCurrentItem } from '~/features/sidebar/hooks/useCurrentItem'
 import { useSidebarItems } from '~/features/sidebar/hooks/useSidebarItems'
 import { TRASH_DROP_ZONE_TYPE } from '~/features/dnd/utils/dnd-registry'
@@ -18,6 +19,11 @@ export function TrashButton() {
   const [open, setOpen] = useState(false)
   const buttonRef = useRef<HTMLDivElement>(null)
 
+  const isDragging = useDndStore((s) => s.isDraggingElement)
+  useEffect(() => {
+    if (isDragging) setOpen(false)
+  }, [isDragging])
+
   const { parentItemsMap } = useSidebarItems(SIDEBAR_ITEM_LOCATION.trash)
   const rootTrashedItems = parentItemsMap.get(null) ?? []
   const trashCount = rootTrashedItems.length