feat: better placing

packages/website/src/components/TierList/DropOff/constants.ts

@@ -1 +0,0 @@
-export const tierListDropOffs = new Set<HTMLDivElement>();

packages/website/src/components/TierList/DropOff/index.css

@@ -1,9 +0,0 @@
-.drop-off {
-  width: 0.125rem;
-  height: 100%;
-  border-radius: var(--radius-1);
-}
-
-.drop-off[data-dragging='true'] {
-  background-color: var(--accent-indicator);
-}

packages/website/src/components/TierList/DropOff/index.tsx

@@ -1,42 +0,0 @@
-import { Box } from '@radix-ui/themes';
-import { useEffect, useRef } from 'react';
-import { TierList } from '../../../stores/tierList';
-import { tierListDropOffs } from './constants';
-import './index.css';
-
-interface DropOffProps {
-  row: number;
-  index: number;
-}
-
-export function DropOff({ row, index }: DropOffProps) {
-  const tierListStore = TierList.useStore();
-  const ref = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const unsubscribe = tierListStore.subscribe(
-      (state) => state.dragging,
-      (dragging) => {
-        if (!ref.current) return;
-        ref.current.dataset.dragging = `${dragging}`;
-      },
-    );
-
-    tierListDropOffs.add(ref.current!);
-
-    return () => {
-      unsubscribe();
-      tierListDropOffs.delete(ref.current!);
-    };
-  }, []);
-
-  return (
-    <Box
-      className="drop-off"
-      data-dragging="false"
-      data-row={row}
-      data-index={index}
-      ref={ref}
-    />
-  );
-}

packages/website/src/components/TierList/Row.tsx

@@ -1,10 +1,9 @@
 import { fetchTankDefinitions } from '@blitzkit/core';
 import { Flex, Heading, Table } from '@radix-ui/themes';
-import { Fragment } from 'react';
+import { useEffect, useRef } from 'react';
 import { Var } from '../../core/radix/var';
 import { TierList } from '../../stores/tierList';
