@leafer-in/linker 2.3.1 → 2.3.3

package/dist/linker.cjs

@@ -21,7 +21,7 @@ class LinkerData extends draw.LineData {
     }
 }
 
-const {directionData: directionData} = draw.AroundHelper;
+const {directionData: directionData$1} = draw.AroundHelper;
 
 const directionNames = [ "top-left", "top", "top-right", "right", "bottom-right", "bottom", "bottom-left", "left", "center" ];
 
@@ -137,8 +137,8 @@ function getPointDirection(boxPoint, bounds, eight) {
     const {width: width, height: height} = bounds;
     const hitRadiusX = width / 4;
     const hitRadiusY = height / 4;
-    for (let i = 0; i < directionData.length; i++) {
-        const unit = directionData[i];
+    for (let i = 0; i < directionData$1.length; i++) {
+        const unit = directionData$1[i];
         const px = unit.x * width;
         const py = unit.y * height;
         const dx = boxPoint.x - px;
@@ -183,7 +183,386 @@ function linkerPointType(defaultValue) {
     }));
 }
 
-const {moveTo: moveTo, bezierCurveTo: bezierCurveTo, drawPoints: drawPoints$1} = draw.PathCommandDataHelper;
+const {directionData: directionData} = draw.AroundHelper;
+
+const {moveTo: moveTo$1, lineTo: lineTo$1} = draw.PathCommandDataHelper;
+
+const POLYLINE_X = 0, POLYLINE_Y = 1;
+
+const POLYLINE_EPSILON = .001;
+
+const POLYLINE_MIN_SEGMENT = 4;
+
+const POLYLINE_TURN_WEIGHT = 1.5;
+
+function getPolylineDirectionIndex(direction) {
+    switch (direction) {
+      case "top-left":
+        return 0;
+
+      case "top":
+        return 1;
+
+      case "top-right":
+        return 2;
+
+      case "right":
+        return 3;
+
+      case "bottom-right":
+        return 4;
+
+      case "bottom":
+        return 5;
+
+      case "bottom-left":
+        return 6;
+
+      case "left":
+        return 7;
+
+      default:
+        return 8;
+    }
+}
+
+function getPolylinePorts(direction, point, target, bounds, targetBounds, ports) {
+    const data = directionData[getPolylineDirectionIndex(direction)];
+    const dx = Math.sign(data.x - .5), dy = Math.sign(data.y - .5);
+    const cx = bounds ? bounds.x + bounds.width / 2 : point.x;
+    const cy = bounds ? bounds.y + bounds.height / 2 : point.y;
+    const tx = targetBounds ? targetBounds.x + targetBounds.width / 2 : target.x;
+    const ty = targetBounds ? targetBounds.y + targetBounds.height / 2 : target.y;
+    const deltaX = tx - cx, deltaY = ty - cy;
+    const xSign = dx || (deltaX >= 0 ? 1 : -1);
+    const ySign = dy || (deltaY >= 0 ? 1 : -1);
+    const xPort = POLYLINE_X * 2 + (xSign > 0 ? 1 : 0);
+    const yPort = POLYLINE_Y * 2 + (ySign > 0 ? 1 : 0);
+    if (dx && !dy) {
+        ports[0] = xPort;
+        return 1;
+    }
+    if (dy && !dx) {
+        ports[0] = yPort;
+        return 1;
+    }
+    if (Math.abs(deltaX) >= Math.abs(deltaY)) {
+        ports[0] = xPort;
+        ports[1] = yPort;
+    } else {
+        ports[0] = yPort;
+        ports[1] = xPort;
+    }
+    return 2;
+}
+
+function getPolylineExit(point, bounds, port, clearance, result) {
+    const axis = port >> 1, sign = port & 1 ? 1 : -1;
+    if (axis === POLYLINE_X) {
+        const boundary = bounds ? sign > 0 ? bounds.x + bounds.width : bounds.x : point.x;
+        result[0] = boundary + sign * clearance;
+        result[1] = point.y;
+    } else {
+        const boundary = bounds ? sign > 0 ? bounds.y + bounds.height : bounds.y : point.y;
+        result[0] = point.x;
+        result[1] = boundary + sign * clearance;
+    }
+}
+
+function isPolylinePointBlocked(x, y, bounds, clearance) {
+    if (!bounds) return false;
+    const left = bounds.x - clearance, right = bounds.x + bounds.width + clearance;
+    const top = bounds.y - clearance, bottom = bounds.y + bounds.height + clearance;
+    return x > left + POLYLINE_EPSILON && x < right - POLYLINE_EPSILON && y > top + POLYLINE_EPSILON && y < bottom - POLYLINE_EPSILON;
+}
+
+function isPolylineSegmentBlocked(x1, y1, x2, y2, bounds, clearance) {
+    if (!bounds) return false;
+    const left = bounds.x - clearance, right = bounds.x + bounds.width + clearance;
+    const top = bounds.y - clearance, bottom = bounds.y + bounds.height + clearance;
+    if (Math.abs(y1 - y2) <= POLYLINE_EPSILON) {
+        return y1 > top + POLYLINE_EPSILON && y1 < bottom - POLYLINE_EPSILON && Math.max(Math.min(x1, x2), left + POLYLINE_EPSILON) < Math.min(Math.max(x1, x2), right - POLYLINE_EPSILON);
+    }
+    if (Math.abs(x1 - x2) <= POLYLINE_EPSILON) {
+        return x1 > left + POLYLINE_EPSILON && x1 < right - POLYLINE_EPSILON && Math.max(Math.min(y1, y2), top + POLYLINE_EPSILON) < Math.min(Math.max(y1, y2), bottom - POLYLINE_EPSILON);
+    }
+    return true;
+}
+
+function addPolylineBoundsCoordinates(xs, ys, bounds, clearance, margin) {
+    if (!bounds) return;
+    const left = bounds.x - clearance, right = bounds.x + bounds.width + clearance;
+    const top = bounds.y - clearance, bottom = bounds.y + bounds.height + clearance;
+    xs.push(left, right, left - margin, right + margin);
+    ys.push(top, bottom, top - margin, bottom + margin);
+}
+
+function sortPolylineCoordinates(values) {
+    values.sort((a, b) => a - b);
+    let write = 0;
+    for (let i = 0; i < values.length; i++) {
+        if (!write || Math.abs(values[i] - values[write - 1]) > POLYLINE_EPSILON) values[write++] = values[i];
+    }
+    values.length = write;
+}
+
+function getPolylineCoordinateIndex(values, value) {
+    for (let i = 0; i < values.length; i++) {
+        if (Math.abs(values[i] - value) <= POLYLINE_EPSILON) return i;
+    }
+    return -1;
+}
+
+function getPolylineMidpointAxis(startPort, endPort, sx, sy, ex, ey) {
+    const startAxis = startPort >> 1, endAxis = endPort >> 1;
+    const startSign = startPort & 1 ? 1 : -1, endSign = endPort & 1 ? 1 : -1;
+    if (startAxis === endAxis && startSign === -endSign) return startAxis;
+    return Math.abs(ex - sx) >= Math.abs(ey - sy) ? POLYLINE_X : POLYLINE_Y;
+}
+
+function getPolylineMidpointRoute(result, startPoint, endPoint, sx, sy, ex, ey, midpointAxis, startBounds, endBounds, clearance) {
+    const midpointX = (sx + ex) / 2, midpointY = (sy + ey) / 2;
+    result.length = 0;
+    result.push(startPoint.x, startPoint.y, sx, sy);
+    if (midpointAxis === POLYLINE_X) {
+        result.push(midpointX, sy, midpointX, ey);
+    } else {
+        result.push(sx, midpointY, ex, midpointY);
+    }
+    result.push(ex, ey, endPoint.x, endPoint.y);
+    for (let i = 4; i < result.length - 2; i += 2) {
+        const x1 = result[i - 2], y1 = result[i - 1];
+        const x2 = result[i], y2 = result[i + 1];
+        if (isPolylineSegmentBlocked(x1, y1, x2, y2, startBounds, clearance) || isPolylineSegmentBlocked(x1, y1, x2, y2, endBounds, clearance)) return Infinity;
+    }
+    return getPolylineScore(result, clearance);
+}
+
+function getPolylineRoute(result, startPoint, endPoint, startPort, endPort, startBounds, endBounds, clearance) {
+    const startExit = [], endExit = [];
+    getPolylineExit(startPoint, startBounds, startPort, clearance, startExit);
+    getPolylineExit(endPoint, endBounds, endPort, clearance, endExit);
+    const sx = startExit[0], sy = startExit[1], ex = endExit[0], ey = endExit[1];
+    const startAxis = startPort >> 1, endAxis = endPort >> 1;
+    const startSign = startPort & 1 ? 1 : -1, endSign = endPort & 1 ? 1 : -1;
+    const startStub = Math.abs(sx - startPoint.x) + Math.abs(sy - startPoint.y);
+    const endStub = Math.abs(ex - endPoint.x) + Math.abs(ey - endPoint.y);
+    if (isPolylineSegmentBlocked(startPoint.x, startPoint.y, sx, sy, endBounds, clearance) || isPolylineSegmentBlocked(endPoint.x, endPoint.y, ex, ey, startBounds, clearance)) return Infinity;
+    const midpointAxis = getPolylineMidpointAxis(startPort, endPort, sx, sy, ex, ey);
+    const midpointScore = getPolylineMidpointRoute(result, startPoint, endPoint, sx, sy, ex, ey, midpointAxis, startBounds, endBounds, clearance);
+    if (midpointScore < Infinity) return midpointScore;
+    const margin = Math.max(clearance, POLYLINE_MIN_SEGMENT) * 2;
+    const xs = [ sx, ex, (sx + ex) / 2 ], ys = [ sy, ey, (sy + ey) / 2 ];
+    addPolylineBoundsCoordinates(xs, ys, startBounds, clearance, margin);
+    addPolylineBoundsCoordinates(xs, ys, endBounds, clearance, margin);
+    let minX = Math.min(...xs), maxX = Math.max(...xs);
+    let minY = Math.min(...ys), maxY = Math.max(...ys);
+    xs.push(minX - margin * 2, maxX + margin * 2);
+    ys.push(minY - margin * 2, maxY + margin * 2);
+    sortPolylineCoordinates(xs);
+    sortPolylineCoordinates(ys);
+    const nx = xs.length, ny = ys.length;
+    const startXIndex = getPolylineCoordinateIndex(xs, sx), startYIndex = getPolylineCoordinateIndex(ys, sy);
+    const endXIndex = getPolylineCoordinateIndex(xs, ex), endYIndex = getPolylineCoordinateIndex(ys, ey);
+    if (startXIndex < 0 || startYIndex < 0 || endXIndex < 0 || endYIndex < 0) return Infinity;
+    const startNode = startYIndex * nx + startXIndex, endNode = endYIndex * nx + endXIndex;
+    const total = nx * ny * 3;
+    const distance = new Float64Array(total), previous = new Int32Array(total), visited = new Uint8Array(total);
+    distance.fill(Infinity);
+    previous.fill(-1);
+    const startState = startNode * 3;
+    distance[startState] = 0;
+    const turnCost = Math.max(POLYLINE_MIN_SEGMENT, clearance * POLYLINE_TURN_WEIGHT);
+    let currentState = -1, currentNode = -1, currentAxis = 0;
+    let currentX = 0, currentY = 0, currentDistance = 0;
+    const relax = (nextXIndex, nextYIndex, axis, sign) => {
+        const nextX = xs[nextXIndex], nextY = ys[nextYIndex];
+        const nextNode = nextYIndex * nx + nextXIndex;
+        if (isPolylinePointBlocked(nextX, nextY, startBounds, clearance) || isPolylinePointBlocked(nextX, nextY, endBounds, clearance)) return;
+        if (isPolylineSegmentBlocked(currentX, currentY, nextX, nextY, startBounds, clearance) || isPolylineSegmentBlocked(currentX, currentY, nextX, nextY, endBounds, clearance)) return;
+        if (currentState === startState) {
+            if (axis === startAxis + 1) {
+                if (sign !== startSign) return;
+            } else if (startStub <= POLYLINE_EPSILON) return;
+        }
+        if (nextNode === endNode) {
+            if (axis === endAxis + 1) {
+                if (sign !== -endSign) return;
+            } else if (endStub <= POLYLINE_EPSILON) return;
+        }
+        const nextState = nextNode * 3 + axis;
+        if (visited[nextState]) return;
+        const segmentLength = Math.abs(nextX - currentX) + Math.abs(nextY - currentY);
+        let cost = currentDistance + segmentLength;
+        if (currentAxis && currentAxis !== axis) {
+            cost += turnCost;
+            const turnCoordinate = currentAxis === POLYLINE_X + 1 ? currentX : currentY;
+            const preferredCoordinate = midpointAxis === POLYLINE_X ? (sx + ex) / 2 : (sy + ey) / 2;
+            if (Math.abs(turnCoordinate - preferredCoordinate) > POLYLINE_EPSILON) cost += turnCost * 2;
+        }
+        if (cost < distance[nextState]) {
+            distance[nextState] = cost;
+            previous[nextState] = currentState;
+        }
+    };
+    let bestState = -1;
+    for (let iteration = 0; iteration < total; iteration++) {
+        let minDistance = Infinity, state = -1;
+        for (let i = 0; i < total; i++) {
+            if (!visited[i] && distance[i] < minDistance) {
+                minDistance = distance[i];
+                state = i;
+            }
+        }
+        if (state < 0) break;
+        currentState = state;
+        currentNode = Math.floor(state / 3);
+        currentAxis = state % 3;
+        currentDistance = minDistance;
+        visited[state] = 1;
+        if (currentNode === endNode) {
+            bestState = state;
+            break;
+        }
+        const xIndex = currentNode % nx, yIndex = Math.floor(currentNode / nx);
+        currentX = xs[xIndex];
+        currentY = ys[yIndex];
+        if (xIndex > 0) relax(xIndex - 1, yIndex, POLYLINE_X + 1, -1);
+        if (xIndex < nx - 1) relax(xIndex + 1, yIndex, POLYLINE_X + 1, 1);
+        if (yIndex > 0) relax(xIndex, yIndex - 1, POLYLINE_Y + 1, -1);
+        if (yIndex < ny - 1) relax(xIndex, yIndex + 1, POLYLINE_Y + 1, 1);
+    }
+    if (bestState < 0) return Infinity;
+    const reverse = [];
+    let state = bestState;
+    while (state >= 0) {
+        const node = Math.floor(state / 3);
+        reverse.push(xs[node % nx], ys[Math.floor(node / nx)]);
+        if (state === startState) break;
+        state = previous[state];
+    }
+    if (state !== startState) return Infinity;
+    result.length = 0;
+    result.push(startPoint.x, startPoint.y, sx, sy);
+    for (let i = reverse.length - 4; i >= 0; i -= 2) result.push(reverse[i], reverse[i + 1]);
+    result.push(endPoint.x, endPoint.y);
+    return distance[bestState] + startStub + endStub;
+}
+
+function appendPolylinePoint(points, x, y) {
+    const length = points.length;
+    if (length >= 2 && Math.abs(points[length - 2] - x) <= POLYLINE_EPSILON && Math.abs(points[length - 1] - y) <= POLYLINE_EPSILON) return;
+    points.push(x, y);
+}
+
+function appendPolylineOrthogonal(points, x1, y1, x2, y2, firstAxis = POLYLINE_X) {
+    if (Math.abs(x1 - x2) > POLYLINE_EPSILON && Math.abs(y1 - y2) > POLYLINE_EPSILON) {
+        if (firstAxis === POLYLINE_X) {
+            const midX = (x1 + x2) / 2;
+            appendPolylinePoint(points, midX, y1);
+            appendPolylinePoint(points, midX, y2);
+        } else {
+            const midY = (y1 + y2) / 2;
+            appendPolylinePoint(points, x1, midY);
+            appendPolylinePoint(points, x2, midY);
+        }
+    }
+    appendPolylinePoint(points, x2, y2);
+}
+
+function getPolylineEditPath(result, startPoint, endPoint, startPort, endPort, startBounds, endBounds, points, clearance) {
+    if (points.length % 2) return Infinity;
+    for (let i = 0; i < points.length; i++) if (!Number.isFinite(points[i])) return Infinity;
+    const startExit = [], endExit = [];
+    getPolylineExit(startPoint, startBounds, startPort, clearance, startExit);
+    getPolylineExit(endPoint, endBounds, endPort, clearance, endExit);
+    const sx = startExit[0], sy = startExit[1], ex = endExit[0], ey = endExit[1];
+    if (isPolylineSegmentBlocked(startPoint.x, startPoint.y, sx, sy, endBounds, clearance) || isPolylineSegmentBlocked(endPoint.x, endPoint.y, ex, ey, startBounds, clearance)) return Infinity;
+    result.length = 0;
+    appendPolylinePoint(result, startPoint.x, startPoint.y);
+    appendPolylinePoint(result, sx, sy);
+    let x = sx, y = sy;
+    for (let i = 0; i < points.length; i += 2) {
+        const nx = points[i], ny = points[i + 1];
+        appendPolylineOrthogonal(result, x, y, nx, ny, i === 0 && clearance === 0 ? startPort >> 1 : POLYLINE_X);
+        x = nx;
+        y = ny;
+    }
+    const endAxis = endPort >> 1;
+    if (Math.abs(x - ex) > POLYLINE_EPSILON && Math.abs(y - ey) > POLYLINE_EPSILON) {
+        if (endAxis === POLYLINE_X) appendPolylinePoint(result, x, ey); else appendPolylinePoint(result, ex, y);
+    }
+    appendPolylinePoint(result, ex, ey);
+    appendPolylinePoint(result, endPoint.x, endPoint.y);
+    return getPolylineScore(result, clearance);
+}
+
+function getPolylineScore(points, clearance) {
+    let length = 0, turns = 0, previousAxis = -1;
+    for (let i = 2; i < points.length; i += 2) {
+        const dx = points[i] - points[i - 2], dy = points[i + 1] - points[i - 1];
+        if (Math.abs(dx) <= POLYLINE_EPSILON && Math.abs(dy) <= POLYLINE_EPSILON) continue;
+        const axis = Math.abs(dx) > POLYLINE_EPSILON ? POLYLINE_X : POLYLINE_Y;
+        length += Math.abs(dx) + Math.abs(dy);
+        if (previousAxis !== -1 && previousAxis !== axis) turns++;
+        previousAxis = axis;
+    }
+    return length + turns * Math.max(clearance, POLYLINE_MIN_SEGMENT) * POLYLINE_TURN_WEIGHT;
+}
+
+function simplifyPolyline(points) {
+    let write = 2;
+    for (let read = 2; read < points.length; read += 2) {
+        const x = points[read], y = points[read + 1];
+        const px = points[write - 2], py = points[write - 1];
+        if (Math.abs(x - px) <= POLYLINE_EPSILON && Math.abs(y - py) <= POLYLINE_EPSILON) continue;
+        if (write >= 4) {
+            const ax = points[write - 4], ay = points[write - 3];
+            const horizontal = Math.abs(ay - py) <= POLYLINE_EPSILON && Math.abs(py - y) <= POLYLINE_EPSILON && (px - ax) * (x - px) >= 0;
+            const vertical = Math.abs(ax - px) <= POLYLINE_EPSILON && Math.abs(px - x) <= POLYLINE_EPSILON && (py - ay) * (y - py) >= 0;
+            if (horizontal || vertical) {
+                points[write - 2] = x;
+                points[write - 1] = y;
+                continue;
+            }
+        }
+        points[write++] = x;
+        points[write++] = y;
+    }
+    points.length = write;
+}
+
+function drawPolyline(path, startPoint, endPoint, startDirection, endDirection, startBounds, endBounds, clearance = 8, points) {
+    if (!Number.isFinite(startPoint.x) || !Number.isFinite(startPoint.y) || !Number.isFinite(endPoint.x) || !Number.isFinite(endPoint.y)) return false;
+    if (startBounds && (!Number.isFinite(startBounds.x) || !Number.isFinite(startBounds.y) || !Number.isFinite(startBounds.width) || !Number.isFinite(startBounds.height) || startBounds.width < 0 || startBounds.height < 0)) return false;
+    if (endBounds && (!Number.isFinite(endBounds.x) || !Number.isFinite(endBounds.y) || !Number.isFinite(endBounds.width) || !Number.isFinite(endBounds.height) || endBounds.width < 0 || endBounds.height < 0)) return false;
+    clearance = Number.isFinite(clearance) ? Math.max(0, clearance) : 8;
+    const startPorts = [], endPorts = [];
+    const startCount = getPolylinePorts(startDirection, startPoint, endPoint, startBounds, endBounds, startPorts);
+    const endCount = getPolylinePorts(endDirection, endPoint, startPoint, endBounds, startBounds, endPorts);
+    const candidate = [], best = [];
+    let bestScore = Infinity;
+    for (let pass = 0; pass < 2 && bestScore === Infinity; pass++) {
+        const currentClearance = pass === 0 ? clearance : 0;
+        for (let i = 0; i < startCount; i++) {
+            for (let j = 0; j < endCount; j++) {
+                const score = points !== undefined ? getPolylineEditPath(candidate, startPoint, endPoint, startPorts[i], endPorts[j], startBounds, endBounds, points, currentClearance) : getPolylineRoute(candidate, startPoint, endPoint, startPorts[i], endPorts[j], startBounds, endBounds, currentClearance);
+                if (score < bestScore) {
+                    bestScore = score;
+                    best.length = 0;
+                    for (let k = 0; k < candidate.length; k++) best.push(candidate[k]);
+                }
+            }
+        }
+    }
+    if (!best.length) return false;
+    if (points === undefined) simplifyPolyline(best);
+    moveTo$1(path, best[0], best[1]);
+    for (let i = 2; i < best.length; i += 2) lineTo$1(path, best[i], best[i + 1]);
+    return true;
+}
+
+const {moveTo: moveTo, lineTo: lineTo, bezierCurveTo: bezierCurveTo, drawPoints: drawPoints$1} = draw.PathCommandDataHelper;
 
 const {isEmpty: isEmpty, getPoint: getPoint} = draw.BoundsHelper;
 
