Skip to content

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

fix: move area utils (#932)

Guy Ben-Aharon2dc1a6fc7519
diff --git a/src/pages/editor-page/canvas/area-utils.ts b/src/lib/utils/area-utils.ts
similarity index 87%
rename from src/pages/editor-page/canvas/area-utils.ts
rename to src/lib/utils/area-utils.ts
index 7d805951..22f42374 100644
--- a/src/pages/editor-page/canvas/area-utils.ts
+++ b/src/lib/utils/area-utils.ts
@@ -1,13 +1,13 @@
import type { DBTable } from '@/lib/domain/db-table';
import type { Area } from '@/lib/domain/area';
-import { calcTableHeight } from '@/lib/domain/db-table';
+import { calcTableHeight, MIN_TABLE_SIZE } from '@/lib/domain/db-table';
/**
* Check if a table is inside an area based on their positions and dimensions
*/
-const isTableInsideArea = (table: DBTable, area: Area): boolean => {
+export const isTableInsideArea = (table: DBTable, area: Area): boolean => {
// Get table dimensions (assuming default width if not specified)
- const tableWidth = table.width ?? 224; // MIN_TABLE_SIZE from db-table.ts
+ const tableWidth = table.width ?? MIN_TABLE_SIZE;
const tableHeight = calcTableHeight(table);
// Check if table's top-left corner is inside the area
@@ -33,7 +33,10 @@ const isTableInsideArea = (table: DBTable, area: Area): boolean => {
/**
* Find which area contains a table
*/
-const findContainingArea = (table: DBTable, areas: Area[]): Area | null => {
+export const findContainingArea = (
+ table: DBTable,
+ areas: Area[]
+): Area | null => {
// Sort areas by order (if available) to prioritize top-most areas
const sortedAreas = [...areas].sort(
(a, b) => (b.order ?? 0) - (a.order ?? 0)
diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts
index 240d6348..72761db2 100644
--- a/src/lib/utils/index.ts
+++ b/src/lib/utils/index.ts
@@ -1,2 +1,3 @@
export * from './utils';
export * from './apply-ids';
+export * from './area-utils';
diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsx
index 6755faf7..8a396e0b 100644
--- a/src/pages/editor-page/canvas/canvas.tsx
+++ b/src/pages/editor-page/canvas/canvas.tsx
@@ -79,7 +79,10 @@ import { useCanvas } from '@/hooks/use-canvas';
import type { AreaNodeType } from './area-node/area-node';
import { AreaNode } from './area-node/area-node';
import type { Area } from '@/lib/domain/area';
-import { updateTablesParentAreas, getTablesInArea } from './area-utils';
+import {
+ updateTablesParentAreas,
+ getTablesInArea,
+} from '@/lib/utils/area-utils';
import { CanvasFilter } from './canvas-filter/canvas-filter';
import { useHotkeys } from 'react-hotkeys-hook';
import { ShowAllButton } from './show-all-button';