Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(editor): Prevent connection line from showing when clicking the plus button of a node #12265

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { setActivePinia } from 'pinia';
import type { ConnectionLineProps } from '@vue-flow/core';
import { Position } from '@vue-flow/core';
import { createCanvasProvide } from '@/__tests__/data';
import { waitFor } from '@testing-library/vue';

const DEFAULT_PROPS = {
sourceX: 0,
Expand Down Expand Up @@ -63,4 +64,19 @@ describe('CanvasConnectionLine', () => {
'M-50 130L-90 130L -124,130Q -140,130 -140,114L -140,-84Q -140,-100 -124,-100L-100 -100',
);
});

it('should show the connection line after a short delay', async () => {
vi.useFakeTimers();
const { container } = renderComponent({
props: DEFAULT_PROPS,
});

const edge = container.querySelector('.vue-flow__edge-path');

expect(edge).not.toHaveClass('visible');

vi.advanceTimersByTime(300);

await waitFor(() => expect(edge).toHaveClass('visible'));
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint-disable vue/no-multiple-template-root */
import type { ConnectionLineProps } from '@vue-flow/core';
import { BaseEdge } from '@vue-flow/core';
import { computed, useCssModule } from 'vue';
import { computed, onMounted, ref, useCssModule } from 'vue';
import { getEdgeRenderData } from './utils';
import { useCanvas } from '@/composables/useCanvas';
import { NodeConnectionType } from 'n8n-workflow';
Expand All @@ -18,6 +18,13 @@ const connectionType = computed(
() => parseCanvasConnectionHandleString(connectingHandle.value?.handleId).type,
);

const classes = computed(() => {
return {
[$style.edge]: true,
[$style.visible]: isVisible.value,
};
});

const edgeColor = computed(() => {
if (connectionType.value !== NodeConnectionType.Main) {
return 'var(--node-type-supplemental-color)';
Expand All @@ -37,13 +44,25 @@ const renderData = computed(() =>
);

const segments = computed(() => renderData.value.segments);

/**
* Used to delay the visibility of the connection line to prevent flickering
* when the actual user intent is to click the plus button
*/
const isVisible = ref(false);

onMounted(() => {
setTimeout(() => {
isVisible.value = true;
}, 300);
});
</script>

<template>
<BaseEdge
v-for="segment in segments"
:key="segment[0]"
:class="$style.edge"
:class="classes"
:style="edgeStyle"
:path="segment[0]"
:marker-end="markerEnd"
Expand All @@ -52,6 +71,13 @@ const segments = computed(() => renderData.value.segments);

<style lang="scss" module>
.edge {
transition: stroke 0.3s ease;
transition-property: stroke, opacity;
transition-duration: 300ms;
transition-timing-function: ease;
opacity: 0;

&.visible {
opacity: 1;
}
}
</style>
Loading