Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
image export fix
Guy Ben-Aharon1e7987c9576a
diff --git a/src/components/spinner/spinner.tsx b/src/components/spinner/spinner.tsxnew file mode 100644index 00000000..d162ead5--- /dev/null+++ b/src/components/spinner/spinner.tsx@@ -0,0 +1,50 @@+import React from 'react';+import { cn } from '@/lib/utils';+import { VariantProps, cva } from 'class-variance-authority';+import { Loader2 } from 'lucide-react';++const spinnerVariants = cva('flex-col items-center justify-center', {+ variants: {+ show: {+ true: 'flex',+ false: 'hidden',+ },+ },+ defaultVariants: {+ show: true,+ },+});++const loaderVariants = cva('animate-spin text-primary', {+ variants: {+ size: {+ small: 'size-6',+ medium: 'size-8',+ large: 'size-12',+ },+ },+ defaultVariants: {+ size: 'medium',+ },+});++interface SpinnerContentProps+ extends VariantProps<typeof spinnerVariants>,+ VariantProps<typeof loaderVariants> {+ className?: string;+ children?: React.ReactNode;+}++export function Spinner({+ size,+ show,+ children,+ className,+}: SpinnerContentProps) {+ return (+ <span className={spinnerVariants({ show })}>+ <Loader2 className={cn(loaderVariants({ size }), className)} />+ {children}+ </span>+ );+}diff --git a/src/context/export-image-context/export-image-provider.tsx b/src/context/export-image-context/export-image-provider.tsxindex ddb46962..6ff0a734 100644--- a/src/context/export-image-context/export-image-provider.tsx+++ b/src/context/export-image-context/export-image-provider.tsx@@ -11,6 +11,7 @@ import {useReactFlow,} from '@xyflow/react';import { useChartDB } from '@/hooks/use-chartdb';+import { useFullScreenLoader } from '@/hooks/use-full-screen-spinner';const imageWidth = 1024;const imageHeight = 768;@@ -18,6 +19,7 @@ const imageHeight = 768;export const ExportImageProvider: React.FC<React.PropsWithChildren> = ({children,}) => {+ const { hideLoader, showLoader } = useFullScreenLoader();const { getNodes, setNodes } = useReactFlow();const { diagramName } = useChartDB();@@ -47,6 +49,8 @@ export const ExportImageProvider: React.FC<React.PropsWithChildren> = ({const exportImage: ExportImageContext['exportImage'] = useCallback(async (type) => {+ showLoader();+setNodes((nodes) =>nodes.map((node) => ({ ...node, selected: false })));@@ -56,32 +60,44 @@ export const ExportImageProvider: React.FC<React.PropsWithChildren> = ({nodesBounds,imageWidth,imageHeight,- 0.5,+ 0.01,2,- 0+ 0.02);const imageCreateFn = imageCreatorMap[type];- const dataUrl = await imageCreateFn(- window.document.querySelector(- '.react-flow__viewport'- ) as HTMLElement,- {- ...(type === 'jpeg' ? { backgroundColor: '#ffffff' } : {}),- width: imageWidth,- height: imageHeight,- style: {- width: `${imageWidth}px`,- height: `${imageHeight}px`,- transform: `translate(${viewport.x}px, ${viewport.y}px) scale(${viewport.zoom})`,- },- }- );+ setTimeout(async () => {+ const dataUrl = await imageCreateFn(+ window.document.querySelector(+ '.react-flow__viewport'+ ) as HTMLElement,+ {+ ...(type === 'jpeg' || type === 'png'+ ? { backgroundColor: '#ffffff' }+ : {}),+ width: imageWidth,+ height: imageHeight,+ style: {+ width: `${imageWidth}px`,+ height: `${imageHeight}px`,+ transform: `translate(${viewport.x}px, ${viewport.y}px) scale(${viewport.zoom})`,+ },+ }+ );- downloadImage(dataUrl, type);+ downloadImage(dataUrl, type);+ hideLoader();+ }, 0);},- [downloadImage, getNodes, imageCreatorMap, setNodes]+ [+ downloadImage,+ getNodes,+ imageCreatorMap,+ setNodes,+ showLoader,+ hideLoader,+ ]);return (diff --git a/src/context/full-screen-spinner-context/full-screen-spinner-context.tsx b/src/context/full-screen-spinner-context/full-screen-spinner-context.tsxnew file mode 100644index 00000000..f7f3b867--- /dev/null+++ b/src/context/full-screen-spinner-context/full-screen-spinner-context.tsx@@ -0,0 +1,12 @@+import { createContext } from 'react';+import { emptyFn } from '@/lib/utils';++export interface FullScreenLoaderContext {+ showLoader: () => void;+ hideLoader: () => void;+}++export const fullScreenLoaderContext = createContext<FullScreenLoaderContext>({+ showLoader: emptyFn,+ hideLoader: emptyFn,+});diff --git a/src/context/full-screen-spinner-context/full-screen-spinner-provider.tsx b/src/context/full-screen-spinner-context/full-screen-spinner-provider.tsxnew file mode 100644index 00000000..f770de49--- /dev/null+++ b/src/context/full-screen-spinner-context/full-screen-spinner-provider.tsx@@ -0,0 +1,34 @@+import React from 'react';+import { fullScreenLoaderContext } from './full-screen-spinner-context';+import { Dialog, DialogContent } from '@/components/dialog/dialog';+import { Spinner } from '@/components/spinner/spinner';++export const FullScreenLoaderProvider: React.FC<React.PropsWithChildren> = ({+ children,+}) => {+ const [open, setOpen] = React.useState(false);++ const hideLoader = React.useCallback(() => {+ setOpen(false);+ }, []);++ const showLoader = React.useCallback(() => {+ setOpen(true);+ }, []);++ return (+ <fullScreenLoaderContext.Provider+ value={{+ showLoader,+ hideLoader,+ }}+ >+ {children}+ <Dialog open={open}>+ <DialogContent className="shadow-none bg-transparent border-none outline-none">+ <Spinner className="text-black" size={'large'} />+ </DialogContent>+ </Dialog>+ </fullScreenLoaderContext.Provider>+ );+};diff --git a/src/hooks/use-full-screen-spinner.ts b/src/hooks/use-full-screen-spinner.tsnew file mode 100644index 00000000..b11bfed0--- /dev/null+++ b/src/hooks/use-full-screen-spinner.ts@@ -0,0 +1,4 @@+import { useContext } from 'react';+import { fullScreenLoaderContext } from '@/context/full-screen-spinner-context/full-screen-spinner-context';++export const useFullScreenLoader = () => useContext(fullScreenLoaderContext);diff --git a/src/router.tsx b/src/router.tsxindex f4b6dc58..980c810f 100644--- a/src/router.tsx+++ b/src/router.tsx@@ -11,30 +11,33 @@ import { RedoUndoStackProvider } from './context/history-context/redo-undo-stackimport { LayoutProvider } from './context/layout-context/layout-provider';import { DialogProvider } from './context/dialog-context/dialog-provider';import { ExportImageProvider } from './context/export-image-context/export-image-provider';+import { FullScreenLoaderProvider } from './context/full-screen-spinner-context/full-screen-spinner-provider';const routes: RouteObject[] = [...['', 'diagrams/:diagramId'].map((path) => ({path,element: (- <LayoutProvider>- <StorageProvider>- <ConfigProvider>- <RedoUndoStackProvider>- <ChartDBProvider>- <HistoryProvider>- <DialogProvider>- <ReactFlowProvider>- <ExportImageProvider>- <EditorPage />- </ExportImageProvider>- </ReactFlowProvider>- </DialogProvider>- </HistoryProvider>- </ChartDBProvider>- </RedoUndoStackProvider>- </ConfigProvider>- </StorageProvider>- </LayoutProvider>+ <FullScreenLoaderProvider>+ <LayoutProvider>+ <StorageProvider>+ <ConfigProvider>+ <RedoUndoStackProvider>+ <ChartDBProvider>+ <HistoryProvider>+ <DialogProvider>+ <ReactFlowProvider>+ <ExportImageProvider>+ <EditorPage />+ </ExportImageProvider>+ </ReactFlowProvider>+ </DialogProvider>+ </HistoryProvider>+ </ChartDBProvider>+ </RedoUndoStackProvider>+ </ConfigProvider>+ </StorageProvider>+ </LayoutProvider>+ </FullScreenLoaderProvider>),})),{