Skip to content

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

fix when create table to create it in the viewport

johnnyfish947821e13793
diff --git a/src/context/chartdb-context/chartdb-context.tsx b/src/context/chartdb-context/chartdb-context.tsx
index e033d608..9825f610 100644
--- a/src/context/chartdb-context/chartdb-context.tsx
+++ b/src/context/chartdb-context/chartdb-context.tsx
@@ -126,6 +126,12 @@ export interface ChartDBContext {
relationship: Partial<DBRelationship>,
options?: { updateHistory: boolean }
) => Promise<void>;
+
+ updateViewport: (viewport: {
+ x: number;
+ y: number;
+ zoom: number;
+ }) => Promise<void>;
}
export const chartDBContext = createContext<ChartDBContext>({
@@ -164,6 +170,7 @@ export const chartDBContext = createContext<ChartDBContext>({
removeTable: emptyFn,
updateTable: emptyFn,
updateTablesState: emptyFn,
+ updateViewport: emptyFn,
// Field operations
updateField: emptyFn,
diff --git a/src/context/chartdb-context/chartdb-provider.tsx b/src/context/chartdb-context/chartdb-provider.tsx
index 3dc14aa0..e01099e7 100644
--- a/src/context/chartdb-context/chartdb-provider.tsx
+++ b/src/context/chartdb-context/chartdb-provider.tsx
@@ -38,6 +38,7 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
>();
const [tables, setTables] = useState<DBTable[]>([]);
const [relationships, setRelationships] = useState<DBRelationship[]>([]);
+ const [viewport, setViewport] = useState({ x: 0, y: 0, zoom: 1 });
const defaultSchemaName = defaultSchemas[databaseType];
@@ -276,11 +277,15 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
);
const createTable: ChartDBContext['createTable'] = useCallback(async () => {
+ const padding = 150; // Add some padding from the edge
+ const centerX = -viewport.x / viewport.zoom + padding / viewport.zoom;
+ const centerY = -viewport.y / viewport.zoom + padding / viewport.zoom;
+
const table: DBTable = {
id: generateId(),
name: `table_${tables.length + 1}`,
- x: 0,
- y: 0,
+ x: centerX,
+ y: centerY,
fields: [
{
id: generateId(),
@@ -303,7 +308,7 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
await addTable(table);
return table;
- }, [addTable, tables, databaseType]);
+ }, [viewport, tables.length, databaseType, addTable]);
const getTable: ChartDBContext['getTable'] = useCallback(
(id: string) => tables.find((table) => table.id === id) ?? null,
@@ -1121,6 +1126,13 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
]
);
+ const updateViewport = useCallback(
+ (newViewport: { x: number; y: number; zoom: number }) => {
+ setViewport(newViewport);
+ },
+ []
+ );
+
return (
<chartDBContext.Provider
value={{
@@ -1164,6 +1176,7 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
removeRelationship,
removeRelationships,
updateRelationship,
+ updateViewport,
}}
>
{children}
diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsx
index b1122e59..39ec37d2 100644
--- a/src/pages/editor-page/canvas/canvas.tsx
+++ b/src/pages/editor-page/canvas/canvas.tsx
@@ -14,6 +14,7 @@ import {
NodeDimensionChange,
OnEdgesChange,
OnNodesChange,
+ useViewport,
} from '@xyflow/react';
import '@xyflow/react/dist/style.css';
import equal from 'fast-deep-equal';
@@ -91,6 +92,12 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
const nodeTypes = useMemo(() => ({ table: TableNode }), []);
const edgeTypes = useMemo(() => ({ 'table-edge': TableEdge }), []);
const [isInitialLoadingNodes, setIsInitialLoadingNodes] = useState(true);
+ const { x, y, zoom } = useViewport();
+ const { updateViewport } = useChartDB();
+
+ useEffect(() => {
+ updateViewport({ x, y, zoom });
+ }, [x, y, zoom, updateViewport]);
const [nodes, setNodes, onNodesChange] = useNodesState<TableNodeType>(
initialTables.map((table) => tableToTableNode(table, filteredSchemas))