-import { DropOff } from './DropOff';
-import { tierListRows } from './Table/constants';
+import { tierListRowElements, tierListRows } from './Table/constants';
 import { TierListTile } from './Tile';
 
 interface TierListRowProps {
@@ -14,30 +13,43 @@ interface TierListRowProps {
 const tankDefinitions = await fetchTankDefinitions();
 
 export function TierListRow({ index }: TierListRowProps) {
-  const row = tierListRows[index];
+  const rowStyle = tierListRows[index];
   const tanks = TierList.use((state) => state.tanks[index]);
+  const row = useRef<HTMLTableRowElement>(null);
+
+  useEffect(() => {
+    if (!row.current) return;
+
+    tierListRowElements.add(row.current);
+
+    return () => {
+      if (!row.current) return;
+
+      tierListRowElements.delete(row.current);
+    };
+  });
 
   return (
-    <Table.Row key={row.name}>
+    <Table.Row key={rowStyle.name} ref={row} data-index={index}>
       <Table.RowHeaderCell
         width="0"
-        style={{ backgroundColor: Var(row.color) }}
+        style={{ backgroundColor: Var(rowStyle.color) }}
       >
-        <Heading>{row.name}</Heading>
+        <Heading>{rowStyle.name}</Heading>
       </Table.RowHeaderCell>
 
       <Table.Cell>
         <Flex wrap="wrap" height="100%" gap="2">
-          <DropOff row={index} index={0} />
-
           {tanks.map((id, tankIndex) => {
             const tank = tankDefinitions.tanks[id];
-
             return (
-              <Fragment key={id}>
-                <TierListTile tank={tank} />
-                <DropOff row={index} index={tankIndex + 1} />
-              </Fragment>
+              <TierListTile
+                isPlaced
+                key={id}
+                tank={tank}
+                rowIndex={index}
+                tileIndex={tankIndex}
+              />
             );
           })}
         </Flex>

packages/website/src/components/TierList/Table/constants.ts

@@ -10,3 +10,8 @@ export const tierListRows: {
   { name: 'C', color: 'green-9' },
   { name: 'D', color: 'blue-9' },
 ];
+
+export const tierListRowElements = new Set<HTMLTableRowElement>();
+export const tierListCardElements = tierListRows.map(
+  () => new Set<HTMLDivElement>(),
+);

packages/website/src/components/TierList/Tile.tsx

@@ -1,18 +1,28 @@
 import type { TankDefinition } from '@blitzkit/core';
 import {
   useCallback,
+  useEffect,
   useRef,
   type PointerEvent as ReactPointerEvent,
 } from 'react';
 import { TierList } from '../../stores/tierList';
 import { TankCard } from '../TankCard';
-import { tierListDropOffs } from './DropOff/constants';
+import { tierListCardElements, tierListRowElements } from './Table/constants';
 
-interface TierListTileProps {
+type TierListTileProps = {
   tank: TankDefinition;
-}
+} & (
+  | {
+      isPlaced?: false;
+    }
+  | {
+      isPlaced: true;
+      rowIndex: number;
+      tileIndex: number;
+    }
+);
 
-export function TierListTile({ tank }: TierListTileProps) {
+export function TierListTile(props: TierListTileProps) {
   const card = useRef<HTMLDivElement>(null);
   const mutateTierList = TierList.useMutation();
   const lastPosition = useRef({ x: 0, y: 0 });
@@ -58,43 +68,59 @@ export function TierListTile({ tank }: TierListTileProps) {
   const handlePointerUp = useCallback((event: PointerEvent) => {
     if (!card.current) return;
 
-    const rect = card.current.getBoundingClientRect();
-    let dropOff: { row: number; index: number; distance: number };
+    const cardRect = card.current.getBoundingClientRect();
+    const cardX = (cardRect.left + cardRect.right) / 2;
+    const cardY = (cardRect.top + cardRect.bottom) / 2;
 
-    tierListDropOffs.forEach((element) => {
-      const thisRect = element.getBoundingClientRect();
-      const thisX = (thisRect.left + thisRect.right) / 2;
-      const thisY = (thisRect.top + thisRect.bottom) / 2;
-      let distance = 0;
+    rowLoop: for (const row of tierListRowElements) {
+      const rowRect = row.getBoundingClientRect();
+      const isWithinRow =
+        cardX >= rowRect.left &&
+        cardX <= rowRect.right &&
+        cardY >= rowRect.top &&
+        cardY <= rowRect.bottom;
 
-      if (
-        (thisX < rect.left || thisX > rect.right) &&
-        (thisY < rect.top || thisY > rect.bottom)
-      ) {
-        const rectX = (rect.left + rect.right) / 2;
-        const rectY = (rect.top + rect.bottom) / 2;
-        distance = Math.sqrt((thisX - rectX) ** 2 + (thisY - rectY) ** 2);
+      if (!isWithinRow) continue;
+
+      const rowIndex = Number(row.dataset.index);
+
+      for (const tile of tierListCardElements[rowIndex]) {
+        const tileId = Number(tile.dataset.tileId);
+
+        if (tileId === props.tank.id) continue;
+
+        const tileRect = tile.getBoundingClientRect();
+        const isWithinTile =
+          cardX >= tileRect.left &&
+          cardX <= tileRect.right &&
+          cardY >= tileRect.top &&
+          cardY <= tileRect.bottom;
+
+        if (!isWithinTile) continue;
+
+        const tileIndex = Number(tile.dataset.tileIndex);
+
+        mutateTierList((draft) => {
+          draft.dragging = false;
+          draft.tanks = draft.tanks.map((row) =>
+            row.filter((tankId) => tankId !== props.tank.id),
+          );
+          draft.tanks[rowIndex].splice(tileIndex, 0, props.tank.id);
+        });
+
+        break rowLoop;
       }
 
-      if (dropOff === undefined || dropOff.distance > distance) {
-        dropOff = {
-          row: Number(element.dataset.row),
-          index: Number(element.dataset.index),
-          distance,
-        };
-      }
-    });
+      mutateTierList((draft) => {
+        draft.dragging = false;
+        draft.tanks = draft.tanks.map((row) =>
+          row.filter((tankId) => tankId !== props.tank.id),
+        );
+        draft.tanks[rowIndex].push(props.tank.id);
+      });
 
-    mutateTierList((draft) => {
-      draft.dragging = false;
-      draft.tanks = draft.tanks.map((tanks) =>
-        tanks.filter((id) => id !== tank.id),
-      );
-
-      if (dropOff) {
-        draft.tanks[dropOff.row].splice(dropOff.index, 0, tank.id);
-      }
-    });
+      break;
+    }
 
     card.current.style.position = 'static';
     card.current.style.zIndex = 'unset';
@@ -104,11 +130,25 @@ export function TierListTile({ tank }: TierListTileProps) {
     window.removeEventListener('pointerup', handlePointerUp);
   }, []);
 
+  useEffect(() => {
+    if (!props.isPlaced || !card.current) return;
+
+    tierListCardElements[props.rowIndex].add(card.current);
+
+    return () => {
+      if (!card.current) return;
+
+      tierListCardElements[props.rowIndex].delete(card.current);
+    };
+  }, []);
+
   return (
     <TankCard
+      data-tile-index={props.isPlaced ? props.tileIndex : undefined}
+      data-tile-id={props.tank.id}
       ref={card}
       noLink
-      tank={tank}
+      tank={props.tank}
       style={{ cursor: 'grab' }}
       onPointerDown={handlePointerDown}
     />

packages/website/src/components/TierList/Tiles.tsx

@@ -15,7 +15,7 @@ export function TierListTiles() {
     <TankCardWrapper>
       {tanks
         .filter((tank) => filterTank(filters, tank))
-        .map((tank) => (
+        .map((tank, tileIndex) => (
           <TierListTile key={tank.id} tank={tank} />
         ))}
     </TankCardWrapper>