feat(core): allow setting padding for extent parent

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
braks
2023-01-04 12:50:23 +01:00
committed by Braks
parent c0d901899c
commit de71b5af65
2 changed files with 62 additions and 18 deletions

View File

@@ -4,6 +4,12 @@ import type { DefaultNodeTypes, NodeComponent } from './components'
import type { HandleConnectable, HandleElement, ValidConnectionFunc } from './handle'
import type { CustomEvent, NodeEventsHandler, NodeEventsOn } from './hooks'
export interface ExtendedParentExtent {
range: 'parent'
/** Values are top, right, bottom, left, you can use these the same as CSS padding */
padding: [number] | [number, number] | [number, number, number] | [number, number, number, number]
}
/** Defined as [[x-from, y-from], [x-to, y-to]] **/
export type CoordinateExtent = [[number, number], [number, number]]
@@ -41,7 +47,7 @@ export interface Node<Data = ElementData, CustomEvents extends Record<string, Cu
/** called when used as source for new connection */
isValidSourcePos?: ValidConnectionFunc
/** define node extent, i.e. area in which node can be moved */
extent?: 'parent' | CoordinateExtent
extent?: CoordinateExtent | ExtendedParentExtent | 'parent'
/** expands parent area to fit child node */
expandParent?: boolean
/** define node as a child node by setting a parent node id */

View File

@@ -1,6 +1,14 @@
import type { Ref } from 'vue'
import { isNumber } from '@vueuse/shared'
import type { ComputedGetters, CoordinateExtent, Getters, GraphNode, NodeDragItem, XYPosition } from '~/types'
import type {
ComputedGetters,
CoordinateExtent,
ExtendedParentExtent,
Getters,
GraphNode,
NodeDragItem,
XYPosition,
} from '~/types'
export function hasSelector(target: Element, selector: string, node: Ref<Element>): boolean {
let current = target
@@ -59,31 +67,61 @@ export function getEventHandlerParams({
return [id ? extendedDragItems.find((n) => n.id === id)! : extendedDragItems[0], extendedDragItems]
}
function getExtentPadding(padding: number[]) {
switch (padding.length) {
case 1:
return [padding[0], padding[0], padding[0], padding[0]]
case 2:
return [padding[0], padding[1], padding[0], padding[1]]
case 3:
return [padding[0], padding[1], padding[2], padding[1]]
default:
return padding || [0, 0, 0, 0]
}
}
function getParentExtent(
currentExtent: ExtendedParentExtent | 'parent',
node: GraphNode | NodeDragItem,
parent: GraphNode,
): CoordinateExtent | false {
const [top, right, bottom, left] = typeof currentExtent !== 'string' ? getExtentPadding(currentExtent.padding) : [0, 0, 0, 0]
if (
parent &&
isNumber(parent.computedPosition.x) &&
isNumber(parent.computedPosition.y) &&
isNumber(parent.dimensions.width) &&
isNumber(parent.dimensions.height)
) {
return [
[parent.computedPosition.x + left, parent.computedPosition.y + top],
[
parent.computedPosition.x + (parent.dimensions.width - node.dimensions.width) - right,
parent.computedPosition.y + (parent.dimensions.height - node.dimensions.height) - bottom,
],
]
}
return false
}
export function getExtent<T extends NodeDragItem | GraphNode>(item: T, extent?: CoordinateExtent, parent?: GraphNode) {
let currentExtent = item.extent || extent
if (item.extent === 'parent') {
if (item.extent === 'parent' || (!Array.isArray(item.extent) && item.extent?.range === 'parent')) {
if (item.parentNode && parent && item.dimensions.width && item.dimensions.height) {
currentExtent =
parent &&
isNumber(parent.computedPosition.x) &&
isNumber(parent.computedPosition.y) &&
isNumber(parent.dimensions.width) &&
isNumber(parent.dimensions.height)
? [
[parent.computedPosition.x, parent.computedPosition.y],
[
parent.computedPosition.x + parent.dimensions.width - item.dimensions.width,
parent.computedPosition.y + parent.dimensions.height - item.dimensions.height,
],
]
: currentExtent
const parentExtent = getParentExtent(item.extent, item, parent)
if (parentExtent) {
currentExtent = parentExtent
}
} else {
warn('Only child nodes can use a parent extent.')
currentExtent = extent
}
} else if (item.extent && parent) {
} else if (Array.isArray(item.extent) && item.extent && parent) {
const parentX = parent.computedPosition.x
const parentY = parent.computedPosition.y