Skip to content

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

fix(shortcuts): add zoom all shortcut (#528)

Jonathan Fishner7452ca6965b0
diff --git a/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx b/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx
index f6849113..59deb4e7 100644
--- a/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx
+++ b/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx
@@ -9,6 +9,7 @@ import { useHistory } from '@/hooks/use-history';
import { useDialog } from '@/hooks/use-dialog';
import { useChartDB } from '@/hooks/use-chartdb';
import { useLayout } from '@/hooks/use-layout';
+import { useReactFlow } from '@xyflow/react';
export const KeyboardShortcutsProvider: React.FC<React.PropsWithChildren> = ({
children,
@@ -17,6 +18,7 @@ export const KeyboardShortcutsProvider: React.FC<React.PropsWithChildren> = ({
const { openOpenDiagramDialog } = useDialog();
const { updateDiagramUpdatedAt } = useChartDB();
const { toggleSidePanel } = useLayout();
+ const { fitView } = useReactFlow();
useHotkeys(
keyboardShortcutsForOS[KeyboardShortcutAction.REDO].keyCombination,
@@ -61,6 +63,20 @@ export const KeyboardShortcutsProvider: React.FC<React.PropsWithChildren> = ({
},
[toggleSidePanel]
);
+ useHotkeys(
+ keyboardShortcutsForOS[KeyboardShortcutAction.SHOW_ALL].keyCombination,
+ () => {
+ fitView({
+ duration: 500,
+ padding: 0.1,
+ maxZoom: 0.8,
+ });
+ },
+ {
+ preventDefault: true,
+ },
+ [fitView]
+ );
return (
<keyboardShortcutsContext.Provider value={{}}>
diff --git a/src/context/keyboard-shortcuts-context/keyboard-shortcuts.ts b/src/context/keyboard-shortcuts-context/keyboard-shortcuts.ts
index 6a30aa29..b3e5317b 100644
--- a/src/context/keyboard-shortcuts-context/keyboard-shortcuts.ts
+++ b/src/context/keyboard-shortcuts-context/keyboard-shortcuts.ts
@@ -6,6 +6,7 @@ export enum KeyboardShortcutAction {
OPEN_DIAGRAM = 'open_diagram',
SAVE_DIAGRAM = 'save_diagram',
TOGGLE_SIDE_PANEL = 'toggle_side_panel',
+ SHOW_ALL = 'show_all',
}
export interface KeyboardShortcut {
@@ -55,6 +56,13 @@ export const keyboardShortcuts: Record<
keyCombinationMac: 'meta+b',
keyCombinationWin: 'ctrl+b',
},
+ [KeyboardShortcutAction.SHOW_ALL]: {
+ action: KeyboardShortcutAction.SHOW_ALL,
+ keyCombinationLabelMac: '⌘0',
+ keyCombinationLabelWin: 'Ctrl+0',
+ keyCombinationMac: 'meta+0',
+ keyCombinationWin: 'ctrl+0',
+ },
};
export interface KeyboardShortcutForOS {
diff --git a/src/pages/editor-page/canvas/toolbar/toolbar.tsx b/src/pages/editor-page/canvas/toolbar/toolbar.tsx
index b26e076b..0ba2fcef 100644
--- a/src/pages/editor-page/canvas/toolbar/toolbar.tsx
+++ b/src/pages/editor-page/canvas/toolbar/toolbar.tsx
@@ -13,6 +13,8 @@ import {
} from '@/components/tooltip/tooltip';
import { useTranslation } from 'react-i18next';
import { Button } from '@/components/button/button';
+import { keyboardShortcutsForOS } from '@/context/keyboard-shortcuts-context/keyboard-shortcuts';
+import { KeyboardShortcutAction } from '@/context/keyboard-shortcuts-context/keyboard-shortcuts';
const convertToPercentage = (value: number) => `${Math.round(value * 100)}%`;
@@ -75,6 +77,14 @@ export const Toolbar: React.FC<ToolbarProps> = ({ readonly }) => {
</TooltipTrigger>
<TooltipContent>
{t('toolbar.save')}
+ <span className="ml-2 text-muted-foreground">
+ {
+ keyboardShortcutsForOS[
+ KeyboardShortcutAction
+ .SAVE_DIAGRAM
+ ].keyCombinationLabel
+ }
+ </span>
</TooltipContent>
</Tooltip>
<Separator orientation="vertical" />
@@ -88,7 +98,16 @@ export const Toolbar: React.FC<ToolbarProps> = ({ readonly }) => {
</ToolbarButton>
</span>
</TooltipTrigger>
- <TooltipContent>{t('toolbar.show_all')}</TooltipContent>
+ <TooltipContent>
+ {t('toolbar.show_all')}
+ <span className="ml-2 text-muted-foreground">
+ {
+ keyboardShortcutsForOS[
+ KeyboardShortcutAction.SHOW_ALL
+ ].keyCombinationLabel
+ }
+ </span>
+ </TooltipContent>
</Tooltip>
<Separator orientation="vertical" />
<Tooltip>
@@ -130,7 +149,16 @@ export const Toolbar: React.FC<ToolbarProps> = ({ readonly }) => {
</ToolbarButton>
</span>
</TooltipTrigger>
- <TooltipContent>{t('toolbar.undo')}</TooltipContent>
+ <TooltipContent>
+ {t('toolbar.undo')}
+ <span className="ml-2 text-muted-foreground">
+ {
+ keyboardShortcutsForOS[
+ KeyboardShortcutAction.UNDO
+ ].keyCombinationLabel
+ }
+ </span>
+ </TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
@@ -143,7 +171,16 @@ export const Toolbar: React.FC<ToolbarProps> = ({ readonly }) => {
</ToolbarButton>
</span>
</TooltipTrigger>
- <TooltipContent>{t('toolbar.redo')}</TooltipContent>
+ <TooltipContent>
+ {t('toolbar.redo')}
+ <span className="ml-2 text-muted-foreground">
+ {
+ keyboardShortcutsForOS[
+ KeyboardShortcutAction.REDO
+ ].keyCombinationLabel
+ }
+ </span>
+ </TooltipContent>
</Tooltip>
</CardContent>
</Card>