feat: open keyboard shortcuts with ?
All checks were successful
Deploy to GitHub Pages / build_site (push) Successful in 2m4s
All checks were successful
Deploy to GitHub Pages / build_site (push) Successful in 2m4s
This commit is contained in:
@@ -1,16 +1,15 @@
|
|||||||
import { animate, lerp } from "$lib/helpers";
|
import { animate, lerp } from '$lib/helpers';
|
||||||
import type { createKeyMap } from "$lib/helpers/createKeyMap";
|
import type { createKeyMap } from '$lib/helpers/createKeyMap';
|
||||||
import FileSaver from "file-saver";
|
import { panelState } from '$lib/sidebar/PanelState.svelte';
|
||||||
import type { GraphManager } from "./graph-manager.svelte";
|
import FileSaver from 'file-saver';
|
||||||
import type { GraphState } from "./graph-state.svelte";
|
import type { GraphManager } from './graph-manager.svelte';
|
||||||
|
import type { GraphState } from './graph-state.svelte';
|
||||||
|
|
||||||
type Keymap = ReturnType<typeof createKeyMap>;
|
type Keymap = ReturnType<typeof createKeyMap>;
|
||||||
export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: GraphState) {
|
export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: GraphState) {
|
||||||
|
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "l",
|
key: 'l',
|
||||||
description: "Select linked nodes",
|
description: 'Select linked nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
const activeNode = graph.getNode(graphState.activeNodeId);
|
const activeNode = graph.getNode(graphState.activeNodeId);
|
||||||
if (activeNode) {
|
if (activeNode) {
|
||||||
@@ -20,56 +19,54 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
graphState.selectedNodes.add(node.id);
|
graphState.selectedNodes.add(node.id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "?",
|
key: '?',
|
||||||
description: "Toggle Help",
|
description: 'Toggle Help',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
// TODO: fix this
|
panelState.setActivePanel('shortcuts');
|
||||||
// showHelp = !showHelp;
|
}
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "c",
|
key: 'c',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Copy active nodes",
|
description: 'Copy active nodes',
|
||||||
callback: () => graphState.copyNodes(),
|
callback: () => graphState.copyNodes()
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "v",
|
key: 'v',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Paste nodes",
|
description: 'Paste nodes',
|
||||||
callback: () => graphState.pasteNodes(),
|
callback: () => graphState.pasteNodes()
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "Escape",
|
key: 'Escape',
|
||||||
description: "Deselect nodes",
|
description: 'Deselect nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
graphState.activeNodeId = -1;
|
graphState.activeNodeId = -1;
|
||||||
graphState.clearSelection();
|
graphState.clearSelection();
|
||||||
graphState.edgeEndPosition = null;
|
graphState.edgeEndPosition = null;
|
||||||
(document.activeElement as HTMLElement)?.blur();
|
(document.activeElement as HTMLElement)?.blur();
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "A",
|
key: 'A',
|
||||||
shift: true,
|
shift: true,
|
||||||
description: "Add new Node",
|
description: 'Add new Node',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
graphState.addMenuPosition = [graphState.mousePosition[0], graphState.mousePosition[1]];
|
graphState.addMenuPosition = [graphState.mousePosition[0], graphState.mousePosition[1]];
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: ".",
|
key: '.',
|
||||||
description: "Center camera",
|
description: 'Center camera',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
|
|
||||||
@@ -90,67 +87,67 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
animate(500, (a: number) => {
|
animate(500, (a: number) => {
|
||||||
graphState.cameraPosition[0] = lerp(camX, average[0], ease(a));
|
graphState.cameraPosition[0] = lerp(camX, average[0], ease(a));
|
||||||
graphState.cameraPosition[1] = lerp(camY, average[1], ease(a));
|
graphState.cameraPosition[1] = lerp(camY, average[1], ease(a));
|
||||||
graphState.cameraPosition[2] = lerp(camZ, 2, ease(a))
|
graphState.cameraPosition[2] = lerp(camZ, 2, ease(a));
|
||||||
if (graphState.mouseDown) return false;
|
if (graphState.mouseDown) return false;
|
||||||
});
|
});
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "a",
|
key: 'a',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
preventDefault: true,
|
preventDefault: true,
|
||||||
description: "Select all nodes",
|
description: 'Select all nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
for (const node of graph.nodes.keys()) {
|
for (const node of graph.nodes.keys()) {
|
||||||
graphState.selectedNodes.add(node);
|
graphState.selectedNodes.add(node);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "z",
|
key: 'z',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Undo",
|
description: 'Undo',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
graph.undo();
|
graph.undo();
|
||||||
for (const node of graph.nodes.values()) {
|
for (const node of graph.nodes.values()) {
|
||||||
graphState.updateNodePosition(node);
|
graphState.updateNodePosition(node);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "y",
|
key: 'y',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Redo",
|
description: 'Redo',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
graph.redo();
|
graph.redo();
|
||||||
for (const node of graph.nodes.values()) {
|
for (const node of graph.nodes.values()) {
|
||||||
graphState.updateNodePosition(node);
|
graphState.updateNodePosition(node);
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "s",
|
key: 's',
|
||||||
ctrl: true,
|
ctrl: true,
|
||||||
description: "Save",
|
description: 'Save',
|
||||||
preventDefault: true,
|
preventDefault: true,
|
||||||
callback: () => {
|
callback: () => {
|
||||||
const state = graph.serialize();
|
const state = graph.serialize();
|
||||||
const blob = new Blob([JSON.stringify(state)], {
|
const blob = new Blob([JSON.stringify(state)], {
|
||||||
type: "application/json;charset=utf-8",
|
type: 'application/json;charset=utf-8'
|
||||||
});
|
});
|
||||||
FileSaver.saveAs(blob, "nodarium-graph.json");
|
FileSaver.saveAs(blob, 'nodarium-graph.json');
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: ["Delete", "Backspace", "x"],
|
key: ['Delete', 'Backspace', 'x'],
|
||||||
description: "Delete selected nodes",
|
description: 'Delete selected nodes',
|
||||||
callback: (event) => {
|
callback: (event) => {
|
||||||
if (!graphState.isBodyFocused()) return;
|
if (!graphState.isBodyFocused()) return;
|
||||||
graph.startUndoGroup();
|
graph.startUndoGroup();
|
||||||
@@ -171,20 +168,18 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
graphState.clearSelection();
|
graphState.clearSelection();
|
||||||
}
|
}
|
||||||
graph.saveUndoGroup();
|
graph.saveUndoGroup();
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: "f",
|
key: 'f',
|
||||||
description: "Smart Connect Nodes",
|
description: 'Smart Connect Nodes',
|
||||||
callback: () => {
|
callback: () => {
|
||||||
const nodes = [...graphState.selectedNodes.values()]
|
const nodes = [...graphState.selectedNodes.values()]
|
||||||
.map((g) => graph.getNode(g))
|
.map((g) => graph.getNode(g))
|
||||||
.filter((n) => !!n);
|
.filter((n) => !!n);
|
||||||
const edge = graph.smartConnect(nodes[0], nodes[1]);
|
const edge = graph.smartConnect(nodes[0], nodes[1]);
|
||||||
if (!edge) graph.smartConnect(nodes[1], nodes[0]);
|
if (!edge) graph.smartConnect(nodes[1], nodes[0]);
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { getContext, type Snippet } from "svelte";
|
import { type Snippet } from "svelte";
|
||||||
import type { PanelState } from "./PanelState.svelte";
|
import { panelState } from "./PanelState.svelte";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
id,
|
id,
|
||||||
@@ -18,8 +18,6 @@
|
|||||||
children?: Snippet;
|
children?: Snippet;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const panelState = getContext<PanelState>("panel-state");
|
|
||||||
|
|
||||||
const panel = panelState.registerPanel(id, icon, classes, hidden);
|
const panel = panelState.registerPanel(id, icon, classes, hidden);
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
panel.hidden = hidden;
|
panel.hidden = hidden;
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
import { localState } from "$lib/helpers/localState.svelte";
|
import { localState } from '$lib/helpers/localState.svelte';
|
||||||
|
|
||||||
type Panel = {
|
type Panel = {
|
||||||
icon: string;
|
icon: string;
|
||||||
classes: string;
|
classes: string;
|
||||||
hidden?: boolean;
|
hidden?: boolean;
|
||||||
}
|
};
|
||||||
|
|
||||||
export class PanelState {
|
|
||||||
|
|
||||||
|
class PanelState {
|
||||||
panels = $state<Record<string, Panel>>({});
|
panels = $state<Record<string, Panel>>({});
|
||||||
activePanel = localState<string | boolean>("node.activePanel", "")
|
activePanel = localState<string | boolean>('node.activePanel', '');
|
||||||
|
|
||||||
get keys() {
|
get keys() {
|
||||||
return Object.keys(this.panels);
|
return Object.keys(this.panels);
|
||||||
@@ -19,7 +18,7 @@ export class PanelState {
|
|||||||
const state = $state({
|
const state = $state({
|
||||||
icon: icon,
|
icon: icon,
|
||||||
classes: classes,
|
classes: classes,
|
||||||
hidden: hidden,
|
hidden: hidden
|
||||||
});
|
});
|
||||||
this.panels[id] = state;
|
this.panels[id] = state;
|
||||||
return state;
|
return state;
|
||||||
@@ -29,7 +28,13 @@ export class PanelState {
|
|||||||
if (this.activePanel.value) {
|
if (this.activePanel.value) {
|
||||||
this.activePanel.value = false;
|
this.activePanel.value = false;
|
||||||
} else {
|
} else {
|
||||||
this.activePanel.value = this.keys[0]
|
this.activePanel.value = this.keys[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public setActivePanel(panelId: string) {
|
||||||
|
this.activePanel.value = panelId;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const panelState = new PanelState();
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { setContext, type Snippet } from "svelte";
|
import { type Snippet } from "svelte";
|
||||||
import { PanelState } from "./PanelState.svelte";
|
import { panelState as state } from "./PanelState.svelte";
|
||||||
|
|
||||||
const state = new PanelState();
|
|
||||||
setContext("panel-state", state);
|
|
||||||
|
|
||||||
const { children } = $props<{ children?: Snippet }>();
|
const { children } = $props<{ children?: Snippet }>();
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user