added SortableAudioGrid

src/components/sortable/SortableAudioGrid/index.tsx

@@ -0,0 +1,57 @@
+import React, { FC, useCallback } from 'react';
+
+import { AudioPlayer } from '~/components/media/AudioPlayer';
+import { AudioUpload } from '~/components/upload/AudioUpload';
+import { UploadStatus } from '~/store/uploader/UploaderStore';
+import { IFile } from '~/types';
+
+import { SortableList } from '../SortableList';
+
+type OnSortEnd = (newValue: IFile[]) => void;
+
+interface SortableAudioGridProps {
+  onSortEnd: OnSortEnd;
+  items: IFile[];
+  locked: UploadStatus[];
+  className?: string;
+  onDelete: (file_id: IFile['id']) => void;
+  onTitleChange: (file_id: IFile['id'], title: string) => void;
+}
+
+const SortableAudioGrid: FC<SortableAudioGridProps> = ({
+  items,
+  locked,
+  onDelete,
+  className,
+  onSortEnd,
+  onTitleChange,
+}) => {
+  const renderItem = useCallback<FC<{ item: IFile }>>(
+    ({ item }) => (
+      <AudioPlayer file={item} onDelete={onDelete} isEditing onTitleChange={onTitleChange} />
+    ),
+    []
+  );
+
+  const renderLocked = useCallback<FC<{ locked: UploadStatus }>>(
+    ({ locked }) => (
+      <AudioUpload id={locked.id} is_uploading title={locked.name} progress={locked.progress} />
+    ),
+    []
+  );
+
+  return (
+    <SortableList
+      items={items}
+      locked={locked}
+      getID={it => it.id}
+      getLockedID={it => it.id}
+      renderItem={renderItem}
+      renderLocked={renderLocked}
+      onSortEnd={onSortEnd}
+      className={className}
+    />
+  );
+};
+
+export { SortableAudioGrid };

src/components/sortable/SortableAudioGrid/styles.module.scss

@@ -0,0 +1,11 @@
+@import "src/styles/variables";
+
+.grid {
+  box-sizing: border-box;
+
+  display: grid;
+  grid-column-gap: $gap;
+  grid-row-gap: $gap;
+  grid-template-columns: auto;
+  grid-template-rows: $comment_height;
+}

src/components/sortable/SortableGrid/index.tsx

@@ -1,27 +1,16 @@
-import React, { createElement, FC, useCallback, useMemo, useState } from 'react';
+import React, { createElement, FC, useMemo } from "react";
 
-import {
-  closestCenter,
-  DndContext,
-  DragOverlay,
-  DragStartEvent,
-  MouseSensor,
-  TouchSensor,
-  useSensor,
-  useSensors,
-} from '@dnd-kit/core';
-import { DragEndEvent } from '@dnd-kit/core/dist/types';
-import { rectSortingStrategy, SortableContext } from '@dnd-kit/sortable';
-import classNames from 'classnames';
+import { closestCenter, DndContext, DragOverlay } from "@dnd-kit/core";
+import { rectSortingStrategy, SortableContext } from "@dnd-kit/sortable";
+import classNames from "classnames";
 
-import { DragOverlayItem } from '~/components/sortable/DragOverlayItem';
-import { useSortableActions } from '~/hooks/sortable';
-import { moveArrItem } from '~/utils/fn';
-import { DivProps } from '~/utils/types';
+import { DragOverlayItem } from "~/components/sortable/DragOverlayItem";
+import { useSortableActions } from "~/hooks/sortable";
+import { DivProps } from "~/utils/types";
 
-import { SortableImageGridItem } from '../SortableGridItem';
+import { SortableItem } from "../SortableItem";
 
