Skip to content

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

add support for dark mode

Guy Ben-Aharonfe42e814171a
diff --git a/src/assets/mariadb_logo_dark.png b/src/assets/mariadb_logo_dark.png
new file mode 100644
index 00000000..56766ab6
Binary files /dev/null and b/src/assets/mariadb_logo_dark.png differ
diff --git a/src/assets/mysql_logo_dark.png b/src/assets/mysql_logo_dark.png
new file mode 100644
index 00000000..6fb12904
Binary files /dev/null and b/src/assets/mysql_logo_dark.png differ
diff --git a/src/assets/postgresql_logo_dark.png b/src/assets/postgresql_logo_dark.png
new file mode 100644
index 00000000..33cac54e
Binary files /dev/null and b/src/assets/postgresql_logo_dark.png differ
diff --git a/src/assets/sql_server_logo_dark.png b/src/assets/sql_server_logo_dark.png
new file mode 100644
index 00000000..26d51965
Binary files /dev/null and b/src/assets/sql_server_logo_dark.png differ
diff --git a/src/assets/sqlite_logo_dark.png b/src/assets/sqlite_logo_dark.png
new file mode 100644
index 00000000..d092afdd
Binary files /dev/null and b/src/assets/sqlite_logo_dark.png differ
diff --git a/src/components/combobox/combobox.tsx b/src/components/combobox/combobox.tsx
index d9975def..6f128154 100644
--- a/src/components/combobox/combobox.tsx
+++ b/src/components/combobox/combobox.tsx
@@ -141,7 +141,7 @@ export const Combobox = React.forwardRef<HTMLDivElement, ComboboxProps>(
)}
<ScrollArea>
- <div className="max-h-80">
+ <div className="max-h-80 w-full">
<CommandGroup>
<CommandList>
{options.map((option) => (
diff --git a/src/context/theme-context/theme-provider.tsx b/src/context/theme-context/theme-provider.tsx
index aeffbf63..4284ea82 100644
--- a/src/context/theme-context/theme-provider.tsx
+++ b/src/context/theme-context/theme-provider.tsx
@@ -1,12 +1,6 @@
import React, { useEffect, useState } from 'react';
import { EffectiveThemeType, ThemeContext, ThemeType } from './theme-context';
-
-const getSystemTheme = (): EffectiveThemeType => {
- if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
- return 'dark';
- }
- return 'light';
-};
+import { useMediaQuery } from 'react-responsive';
export const ThemeProvider: React.FC<React.PropsWithChildren> = ({
children,
@@ -15,32 +9,19 @@ export const ThemeProvider: React.FC<React.PropsWithChildren> = ({
const savedTheme = localStorage.getItem('theme') as ThemeType | null;
return savedTheme || 'system';
});
+ const isDarkSystemTheme = useMediaQuery({
+ query: '(prefers-color-scheme: dark)',
+ });
- const [effectiveTheme, setEffectiveTheme] =
- useState<EffectiveThemeType>(getSystemTheme());
-
- useEffect(() => {
- const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-
- const handleChange = () => {
- if (theme === 'system') {
- setEffectiveTheme(getSystemTheme());
- }
- };
-
- mediaQuery.addEventListener('change', handleChange);
+ const systemTheme = isDarkSystemTheme ? 'dark' : 'light';
- return () => mediaQuery.removeEventListener('change', handleChange);
- }, [theme]);
+ const [effectiveTheme, setEffectiveTheme] =
+ useState<EffectiveThemeType>(systemTheme);
useEffect(() => {
localStorage.setItem('theme', theme);
- if (theme === 'system') {
- setEffectiveTheme(getSystemTheme());
- } else {
- setEffectiveTheme(theme);
- }
- }, [theme]);
+ setEffectiveTheme(theme === 'system' ? systemTheme : theme);
+ }, [theme, systemTheme]);
useEffect(() => {
if (effectiveTheme === 'dark') {
diff --git a/src/dialogs/create-diagram-dialog/select-database-step/select-database-step.tsx b/src/dialogs/create-diagram-dialog/select-database-step/select-database-step.tsx
index 5b50c478..5c5ed640 100644
--- a/src/dialogs/create-diagram-dialog/select-database-step/select-database-step.tsx
+++ b/src/dialogs/create-diagram-dialog/select-database-step/select-database-step.tsx
@@ -10,11 +10,12 @@ import {
import { ToggleGroup, ToggleGroupItem } from '@/components/toggle/toggle-group';
import { DatabaseType } from '@/lib/domain/database-type';
-import { databaseLogoMap } from '@/lib/databases';
+import { databaseTypeToLabelMap, getDatabaseLogo } from '@/lib/databases';
import { Link } from '@/components/link/link';
import { LayoutGrid } from 'lucide-react';
import { CreateDiagramDialogStep } from '../create-diagram-dialog-step';
import { useTranslation } from 'react-i18next';
+import { useTheme } from '@/hooks/use-theme';
export interface SelectDatabaseStepProps {
setStep: React.Dispatch<React.SetStateAction<CreateDiagramDialogStep>>;
@@ -32,18 +33,22 @@ export const SelectDatabaseStep: React.FC<SelectDatabaseStepProps> = ({
createNewDiagram,
}) => {
const { t } = useTranslation();
- const renderDatabaseOption = useCallback((type: DatabaseType) => {
- const logo = databaseLogoMap[type];
- return (
- <ToggleGroupItem
- value={type}
- aria-label="Toggle bold"
- className="flex size-20 md:size-32"
- >
- <img src={logo} alt="PostgreSQL" />
- </ToggleGroupItem>
- );
- }, []);
+ const { effectiveTheme } = useTheme();
+ const renderDatabaseOption = useCallback(
+ (type: DatabaseType) => {
+ const logo = getDatabaseLogo(type, effectiveTheme);
+ return (
+ <ToggleGroupItem
+ value={type}
+ aria-label="Toggle bold"
+ className="flex size-20 md:size-32"
+ >
+ <img src={logo} alt={databaseTypeToLabelMap[type]} />
+ </ToggleGroupItem>
+ );
+ },
+ [effectiveTheme]
+ );
const renderExamplesOption = useCallback(
() => (
diff --git a/src/globals.css b/src/globals.css
index 99a7b0c0..95a3908f 100644
--- a/src/globals.css
+++ b/src/globals.css
@@ -29,6 +29,7 @@
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
+ --subtitle: 215.3 19.3% 34.5%;
}
.dark {
@@ -56,6 +57,7 @@
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
+ --subtitle: 212.7 26.8% 83.9%;
}
}
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index ec1114fc..d9585a38 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -23,6 +23,7 @@ export const en: ResourceLanguage = {
view: 'View',
show_sidebar: 'Show Sidebar',
hide_sidebar: 'Hide Sidebar',
+ theme: 'Theme',
},
help: {
help: 'Help',
@@ -47,11 +48,19 @@ export const en: ResourceLanguage = {
clear: 'Clear',
},
+ theme: {
+ system: 'System',
+ light: 'Light',
+ dark: 'Dark',
+ },
+
last_saved: 'Last saved',
saved: 'Saved',
diagrams: 'Diagrams',
+ loading_diagram: 'Loading diagram...',
side_panel: {
+ view_all_options: 'View all Options...',
tables_section: {
tables: 'Tables',
add_table: 'Add Table',
diff --git a/src/lib/databases.ts b/src/lib/databases.ts
index 4337dc2c..5370fa38 100644
--- a/src/lib/databases.ts
+++ b/src/lib/databases.ts
@@ -1,8 +1,13 @@
import MysqlLogo from '@/assets/mysql_logo.png';
+import MysqlLogoDark from '@/assets/mysql_logo_dark.png';
import PostgresqlLogo from '@/assets/postgresql_logo.png';
+import PostgresqlLogoDark from '@/assets/postgresql_logo_dark.png';
import MariaDBLogo from '@/assets/mariadb_logo.png';
+import MariaDBLogoDark from '@/assets/mariadb_logo_dark.png';
import SqliteLogo from '@/assets/sqlite_logo.png';
+import SqliteLogoDark from '@/assets/sqlite_logo_dark.png';
import SqlServerLogo from '@/assets/sql_server_logo.png';
+import SqlServerLogoDark from '@/assets/sql_server_logo_dark.png';
import MysqlLogo2 from '@/assets/mysql_logo_2.png';
import PostgresqlLogo2 from '@/assets/postgresql_logo_2.png';
import MariaDBLogo2 from '@/assets/mariadb_logo_2.png';
@@ -10,6 +15,7 @@ import SqliteLogo2 from '@/assets/sqlite_logo_2.png';
import SqlServerLogo2 from '@/assets/sql_server_logo_2.png';
import GeneralDBLogo2 from '@/assets/general_db_logo_2.png';
import { DatabaseType } from './domain/database-type';
+import { EffectiveThemeType } from '@/context/theme-context/theme-context';
export const databaseTypeToLabelMap: Record<DatabaseType, string> = {
[DatabaseType.GENERIC]: 'Generic',
@@ -29,6 +35,23 @@ export const databaseLogoMap: Record<DatabaseType, string> = {
[DatabaseType.GENERIC]: '',
};
+export const databaseDarkLogoMap: Record<DatabaseType, string> = {
+ [DatabaseType.MYSQL]: MysqlLogoDark,
+ [DatabaseType.POSTGRESQL]: PostgresqlLogoDark,
+ [DatabaseType.MARIADB]: MariaDBLogoDark,
+ [DatabaseType.SQLITE]: SqliteLogoDark,
+ [DatabaseType.SQL_SERVER]: SqlServerLogoDark,
+ [DatabaseType.GENERIC]: '',
+};
+
+export const getDatabaseLogo = (
+ databaseType: DatabaseType,
+ theme: EffectiveThemeType
+) =>
+ theme === 'dark'
+ ? databaseDarkLogoMap[databaseType]
+ : databaseLogoMap[databaseType];
+
export const databaseSecondaryLogoMap: Record<DatabaseType, string> = {
[DatabaseType.MYSQL]: MysqlLogo2,
[DatabaseType.POSTGRESQL]: PostgresqlLogo2,
diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsx
index a621602e..8a7db208 100644
--- a/src/pages/editor-page/canvas/canvas.tsx
+++ b/src/pages/editor-page/canvas/canvas.tsx
@@ -27,6 +27,8 @@ import { Button } from '@/components/button/button';
import { useLayout } from '@/hooks/use-layout';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { Badge } from '@/components/badge/badge';
+import { useTheme } from '@/hooks/use-theme';
+import { useTranslation } from 'react-i18next';
type AddEdgeParams = Parameters<typeof addEdge<TableEdgeType>>[0];
@@ -38,6 +40,7 @@ export interface CanvasProps {}
export const Canvas: React.FC<CanvasProps> = () => {
const { getEdge, getInternalNode } = useReactFlow();
const { toast } = useToast();
+ const { t } = useTranslation();
const {
tables,
relationships,
@@ -47,6 +50,7 @@ export const Canvas: React.FC<CanvasProps> = () => {
getField,
} = useChartDB();
const { showSidePanel } = useLayout();
+ const { effectiveTheme } = useTheme();
const { isMd: isDesktop } = useBreakpoint('md');
const nodeTypes = useMemo(() => ({ table: TableNode }), []);
const edgeTypes = useMemo(() => ({ 'table-edge': TableEdge }), []);
@@ -240,6 +244,7 @@ export const Canvas: React.FC<CanvasProps> = () => {
return (
<div className="flex h-full">
<ReactFlow
+ colorMode={effectiveTheme}
className="canvas-cursor-default nodes-animated"
nodes={nodes}
edges={edges}
@@ -269,8 +274,11 @@ export const Canvas: React.FC<CanvasProps> = () => {
showInteractive={false}
className="!shadow-none"
>
- <Badge variant="default" className="bg-pink-600">
- Loading diagram...
+ <Badge
+ variant="default"
+ className="bg-pink-600 text-white"
+ >
+ {t('loading_diagram')}
</Badge>
</Controls>
) : null}
@@ -312,7 +320,6 @@ export const Canvas: React.FC<CanvasProps> = () => {
variant={BackgroundVariant.Dots}
gap={16}
size={1}
- bgColor="#ffffff"
/>
</ReactFlow>
</div>
diff --git a/src/pages/editor-page/canvas/table-node-field.tsx b/src/pages/editor-page/canvas/table-node-field.tsx
index 8a50cd26..68b9bcf8 100644
--- a/src/pages/editor-page/canvas/table-node-field.tsx
+++ b/src/pages/editor-page/canvas/table-node-field.tsx
@@ -42,7 +42,7 @@ export const TableNodeField: React.FC<TableNodeFieldProps> = ({
}, [tableNodeId, updateNodeInternals, numberOfEdgesToField]);
return (
- <div className="group relative flex h-8 items-center justify-between border-t px-3 text-sm last:rounded-b-[6px] hover:bg-slate-100">
+ <div className="group relative flex h-8 items-center justify-between border-t px-3 text-sm last:rounded-b-[6px] hover:bg-slate-100 dark:hover:bg-slate-800">
{!connection.inProgress && (
<>
<Handle
diff --git a/src/pages/editor-page/canvas/table-node.tsx b/src/pages/editor-page/canvas/table-node.tsx
index cde01022..bd920493 100644
--- a/src/pages/editor-page/canvas/table-node.tsx
+++ b/src/pages/editor-page/canvas/table-node.tsx
@@ -56,7 +56,7 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
return (
<div
- className={`flex w-full flex-col border-2 bg-slate-50 ${selected ? 'border-pink-600' : 'border-slate-500'} rounded-lg shadow-sm`}
+ className={`flex w-full flex-col border-2 bg-slate-50 dark:bg-slate-950 ${selected ? 'border-pink-600' : 'border-slate-500'} rounded-lg shadow-sm`}
onClick={(e) => {
if (e.detail === 2) {
openTableInEditor();
@@ -75,9 +75,9 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
className="h-2 rounded-t-[6px]"
style={{ backgroundColor: table.color }}
></div>
- <div className="group flex h-9 items-center justify-between bg-slate-200 px-2">
- <div className="flex min-w-0 flex-1 items-center gap-1">
- <Table2 className="size-3.5 shrink-0 text-gray-600" />
+ <div className="group flex h-9 items-center justify-between bg-slate-200 px-2 dark:bg-slate-900">
+ <div className="flex min-w-0 flex-1 items-center gap-2">
+ <Table2 className="size-3.5 shrink-0 text-gray-600 dark:text-primary" />
<Label className="truncate text-sm font-bold">
{table.name}
</Label>
@@ -85,14 +85,14 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
<div className="hidden shrink-0 flex-row group-hover:flex">
<Button
variant="ghost"
- className="size-6 p-0 text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="size-6 p-0 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:bg-slate-800 dark:hover:text-slate-200"
onClick={openTableInEditor}
>
<Pencil className="size-4" />
</Button>
<Button
variant="ghost"
- className="size-6 p-0 text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="size-6 p-0 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:bg-slate-800 dark:hover:text-slate-200"
onClick={
table.width !== MAX_TABLE_SIZE
? expandTable
diff --git a/src/pages/editor-page/canvas/toolbar/toolbar-button.tsx b/src/pages/editor-page/canvas/toolbar/toolbar-button.tsx
index a449373c..9182af86 100644
--- a/src/pages/editor-page/canvas/toolbar/toolbar-button.tsx
+++ b/src/pages/editor-page/canvas/toolbar/toolbar-button.tsx
@@ -1,12 +1,18 @@
import React from 'react';
import { Button, ButtonProps } from '@/components/button/button';
-export const ToolbarButton: React.FC<ButtonProps> = (props) => {
+export const ToolbarButton = React.forwardRef<
+ React.ElementRef<typeof Button>,
+ ButtonProps
+>((props, ref) => {
return (
<Button
+ ref={ref}
variant="ghost"
- className="w-[36px] p-2 hover:bg-primary-foreground"
+ className={'w-[36px] p-2 hover:bg-primary-foreground'}
{...props}
/>
);
-};
+});
+
+ToolbarButton.displayName = Button.displayName;
diff --git a/src/pages/editor-page/canvas/toolbar/toolbar.tsx b/src/pages/editor-page/canvas/toolbar/toolbar.tsx
index cd28c2bb..0b9348f2 100644
--- a/src/pages/editor-page/canvas/toolbar/toolbar.tsx
+++ b/src/pages/editor-page/canvas/toolbar/toolbar.tsx
@@ -12,6 +12,7 @@ import {
TooltipContent,
} from '@/components/tooltip/tooltip';
import { useTranslation } from 'react-i18next';
+import { Button } from '@/components/button/button';
const convertToPercentage = (value: number) => `${Math.round(value * 100)}%`;
@@ -86,7 +87,13 @@ export const Toolbar: React.FC<ToolbarProps> = () => {
</TooltipTrigger>
<TooltipContent>{t('toolbar.zoom_out')}</TooltipContent>
</Tooltip>
- <ToolbarButton onClick={resetZoom}>{zoom}</ToolbarButton>
+ <Button
+ variant="ghost"
+ onClick={resetZoom}
+ className="w-[60px] p-2 hover:bg-primary-foreground"
+ >
+ {zoom}
+ </Button>
<Tooltip>
<TooltipTrigger asChild>
<span>
diff --git a/src/pages/editor-page/dark-mode-toggle/dark-mode-toggle.tsx b/src/pages/editor-page/dark-mode-toggle/dark-mode-toggle.tsx
deleted file mode 100644
index 7dfd41ac..00000000
--- a/src/pages/editor-page/dark-mode-toggle/dark-mode-toggle.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useTheme } from '@/hooks/use-theme';
-import { Moon, Sun } from 'lucide-react';
-import React from 'react';
-
-const DarkModeToggle: React.FC = () => {
- const { theme, setTheme } = useTheme();
-
- const toggleTheme = () => {
- setTheme(theme === 'light' ? 'dark' : 'light');
- };
-
- return (
- <button
- onClick={toggleTheme}
- className="text-slate-500 hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-300"
- aria-label={`Switch to ${theme === 'light' ? 'dark' : 'light'} mode`}
- >
- {theme === 'light' ? <Moon /> : <Sun />}
- </button>
- );
-};
-
-export default DarkModeToggle;
diff --git a/src/pages/editor-page/side-panel/list-item-header-button/list-item-header-button.tsx b/src/pages/editor-page/side-panel/list-item-header-button/list-item-header-button.tsx
index ad68604c..51d8d4fc 100644
--- a/src/pages/editor-page/side-panel/list-item-header-button/list-item-header-button.tsx
+++ b/src/pages/editor-page/side-panel/list-item-header-button/list-item-header-button.tsx
@@ -9,7 +9,7 @@ export const ListItemHeaderButton: React.FC<ButtonProps> = React.forwardRef<
<Button
ref={ref}
variant="ghost"
- className="size-8 p-2 text-slate-500 hover:cursor-pointer hover:bg-primary-foreground hover:text-slate-700"
+ className="size-8 p-2 text-slate-500 hover:cursor-pointer hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-200"
asChild
{...props}
/>
diff --git a/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item-content/relationship-list-item-content.tsx b/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item-content/relationship-list-item-content.tsx
index de9c40df..394ac842 100644
--- a/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item-content/relationship-list-item-content.tsx
+++ b/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item-content/relationship-list-item-content.tsx
@@ -56,8 +56,8 @@ export const RelationshipListItemContent: React.FC<
<div className="flex items-center justify-between gap-1 text-xs">
<div className="flex flex-col gap-2 overflow-hidden text-xs">
<div className="flex flex-row items-center gap-1">
- <FileMinus2 className="size-4 text-slate-700" />
- <div className="font-bold text-slate-700">
+ <FileMinus2 className="size-4 text-subtitle" />
+ <div className="font-bold text-subtitle">
{t(
'side_panel.relationships_section.relationship.primary'
)}
@@ -76,8 +76,8 @@ export const RelationshipListItemContent: React.FC<
</div>
<div className="flex flex-col gap-2 overflow-hidden text-xs">
<div className="flex flex-row items-center gap-1">
- <FileOutput className="size-4 text-slate-700" />
- <div className="font-bold text-slate-700">
+ <FileOutput className="size-4 text-subtitle" />
+ <div className="font-bold text-subtitle">
{t(
'side_panel.relationships_section.relationship.foreign'
)}
@@ -97,8 +97,8 @@ export const RelationshipListItemContent: React.FC<
</div>
<div className="flex flex-col gap-2 text-xs">
<div className="flex flex-row items-center gap-1">
- <FileOutput className="size-4 text-slate-700" />
- <div className="font-bold text-slate-700">
+ <FileOutput className="size-4 text-subtitle" />
+ <div className="font-bold text-subtitle">
{t(
'side_panel.relationships_section.relationship.cardinality'
)}
diff --git a/src/pages/editor-page/side-panel/side-panel.tsx b/src/pages/editor-page/side-panel/side-panel.tsx
index 653c3818..792d2e41 100644
--- a/src/pages/editor-page/side-panel/side-panel.tsx
+++ b/src/pages/editor-page/side-panel/side-panel.tsx
@@ -30,7 +30,7 @@ export const SidePanel: React.FC<SidePanelProps> = () => {
<SelectTrigger className="rounded-none border-none font-semibold shadow-none hover:bg-secondary hover:underline focus:border-transparent focus:ring-0">
<SelectValue />
<div className="flex flex-1 justify-end px-2 text-xs font-normal text-muted-foreground">
- View all Options...
+ {t('side_panel.view_all_options')}
</div>
</SelectTrigger>
<SelectContent>
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-toggle.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-toggle.tsx
new file mode 100644
index 00000000..0e2d34db
--- /dev/null
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-toggle.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Toggle } from '@/components/toggle/toggle';
+
+export const TableFieldToggle = React.forwardRef<
+ React.ElementRef<typeof Toggle>,
+ React.ComponentPropsWithoutRef<typeof Toggle>
+>((props, ref) => {
+ return (
+ <Toggle
+ {...props}
+ ref={ref}
+ variant="default"
+ className="h-8 w-[32px] p-2 text-xs text-slate-500 hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-200"
+ />
+ );
+});
+
+TableFieldToggle.displayName = Toggle.displayName;
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx
index c685bbde..dd06149b 100644
--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx
@@ -9,7 +9,6 @@ import { Separator } from '@/components/separator/separator';
import { DBField } from '@/lib/domain/db-field';
import { useChartDB } from '@/hooks/use-chartdb';
import { dataTypeMap } from '@/lib/data/data-types';
-import { Toggle } from '@/components/toggle/toggle';
import {
Tooltip,
TooltipContent,
@@ -24,6 +23,7 @@ import { Label } from '@/components/label/label';
import { Checkbox } from '@/components/checkbox/checkbox';
import { useTranslation } from 'react-i18next';
import { Textarea } from '@/components/textarea/textarea';
+import { TableFieldToggle } from './table-field-toggle';
export interface TableFieldProps {
field: DBField;
@@ -96,9 +96,7 @@ export const TableField: React.FC<TableFieldProps> = ({
<Tooltip>
<TooltipTrigger asChild>
<span>
- <Toggle
- variant="default"
- className="h-8 w-[32px] p-2 text-xs text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ <TableFieldToggle
pressed={field.nullable}
onPressedChange={(value) =>
updateField({
@@ -107,7 +105,7 @@ export const TableField: React.FC<TableFieldProps> = ({
}
>
N
- </Toggle>
+ </TableFieldToggle>
</span>
</TooltipTrigger>
<TooltipContent>
@@ -117,9 +115,7 @@ export const TableField: React.FC<TableFieldProps> = ({
<Tooltip>
<TooltipTrigger asChild>
<span>
- <Toggle
- variant="default"
- className="h-8 w-[32px] p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ <TableFieldToggle
pressed={field.primaryKey}
onPressedChange={(value) =>
updateField({
@@ -129,7 +125,7 @@ export const TableField: React.FC<TableFieldProps> = ({
}
>
<KeyRound className="h-3.5" />
- </Toggle>
+ </TableFieldToggle>
</span>
</TooltipTrigger>
<TooltipContent>
@@ -140,7 +136,7 @@ export const TableField: React.FC<TableFieldProps> = ({
<PopoverTrigger asChild>
<Button
variant="ghost"
- className="h-8 w-[32px] p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="h-8 w-[32px] p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-200"
>
<Ellipsis className="size-3.5" />
</Button>
@@ -157,7 +153,7 @@ export const TableField: React.FC<TableFieldProps> = ({
<div className="flex items-center justify-between">
<Label
htmlFor="width"
- className="text-gray-700"
+ className="text-subtitle"
>
{t(
'side_panel.tables_section.table.field_actions.unique'
@@ -176,7 +172,7 @@ export const TableField: React.FC<TableFieldProps> = ({
<div className="flex flex-col gap-2">
<Label
htmlFor="width"
- className="text-gray-700"
+ className="text-subtitle"
>
{t(
'side_panel.tables_section.table.field_actions.comments'
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx
index 7b87a1fd..418ea530 100644
--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx
@@ -56,7 +56,7 @@ export const TableIndex: React.FC<TableIndexProps> = ({
<PopoverTrigger asChild>
<Button
variant="ghost"
- className="h-8 w-[32px] p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="h-8 w-[32px] p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-200"
>
<Ellipsis className="size-3.5" />
</Button>
@@ -72,7 +72,7 @@ export const TableIndex: React.FC<TableIndexProps> = ({
<div className="flex flex-col gap-2">
<Label
htmlFor="width"
- className="text-gray-700"
+ className="text-subtitle"
>
{t(
'side_panel.tables_section.table.index_actions.name'
@@ -90,7 +90,7 @@ export const TableIndex: React.FC<TableIndexProps> = ({
<div className="mt-2 flex items-center justify-between">
<Label
htmlFor="width"
- className="text-gray-700"
+ className="text-subtitle"
>
{t(
'side_panel.tables_section.table.index_actions.unique'
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx
index 250667e6..a9558ea4 100644
--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-list-item-content.tsx
@@ -71,7 +71,7 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
<AccordionItem value="fields" className="mb-2 border-y-0">
<AccordionTrigger
iconPosition="right"
- className="group flex flex-1 p-0 px-2 py-1 text-xs text-slate-600 hover:bg-secondary"
+ className="group flex flex-1 p-0 px-2 py-1 text-xs text-subtitle hover:bg-secondary"
asChild
>
<div className="flex flex-1 items-center justify-between">
@@ -83,7 +83,7 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
<div className="hidden flex-row-reverse group-hover:flex">
<Button
variant="ghost"
- className="size-4 p-0 text-xs text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="size-4 p-0 text-xs hover:bg-primary-foreground"
onClick={(e) => {
e.stopPropagation();
createField(table.id);
@@ -114,7 +114,7 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
<AccordionItem value="indexes" className="mb-2 border-y-0">
<AccordionTrigger
iconPosition="right"
- className="group flex flex-1 p-0 px-2 py-1 text-xs text-slate-600 hover:bg-secondary"
+ className="group flex flex-1 p-0 px-2 py-1 text-xs text-subtitle hover:bg-secondary"
asChild
>
<div className="flex flex-1 items-center justify-between">
@@ -126,7 +126,7 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
<div className="hidden flex-row-reverse group-hover:flex">
<Button
variant="ghost"
- className="size-4 p-0 text-xs text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="size-4 p-0 text-xs hover:bg-primary-foreground"
onClick={(e) => {
e.stopPropagation();
createIndexHandler();
@@ -158,7 +158,7 @@ export const TableListItemContent: React.FC<TableListItemContentProps> = ({
<AccordionItem value="comments" className="border-y-0">
<AccordionTrigger
iconPosition="right"
- className="group flex flex-1 p-0 px-2 py-1 text-xs text-slate-600 hover:bg-secondary"
+ className="group flex flex-1 p-0 px-2 py-1 text-xs text-subtitle hover:bg-secondary"
asChild
>
<div className="flex flex-1 items-center justify-between">
diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsx
index 7375d224..6134852e 100644
--- a/src/pages/editor-page/top-navbar/top-navbar.tsx
+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
import TimeAgo from 'timeago-react';
import {
Menubar,
+ MenubarCheckboxItem,
MenubarContent,
MenubarItem,
MenubarMenu,
@@ -19,6 +20,7 @@ import { Input } from '@/components/input/input';
import { useChartDB } from '@/hooks/use-chartdb';
import { useClickAway, useKeyPressEvent } from 'react-use';
import ChartDBLogo from '@/assets/logo.png';
+import ChartDBDarkLogo from '@/assets/logo-dark.png';
import { useDialog } from '@/hooks/use-dialog';
import { Badge } from '@/components/badge/badge';
import {
@@ -40,6 +42,7 @@ import {
import { useHistory } from '@/hooks/use-history';
import { useTranslation } from 'react-i18next';
import { useLayout } from '@/hooks/use-layout';
+import { useTheme } from '@/hooks/use-theme';
export interface TopNavbarProps {}
@@ -58,7 +61,9 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
openExportSQLDialog,
showAlert,
} = useDialog();
+ const { setTheme, theme } = useTheme();
const { hideSidePanel, isSidePanelShowed, showSidePanel } = useLayout();
+ const { effectiveTheme } = useTheme();
const { t } = useTranslation();
const { redo, undo, hasRedo, hasUndo } = useHistory();
const { isMd: isDesktop } = useBreakpoint('md');
@@ -230,7 +235,7 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
/>
<Button
variant="ghost"
- className="hidden size-7 p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 group-hover:flex"
+ className="hidden size-7 p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 group-hover:flex dark:text-slate-400 dark:hover:text-slate-300"
onClick={editDiagramName}
>
<Check />
@@ -241,7 +246,7 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
<Label>{diagramName}</Label>
<Button
variant="ghost"
- className="hidden size-7 p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 group-hover:flex"
+ className="hidden size-7 p-2 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 group-hover:flex dark:text-slate-400 dark:hover:text-slate-300"
onClick={enterEditMode}
>
<Pencil />
@@ -281,7 +286,11 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
rel="noreferrer"
>
<img
- src={ChartDBLogo}
+ src={
+ effectiveTheme === 'light'
+ ? ChartDBLogo
+ : ChartDBDarkLogo
+ }
alt="chartDB"
className="h-4 max-w-fit"
/>
@@ -497,6 +506,32 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
? t('menu.view.hide_sidebar')
: t('menu.view.show_sidebar')}
</MenubarItem>
+ <MenubarSeparator />
+ <MenubarSub>
+ <MenubarSubTrigger>
+ {t('menu.view.theme')}
+ </MenubarSubTrigger>
+ <MenubarSubContent>
+ <MenubarCheckboxItem
+ checked={theme === 'system'}
+ onClick={() => setTheme('system')}
+ >
+ {t('theme.system')}
+ </MenubarCheckboxItem>
+ <MenubarCheckboxItem
+ checked={theme === 'light'}
+ onClick={() => setTheme('light')}
+ >
+ {t('theme.light')}
+ </MenubarCheckboxItem>
+ <MenubarCheckboxItem
+ checked={theme === 'dark'}
+ onClick={() => setTheme('dark')}
+ >
+ {t('theme.dark')}
+ </MenubarCheckboxItem>
+ </MenubarSubContent>
+ </MenubarSub>
</MenubarContent>
</MenubarMenu>
<MenubarMenu>
diff --git a/src/pages/examples-page/example-card.tsx b/src/pages/examples-page/example-card.tsx
index 4a81716f..d8487829 100644
--- a/src/pages/examples-page/example-card.tsx
+++ b/src/pages/examples-page/example-card.tsx
@@ -78,7 +78,7 @@ export const ExampleCard: React.FC<ExampleCardProps> = ({ example }) => {
<div className="flex flex-row">
<Button
variant="ghost"
- className="size-9 p-0 text-slate-500 hover:bg-primary-foreground hover:text-slate-700"
+ className="size-9 p-0 text-slate-500 hover:bg-primary-foreground hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-300"
// onClick={openTableInEditor}
>
<Import className="size-5" />
diff --git a/src/router.tsx b/src/router.tsx
index 399def5f..0253a172 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -14,6 +14,7 @@ import { ExportImageProvider } from './context/export-image-context/export-image
import { FullScreenLoaderProvider } from './context/full-screen-spinner-context/full-screen-spinner-provider';
import { ExamplesPage } from './pages/examples-page/examples-page';
import { KeyboardShortcutsProvider } from './context/keyboard-shortcuts-context/keyboard-shortcuts-provider';
+import { ThemeProvider } from './context/theme-context/theme-provider';
const routes: RouteObject[] = [
...['', 'diagrams/:diagramId'].map((path) => ({
@@ -26,17 +27,17 @@ const routes: RouteObject[] = [
<RedoUndoStackProvider>
<ChartDBProvider>
<HistoryProvider>
- <DialogProvider>
- <ReactFlowProvider>
- <ExportImageProvider>
- <KeyboardShortcutsProvider>
- {/* <ThemeProvider> */}
- <EditorPage />
- {/* </ThemeProvider> */}
- </KeyboardShortcutsProvider>
- </ExportImageProvider>
- </ReactFlowProvider>
- </DialogProvider>
+ <ThemeProvider>
+ <DialogProvider>
+ <ReactFlowProvider>
+ <ExportImageProvider>
+ <KeyboardShortcutsProvider>
+ <EditorPage />
+ </KeyboardShortcutsProvider>
+ </ExportImageProvider>
+ </ReactFlowProvider>
+ </DialogProvider>
+ </ThemeProvider>
</HistoryProvider>
</ChartDBProvider>
</RedoUndoStackProvider>
diff --git a/tailwind.config.js b/tailwind.config.js
index 7ea217f2..048df511 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -23,6 +23,7 @@ module.exports = {
ring: 'hsl(var(--ring))',
background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))',
+ subtitle: 'hsl(var(--subtitle))',
primary: {
DEFAULT: 'hsl(var(--primary))',
foreground: 'hsl(var(--primary-foreground))',