Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

draggable table fields order

Guy Ben-Aharonff2b62d797e8
diff --git a/package-lock.json b/package-lock.json
index 90d155ed..77ca1faf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
"version": "0.0.0",
"dependencies": {
"@ai-sdk/openai": "^0.0.51",
+ "@dnd-kit/sortable": "^8.0.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.0",
@@ -613,6 +614,61 @@
"node": ">=6.9.0"
}
},
+ "node_modules/@dnd-kit/accessibility": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.0.tgz",
+ "integrity": "sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ }
+ },
+ "node_modules/@dnd-kit/core": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.1.0.tgz",
+ "integrity": "sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "@dnd-kit/accessibility": "^3.1.0",
+ "@dnd-kit/utilities": "^3.2.2",
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
+ "node_modules/@dnd-kit/sortable": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-8.0.0.tgz",
+ "integrity": "sha512-U3jk5ebVXe1Lr7c2wU7SBZjcWdQP+j7peHJfCspnA81enlu88Mgd7CC8Q+pub9ubP7eKVETzJW+IBAhsqbSu/g==",
+ "license": "MIT",
+ "dependencies": {
+ "@dnd-kit/utilities": "^3.2.2",
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "@dnd-kit/core": "^6.1.0",
+ "react": ">=16.8.0"
+ }
+ },
+ "node_modules/@dnd-kit/utilities": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
+ "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
+ "license": "MIT",
+ "dependencies": {
+ "tslib": "^2.0.0"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ }
+ },
"node_modules/@emotion/is-prop-valid": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
diff --git a/package.json b/package.json
index 7143583c..fa444227 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
},
"dependencies": {
"@ai-sdk/openai": "^0.0.51",
+ "@dnd-kit/sortable": "^8.0.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.0",
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx
index dd06149b..568666a4 100644
--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Ellipsis, Trash2 } from 'lucide-react';
+import { Ellipsis, GripVertical, Trash2 } from 'lucide-react';
import { Input } from '@/components/input/input';
import { Combobox } from '@/components/combobox/combobox';
import { Button } from '@/components/button/button';
@@ -24,6 +24,8 @@ import { Checkbox } from '@/components/checkbox/checkbox';
import { useTranslation } from 'react-i18next';
import { Textarea } from '@/components/textarea/textarea';
import { TableFieldToggle } from './table-field-toggle';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
export interface TableFieldProps {
field: DBField;
@@ -38,18 +40,32 @@ export const TableField: React.FC<TableFieldProps> = ({
}) => {
const { databaseType } = useChartDB();
const { t } = useTranslation();
+ const { attributes, listeners, setNodeRef, transform, transition } =
+ useSortable({ id: field.id });
const dataFieldOptions = dataTypeMap[databaseType].map((type) => ({
label: type.name,
value: type.id,
}));
+ const style = {
+ transform: CSS.Transform.toString(transform),
+ transition,
+ };
+
return (
- <div className="flex flex-1 flex-row justify-between p-1">
- <div className="flex w-8/12 justify-start gap-1 overflow-hidden">
+ <div
+ className="flex flex-1 flex-row justify-between p-1"
+ ref={setNodeRef}
+ style={style}
+ {...attributes}
+ {...listeners}
+ >
+ <div className="flex w-8/12 items-center justify-start gap-1 overflow-hidden">
+ <GripVertical className="size-3 shrink-0 cursor-move text-muted-foreground" />
<Tooltip>
<TooltipTrigger asChild>
- <span className="w-7/12">
+ <span className="w-5/12">
<Input
className="h-8 w-full !truncate focus-visible:ring-0"
type="text"
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx
index a9558ea4..cbe64540 100644
--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx
@@ -16,6 +16,19 @@ import { TableIndex } from './table-index/table-index';
import { DBIndex } from '@/lib/domain/db-index';
import { useTranslation } from 'react-i18next';
import { Textarea } from '@/components/textarea/textarea';
+import {
+ DndContext,
+ closestCenter,
+ PointerSensor,
+ useSensor,
+ useSensors,
+ DragEndEvent,
+} from '@dnd-kit/core';
+import {
+ arrayMove,
+ SortableContext,
+ verticalListSortingStrategy,
+} from '@dnd-kit/sortable';
type AccordionItemValue = 'fields' | 'indexes';
@@ -40,6 +53,21 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
const [selectedItems, setSelectedItems] = React.useState<
AccordionItemValue[]
>(['fields']);
+ const sensors = useSensors(useSensor(PointerSensor));
+
+ const handleDragEnd = (event: DragEndEvent) => {
+ const { active, over } = event;
+
+ if (active?.id !== over?.id && !!over && !!active) {
+ const items = table.fields;
+ const oldIndex = items.findIndex((item) => item.id === active.id);
+ const newIndex = items.findIndex((item) => item.id === over.id);
+
+ updateTable(table.id, {
+ fields: arrayMove(items, oldIndex, newIndex),
+ });
+ }
+ };
const createIndexHandler = () => {
setSelectedItems((prev) => {
@@ -96,18 +124,35 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
</div>
</AccordionTrigger>
<AccordionContent className="flex flex-col pb-0 pt-1">
- {table.fields.map((field) => (
- <TableField
- key={field.id}
- field={field}
- updateField={(attrs: Partial<DBField>) =>
- updateField(table.id, field.id, attrs)
- }
- removeField={() =>
- removeField(table.id, field.id)
- }
- />
- ))}
+ <DndContext
+ sensors={sensors}
+ collisionDetection={closestCenter}
+ onDragEnd={handleDragEnd}
+ >
+ <SortableContext
+ items={table.fields}
+ strategy={verticalListSortingStrategy}
+ >
+ {table.fields.map((field) => (
+ <TableField
+ key={field.id}
+ field={field}
+ updateField={(
+ attrs: Partial<DBField>
+ ) =>
+ updateField(
+ table.id,
+ field.id,
+ attrs
+ )
+ }
+ removeField={() =>
+ removeField(table.id, field.id)
+ }
+ />
+ ))}
+ </SortableContext>
+ </DndContext>
</AccordionContent>
</AccordionItem>