-import styles from './styles.module.scss';
+import styles from "./styles.module.scss";
 
 interface SortableGridProps<T extends {}, R extends {}> {
   items: T[];
@@ -70,7 +59,7 @@ const SortableGrid = <T, R>({
       <SortableContext items={ids} strategy={rectSortingStrategy}>
         <div className={classNames(styles.grid, className)} style={gridStyle}>
           {items.map(item => (
-            <SortableImageGridItem
+            <SortableItem
               key={getID(item)}
               id={getID(item)}
               className={
@@ -78,7 +67,7 @@ const SortableGrid = <T, R>({
               }
             >
               {createElement(renderItem, { item })}
-            </SortableImageGridItem>
+            </SortableItem>
           ))}
 
           {locked.map(item =>

src/components/sortable/SortableItem/index.tsx

@@ -12,7 +12,7 @@ interface SortableImageGridItemProps {
   className?: string;
 }
 
-const SortableImageGridItem: FC<SortableImageGridItemProps> = ({
+const SortableItem: FC<SortableImageGridItemProps> = ({
   children,
   id,
   disabled = false,
@@ -41,4 +41,4 @@ const SortableImageGridItem: FC<SortableImageGridItemProps> = ({
   );
 };
 
-export { SortableImageGridItem };
+export { SortableItem };

src/components/sortable/SortableList/index.tsx

@@ -0,0 +1,76 @@
+import React, { createElement, FC } from 'react';
+
+import { closestCenter, DndContext, DragOverlay } from '@dnd-kit/core';
+import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import classNames from 'classnames';
+
+import { DragOverlayItem } from '~/components/sortable/DragOverlayItem';
+import { SortableItem } from '~/components/sortable/SortableItem';
+import { useSortableActions } from '~/hooks/sortable';
+
+import styles from './styles.module.scss';
+
+interface SortableListProps<T extends {}, R extends {}> {
+  items: T[];
+  locked: R[];
+  getID: (item: T) => number | string;
+  getLockedID: (locked: R) => number | string;
+  renderItem: FC<{ item: T }>;
+  renderLocked: FC<{ locked: R }>;
+  onSortEnd: (newVal: T[]) => void;
+  className?: string;
+}
+
+const SortableList = <T, R>({
+  items,
+  locked,
+  getID,
+  getLockedID,
+  className,
+  renderItem,
+  renderLocked,
+  onSortEnd,
+}: SortableListProps<T, R>) => {
+  const { sensors, onDragEnd, onDragStart, draggingItem, ids } = useSortableActions(
+    items,
+    getID,
+    onSortEnd
+  );
+
+  return (
+    <DndContext
+      sensors={sensors}
+      collisionDetection={closestCenter}
+      onDragEnd={onDragEnd}
+      onDragStart={onDragStart}
+    >
+      <SortableContext items={ids} strategy={verticalListSortingStrategy}>
+        <div className={classNames(styles.grid, className)}>
+          {items.map(item => (
+            <SortableItem
+              key={getID(item)}
+              id={getID(item)}
+              className={
+                draggingItem && getID(item) === getID(draggingItem) ? styles.dragging : undefined
+              }
+            >
+              {createElement(renderItem, { item })}
+            </SortableItem>
+          ))}
+
+          {locked.map(item =>
+            createElement(renderLocked, { locked: item, key: getLockedID(item) })
+          )}
+
+          <DragOverlay>
+            {draggingItem ? (
+              <DragOverlayItem>{createElement(renderItem, { item: draggingItem })}</DragOverlayItem>
+            ) : null}
+          </DragOverlay>
+        </div>
+      </SortableContext>
+    </DndContext>
+  );
+};
+
+export { SortableList };

src/components/sortable/SortableList/styles.module.scss

@@ -0,0 +1,15 @@
+@import "src/styles/variables";
+
+.grid {
+  box-sizing: border-box;
+
+  display: grid;
+  grid-row-gap: $gap;
+  grid-template-columns: 1fr;
+  grid-template-rows: auto;
+  grid-auto-flow: row;
+}
+
+.dragging {
+  opacity: 0.1;
+}

src/components/sortable/index.ts

@@ -1,2 +1,2 @@
 export * from './SortableImageGrid';
-export * from './SortableGrid';
+export * from './SortableAudioGrid';