Skip to content

Commit 259514a

Browse files
committed
refactor(core): cast zIndex to ref
1 parent cc9f4fb commit 259514a

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

packages/core/src/components/Nodes/NodeWrapper.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { computed, defineComponent, h, nextTick, onBeforeUnmount, onMounted, provide, ref, watch } from 'vue'
2-
import { until, useVModel } from '@vueuse/core'
2+
import { toRef, until, useVModel } from '@vueuse/core'
33
import {
44
ARIA_NODE_DESC_KEY,
55
arrowKeyDiffs,
@@ -105,7 +105,7 @@ const NodeWrapper = defineComponent({
105105
return styles
106106
})
107107

108-
const zIndex = () => Number(node.value.zIndex ?? getStyle.value.zIndex ?? 0)
108+
const zIndex = toRef(() => Number(node.value.zIndex ?? getStyle.value.zIndex ?? 0))
109109

110110
onUpdateNodeInternals((updateIds) => {
111111
if (updateIds.includes(props.id)) {
@@ -135,7 +135,7 @@ const NodeWrapper = defineComponent({
135135
() => parentNode.value?.computedPosition.x,
136136
() => parentNode.value?.computedPosition.y,
137137
() => parentNode.value?.computedPosition.z,
138-
() => zIndex(),
138+
zIndex,
139139
() => node.value.selected,
140140
() => node.value.dimensions.height,
141141
() => node.value.dimensions.width,
@@ -200,7 +200,7 @@ const NodeWrapper = defineComponent({
200200
],
201201
'style': {
202202
visibility: node.value.initialized ? 'visible' : 'hidden',
203-
zIndex: node.value.computedPosition.z ?? zIndex(),
203+
zIndex: node.value.computedPosition.z ?? zIndex.value,
204204
transform: `translate(${node.value.computedPosition.x}px,${node.value.computedPosition.y}px)`,
205205
pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
206206
...getStyle.value,
@@ -223,16 +223,17 @@ const NodeWrapper = defineComponent({
223223
type: node.value.type,
224224
data: node.value.data,
225225
events: { ...node.value.events, ...on },
226-
selected: !!node.value.selected,
227-
resizing: !!node.value.resizing,
226+
selected: node.value.selected,
227+
resizing: node.value.resizing,
228228
dragging: dragging.value,
229229
connectable: props.connectable,
230-
position: node.value.position,
230+
position: node.value.computedPosition,
231231
dimensions: node.value.dimensions,
232232
isValidTargetPos: node.value.isValidTargetPos,
233233
isValidSourcePos: node.value.isValidSourcePos,
234234
parent: node.value.parentNode,
235-
zIndex: node.value.computedPosition.z,
235+
parentNodeId: node.value.parentNode,
236+
zIndex: node.value.computedPosition.z ?? zIndex.value,
236237
targetPosition: node.value.targetPosition,
237238
sourcePosition: node.value.sourcePosition,
238239
label: node.value.label,

0 commit comments

Comments
 (0)