Skip to content

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

feat: add move-to-area and auto-arrange-area context menu options (#1120)

Jonathan Fishnerc24936a402bb
diff --git a/src/context/chartdb-context/chartdb-provider.tsx b/src/context/chartdb-context/chartdb-provider.tsx
index 44d05bb0..0edd854c 100644
--- a/src/context/chartdb-context/chartdb-provider.tsx
+++ b/src/context/chartdb-context/chartdb-provider.tsx
@@ -1,7 +1,7 @@
import React, { useCallback, useMemo, useState } from 'react';
import type { DBTable } from '@/lib/domain/db-table';
import { deepCopy, generateId } from '@/lib/utils';
-import { defaultTableColor, defaultAreaColor, viewColor } from '@/lib/colors';
+import { defaultTableColor, randomColor, viewColor } from '@/lib/colors';
import type { ChartDBContext, ChartDBEvent } from './chartdb-context';
import { chartDBContext } from './chartdb-context';
import { DatabaseType } from '@/lib/domain/database-type';
@@ -1661,7 +1661,7 @@ export const ChartDBProvider: React.FC<
y: 0,
width: 300,
height: 200,
- color: defaultAreaColor,
+ color: randomColor(),
...attributes,
};
diff --git a/src/i18n/locales/ar.ts b/src/i18n/locales/ar.ts
index 5dc9bd8d..1d2b75ad 100644
--- a/src/i18n/locales/ar.ts
+++ b/src/i18n/locales/ar.ts
@@ -522,6 +522,8 @@ export const ar: LanguageTranslation = {
duplicate_table: 'نسخ الجدول',
delete_table: 'حذف الجدول',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'نقل إلى منطقة',
+ no_area: 'بدون منطقة',
},
canvas: {
diff --git a/src/i18n/locales/bn.ts b/src/i18n/locales/bn.ts
index 73b5a570..d07b1527 100644
--- a/src/i18n/locales/bn.ts
+++ b/src/i18n/locales/bn.ts
@@ -533,6 +533,8 @@ export const bn: LanguageTranslation = {
duplicate_table: 'টেবিল নকল করুন',
delete_table: 'টেবিল মুছে ফেলুন',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'এলাকায় সরান',
+ no_area: 'কোনো এলাকা নেই',
},
canvas: {
diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts
index e0241d80..800d49e5 100644
--- a/src/i18n/locales/de.ts
+++ b/src/i18n/locales/de.ts
@@ -533,6 +533,8 @@ export const de: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: 'Tabelle löschen',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'In Bereich verschieben',
+ no_area: 'Kein Bereich',
},
canvas: {
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index f0104bd3..132940ab 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -520,6 +520,8 @@ export const en = {
duplicate_table: 'Duplicate Table',
delete_table: 'Delete Table',
add_relationship: 'Add Relationship',
+ move_to_area: 'Move to Area',
+ no_area: 'No Area',
},
canvas: {
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index 9145e281..7ca28f69 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -533,6 +533,8 @@ export const es: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: 'Eliminar Tabla',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'Mover a Área',
+ no_area: 'Sin Área',
},
canvas: {
diff --git a/src/i18n/locales/fr.ts b/src/i18n/locales/fr.ts
index 4d04f312..4b9ababb 100644
--- a/src/i18n/locales/fr.ts
+++ b/src/i18n/locales/fr.ts
@@ -528,6 +528,8 @@ export const fr: LanguageTranslation = {
duplicate_table: 'Tableau Dupliqué',
delete_table: 'Supprimer la Table',
add_relationship: 'Ajouter une Relation',
+ move_to_area: 'Déplacer vers une Zone',
+ no_area: 'Aucune Zone',
},
canvas: {
diff --git a/src/i18n/locales/gu.ts b/src/i18n/locales/gu.ts
index 5f658457..beea7b10 100644
--- a/src/i18n/locales/gu.ts
+++ b/src/i18n/locales/gu.ts
@@ -531,6 +531,8 @@ export const gu: LanguageTranslation = {
duplicate_table: 'ટેબલ નકલ કરો',
delete_table: 'ટેબલ કાઢી નાખો',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'વિસ્તારમાં ખસેડો',
+ no_area: 'કોઈ વિસ્તાર નહીં',
},
canvas: {
diff --git a/src/i18n/locales/hi.ts b/src/i18n/locales/hi.ts
index 1087640d..cf46d764 100644
--- a/src/i18n/locales/hi.ts
+++ b/src/i18n/locales/hi.ts
@@ -535,6 +535,8 @@ export const hi: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: 'तालिका हटाएँ',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'क्षेत्र में ले जाएं',
+ no_area: 'कोई क्षेत्र नहीं',
},
canvas: {
diff --git a/src/i18n/locales/hr.ts b/src/i18n/locales/hr.ts
index 8f35efc9..da951e58 100644
--- a/src/i18n/locales/hr.ts
+++ b/src/i18n/locales/hr.ts
@@ -525,6 +525,8 @@ export const hr: LanguageTranslation = {
duplicate_table: 'Dupliciraj tablicu',
delete_table: 'Izbriši tablicu',
add_relationship: 'Dodaj vezu',
+ move_to_area: 'Premjesti u područje',
+ no_area: 'Bez područja',
},
canvas: {
diff --git a/src/i18n/locales/id_ID.ts b/src/i18n/locales/id_ID.ts
index f20aa8a9..401a3169 100644
--- a/src/i18n/locales/id_ID.ts
+++ b/src/i18n/locales/id_ID.ts
@@ -531,6 +531,8 @@ export const id_ID: LanguageTranslation = {
delete_table: 'Hapus Tabel',
duplicate_table: 'Duplikat Tabel',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'Pindahkan ke Area',
+ no_area: 'Tanpa Area',
},
canvas: {
diff --git a/src/i18n/locales/ja.ts b/src/i18n/locales/ja.ts
index 0374f0d7..adc4f962 100644
--- a/src/i18n/locales/ja.ts
+++ b/src/i18n/locales/ja.ts
@@ -534,6 +534,8 @@ export const ja: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: 'テーブルを削除',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'エリアに移動',
+ no_area: 'エリアなし',
},
canvas: {
diff --git a/src/i18n/locales/ko_KR.ts b/src/i18n/locales/ko_KR.ts
index 307a9c06..e44b66f6 100644
--- a/src/i18n/locales/ko_KR.ts
+++ b/src/i18n/locales/ko_KR.ts
@@ -527,6 +527,8 @@ export const ko_KR: LanguageTranslation = {
duplicate_table: '테이블 복제',
delete_table: '테이블 삭제',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: '영역으로 이동',
+ no_area: '영역 없음',
},
canvas: {
diff --git a/src/i18n/locales/mr.ts b/src/i18n/locales/mr.ts
index 061f968d..e154bcfc 100644
--- a/src/i18n/locales/mr.ts
+++ b/src/i18n/locales/mr.ts
@@ -541,6 +541,8 @@ export const mr: LanguageTranslation = {
delete_table: 'टेबल हटवा',
duplicate_table: 'Duplicate Table', // TODO: Translate
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'क्षेत्रात हलवा',
+ no_area: 'क्षेत्र नाही',
},
canvas: {
diff --git a/src/i18n/locales/ne.ts b/src/i18n/locales/ne.ts
index eeedffe3..d7c3112a 100644
--- a/src/i18n/locales/ne.ts
+++ b/src/i18n/locales/ne.ts
@@ -534,6 +534,8 @@ export const ne: LanguageTranslation = {
duplicate_table: 'तालिका नक्कली गर्नुहोस्',
delete_table: 'तालिका हटाउनुहोस्',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'क्षेत्रमा सार्नुहोस्',
+ no_area: 'कुनै क्षेत्र छैन',
},
canvas: {
diff --git a/src/i18n/locales/pt_BR.ts b/src/i18n/locales/pt_BR.ts
index e100380c..d97e6bc5 100644
--- a/src/i18n/locales/pt_BR.ts
+++ b/src/i18n/locales/pt_BR.ts
@@ -533,6 +533,8 @@ export const pt_BR: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: 'Excluir Tabela',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'Mover para Área',
+ no_area: 'Sem Área',
},
canvas: {
diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts
index 401e0fa9..6e7ce445 100644
--- a/src/i18n/locales/ru.ts
+++ b/src/i18n/locales/ru.ts
@@ -529,6 +529,8 @@ export const ru: LanguageTranslation = {
duplicate_table: 'Создать копию',
delete_table: 'Удалить таблицу',
add_relationship: 'Добавить связь',
+ move_to_area: 'Переместить в область',
+ no_area: 'Без области',
},
canvas: {
diff --git a/src/i18n/locales/te.ts b/src/i18n/locales/te.ts
index 4d4af307..6dbb0cac 100644
--- a/src/i18n/locales/te.ts
+++ b/src/i18n/locales/te.ts
@@ -536,6 +536,8 @@ export const te: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: 'పట్టికను తొలగించు',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'ప్రాంతానికి తరలించు',
+ no_area: 'ప్రాంతం లేదు',
},
canvas: {
diff --git a/src/i18n/locales/tr.ts b/src/i18n/locales/tr.ts
index 688f54db..704baa39 100644
--- a/src/i18n/locales/tr.ts
+++ b/src/i18n/locales/tr.ts
@@ -519,6 +519,8 @@ export const tr: LanguageTranslation = {
delete_table: 'Tabloyu Sil',
duplicate_table: 'Duplicate Table', // TODO: Translate
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'Alana Taşı',
+ no_area: 'Alan Yok',
},
canvas: {
diff --git a/src/i18n/locales/uk.ts b/src/i18n/locales/uk.ts
index 2a547f70..40dfcdbb 100644
--- a/src/i18n/locales/uk.ts
+++ b/src/i18n/locales/uk.ts
@@ -529,6 +529,8 @@ export const uk: LanguageTranslation = {
duplicate_table: 'Дублювати таблицю',
delete_table: 'Видалити таблицю',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'Перемістити в область',
+ no_area: 'Без області',
},
canvas: {
diff --git a/src/i18n/locales/vi.ts b/src/i18n/locales/vi.ts
index d7b28df0..dc9d01a0 100644
--- a/src/i18n/locales/vi.ts
+++ b/src/i18n/locales/vi.ts
@@ -529,6 +529,8 @@ export const vi: LanguageTranslation = {
duplicate_table: 'Nhân đôi bảng',
delete_table: 'Xóa bảng',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: 'Di chuyển đến Khu vực',
+ no_area: 'Không có Khu vực',
},
canvas: {
diff --git a/src/i18n/locales/zh_CN.ts b/src/i18n/locales/zh_CN.ts
index 6aaee7d7..6eb04867 100644
--- a/src/i18n/locales/zh_CN.ts
+++ b/src/i18n/locales/zh_CN.ts
@@ -520,6 +520,8 @@ export const zh_CN: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: '删除表',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: '移动到区域',
+ no_area: '无区域',
},
canvas: {
diff --git a/src/i18n/locales/zh_TW.ts b/src/i18n/locales/zh_TW.ts
index 86ac277f..098d9bdb 100644
--- a/src/i18n/locales/zh_TW.ts
+++ b/src/i18n/locales/zh_TW.ts
@@ -520,6 +520,8 @@ export const zh_TW: LanguageTranslation = {
duplicate_table: 'Duplicate Table', // TODO: Translate
delete_table: '刪除表格',
add_relationship: 'Add Relationship', // TODO: Translate
+ move_to_area: '移動到區域',
+ no_area: '無區域',
},
canvas: {
diff --git a/src/lib/domain/db-table.ts b/src/lib/domain/db-table.ts
index 246542cd..7498d1dc 100644
--- a/src/lib/domain/db-table.ts
+++ b/src/lib/domain/db-table.ts
@@ -185,7 +185,7 @@ function isTableInsideArea(table: DBTable, area: Area): boolean {
}
// Helper function to position tables within an area
-function positionTablesWithinArea(
+export function positionTablesWithinArea(
tables: DBTable[],
_relationships: DBRelationship[],
area: Area
@@ -228,7 +228,7 @@ function positionTablesWithinArea(
}
// Original algorithm with area avoidance
-function adjustTablePositionsWithoutAreas(
+export function adjustTablePositionsWithoutAreas(
tables: DBTable[],
relationships: DBRelationship[],
mode: 'all' | 'perSchema',
diff --git a/src/lib/utils/area-utils.ts b/src/lib/utils/area-utils.ts
index 22f42374..ca729f4a 100644
--- a/src/lib/utils/area-utils.ts
+++ b/src/lib/utils/area-utils.ts
@@ -1,6 +1,12 @@
import type { DBTable } from '@/lib/domain/db-table';
+import type { DBRelationship } from '@/lib/domain/db-relationship';
import type { Area } from '@/lib/domain/area';
-import { calcTableHeight, MIN_TABLE_SIZE } from '@/lib/domain/db-table';
+import {
+ adjustTablePositionsWithoutAreas,
+ calcTableHeight,
+ getTableDimensions,
+ MIN_TABLE_SIZE,
+} from '@/lib/domain/db-table';
/**
* Check if a table is inside an area based on their positions and dimensions
@@ -83,3 +89,64 @@ export const getTablesInArea = (
): DBTable[] => {
return tables.filter((table) => table.parentAreaId === areaId);
};
+
+const AREA_PADDING = 30;
+const AREA_HEADER_HEIGHT = 50;
+
+/**
+ * Arrange tables using the relationship-aware algorithm and fit them into an area.
+ * Returns the arranged positions and the required area dimensions.
+ */
+export const arrangeTablesForArea = (
+ tablesToArrange: DBTable[],
+ relationships: DBRelationship[],
+ areaRect: { x: number; y: number; width: number; height: number }
+): {
+ positions: { id: string; x: number; y: number }[];
+ requiredWidth: number;
+ requiredHeight: number;
+} => {
+ if (tablesToArrange.length === 0) {
+ return {
+ positions: [],
+ requiredWidth: areaRect.width,
+ requiredHeight: areaRect.height,
+ };
+ }
+
+ const cloned = tablesToArrange.map((t) => ({ ...t }));
+
+ const ids = new Set(cloned.map((t) => t.id));
+ const areaRels = relationships.filter(
+ (rel) => ids.has(rel.sourceTableId) && ids.has(rel.targetTableId)
+ );
+
+ adjustTablePositionsWithoutAreas(cloned, areaRels, 'all');
+
+ // Calculate bounding box
+ let minX = Infinity;
+ let minY = Infinity;
+ let maxX = -Infinity;
+ let maxY = -Infinity;
+ cloned.forEach((t) => {
+ const { width, height } = getTableDimensions(t);
+ minX = Math.min(minX, t.x);
+ minY = Math.min(minY, t.y);
+ maxX = Math.max(maxX, t.x + width);
+ maxY = Math.max(maxY, t.y + height);
+ });
+
+ // Translate into area
+ const offsetX = areaRect.x + AREA_PADDING - minX;
+ const offsetY = areaRect.y + AREA_HEADER_HEIGHT - minY;
+
+ return {
+ positions: cloned.map((t) => ({
+ id: t.id,
+ x: t.x + offsetX,
+ y: t.y + offsetY,
+ })),
+ requiredWidth: maxX - minX + 2 * AREA_PADDING,
+ requiredHeight: maxY - minY + AREA_PADDING + AREA_HEADER_HEIGHT,
+ };
+};
diff --git a/src/pages/editor-page/canvas/area-node/area-node-context-menu.tsx b/src/pages/editor-page/canvas/area-node/area-node-context-menu.tsx
index c1aeca67..ab3e7fb3 100644
--- a/src/pages/editor-page/canvas/area-node/area-node-context-menu.tsx
+++ b/src/pages/editor-page/canvas/area-node/area-node-context-menu.tsx
@@ -2,13 +2,16 @@ import {
ContextMenu,
ContextMenuContent,
ContextMenuItem,
+ ContextMenuSeparator,
ContextMenuTrigger,
} from '@/components/context-menu/context-menu';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { useChartDB } from '@/hooks/use-chartdb';
import type { Area } from '@/lib/domain/area';
-import { Pencil, Trash2 } from 'lucide-react';
+import { arrangeTablesForArea } from '@/lib/utils/area-utils';
+import { LayoutGrid, Pencil, Trash2 } from 'lucide-react';
import React, { useCallback } from 'react';
+import { useReactFlow } from '@xyflow/react';
export interface AreaNodeContextMenuProps {
area: Area;
@@ -18,13 +21,60 @@ export interface AreaNodeContextMenuProps {
export const AreaNodeContextMenu: React.FC<
React.PropsWithChildren<AreaNodeContextMenuProps>
> = ({ children, area, onEditName }) => {
- const { removeArea, readonly } = useChartDB();
+ const {
+ removeArea,
+ readonly,
+ tables,
+ relationships,
+ updateTablesState,
+ updateArea,
+ } = useChartDB();
const { isMd: isDesktop } = useBreakpoint('md');
+ const { getNodes } = useReactFlow();
const removeAreaHandler = useCallback(() => {
removeArea(area.id);
}, [removeArea, area.id]);
+ const autoArrangeHandler = useCallback(() => {
+ const canvasNodes = getNodes();
+ const areaNode = canvasNodes.find(
+ (n) => n.id === area.id && n.type === 'area'
+ );
+ const areaRect = {
+ x: areaNode?.position.x ?? area.x,
+ y: areaNode?.position.y ?? area.y,
+ width: areaNode?.measured?.width ?? area.width,
+ height: areaNode?.measured?.height ?? area.height,
+ };
+
+ const tablesInArea = tables.filter((t) => t.parentAreaId === area.id);
+ if (tablesInArea.length === 0) return;
+
+ const { positions, requiredWidth, requiredHeight } =
+ arrangeTablesForArea(tablesInArea, relationships, areaRect);
+
+ if (
+ requiredWidth > areaRect.width ||
+ requiredHeight > areaRect.height
+ ) {
+ updateArea(area.id, {
+ width: Math.max(areaRect.width, requiredWidth),
+ height: Math.max(areaRect.height, requiredHeight),
+ });
+ }
+
+ updateTablesState(
+ (currentTables) =>
+ currentTables.map((t) => {
+ const pos = positions.find((p) => p.id === t.id);
+ if (!pos) return t;
+ return { ...t, x: pos.x, y: pos.y };
+ }),
+ { updateHistory: true }
+ );
+ }, [area, tables, relationships, updateTablesState, updateArea, getNodes]);
+
if (!isDesktop || readonly) {
return <>{children}</>;
}
@@ -41,6 +91,14 @@ export const AreaNodeContextMenu: React.FC<
<Pencil className="size-3.5" />
</ContextMenuItem>
) : null}
+ <ContextMenuItem
+ onClick={autoArrangeHandler}
+ className="flex justify-between gap-3"
+ >
+ <span>Auto Arrange</span>
+ <LayoutGrid className="size-3.5" />
+ </ContextMenuItem>
+ <ContextMenuSeparator />
<ContextMenuItem
onClick={removeAreaHandler}
className="flex justify-between gap-3"
diff --git a/src/pages/editor-page/canvas/canvas-context-menu.tsx b/src/pages/editor-page/canvas/canvas-context-menu.tsx
index 42db6963..99c4fbf9 100644
--- a/src/pages/editor-page/canvas/canvas-context-menu.tsx
+++ b/src/pages/editor-page/canvas/canvas-context-menu.tsx
@@ -3,35 +3,69 @@ import {
ContextMenuContent,
ContextMenuItem,
ContextMenuSeparator,
+ ContextMenuSub,
+ ContextMenuSubContent,
+ ContextMenuSubTrigger,
ContextMenuTrigger,
} from '@/components/context-menu/context-menu';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { useChartDB } from '@/hooks/use-chartdb';
import { useDialog } from '@/hooks/use-dialog';
-import { useReactFlow } from '@xyflow/react';
+import { useReactFlow, useStore } from '@xyflow/react';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
-import { Table, Workflow, Group, View, StickyNote, Import } from 'lucide-react';
+import {
+ Table,
+ Workflow,
+ Group,
+ View,
+ StickyNote,
+ Import,
+ LayoutGrid,
+ Plus,
+ SquareArrowOutUpRight,
+} from 'lucide-react';
import { useDiagramFilter } from '@/context/diagram-filter-context/use-diagram-filter';
import { useLocalConfig } from '@/hooks/use-local-config';
import { useCanvas } from '@/hooks/use-canvas';
import { defaultSchemas } from '@/lib/data/default-schemas';
+import { useAlert } from '@/context/alert-context/alert-context';
+import { arrangeTablesForArea } from '@/lib/utils/area-utils';
export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
children,
}) => {
- const { createTable, readonly, createArea, databaseType, createNote } =
- useChartDB();
+ const {
+ createTable,
+ readonly,
+ createArea,
+ databaseType,
+ createNote,
+ areas,
+ tables,
+ relationships,
+ updateArea,
+ updateTablesState,
+ } = useChartDB();
const { schemasDisplayed } = useDiagramFilter();
const { openCreateRelationshipDialog, openImportDatabaseDialog } =
useDialog();
- const { screenToFlowPosition } = useReactFlow();
+ const { screenToFlowPosition, getNodes } = useReactFlow();
const { t } = useTranslation();
const { showDBViews } = useLocalConfig();
- const { setEditTableModeTable } = useCanvas();
+ const { setEditTableModeTable, reorderTables } = useCanvas();
+ const { showAlert } = useAlert();
const { isMd: isDesktop } = useBreakpoint('md');
+ // Reactively detect selected tables
+ const selectedTableIds = useStore((state) =>
+ state.nodes
+ .filter((n) => n.type === 'table' && n.selected && !n.hidden)
+ .map((n) => n.id)
+ );
+ const hasSelectedTables = selectedTableIds.length > 0;
+
const createTableHandler = useCallback(
async (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
const position = screenToFlowPosition({
@@ -39,7 +73,6 @@ export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
y: event.clientY,
});
- // Auto-select schema with priority: default schema > first displayed schema > undefined
let schema: string | undefined = undefined;
if (schemasDisplayed.length > 0) {
const defaultSchemaName = defaultSchemas[databaseType];
@@ -77,7 +110,6 @@ export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
y: event.clientY,
});
- // Auto-select schema with priority: default schema > first displayed schema > undefined
let schema: string | undefined = undefined;
if (schemasDisplayed.length > 0) {
const defaultSchemaName = defaultSchemas[databaseType];
@@ -143,8 +175,17 @@ export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
openCreateRelationshipDialog();
}, [openCreateRelationshipDialog]);
+ const autoArrangeHandler = useCallback(() => {
+ showAlert({
+ title: t('reorder_diagram_alert.title'),
+ description: t('reorder_diagram_alert.description'),
+ actionLabel: t('reorder_diagram_alert.reorder'),
+ closeLabel: t('reorder_diagram_alert.cancel'),
+ onAction: reorderTables,
+ });
+ }, [t, showAlert, reorderTables]);
+
const importSqlDbmlHandler = useCallback(() => {
- // Defer dialog opening to prevent Radix UI context menu/dialog portal conflicts
queueMicrotask(() => {
openImportDatabaseDialog({
databaseType,
@@ -153,6 +194,97 @@ export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
});
}, [openImportDatabaseDialog, databaseType]);
+ // Arrange selected tables into an area
+ const moveSelectedToArea = useCallback(
+ (
+ areaId: string,
+ overrideRect?: {
+ x: number;
+ y: number;
+ width: number;
+ height: number;
+ }
+ ) => {
+ let areaRect = overrideRect;
+ if (!areaRect) {
+ const canvasNodes = getNodes();
+ const areaNode = canvasNodes.find(
+ (n) => n.id === areaId && n.type === 'area'
+ );
+ const areaData = areas.find((a) => a.id === areaId)!;
+ areaRect = {
+ x: areaNode?.position.x ?? areaData.x,
+ y: areaNode?.position.y ?? areaData.y,
+ width: areaNode?.measured?.width ?? areaData.width,
+ height: areaNode?.measured?.height ?? areaData.height,
+ };
+ }
+
+ const tableIdSet = new Set(selectedTableIds);
+ const existingAreaTables = tables.filter(
+ (t) => t.parentAreaId === areaId && !tableIdSet.has(t.id)
+ );
+ const movingTables = tables.filter((t) => tableIdSet.has(t.id));
+ const allAreaTables = [...existingAreaTables, ...movingTables];
+
+ const { positions, requiredWidth, requiredHeight } =
+ arrangeTablesForArea(allAreaTables, relationships, areaRect);
+
+ if (
+ requiredWidth > areaRect.width ||
+ requiredHeight > areaRect.height
+ ) {
+ updateArea(areaId, {
+ width: Math.max(areaRect.width, requiredWidth),
+ height: Math.max(areaRect.height, requiredHeight),
+ });
+ }
+
+ updateTablesState(
+ (currentTables) =>
+ currentTables.map((t) => {
+ const pos = positions.find((p) => p.id === t.id);
+ if (!pos) return t;
+ return {
+ ...t,
+ parentAreaId: areaId,
+ x: pos.x,
+ y: pos.y,
+ };
+ }),
+ { updateHistory: true }
+ );
+ },
+ [
+ selectedTableIds,
+ updateTablesState,
+ updateArea,
+ tables,
+ relationships,
+ areas,
+ getNodes,
+ ]
+ );
+
+ const createAreaForSelectedHandler = useCallback(async () => {
+ const canvasNodes = getNodes();
+ const firstSelected = canvasNodes.find((n) =>
+ selectedTableIds.includes(n.id)
+ );
+
+ const newArea = await createArea({
+ x: (firstSelected?.position.x ?? 0) - 30,
+ y: (firstSelected?.position.y ?? 0) - 50,
+ });
+
+ moveSelectedToArea(newArea.id, {
+ x: newArea.x,
+ y: newArea.y,
+ width: newArea.width,
+ height: newArea.height,
+ });
+ }, [selectedTableIds, createArea, getNodes, moveSelectedToArea]);
+
if (!isDesktop) {
return <>{children}</>;
}
@@ -200,7 +332,7 @@ export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
>
{t('canvas_context_menu.new_note')}
<StickyNote className="size-3.5" />
- </ContextMenuItem>{' '}
+ </ContextMenuItem>
<ContextMenuSeparator />
<ContextMenuItem
onClick={importSqlDbmlHandler}
@@ -209,6 +341,56 @@ export const CanvasContextMenu: React.FC<React.PropsWithChildren> = ({
Import SQL/DBML
<Import className="size-3.5" />
</ContextMenuItem>
+ {hasSelectedTables && (
+ <>
+ <ContextMenuSeparator />
+ <ContextMenuSub>
+ <ContextMenuSubTrigger className="flex items-center gap-3">
+ <span>
+ {`${t('table_node_context_menu.move_to_area')} (${selectedTableIds.length})`}
+ </span>
+ <SquareArrowOutUpRight className="ml-auto size-3.5" />
+ </ContextMenuSubTrigger>
+ <ContextMenuSubContent>
+ <ContextMenuItem
+ onClick={createAreaForSelectedHandler}
+ className="flex items-center gap-2"
+ >
+ <Plus className="size-3.5" />
+ <span>
+ {t('canvas_context_menu.new_area')}
+ </span>
+ </ContextMenuItem>
+ {areas.length > 0 && <ContextMenuSeparator />}
+ {areas.map((area) => (
+ <ContextMenuItem
+ key={area.id}
+ onClick={() =>
+ moveSelectedToArea(area.id)
+ }
+ className="flex items-center gap-2"
+ >
+ <div
+ className="size-2.5 shrink-0 rounded-full"
+ style={{
+ backgroundColor: area.color,
+ }}
+ />
+ <span>{area.name}</span>
+ </ContextMenuItem>
+ ))}
+ </ContextMenuSubContent>
+ </ContextMenuSub>
+ </>
+ )}
+ <ContextMenuSeparator />
+ <ContextMenuItem
+ onClick={autoArrangeHandler}
+ className="flex justify-between gap-4"
+ >
+ {t('toolbar.reorder_diagram')}
+ <LayoutGrid className="size-3.5" />
+ </ContextMenuItem>
</ContextMenuContent>
</ContextMenu>
);
diff --git a/src/pages/editor-page/canvas/table-node/table-node-context-menu.tsx b/src/pages/editor-page/canvas/table-node/table-node-context-menu.tsx
index b89efef2..3d9bf046 100644
--- a/src/pages/editor-page/canvas/table-node/table-node-context-menu.tsx
+++ b/src/pages/editor-page/canvas/table-node/table-node-context-menu.tsx
@@ -2,6 +2,10 @@ import {
ContextMenu,
ContextMenuContent,
ContextMenuItem,
+ ContextMenuSeparator,
+ ContextMenuSub,
+ ContextMenuSubContent,
+ ContextMenuSubTrigger,
ContextMenuTrigger,
} from '@/components/context-menu/context-menu';
import { useBreakpoint } from '@/hooks/use-breakpoint';
@@ -9,10 +13,20 @@ import { useChartDB } from '@/hooks/use-chartdb';
import { useLayout } from '@/hooks/use-layout';
import { cloneTable } from '@/lib/clone';
import type { DBTable } from '@/lib/domain/db-table';
-import { Copy, Pencil, Trash2, Workflow } from 'lucide-react';
+import { arrangeTablesForArea } from '@/lib/utils/area-utils';
+import {
+ Check,
+ Copy,
+ Pencil,
+ Plus,
+ SquareArrowOutUpRight,
+ Trash2,
+ Workflow,
+} from 'lucide-react';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { useCanvas } from '@/hooks/use-canvas';
+import { useReactFlow, useStore } from '@xyflow/react';
export interface TableNodeContextMenuProps {
table: DBTable;
@@ -21,22 +35,40 @@ export interface TableNodeContextMenuProps {
export const TableNodeContextMenu: React.FC<
React.PropsWithChildren<TableNodeContextMenuProps>
> = ({ children, table }) => {
- const { removeTable, readonly, createTable } = useChartDB();
+ const {
+ removeTable,
+ readonly,
+ createTable,
+ createArea,
+ areas,
+ tables,
+ relationships,
+ updateArea,
+ updateTablesState,
+ } = useChartDB();
const { closeAllTablesInSidebar } = useLayout();
const { t } = useTranslation();
const { isMd: isDesktop } = useBreakpoint('md');
const { setEditTableModeTable, startFloatingEdgeCreation } = useCanvas();
+ const { getNodes } = useReactFlow();
+
+ // Reactively detect multi-selection
+ const selectedTableIds = useStore((state) =>
+ state.nodes
+ .filter((n) => n.type === 'table' && n.selected && !n.hidden)
+ .map((n) => n.id)
+ );
+ const isMultiSelect =
+ selectedTableIds.length > 1 && selectedTableIds.includes(table.id);
const duplicateTableHandler: React.MouseEventHandler<HTMLDivElement> =
useCallback(
(e) => {
e.stopPropagation();
const clonedTable = cloneTable(table);
-
clonedTable.name = `${clonedTable.name}_copy`;
clonedTable.x += 30;
clonedTable.y += 50;
-
createTable(clonedTable);
},
[createTable, table]
@@ -46,10 +78,7 @@ export const TableNodeContextMenu: React.FC<
useCallback(
(e) => {
e.stopPropagation();
- if (readonly) {
- return;
- }
-
+ if (readonly) return;
closeAllTablesInSidebar();
setEditTableModeTable({ tableId: table.id });
},
@@ -69,13 +98,128 @@ export const TableNodeContextMenu: React.FC<
useCallback(
(e) => {
e.stopPropagation();
- startFloatingEdgeCreation({
- sourceNodeId: table.id,
- });
+ startFloatingEdgeCreation({ sourceNodeId: table.id });
},
[startFloatingEdgeCreation, table.id]
);
+ // Arrange tables into an area and apply positions
+ const moveToArea = useCallback(
+ (
+ areaId: string,
+ tableIds: string[],
+ overrideRect?: {
+ x: number;
+ y: number;
+ width: number;
+ height: number;
+ }
+ ) => {
+ let areaRect = overrideRect;
+ if (!areaRect) {
+ const canvasNodes = getNodes();
+ const areaNode = canvasNodes.find(
+ (n) => n.id === areaId && n.type === 'area'
+ );
+ const areaData = areas.find((a) => a.id === areaId)!;
+ areaRect = {
+ x: areaNode?.position.x ?? areaData.x,
+ y: areaNode?.position.y ?? areaData.y,
+ width: areaNode?.measured?.width ?? areaData.width,
+ height: areaNode?.measured?.height ?? areaData.height,
+ };
+ }
+
+ const tableIdSet = new Set(tableIds);
+ const existingAreaTables = tables.filter(
+ (t) => t.parentAreaId === areaId && !tableIdSet.has(t.id)
+ );
+ const movingTables = tables.filter((t) => tableIdSet.has(t.id));
+ const allAreaTables = [...existingAreaTables, ...movingTables];
+
+ const { positions, requiredWidth, requiredHeight } =
+ arrangeTablesForArea(allAreaTables, relationships, areaRect);
+
+ if (
+ requiredWidth > areaRect.width ||
+ requiredHeight > areaRect.height
+ ) {
+ updateArea(areaId, {
+ width: Math.max(areaRect.width, requiredWidth),
+ height: Math.max(areaRect.height, requiredHeight),
+ });
+ }
+
+ updateTablesState(
+ (currentTables) =>
+ currentTables.map((t) => {
+ const pos = positions.find((p) => p.id === t.id);
+ if (!pos) return t;
+ return {
+ ...t,
+ parentAreaId: areaId,
+ x: pos.x,
+ y: pos.y,
+ };
+ }),
+ { updateHistory: true }
+ );
+ },
+ [tables, relationships, areas, getNodes, updateArea, updateTablesState]
+ );
+
+ const moveToAreaHandler = useCallback(
+ (areaId: string | null) => {
+ const tableIds = isMultiSelect ? selectedTableIds : [table.id];
+
+ if (areaId === null) {
+ updateTablesState(
+ (currentTables) =>
+ currentTables.map((t) =>
+ tableIds.includes(t.id)
+ ? { ...t, parentAreaId: null }
+ : t
+ ),
+ { updateHistory: true }
+ );
+ return;
+ }
+
+ moveToArea(areaId, tableIds);
+ },
+ [
+ isMultiSelect,
+ selectedTableIds,
+ table.id,
+ moveToArea,
+ updateTablesState,
+ ]
+ );
+
+ const createAreaHandler = useCallback(async () => {
+ const canvasNodes = getNodes();
+ const node = canvasNodes.find((n) => n.id === table.id);
+ const newArea = await createArea({
+ x: (node?.position.x ?? table.x) - 30,
+ y: (node?.position.y ?? table.y) - 50,
+ });
+
+ const tableIds = isMultiSelect ? selectedTableIds : [table.id];
+ moveToArea(newArea.id, tableIds, {
+ x: newArea.x,
+ y: newArea.y,
+ width: newArea.width,
+ height: newArea.height,
+ });
+ }, [
+ isMultiSelect,
+ selectedTableIds,
+ table,
+ createArea,
+ getNodes,
+ moveToArea,
+ ]);
+
if (!isDesktop || readonly) {
return <>{children}</>;
}
@@ -104,6 +248,66 @@ export const TableNodeContextMenu: React.FC<
<span>{t('table_node_context_menu.add_relationship')}</span>
<Workflow className="size-3.5" />
</ContextMenuItem>
+ <ContextMenuSeparator />
+ <ContextMenuSub>
+ <ContextMenuSubTrigger className="flex items-center gap-3">
+ <span>
+ {isMultiSelect
+ ? `${t('table_node_context_menu.move_to_area')} (${selectedTableIds.length})`
+ : t('table_node_context_menu.move_to_area')}
+ </span>
+ <SquareArrowOutUpRight className="ml-auto size-3.5" />
+ </ContextMenuSubTrigger>
+ <ContextMenuSubContent>
+ <ContextMenuItem
+ onClick={createAreaHandler}
+ className="flex items-center gap-2"
+ >
+ <Plus className="size-3.5" />
+ <span>{t('canvas_context_menu.new_area')}</span>
+ </ContextMenuItem>
+ {areas.length > 0 && <ContextMenuSeparator />}
+ {areas.map((area) => (
+ <ContextMenuItem
+ key={area.id}
+ onClick={() => moveToAreaHandler(area.id)}
+ className="flex items-center gap-2"
+ >
+ <div
+ className="size-2.5 shrink-0 rounded-full"
+ style={{
+ backgroundColor: area.color,
+ }}
+ />
+ <span>{area.name}</span>
+ {!isMultiSelect &&
+ table.parentAreaId === area.id && (
+ <Check className="ml-auto size-3.5" />
+ )}
+ </ContextMenuItem>
+ ))}
+ {areas.length > 0 && (
+ <>
+ <ContextMenuSeparator />
+ <ContextMenuItem
+ onClick={() => moveToAreaHandler(null)}
+ disabled={
+ !isMultiSelect && !table.parentAreaId
+ }
+ className="flex items-center gap-2"
+ >
+ <span>
+ {t('table_node_context_menu.no_area')}
+ </span>
+ {!isMultiSelect && !table.parentAreaId && (
+ <Check className="ml-auto size-3.5" />
+ )}
+ </ContextMenuItem>
+ </>
+ )}
+ </ContextMenuSubContent>
+ </ContextMenuSub>
+ <ContextMenuSeparator />
<ContextMenuItem
onClick={removeTableHandler}
className="flex justify-between gap-3"