Skip to content

Commit

Permalink
Bugfix: Starting node shifted
Browse files Browse the repository at this point in the history
  • Loading branch information
WunderJacob committed Jan 4, 2024
1 parent e5e12eb commit 58d91c3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion vue3/components/flowchart/Controls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ watch(() => store.state.learninggoal[0], (newValue, oldValue) => {
setNodes([])
setEdges([])
}
setStartingNode(removeNodes, nextTick, addNodes, nodes.value)
setStartingNode(removeNodes, nextTick, addNodes, nodes.value, 800)
});


Expand Down
9 changes: 4 additions & 5 deletions vue3/components/flowchart/LearningPath.vue
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,6 @@ function onDrop(event) {
}
addNodes([newNode])

if(intersectedNode.value.closestnode.id == 'starting_node'){
setStartingNode(removeNodes, nextTick, addNodes, nodes.value)
}

// align node position after drop, so it's centered to the mouse
nextTick(() => {
const node = findNode(newNode.id)
Expand Down Expand Up @@ -273,6 +269,9 @@ function onDrop(event) {
store.state.learninggoal[0].json = {
tree: tree,
}
if(intersectedNode.value.closestnode.id == 'starting_node'){
setStartingNode(removeNodes, nextTick, addNodes, nodes.value, 600)
}
} else{
notify({
title: 'Node drop refused',
Expand All @@ -296,7 +295,7 @@ watch(
() => nodes.value.length,
(newNodes, oldNodes) => {
if(oldNodes > newNodes){
setStartingNode(removeNodes, nextTick, addNodes, nodes.value, true)
setStartingNode(removeNodes, nextTick, addNodes, nodes.value, 600, true)
}
},
);
Expand Down
5 changes: 3 additions & 2 deletions vue3/composables/setStartingNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let startingNode = {
parentCourse: '',
}

const setStartingNode = (removeNodes, nextTick, addNodes, nodes, backwards = false) => {
const setStartingNode = (removeNodes, nextTick, addNodes, nodes, skip, backwards = false) => {
removeNodes(['starting_node'])
nextTick(() => {
let rightStartingNode = 0
Expand All @@ -25,6 +25,7 @@ const setStartingNode = (removeNodes, nextTick, addNodes, nodes, backwards = fa
nodes.forEach((node) => {
if(node.parentCourse == 'starting_node' &&
node.position.x >= rightStartingNode){
console.log(node.position.x)
rightStartingNode = node.position.x
if(backwards){
rightStartingNode += node.dimensions.width/2
Expand All @@ -33,7 +34,7 @@ const setStartingNode = (removeNodes, nextTick, addNodes, nodes, backwards = fa
}
})
if(shifted) {
startingNode.position.x = rightStartingNode + 600
startingNode.position.x = rightStartingNode + skip
}
addNodes([startingNode])
})
Expand Down

0 comments on commit 58d91c3

Please sign in to comment.