From db1ce45cd2618f4be133da92343fca203db3c814 Mon Sep 17 00:00:00 2001
From: Shusui MOYATANI <syusui.s@gmail.com>
Date: Tue, 30 Jan 2024 12:36:38 +0900
Subject: [PATCH] feat: draggable column

---
 src/components/SideBar.tsx | 64 +++++++++++++++++++++++++++++++++++---
 src/core/useConfig.ts      |  7 +++++
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index a2d0f44..94cfa23 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -10,6 +10,16 @@ import {
   createMemo,
 } from 'solid-js';
 
+import {
+  DragDropProvider,
+  DragDropSensors,
+  DragEventHandler,
+  SortableProvider,
+  createSortable,
+  closestCenter,
+  useDragDropContext,
+  type Transformer,
+} from '@thisbeyond/solid-dnd';
 import Bell from 'heroicons/24/outline/bell.svg';
 import BookmarkIcon from 'heroicons/24/outline/bookmark.svg';
 import ChatBubbleLeftRight from 'heroicons/24/outline/chat-bubble-left-right.svg';
@@ -149,6 +159,8 @@ const columns: Readonly<Record<ColumnKind, { icon: string /* svg */; nameKey: Pa
 const ColumnButton: Component<{ column: ColumnType; index: number }> = (props) => {
   const i18n = useTranslation();
 
+  const sortable = createSortable(props.column.id);
+
   const request = useRequestCommand();
   const jumpToColumn = () => {
     request({
@@ -162,7 +174,12 @@ const ColumnButton: Component<{ column: ColumnType; index: number }> = (props) =
 
   return (
     <button
-      class="relative flex w-full flex-col items-center py-3 text-primary hover:text-primary-hover"
+      // https://github.com/thisbeyond/solid-dnd/issues/60
+      // https://github.com/thisbeyond/solid-dnd/issues/68
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      use:sortable
+      class="relative flex w-full touch-none select-none flex-col items-center py-3 text-primary hover:text-primary-hover"
       onClick={() => jumpToColumn()}
       title={props.column.name ?? i18n.t(columnNameKey())}
     >
@@ -174,15 +191,52 @@ const ColumnButton: Component<{ column: ColumnType; index: number }> = (props) =
   );
 };
 
+const ConstrainDragAxis = () => {
+  const dragDropContext = useDragDropContext();
+  const actions = dragDropContext?.[1];
+
+  const transformer: Transformer = {
+    id: 'constrain-x-axis',
+    order: 100,
+    callback: (transform) => ({ ...transform, x: 0 }),
+  };
+
+  actions?.onDragStart(({ draggable }) => {
+    actions?.addTransformer('draggables', draggable.id, transformer);
+  });
+
+  actions?.onDragEnd(({ draggable }) => {
+    actions?.removeTransformer('draggables', draggable.id, transformer.id);
+  });
+
+  return <></>;
+};
+
 const ColumnButtons: Component = () => {
-  const { config } = useConfig();
+  const { config, moveColumnById } = useConfig();
+
+  const columnIds = () => config().columns.map((column) => column.id);
+
+  const handleDragEnd: DragEventHandler = ({ draggable, droppable }) => {
+    if (draggable && droppable) {
+      const columnId = draggable?.id as string;
+      const insertBeforeId = droppable?.id as string;
+      moveColumnById(columnId, insertBeforeId);
+    }
+  };
 
   return (
     <div class="scrollbar flex w-full grow overflow-y-auto overflow-x-hidden border-y border-primary/30 px-2 ">
       <div class="size-full flex-col items-center justify-center py-2">
-        <For each={config().columns}>
-          {(column, index) => <ColumnButton column={column} index={index() + 1} />}
-        </For>
+        <DragDropProvider onDragEnd={handleDragEnd} collisionDetector={closestCenter}>
+          <DragDropSensors />
+          <ConstrainDragAxis />
+          <SortableProvider ids={columnIds()}>
+            <For each={config().columns}>
+              {(column, index) => <ColumnButton column={column} index={index() + 1} />}
+            </For>
+          </SortableProvider>
+        </DragDropProvider>
       </div>
     </div>
   );
diff --git a/src/core/useConfig.ts b/src/core/useConfig.ts
index d899e3a..c9fbea4 100644
--- a/src/core/useConfig.ts
+++ b/src/core/useConfig.ts
@@ -63,6 +63,7 @@ type UseConfig = {
   // column
   saveColumn: (column: ColumnType) => void;
   moveColumn: (columnId: string, index: number) => void;
+  moveColumnById: (columnId: string, insertBeforeId: string) => void;
   removeColumn: (columnId: string) => void;
   initializeColumns: (param: { pubkey: string }) => void;
   // emoji
@@ -184,6 +185,11 @@ const useConfig = (): UseConfig => {
     });
   };
 
+  const moveColumnById = (columnId: string, insertBeforeId: string) => {
+    const toIndex = config.columns.findIndex((column) => column.id === insertBeforeId);
+    moveColumn(columnId, toIndex + 1);
+  };
+
   const removeColumn = (columnId: string) => {
     setConfig('columns', (current) => current.filter((e) => e.id !== columnId));
   };
@@ -259,6 +265,7 @@ const useConfig = (): UseConfig => {
     // column
     saveColumn,
     moveColumn,
+    moveColumnById,
     removeColumn,
     initializeColumns,
     // emoji