Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

feat(editor): Change selection to be default canvas behaviour (no-changelog) #10668

Merged
merged 2 commits into from
Sep 4, 2024
Merged

feat(editor): Change selection to be default canvas behaviour (no-changelog) #10668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77bd269
feat: change selection to be default canvas behaviour
alexgrozav Sep 4, 2024
90a8516
feat: extract keycode to variables
alexgrozav Sep 4, 2024
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
51 changes: 39 additions & 12 deletions packages/editor-ui/src/components/canvas/Canvas.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import type { PinDataSource } from '@/composables/usePinnedData';
import { isPresent } from '@/utils/typesUtils';
import { GRID_SIZE } from '@/utils/nodeViewUtils';
import { CanvasKey } from '@/constants';
import { onKeyDown, onKeyUp } from '@vueuse/core';

const $style = useCssModule();

Expand Down Expand Up @@ -107,12 +108,31 @@ const {
findNode,
} = useVueFlow({ id: props.id, deleteKeyCode: null });

const isPaneReady = ref(false);

const classes = computed(() => ({
[$style.canvas]: true,
[$style.ready]: isPaneReady.value,
[$style.draggable]: isPanningEnabled.value,
}));

/**
* Key bindings
*/

const disableKeyBindings = computed(() => !props.keyBindings);

const panningKeyCode = 'Shift';
const isPanningEnabled = ref(false);

onKeyDown(panningKeyCode, () => {
isPanningEnabled.value = true;
});

onKeyUp(panningKeyCode, () => {
isPanningEnabled.value = false;
});

useKeybindings(
{
ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
Expand All @@ -138,20 +158,15 @@ useKeybindings(
{ disabled: disableKeyBindings },
);

const contextMenu = useContextMenu();
/**
* Nodes
*/

const selectionKeyCode = computed(() => (isPanningEnabled.value ? null : true));
const lastSelectedNode = computed(() => selectedNodes.value[selectedNodes.value.length - 1]);

const hasSelection = computed(() => selectedNodes.value.length > 0);

const selectedNodeIds = computed(() => selectedNodes.value.map((node) => node.id));

const paneReady = ref(false);

/**
* Nodes
*/

function onClickNodeAdd(id: string, handle: string) {
emit('click:node:add', id, handle);
}
Expand Down Expand Up @@ -343,6 +358,8 @@ function setReadonly(value: boolean) {
* Context menu
*/

const contextMenu = useContextMenu();

function onOpenContextMenu(event: MouseEvent) {
contextMenu.open(event, {
source: 'canvas',
Expand Down Expand Up @@ -417,7 +434,7 @@ onUnmounted(() => {

onPaneReady(async () => {
await onFitView();
paneReady.value = true;
isPaneReady.value = true;
});

watch(() => props.readOnly, setReadonly, {
Expand All @@ -444,7 +461,9 @@ provide(CanvasKey, {
:snap-grid="[GRID_SIZE, GRID_SIZE]"
:min-zoom="0.2"
:max-zoom="4"
:class="[$style.canvas, { [$style.visible]: paneReady }]"
:class="classes"
:selection-key-code="selectionKeyCode"
:pan-activation-key-code="panningKeyCode"
data-test-id="canvas"
@edge-mouse-enter="onMouseEnterEdge"
@edge-mouse-leave="onMouseLeaveEdge"
Expand Down Expand Up @@ -524,8 +543,16 @@ provide(CanvasKey, {
.canvas {
opacity: 0;

&.visible {
&.ready {
opacity: 1;
}

&.draggable :global(.vue-flow__pane) {
cursor: grab;
}

:global(.vue-flow__pane.dragging) {
cursor: grabbing;
}
}
</style>
4 changes: 0 additions & 4 deletions packages/editor-ui/src/styles/plugins/_vueflow.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
&.draggable {
cursor: default;
}

&.dragging {
cursor: grabbing;
}
}

.vue-flow__node {
Expand Down
Loading