@@ -276,7 +655,7 @@ exports.Linker = class Linker extends draw.Line {
         }
     }
     updateLinkerPoint(type) {
-        const {startPoint: startPoint, endPoint: endPoint} = this;
+        const {startPoint: startPoint, endPoint: endPoint, lineType: lineType} = this;
         const nowPoint = type === "end" ? endPoint : startPoint;
         if (nowPoint) {
             const data = {};
@@ -301,6 +680,7 @@ exports.Linker = class Linker extends draw.Line {
                     if (isEmpty(boxBounds)) draw.LeafHelper.updateBounds(ui);
                     p = getPoint(boxBounds, point, true);
                     ui.getWorldPointByBox(p, this, false, true);
+                    if (lineType === "polyline") data.bounds = ui.getBounds("box", this.parent);
                 }
             } else {
                 if (draw.isObject(point)) p = point;
@@ -326,56 +706,69 @@ exports.Linker = class Linker extends draw.Line {
         }
         const startPoint = startData.point, endPoint = endData.point;
         const startDirection = startData.direction, endDirection = endData.direction;
-        const half = {
-            x: abs((startPoint.x - endPoint.x) / 2),
-            y: abs((startPoint.y - endPoint.y) / 2)
-        };
         const arrowWidth = this.__.strokeWidth * 8;
-        let minCtrl;
-        if (this.__.__useArrow) {
-            const ratio = min(getDistance(startPoint, endPoint) / (arrowWidth * 25), 1);
-            minCtrl = max(arrowWidth * ratio * 12, arrowWidth * 3);
-        } else {
-            minCtrl = arrowWidth * 2;
-        }
-        if (endDirection) {
-            if (isOppositeDirection(startDirection, endDirection) && startDirection === getDirectionForFromPoint(startPoint, endPoint)) {
+        switch (data.lineType) {
+          case "straight":
+            moveTo(path, startPoint.x, startPoint.y);
+            lineTo(path, endPoint.x, endPoint.y);
+            break;
+
+          case "polyline":
+            drawPolyline(path, startPoint, endPoint, startDirection, endDirection, startData.bounds, endData.bounds, arrowWidth, hasPoints && draw.PointHelper.toNumberPoints(data.points));
+            break;
+
+          case "curve":
+          default:
+            const half = {
+                x: abs((startPoint.x - endPoint.x) / 2),
+                y: abs((startPoint.y - endPoint.y) / 2)
+            };
+            let minCtrl;
+            if (this.__.__useArrow) {
+                const ratio = min(getDistance(startPoint, endPoint) / (arrowWidth * 25), 1);
+                minCtrl = max(arrowWidth * ratio * 12, arrowWidth * 3);
+            } else {
                 minCtrl = arrowWidth * 2;
             }
-        }
-        half.x = max(minCtrl, half.x);
-        half.y = max(minCtrl, half.y);
-        if (hasPoints) {
-            minCtrl *= .6;
-            const points = draw.PointHelper.toNumberPoints(data.points);
-            drawPoints$1(path, [ startPoint.x, startPoint.y, ...points, endPoint.x, endPoint.y ], data.curve, false, data);
-            if (startDirection) {
-                const handleX = path[4];
-                const handleY = path[5];
-                half.x = max(minCtrl, abs(handleX - startPoint.x));
-                half.y = max(minCtrl, abs(handleY - startPoint.y));
-                const startCtrlPoint = getCtrlPoint(this, startNode, startPoint, startDirection, half);
-                path[4] = startCtrlPoint.x;
-                path[5] = startCtrlPoint.y;
-            }
-            const len = path.length;
             if (endDirection) {
-                const handleX = path[len - 4];
-                const handleY = path[len - 3];
-                half.x = max(minCtrl, abs(handleX - endPoint.x));
-                half.y = max(minCtrl, abs(handleY - endPoint.y));
-                const endCtrlPoint = getCtrlPoint(this, endNode, endPoint, endDirection, half);
-                path[len - 4] = endCtrlPoint.x;
-                path[len - 3] = endCtrlPoint.y;
+                if (isOppositeDirection(startDirection, endDirection) && startDirection === getDirectionForFromPoint(startPoint, endPoint)) {
+                    minCtrl = arrowWidth * 2;
+                }
+            }
+            half.x = max(minCtrl, half.x);
+            half.y = max(minCtrl, half.y);
+            if (hasPoints) {
+                minCtrl *= .6;
+                const points = draw.PointHelper.toNumberPoints(data.points);
+                drawPoints$1(path, [ startPoint.x, startPoint.y, ...points, endPoint.x, endPoint.y ], data.curve, false, data);
+                if (startDirection) {
+                    const handleX = path[4];
+                    const handleY = path[5];
+                    half.x = max(minCtrl, abs(handleX - startPoint.x));
+                    half.y = max(minCtrl, abs(handleY - startPoint.y));
+                    const startCtrlPoint = getCtrlPoint(this, startNode, startPoint, startDirection, half);
+                    path[4] = startCtrlPoint.x;
+                    path[5] = startCtrlPoint.y;
+                }
+                const len = path.length;
+                if (endDirection) {
+                    const handleX = path[len - 4];
+                    const handleY = path[len - 3];
+                    half.x = max(minCtrl, abs(handleX - endPoint.x));
+                    half.y = max(minCtrl, abs(handleY - endPoint.y));
+                    const endCtrlPoint = getCtrlPoint(this, endNode, endPoint, endDirection, half);
+                    path[len - 4] = endCtrlPoint.x;
+                    path[len - 3] = endCtrlPoint.y;
+                } else {
+                    path[len - 4] = endPoint.x;
+                    path[len - 3] = endPoint.y;
+                }
             } else {
-                path[len - 4] = endPoint.x;
-                path[len - 3] = endPoint.y;
+                const startCtrlPoint = startDirection ? getCtrlPoint(this, startNode, startPoint, startDirection, half) : startPoint;
+                const endCtrlPoint = endDirection ? getCtrlPoint(this, endNode, endPoint, endDirection, half) : endPoint;
+                moveTo(path, startPoint.x, startPoint.y);
+                bezierCurveTo(path, startCtrlPoint.x, startCtrlPoint.y, endCtrlPoint.x, endCtrlPoint.y, endPoint.x, endPoint.y);
             }
-        } else {
-            const startCtrlPoint = startDirection ? getCtrlPoint(this, startNode, startPoint, startDirection, half) : startPoint;
-            const endCtrlPoint = endDirection ? getCtrlPoint(this, endNode, endPoint, endDirection, half) : endPoint;
-            moveTo(path, startPoint.x, startPoint.y);
-            bezierCurveTo(path, startCtrlPoint.x, startCtrlPoint.y, endCtrlPoint.x, endCtrlPoint.y, endPoint.x, endPoint.y);
         }
     }
     createStartPoint(worldPoint, node, options) {
@@ -445,6 +838,8 @@ exports.Linker = class Linker extends draw.Line {
 
 __decorate([ draw.dataProcessor(LinkerData) ], exports.Linker.prototype, "__", void 0);
 
+__decorate([ draw.boundsType("curve") ], exports.Linker.prototype, "lineType", void 0);
+
 __decorate([ linkerPointType() ], exports.Linker.prototype, "startPoint", void 0);
 
 __decorate([ linkerPointType() ], exports.Linker.prototype, "endPoint", void 0);