Skip to content

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

add dialog with scale option for export image

Guy Ben-Aharonc9fd030a7b93
diff --git a/src/context/dialog-context/dialog-context.tsx b/src/context/dialog-context/dialog-context.tsx
index eca539c6..fd3ff8ec 100644
--- a/src/context/dialog-context/dialog-context.tsx
+++ b/src/context/dialog-context/dialog-context.tsx
@@ -4,6 +4,7 @@ import type { BaseAlertDialogProps } from '@/dialogs/base-alert-dialog/base-aler
import type { TableSchemaDialogProps } from '@/dialogs/table-schema-dialog/table-schema-dialog';
import type { ImportDatabaseDialogProps } from '@/dialogs/import-database-dialog/import-database-dialog';
import type { ExportSQLDialogProps } from '@/dialogs/export-sql-dialog/export-sql-dialog';
+import type { ExportImageDialogProps } from '@/dialogs/export-image-dialog/export-image-dialog';
export interface DialogContext {
// Create diagram dialog
@@ -41,6 +42,12 @@ export interface DialogContext {
// Star us dialog
openStarUsDialog: () => void;
closeStarUsDialog: () => void;
+
+ // Export image dialog
+ openExportImageDialog: (
+ params: Omit<ExportImageDialogProps, 'dialog'>
+ ) => void;
+ closeExportImageDialog: () => void;
}
export const dialogContext = createContext<DialogContext>({
@@ -60,4 +67,6 @@ export const dialogContext = createContext<DialogContext>({
closeTableSchemaDialog: emptyFn,
openStarUsDialog: emptyFn,
closeStarUsDialog: emptyFn,
+ openExportImageDialog: emptyFn,
+ closeExportImageDialog: emptyFn,
});
diff --git a/src/context/dialog-context/dialog-provider.tsx b/src/context/dialog-context/dialog-provider.tsx
index b8128f5a..321d9af2 100644
--- a/src/context/dialog-context/dialog-provider.tsx
+++ b/src/context/dialog-context/dialog-provider.tsx
@@ -15,61 +15,82 @@ import type { TableSchemaDialogProps } from '@/dialogs/table-schema-dialog/table
import { TableSchemaDialog } from '@/dialogs/table-schema-dialog/table-schema-dialog';
import { emptyFn } from '@/lib/utils';
import { StarUsDialog } from '@/dialogs/star-us-dialog/star-us-dialog';
+import type { ExportImageDialogProps } from '@/dialogs/export-image-dialog/export-image-dialog';
+import { ExportImageDialog } from '@/dialogs/export-image-dialog/export-image-dialog';
export const DialogProvider: React.FC<React.PropsWithChildren> = ({
children,
}) => {
const [openNewDiagramDialog, setOpenNewDiagramDialog] = useState(false);
const [openOpenDiagramDialog, setOpenOpenDiagramDialog] = useState(false);
- const [openExportSQLDialog, setOpenExportSQLDialog] = useState(false);
- const [exportSQLDialogParams, setExportSQLDialogParams] = useState<
- Omit<ExportSQLDialogProps, 'dialog'>
- >({ targetDatabaseType: DatabaseType.GENERIC });
+
const [openCreateRelationshipDialog, setOpenCreateRelationshipDialog] =
useState(false);
- const [openImportDatabaseDialog, setOpenImportDatabaseDialog] =
- useState(false);
- const [importDatabaseDialogParams, setImportDatabaseDialogParams] =
- useState<Omit<ImportDatabaseDialogProps, 'dialog'>>({
- databaseType: DatabaseType.GENERIC,
- });
- const [openTableSchemaDialog, setOpenTableSchemaDialog] = useState(false);
- const [tableSchemaDialogParams, setTableSchemaDialogParams] = useState<
- Omit<TableSchemaDialogProps, 'dialog'>
- >({ schemas: [], onConfirm: emptyFn });
- const [showAlert, setShowAlert] = useState(false);
- const [alertParams, setAlertParams] = useState<BaseAlertDialogProps>({
- title: '',
- });
const [openStarUsDialog, setOpenStarUsDialog] = useState(false);
+ // Export image dialog
+ const [openExportImageDialog, setOpenExportImageDialog] = useState(false);
+ const [exportImageDialogParams, setExportImageDialogParams] = useState<
+ Omit<ExportImageDialogProps, 'dialog'>
+ >({ format: 'png' });
+ const openExportImageDialogHandler: DialogContext['openExportImageDialog'] =
+ useCallback(
+ (params) => {
+ setExportImageDialogParams(params);
+ setOpenExportImageDialog(true);
+ },
+ [setOpenExportImageDialog]
+ );
+
+ // Export SQL dialog
+ const [openExportSQLDialog, setOpenExportSQLDialog] = useState(false);
+ const [exportSQLDialogParams, setExportSQLDialogParams] = useState<
+ Omit<ExportSQLDialogProps, 'dialog'>
+ >({ targetDatabaseType: DatabaseType.GENERIC });
const openExportSQLDialogHandler: DialogContext['openExportSQLDialog'] =
useCallback(
({ targetDatabaseType }) => {
- setOpenExportSQLDialog(true);
setExportSQLDialogParams({ targetDatabaseType });
+ setOpenExportSQLDialog(true);
},
[setOpenExportSQLDialog]
);
+ // Import database dialog
+ const [openImportDatabaseDialog, setOpenImportDatabaseDialog] =
+ useState(false);
+ const [importDatabaseDialogParams, setImportDatabaseDialogParams] =
+ useState<Omit<ImportDatabaseDialogProps, 'dialog'>>({
+ databaseType: DatabaseType.GENERIC,
+ });
const openImportDatabaseDialogHandler: DialogContext['openImportDatabaseDialog'] =
useCallback(
({ databaseType }) => {
- setOpenImportDatabaseDialog(true);
setImportDatabaseDialogParams({ databaseType });
+ setOpenImportDatabaseDialog(true);
},
[setOpenImportDatabaseDialog]
);
+ // Table schema dialog
+ const [openTableSchemaDialog, setOpenTableSchemaDialog] = useState(false);
+ const [tableSchemaDialogParams, setTableSchemaDialogParams] = useState<
+ Omit<TableSchemaDialogProps, 'dialog'>
+ >({ schemas: [], onConfirm: emptyFn });
const openTableSchemaDialogHandler: DialogContext['openTableSchemaDialog'] =
useCallback(
(params) => {
- setOpenTableSchemaDialog(true);
setTableSchemaDialogParams(params);
+ setOpenTableSchemaDialog(true);
},
[setOpenTableSchemaDialog]
);
+ // Alert dialog
+ const [showAlert, setShowAlert] = useState(false);
+ const [alertParams, setAlertParams] = useState<BaseAlertDialogProps>({
+ title: '',
+ });
const showAlertHandler: DialogContext['showAlert'] = useCallback(
(params) => {
setAlertParams(params);
@@ -77,7 +98,6 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
},
[setShowAlert, setAlertParams]
);
-
const closeAlertHandler = useCallback(() => {
setShowAlert(false);
}, [setShowAlert]);
@@ -104,6 +124,8 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
closeTableSchemaDialog: () => setOpenTableSchemaDialog(false),
openStarUsDialog: () => setOpenStarUsDialog(true),
closeStarUsDialog: () => setOpenStarUsDialog(false),
+ closeExportImageDialog: () => setOpenExportImageDialog(false),
+ openExportImageDialog: openExportImageDialogHandler,
}}
>
{children}
@@ -126,6 +148,10 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
{...tableSchemaDialogParams}
/>
<StarUsDialog dialog={{ open: openStarUsDialog }} />
+ <ExportImageDialog
+ dialog={{ open: openExportImageDialog }}
+ {...exportImageDialogParams}
+ />
</dialogContext.Provider>
);
};
diff --git a/src/dialogs/export-image-dialog/export-image-dialog.tsx b/src/dialogs/export-image-dialog/export-image-dialog.tsx
new file mode 100644
index 00000000..8a5de199
--- /dev/null
+++ b/src/dialogs/export-image-dialog/export-image-dialog.tsx
@@ -0,0 +1,94 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDialog } from '@/hooks/use-dialog';
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@/components/dialog/dialog';
+import { Button } from '@/components/button/button';
+import type { SelectBoxOption } from '@/components/select-box/select-box';
+import { SelectBox } from '@/components/select-box/select-box';
+import type { BaseDialogProps } from '../common/base-dialog-props';
+import { useTranslation } from 'react-i18next';
+import type { ImageType } from '@/context/export-image-context/export-image-context';
+import { useExportImage } from '@/hooks/use-export-image';
+
+export interface ExportImageDialogProps extends BaseDialogProps {
+ format: ImageType;
+}
+
+const DEFAULT_SCALE = '1';
+export const ExportImageDialog: React.FC<ExportImageDialogProps> = ({
+ dialog,
+ format,
+}) => {
+ const { t } = useTranslation();
+ const [scale, setScale] = useState<string>(DEFAULT_SCALE);
+ const { exportImage } = useExportImage();
+
+ useEffect(() => {
+ if (!dialog.open) return;
+ setScale(DEFAULT_SCALE);
+ }, [dialog.open]);
+ const { closeExportImageDialog } = useDialog();
+
+ const handleExport = useCallback(() => {
+ console.log({ format, scale });
+ exportImage(format, Number(scale));
+ }, [exportImage, format, scale]);
+
+ const scaleOptions: SelectBoxOption[] = useMemo(
+ () =>
+ ['1', '2', '3', '4'].map((scale) => ({
+ value: scale,
+ label: t(`export_image_dialog.scale_${scale}x`),
+ })),
+ [t]
+ );
+
+ return (
+ <Dialog
+ {...dialog}
+ onOpenChange={(open) => {
+ if (!open) {
+ closeExportImageDialog();
+ }
+ }}
+ >
+ <DialogContent className="flex flex-col" showClose>
+ <DialogHeader>
+ <DialogTitle>{t('export_image_dialog.title')}</DialogTitle>
+ <DialogDescription>
+ {t('export_image_dialog.description')}
+ </DialogDescription>
+ </DialogHeader>
+ <div className="grid gap-4 py-1">
+ <div className="grid w-full items-center gap-4">
+ <SelectBox
+ options={scaleOptions}
+ multiple={false}
+ value={scale}
+ onChange={(value) => setScale(value as string)}
+ />
+ </div>
+ </div>
+ <DialogFooter className="flex gap-1 md:justify-between">
+ <DialogClose asChild>
+ <Button variant="secondary">
+ {t('export_image_dialog.cancel')}
+ </Button>
+ </DialogClose>
+ <DialogClose asChild>
+ <Button onClick={handleExport}>
+ {t('export_image_dialog.export')}
+ </Button>
+ </DialogClose>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index a676df51..56c21060 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -270,6 +270,20 @@ export const en = {
},
},
+ export_image_dialog: {
+ title: 'Export Image',
+ description: 'Choose the scale factor for export:',
+ select_scale: 'Select scale',
+ scale_1x: '1x Regular',
+ scale_2x: '2x (Recommended)',
+ scale_3x: '3x',
+ scale_4x: '4x',
+ export_png: 'Export High-Res PNG',
+ export_jpg: 'Export High-Res JPG',
+ cancel: 'Cancel',
+ export: 'Export',
+ },
+
new_table_schema_dialog: {
title: 'Select Schema',
description:
@@ -309,18 +323,6 @@ export const en = {
edit_table: 'Edit Table',
delete_table: 'Delete Table',
},
-
- export_high_res: {
- title: 'Export High Resolution Image',
- description: 'Choose the scale factor for export:',
- select_scale: 'Select scale',
- scale_1x: '1x Regular',
- scale_2x: '2x (Recommended)',
- scale_3x: '3x',
- scale_4x: '4x',
- export_png: 'Export High-Res PNG',
- export_jpg: 'Export High-Res JPG',
- },
},
};
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index ce2e9484..c81eaf7b 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -197,6 +197,7 @@ export const es: LanguageTranslation = {
},
open_diagram_dialog: {
+ // TODO: Translate
title: 'Abrir Diagrama',
description:
'Selecciona un diagrama para abrir de la lista a continuación.',
@@ -262,6 +263,20 @@ export const es: LanguageTranslation = {
},
},
+ export_image_dialog: {
+ title: 'Export Image',
+ description: 'Choose the scale factor for export:',
+ select_scale: 'Select scale',
+ scale_1x: '1x Regular',
+ scale_2x: '2x (Recommended)',
+ scale_3x: '3x',
+ scale_4x: '4x',
+ export_png: 'Export High-Res PNG',
+ export_jpg: 'Export High-Res JPG',
+ cancel: 'Cancel',
+ export: 'Export',
+ },
+
new_table_schema_dialog: {
title: 'Seleccionar Esquema',
description:
diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsx
index 72335270..704486dd 100644
--- a/src/pages/editor-page/canvas/canvas.tsx
+++ b/src/pages/editor-page/canvas/canvas.tsx
@@ -99,6 +99,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
const nodeTypes = useMemo(() => ({ table: TableNode }), []);
const edgeTypes = useMemo(() => ({ 'table-edge': TableEdge }), []);
const [isInitialLoadingNodes, setIsInitialLoadingNodes] = useState(true);
+
const [nodes, setNodes, onNodesChange] = useNodesState<TableNodeType>(
initialTables.map((table) => tableToTableNode(table, filteredSchemas))
);
@@ -272,26 +273,6 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
const onNodesChangeHandler: OnNodesChange<TableNodeType> = useCallback(
(changes) => {
- changes.forEach((change) => {
- if (
- change.type === 'dimensions' &&
- 'dimensions' in change &&
- change.dimensions
- ) {
- setNodes((nds) =>
- nds.map((node) =>
- node.id === change.id
- ? {
- ...node,
- width: change.dimensions.width,
- height: change.dimensions.height,
- }
- : node
- )
- );
- }
- });
-
const positionChanges: NodePositionChange[] = changes.filter(
(change) => change.type === 'position' && !change.dragging
) as NodePositionChange[];
@@ -347,25 +328,9 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
);
}
- changes.forEach((change) => {
- if (
- change.type === 'dimensions' &&
- 'dimensions' in change &&
- change.dimensions
- ) {
- setNodes((nds) =>
- nds.map((node) =>
- node.id === change.id
- ? { ...node, ...change.dimensions }
- : node
- )
- );
- }
- });
-
return onNodesChange(changes);
},
- [onNodesChange, updateTablesState, setNodes]
+ [onNodesChange, updateTablesState]
);
const isLoadingDOM =
diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsx
index 33d9db3a..24d2c42b 100644
--- a/src/pages/editor-page/top-navbar/top-navbar.tsx
+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx
@@ -66,6 +66,7 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
openExportSQLDialog,
openImportDatabaseDialog,
showAlert,
+ openExportImageDialog,
} = useDialog();
const { setTheme, theme } = useTheme();
const { hideSidePanel, isSidePanelShowed, showSidePanel } = useLayout();
@@ -120,6 +121,18 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
exportImage('svg', 1);
}, [exportImage]);
+ const exportPNG = useCallback(() => {
+ openExportImageDialog({
+ format: 'png',
+ });
+ }, [openExportImageDialog]);
+
+ const exportJPG = useCallback(() => {
+ openExportImageDialog({
+ format: 'jpeg',
+ });
+ }, [openExportImageDialog]);
+
const openChartDBIO = useCallback(() => {
window.location.href = 'https://chartdb.io';
}, []);
@@ -294,48 +307,6 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
[i18n]
);
- const handleHighResExport = useCallback(
- (format: 'png' | 'jpg') => {
- showAlert({
- title: t('export_high_res.title'),
- content: (
- <div className="flex flex-col gap-4">
- <p>{t('export_high_res.description')}</p>
- <Select
- onValueChange={(value) =>
- exportImage(format, Number(value))
- }
- >
- <SelectTrigger>
- <SelectValue
- placeholder={t(
- 'export_high_res.select_scale'
- )}
- />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="1">
- {t('export_high_res.scale_1x')}
- </SelectItem>
- <SelectItem value="2">
- {t('export_high_res.scale_2x')}
- </SelectItem>
- <SelectItem value="3">
- {t('export_high_res.scale_3x')}
- </SelectItem>
- <SelectItem value="4">
- {t('export_high_res.scale_4x')}
- </SelectItem>
- </SelectContent>
- </Select>
- </div>
- ),
- closeLabel: 'Cancel',
- });
- },
- [exportImage, showAlert, t]
- );
-
return (
<nav className="flex h-20 flex-col justify-between border-b px-3 md:h-12 md:flex-row md:items-center md:px-4">
<div className="flex flex-1 justify-between gap-x-3 md:justify-normal">
@@ -536,18 +507,10 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
{t('menu.file.export_as')}
</MenubarSubTrigger>
<MenubarSubContent>
- <MenubarItem
- onClick={() =>
- handleHighResExport('png')
- }
- >
+ <MenubarItem onClick={exportPNG}>
PNG
</MenubarItem>
- <MenubarItem
- onClick={() =>
- handleHighResExport('jpg')
- }
- >
+ <MenubarItem onClick={exportJPG}>
JPG
</MenubarItem>
<MenubarItem onClick={exportSVG}>
diff --git a/src/router.tsx b/src/router.tsx
index 18889268..44532c50 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -32,13 +32,13 @@ const routes: RouteObject[] = [
<HistoryProvider>
<ThemeProvider>
<ReactFlowProvider>
- <DialogProvider>
- <ExportImageProvider>
+ <ExportImageProvider>
+ <DialogProvider>
<KeyboardShortcutsProvider>
<EditorPage />
</KeyboardShortcutsProvider>
- </ExportImageProvider>
- </DialogProvider>
+ </DialogProvider>
+ </ExportImageProvider>
</ReactFlowProvider>
</ThemeProvider>
</HistoryProvider>