#34

frontend/src/components/DraggableDroppableTagRow.tsx

@@ -57,8 +57,7 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
 	  isDragging: dragging } = useDraggable ({ id:    dndId,
 						   data:  { kind:   'tag',
 							    tagId:  tag.id,
-							    parentTagId,
+							    parentTagId } })
-							    nestLevel } })
 
   const { setNodeRef: setDropRef, isOver: over } = useDroppable ({
       id:   dndId,
@@ -78,16 +77,12 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
 	      return
 	    const dx = e.clientX - p.x
 	    const dy = e.clientY - p.y
-
 	    if (dx * dx + dy * dy >= 9)
 	      armEatNextClick ()
 	  }}
 	  onPointerUpCapture={() => {
 	    downPosRef.current = null
 	  }}
-	  onPointerCancelCapture={() => {
-	    downPosRef.current = null
-	  }}
 	  onClickCapture={e => {
 	    if (suppressClickRef.current)
 	      {
@@ -95,20 +90,18 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
 		e.stopPropagation ()
 	      }
 	  }}
-	  ref={setDropRef}
+	  ref={node => {
+	    setDragRef (node)
+	    setDropRef (node)
+	  }}
+	  style={style}
 	  className={cn (
 	      'min-w-0 max-w-full overflow-hidden rounded select-none',
-	      sp && 'touch-pan-y',
 	      over && 'ring-2 ring-offset-2')}
-	  >
+	  {...attributes}
+	  {...listeners}>
 	<motion.div
-	    ref={setDragRef}
+	    className="flex min-w-0 max-w-full items-baseline overflow-hidden"
-	    style={style}
-	    className={cn (
-		'inline-flex min-w-0 max-w-full items-baseline overflow-hidden',
-		sp && 'touch-pan-y')}
-	    {...attributes}
-	    {...listeners}
 	    transition={{ layout: layoutTransition }}
 	    layoutId={animationMode === 'off'
 		? undefined

frontend/src/components/TagDetailSidebar.tsx

@@ -1,9 +1,7 @@
 import { DndContext,
 	 DragOverlay,
-	 MeasuringStrategy,
 	 MouseSensor,
 	 TouchSensor,
-	 pointerWithin,
 	 useDroppable,
 	 useSensor,
 	 useSensors } from '@dnd-kit/core'
@@ -27,20 +25,13 @@ import { postsKeys, tagsKeys } from '@/lib/queryKeys'
 import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { dateString, originalCreatedAtString } from '@/lib/utils'
 
-import type { CollisionDetection, DragEndEvent } from '@dnd-kit/core'
+import type { DragEndEvent } from '@dnd-kit/core'
 import type { FC, MutableRefObject, ReactNode } from 'react'
 
 import type { Category, Post, TagWithSections } from '@/types'
 
 type TagByCategory = { [key in Category]: TagWithSections[] }
 
-const tagCollisionDetection: CollisionDetection = args => {
-  return pointerWithin (args)
-}
-
-const alwaysMeasureDroppables = {
-    droppable: { strategy: MeasuringStrategy.Always } } as const
-
 
 const renderTagTree = (
     tag:              TagWithSections,
@@ -186,34 +177,12 @@ const DropSlot = ({ cat }: { cat: Category }) => {
       </li>)
 }
 
-const EmptyCategoryDropSection = (
-    { cat, children }: { cat: Category
-			 children: ReactNode }) => {
-  const { setNodeRef, isOver: over } = useDroppable ({
-      id:   `slot:${ cat }`,
-      data: { kind: 'slot', cat } })
-
-  return (
-      <div ref={setNodeRef} className="my-3">
-	{children}
-	<ul>
-	  <li className="h-1">
-	    {over && <div className="h-0.5 w-full rounded bg-sky-400"/>}
-	  </li>
-	</ul>
-      </div>)
-}
-
 
 type Props = {
     className?: string
     post:       Post
     sp?:        boolean }
 
-type ActiveTagDrag = {
-    tagId:      number
-    nestLevel:  number }
-
 
 const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
   sp = Boolean (sp)
@@ -243,7 +212,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
     return tagsTmp
   }, [post])
 
