From c8d701d3b41428808d33120d79c73e1001d5766b Mon Sep 17 00:00:00 2001 From: Braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Sun, 12 Dec 2021 00:00:18 +0100 Subject: [PATCH] update(pane): remove slots * remove ref and set store state directly Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com> --- src/container/SelectionPane/SelectionPane.vue | 53 +++++++------------ 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/src/container/SelectionPane/SelectionPane.vue b/src/container/SelectionPane/SelectionPane.vue index ec6d8d75..a10c88f8 100644 --- a/src/container/SelectionPane/SelectionPane.vue +++ b/src/container/SelectionPane/SelectionPane.vue @@ -4,15 +4,12 @@ import { useStore, useKeyPress } from '../../composables' import { getConnectedEdges } from '../../utils' import NodesSelection from '../../components/NodesSelection/NodesSelection.vue' import UserSelection from '../../components/UserSelection/UserSelection.vue' -import NodeRenderer from '../NodeRenderer/NodeRenderer.vue' -import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue' const store = useStore() -const userSelection = ref(false) const onClick = (event: MouseEvent) => { store.hooks.paneClick.trigger(event) - store.unsetNodesSelection() + store.nodesSelectionActive = false store.resetSelectedElements() } @@ -22,15 +19,15 @@ const onWheel = (event: WheelEvent) => store.hooks.paneScroll.trigger(event) onMounted(() => { useKeyPress(store.deleteKeyCode, (keyPressed) => { - if (keyPressed && store.selectedElements) { - const connectedEdges = getConnectedEdges(store.getSelectedNodes, store.getEdges) - const elementsToRemove = [...store.selectedElements, ...connectedEdges].reduce( + if (keyPressed && (store.selectedNodes || store.selectedEdges)) { + const connectedEdges = (store.selectedNodes && getConnectedEdges(store.selectedNodes, store.getEdges)) ?? [] + const elementsToRemove = [...(store.selectedNodes ?? []), ...(store.selectedEdges ?? []), ...connectedEdges].reduce( (res, item) => res.set(item.id, item), new Map(), ) store.hooks.elementsRemove.trigger(Array.from(elementsToRemove.values())) - store.unsetNodesSelection() + store.nodesSelectionActive = false store.resetSelectedElements() } }) @@ -40,7 +37,8 @@ onMounted(() => { }) useKeyPress(store.selectionKeyCode, (keyPressed) => { - userSelection.value = keyPressed && (store.selectionActive || store.elementsSelectable) + store.selectionActive = + store.selectionActive === true && keyPressed ? true : keyPressed && (store.selectionActive || store.elementsSelectable) }) }) @@ -51,28 +49,17 @@ export default { }