mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-19 22:37:31 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat(editor): Show minimap only while panning, zooming or while minimap is hovered (no-changelog) (#10677)
Some checks are pending
Test Master / install-and-build (push) Waiting to run
Details
Test Master / Unit tests (18.x) (push) Blocked by required conditions
Details
Test Master / Unit tests (20.x) (push) Blocked by required conditions
Details
Test Master / Unit tests (22.4) (push) Blocked by required conditions
Details
Test Master / Lint (push) Blocked by required conditions
Details
Test Master / Notify Slack on failure (push) Blocked by required conditions
Details
Benchmark Docker Image CI / build (push) Waiting to run
Details

Browse source
This commit is contained in:
Alex Grozav 2024-09-05 15:41:33 +03:00 committed by GitHub
parent c5bc8e6eb9
commit 3ea114129b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 152 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
packages/editor-ui/src/components/canvas/Canvas.spec.ts
View file

@ -28,6 +28,7 @@ beforeEach(() => {
afterEach(() => {
vi.clearAllMocks();
vi.useRealTimers();
});
describe('Canvas', () => {
@ -36,8 +37,8 @@ describe('Canvas', () => {
expect(getByTestId('canvas')).toBeVisible();
expect(getByTestId('canvas-background')).toBeVisible();
expect(getByTestId('canvas-minimap')).toBeVisible();
expect(getByTestId('canvas-controls')).toBeVisible();
expect(getByTestId('canvas-minimap')).toBeInTheDocument();
});
it('should render nodes and edges', async () => {
@ -142,4 +143,79 @@ describe('Canvas', () => {
],
]);
});
describe('minimap', () => {
const minimapVisibilityDelay = 1000;
const minimapTransitionDuration = 300;
it('should show minimap for 1sec after panning', async () => {
vi.useFakeTimers();
const nodes = [createCanvasNodeElement()];
const { getByTestId, container } = renderComponent({
props: {
nodes,
},
});
await waitFor(() => expect(container.querySelectorAll('.vue-flow__node')).toHaveLength(1));
const canvas = getByTestId('canvas');
const pane = canvas.querySelector('.vue-flow__pane');
if (!pane) throw new Error('VueFlow pane not found');
await fireEvent.keyDown(pane, { view: window, key: 'Shift' });
await fireEvent.mouseDown(pane, { view: window });
await fireEvent.mouseMove(pane, {
view: window,
clientX: 100,
clientY: 100,
});
await fireEvent.mouseUp(pane, { view: window });
await fireEvent.keyUp(pane, { view: window, key: 'Shift' });
vi.advanceTimersByTime(minimapTransitionDuration);
await waitFor(() => expect(getByTestId('canvas-minimap')).toBeVisible());
vi.advanceTimersByTime(minimapVisibilityDelay + minimapTransitionDuration);
await waitFor(() => expect(getByTestId('canvas-minimap')).not.toBeVisible());
});
it('should keep minimap visible when hovered', async () => {
vi.useFakeTimers();
const nodes = [createCanvasNodeElement()];
const { getByTestId, container } = renderComponent({
props: {
nodes,
},
});
await waitFor(() => expect(container.querySelectorAll('.vue-flow__node')).toHaveLength(1));
const canvas = getByTestId('canvas');
const pane = canvas.querySelector('.vue-flow__pane');
if (!pane) throw new Error('VueFlow pane not found');
await fireEvent.keyDown(pane, { view: window, key: 'Shift' });
await fireEvent.mouseDown(pane, { view: window });
await fireEvent.mouseMove(pane, {
view: window,
clientX: 100,
clientY: 100,
});
await fireEvent.mouseUp(pane, { view: window });
await fireEvent.keyUp(pane, { view: window, key: 'Shift' });
vi.advanceTimersByTime(minimapTransitionDuration);
await waitFor(() => expect(getByTestId('canvas-minimap')).toBeVisible());
await fireEvent.mouseEnter(getByTestId('canvas-minimap'));
vi.advanceTimersByTime(minimapVisibilityDelay + minimapTransitionDuration);
await waitFor(() => expect(getByTestId('canvas-minimap')).toBeVisible());
await fireEvent.mouseLeave(getByTestId('canvas-minimap'));
vi.advanceTimersByTime(minimapVisibilityDelay + minimapTransitionDuration);
await waitFor(() => expect(getByTestId('canvas-minimap')).not.toBeVisible());
});
});
});

63
packages/editor-ui/src/components/canvas/Canvas.vue
View file

@ -309,6 +309,7 @@ function emitWithLastSelectedNode(emitFn: (id: string) => void) {
const defaultZoom = 1;
const zoom = ref(defaultZoom);
const isPaneMoving = ref(false);
function getProjectedPosition(event?: MouseEvent) {
const bounds = viewportRef.value?.getBoundingClientRect() ?? { left: 0, top: 0 };
@ -354,6 +355,14 @@ function setReadonly(value: boolean) {
elementsSelectable.value = true;
}
function onPaneMoveStart() {
isPaneMoving.value = true;
}
function onPaneMoveEnd() {
isPaneMoving.value = false;
}
/**
* Context menu
*/
@ -414,10 +423,45 @@ function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
* Minimap
*/
const minimapVisibilityDelay = 1000;
const minimapHideTimeout = ref<NodeJS.Timeout | null>(null);
const isMinimapVisible = ref(false);
function minimapNodeClassnameFn(node: CanvasNode) {
return `minimap-node-${node.data?.render.type.replace(/\./g, '-') ?? 'default'}`;
}
watch(isPaneMoving, (value) => {
if (value) {
showMinimap();
} else {
hideMinimap();
}
});
function showMinimap() {
if (minimapHideTimeout.value) {
clearTimeout(minimapHideTimeout.value);
minimapHideTimeout.value = null;
}
isMinimapVisible.value = true;
}
function hideMinimap() {
minimapHideTimeout.value = setTimeout(() => {
isMinimapVisible.value = false;
}, minimapVisibilityDelay);
}
function onMinimapMouseEnter() {
showMinimap();
}
function onMinimapMouseLeave() {
hideMinimap();
}
/**
* Lifecycle
*/
@ -474,6 +518,8 @@ provide(CanvasKey, {
@contextmenu="onOpenContextMenu"
@viewport-change="onViewportChange"
@nodes-change="onNodesChange"
@move-start="onPaneMoveStart"
@move-end="onPaneMoveEnd"
>
<template #node-canvas-node="canvasNodeProps">
<Node
@ -508,7 +554,9 @@ provide(CanvasKey, {
<Background data-test-id="canvas-background" pattern-color="#aaa" :gap="GRID_SIZE" />
<Transition name="minimap">
<MiniMap
v-show="isMinimapVisible"
data-test-id="canvas-minimap"
aria-label="n8n Minimap"
:height="120"
@ -519,7 +567,10 @@ provide(CanvasKey, {
:node-class-name="minimapNodeClassnameFn"
mask-color="var(--color-background-base)"
:node-border-radius="16"
@mouseenter="onMinimapMouseEnter"
@mouseleave="onMinimapMouseLeave"
/>
</Transition>
<CanvasControlButtons
data-test-id="canvas-controls"
@ -556,3 +607,15 @@ provide(CanvasKey, {
}
}
</style>
<style lang="scss" scoped>
.minimap-enter-active,
.minimap-leave-active {
transition: opacity 0.3s ease;
}
.minimap-enter-from,
.minimap-leave-to {
opacity: 0;
}
</style>