-  const [activeTagDrag, setActiveTagDrag] = useState<ActiveTagDrag | null> (null)
+  const [activeTagId, setActiveTagId] = useState<number | null> (null)
   const [dragging, setDragging] = useState (false)
   const [saving, setSaving] = useState (false)
   const [tags, setTags] = useState (baseTags)
@@ -359,18 +328,9 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
 	<TagSearch/>
 	<DndContext
 	    sensors={sensors}
-	    collisionDetection={sp ? tagCollisionDetection : undefined}
-	    measuring={sp ? alwaysMeasureDroppables : undefined}
 	    onDragStart={e => {
 	      if (e.active.data.current?.kind === 'tag')
-		{
+		setActiveTagId (e.active.data.current?.tagId ?? null)
-		  const tagId = e.active.data.current?.tagId
-		  const nestLevel = e.active.data.current?.nestLevel
-		  setActiveTagDrag (
-		      tagId == null || nestLevel == null
-		      ? null
-		      : { tagId, nestLevel })
-		}
 	      setDragging (true)
 	      suppressClickRef.current = true
 	      document.body.style.userSelect = 'none'
@@ -381,13 +341,13 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
 		suppressClickRef.current = false}, { capture: true, once: true })
 	    }}
 	    onDragCancel={() => {
-	      setActiveTagDrag (null)
+	      setActiveTagId (null)
 	      setDragging (false)
 	      document.body.style.userSelect = ''
 	      suppressClickRef.current = false
 	    }}
 	    onDragEnd={async e => {
-	      setActiveTagDrag (null)
+	      setActiveTagId (null)
 	      setDragging (false)
 	      await onDragEnd (e)
 	      document.body.style.userSelect = ''
@@ -402,26 +362,18 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
 	    if (!(categoryTags.length > 0 || dragging))
 	      return null
 
-	    const sectionTitle = (
-		<SubsectionTitle>
-		  <motion.div
-		      layoutId={animationMode === 'off'
-			  ? undefined
-			  : `tag-${ sp ? 'sp-' : '' }${ cat }`}
-		      transition={{ layout: layoutTransition }}>
-		    {CATEGORY_NAMES[cat]}
-		  </motion.div>
-		</SubsectionTitle>)
-
-	    if (!(categoryTags.length > 0))
-	      return (
-		  <EmptyCategoryDropSection cat={cat} key={cat}>
-		    {sectionTitle}
-		  </EmptyCategoryDropSection>)
-
 	    return (
 		<div className="my-3" key={cat}>
-		  {sectionTitle}
+		  <SubsectionTitle>
+		    <motion.div
+			layoutId={animationMode === 'off'
+			    ? undefined
+			    : `tag-${ sp ? 'sp-' : '' }${ cat }`}
+			transition={{ layout: layoutTransition }}>
+		      {CATEGORY_NAMES[cat]}
+		    </motion.div>
+		  </SubsectionTitle>
+
 		  <ul>
 		    {(tagRelationDisplay === 'grouped'
 		      ? (tags[cat] ?? []).flatMap (tag =>
@@ -491,9 +443,9 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
 
 	  <DragOverlay adjustScale={false}>
 	    <div className="pointer-events-none">
-	      {activeTagDrag != null && (() => {
+	      {activeTagId != null && (() => {
-		const tag = findTag (tags, activeTagDrag.tagId)
+		const tag = findTag (tags, activeTagId)
-		return tag && <TagLink tag={tag} nestLevel={activeTagDrag.nestLevel}/>
+		return tag && <TagLink tag={tag}/>
 	      }) ()}
 	    </div>
 	  </DragOverlay>