Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
lib fix (#742)
Guy Ben-Aharon797895581969
diff --git a/src/context/theme-context/theme-context.tsx b/src/context/theme-context/theme-context.tsxindex 0728ab93..73e55a82 100644--- a/src/context/theme-context/theme-context.tsx+++ b/src/context/theme-context/theme-context.tsx@@ -1,8 +1,7 @@import { createContext } from 'react';import { emptyFn } from '@/lib/utils';--export type Theme = 'light' | 'dark' | 'system';-export type EffectiveTheme = Exclude<Theme, 'system'>;+import type { Theme, EffectiveTheme } from '@/lib/types';+export type { Theme, EffectiveTheme };export interface ThemeContext {theme: Theme;diff --git a/src/lib/databases.ts b/src/lib/databases.tsindex fa7cf0c0..dae710a5 100644--- a/src/lib/databases.ts+++ b/src/lib/databases.ts@@ -24,7 +24,7 @@ import OracleLogo from '@/assets/oracle_logo.png';import OracleLogoDark from '@/assets/oracle_logo_dark.png';import OracleLogo2 from '@/assets/oracle_logo_2.png';import { DatabaseType } from './domain/database-type';-import type { EffectiveTheme } from '@/context/theme-context/theme-context';+import type { EffectiveTheme } from './types';export const databaseTypeToLabelMap: Record<DatabaseType, string> = {[DatabaseType.GENERIC]: 'Generic',diff --git a/src/lib/domain/db-table.ts b/src/lib/domain/db-table.tsindex fd998f19..e9689b81 100644--- a/src/lib/domain/db-table.ts+++ b/src/lib/domain/db-table.ts@@ -25,7 +25,11 @@ import {import { DatabaseType } from './database-type';import type { DatabaseMetadata } from '../data/import-metadata/metadata-types/database-metadata';import { z } from 'zod';-import { getTableDimensions } from '@/pages/editor-page/canvas/canvas-utils';++export const MAX_TABLE_SIZE = 450;+export const MID_TABLE_SIZE = 337;+export const MIN_TABLE_SIZE = 224;+export const TABLE_MINIMIZED_FIELDS = 10;export interface DBTable {id: string;@@ -368,3 +372,36 @@ export const adjustTablePositions = ({return tables;};++export const calcTableHeight = (table?: DBTable): number => {+ if (!table) {+ return 300;+ }++ const FIELD_HEIGHT = 32; // h-8 per field+ const TABLE_FOOTER_HEIGHT = 32; // h-8 for show more button+ const TABLE_HEADER_HEIGHT = 42;+ // Calculate how many fields are visible+ const fieldCount = table.fields.length;+ let visibleFieldCount = fieldCount;++ // If not expanded, use minimum of field count and TABLE_MINIMIZED_FIELDS+ if (!table.expanded) {+ visibleFieldCount = Math.min(fieldCount, TABLE_MINIMIZED_FIELDS);+ }++ // Calculate height based on visible fields+ const fieldsHeight = visibleFieldCount * FIELD_HEIGHT;+ const showMoreButtonHeight =+ fieldCount > TABLE_MINIMIZED_FIELDS ? TABLE_FOOTER_HEIGHT : 0;++ return TABLE_HEADER_HEIGHT + fieldsHeight + showMoreButtonHeight;+};++export const getTableDimensions = (+ table: DBTable+): { width: number; height: number } => {+ const height = calcTableHeight(table);+ const width = table.width || MIN_TABLE_SIZE;+ return { width, height };+};diff --git a/src/lib/types.ts b/src/lib/types.tsnew file mode 100644index 00000000..da193824--- /dev/null+++ b/src/lib/types.ts@@ -0,0 +1,2 @@+export type Theme = 'light' | 'dark' | 'system';+export type EffectiveTheme = Exclude<Theme, 'system'>;diff --git a/src/pages/editor-page/canvas/canvas-utils.ts b/src/pages/editor-page/canvas/canvas-utils.tsindex ed3bf864..ba6fdb72 100644--- a/src/pages/editor-page/canvas/canvas-utils.ts+++ b/src/pages/editor-page/canvas/canvas-utils.ts@@ -1,11 +1,14 @@import type { Cardinality } from '@/lib/domain/db-relationship';+import { type TableNodeType } from './table-node/table-node';+import { addEdge, createGraph, removeEdge, type Graph } from '@/lib/graph';import {+ getTableDimensions,+ calcTableHeight,+ type DBTable,MIN_TABLE_SIZE,- TABLE_MINIMIZED_FIELDS,- type TableNodeType,-} from './table-node/table-node';-import { addEdge, createGraph, removeEdge, type Graph } from '@/lib/graph';-import type { DBTable } from '@/lib/domain/db-table';+} from '@/lib/domain/db-table';++export { calcTableHeight, getTableDimensions };export const getCardinalityMarkerId = ({cardinality,@@ -110,36 +113,3 @@ export const findOverlappingTables = ({return graph;};--export const calcTableHeight = (table?: DBTable): number => {- if (!table) {- return 300;- }-- const FIELD_HEIGHT = 32; // h-8 per field- const TABLE_FOOTER_HEIGHT = 32; // h-8 for show more button- const TABLE_HEADER_HEIGHT = 42;- // Calculate how many fields are visible- const fieldCount = table.fields.length;- let visibleFieldCount = fieldCount;-- // If not expanded, use minimum of field count and TABLE_MINIMIZED_FIELDS- if (!table.expanded) {- visibleFieldCount = Math.min(fieldCount, TABLE_MINIMIZED_FIELDS);- }-- // Calculate height based on visible fields- const fieldsHeight = visibleFieldCount * FIELD_HEIGHT;- const showMoreButtonHeight =- fieldCount > TABLE_MINIMIZED_FIELDS ? TABLE_FOOTER_HEIGHT : 0;-- return TABLE_HEADER_HEIGHT + fieldsHeight + showMoreButtonHeight;-};--export const getTableDimensions = (- table: DBTable-): { width: number; height: number } => {- const height = calcTableHeight(table);- const width = table.width || MIN_TABLE_SIZE;- return { width, height };-};