orcasvn-react-diagrams 0.1.42 → 0.1.44

package/dist/cjs/index.js

@@ -1248,7 +1248,6 @@ var SelectionFrame = function (props) {
             var newX = mousePosition.x + xFromMouse;
             var newY = mousePosition.y + yFromMouse;
             if (propOnMove) {
-                console.log('newX', newX, 'newY', newY);
                 setX(newX);
                 setY(newY);
                 propOnMove(newX, newY);
@@ -7739,28 +7738,6 @@ var getAbsolutePosition = function (element) {
     };
 };
 //get absolute position of element
-var getAnchorAdjustedAbsolutePosition = function (element) {
-    var parentElement = element.parentElement;
-    var elemenetPositionWithTopLeftAnchor = {
-        x: element.position.x,
-        y: element.position.y,
-    };
-    if (element.positionAnchor === exports.PositioningAnchor.Center) {
-        elemenetPositionWithTopLeftAnchor.x -= element.size.width / 2;
-        elemenetPositionWithTopLeftAnchor.y -= element.size.height / 2;
-    }
-    if (!parentElement) {
-        return __assign({}, elemenetPositionWithTopLeftAnchor);
-    }
-    var absoluteParentElement = getAbsolutePosition(parentElement);
-    var x = elemenetPositionWithTopLeftAnchor.x + absoluteParentElement.x;
-    var y = elemenetPositionWithTopLeftAnchor.y + absoluteParentElement.y;
-    return {
-        x: x,
-        y: y,
-    };
-};
-//get absolute position of element
 var getPortAbsolutePosition = function (port, element) {
     var elementAbsolutePosition = getAbsolutePosition(element);
     return {
@@ -7774,10 +7751,15 @@ var transformAbsPositionToElementRelativePosition = function (position, element)
         return position;
     }
     var absoluteParentElement = getAbsolutePosition(parentElement);
-    return {
+    var result = {
         x: position.x - absoluteParentElement.x,
         y: position.y - absoluteParentElement.y,
     };
+    if (element.positionAnchor === exports.PositioningAnchor.Center) {
+        result.x += element.size.width / 2;
+        result.y += element.size.height / 2;
+    }
+    return result;
 };
 var transformAbsPositionToRelativePositionInsideElement = function (absolutePosition, parentAbsolutePosition) {
     var _a, _b;
@@ -9844,16 +9826,16 @@ var Paper = function (props) {
                 if (!link.targetElement || !link.targetPort)
                     return null;
                 return (React.createElement(ElementLink, { key: link.id, id: link.id, path: link.path, sourcePosition: {
-                        x: getAnchorAdjustedAbsolutePosition(link.sourceElement).x + link.sourcePort.position.x,
-                        y: getAnchorAdjustedAbsolutePosition(link.sourceElement).y + link.sourcePort.position.y
+                        x: getAbsolutePosition(link.sourceElement).x + link.sourcePort.position.x,
+                        y: getAbsolutePosition(link.sourceElement).y + link.sourcePort.position.y
                     }, targetPosition: {
-                        x: getAnchorAdjustedAbsolutePosition(link.targetElement).x + link.targetPort.position.x,
-                        y: getAnchorAdjustedAbsolutePosition(link.targetElement).y + link.targetPort.position.y
+                        x: getAbsolutePosition(link.targetElement).x + link.targetPort.position.x,
+                        y: getAbsolutePosition(link.targetElement).y + link.targetPort.position.y
                     }, points: link.points, onPathChanged: handlePathChange, onClickDelete: handleClickLinkDelete(link, index), onSelected: function () { return handleSelectLink(link); }, onDeselected: function () { return handleDeselectLink(); }, container: paperContainerRef.current, markerStart: link.markerStart, markerEnd: link.markerEnd, markerDistanceFromPort: link.markerDistanceFromPort, markerSize: link.markerSize, label: link.label, sourceLabel: link.sourceLabel, targetLabel: link.targetLabel, onLabelMoved: onLabelMoved(index), onLabelResized: onLabelResized(index), onLabelContentChanged: onLabelContentChanged(index) }));
             }),
             (tempLink === null || tempLink === void 0 ? void 0 : tempLink.tempTargetPosition) && React.createElement(ElementLink, { id: tempLink.id, points: tempLink.points, sourcePosition: {
-                    x: getAnchorAdjustedAbsolutePosition(tempLink.sourceElement).x + tempLink.sourcePort.position.x,
-                    y: getAnchorAdjustedAbsolutePosition(tempLink.sourceElement).y + tempLink.sourcePort.position.y
+                    x: getAbsolutePosition(tempLink.sourceElement).x + tempLink.sourcePort.position.x,
+                    y: getAbsolutePosition(tempLink.sourceElement).y + tempLink.sourcePort.position.y
                 }, targetPosition: tempLink.tempTargetPosition, container: paperContainerRef.current, markerStart: tempLink.markerStart, markerEnd: tempLink.markerEnd, markerDistanceFromPort: tempLink.markerDistanceFromPort, markerSize: tempLink.markerSize }),
             texts.map(function (text, index) { return (React.createElement(Text$1, { key: text.id, id: text.id, x: text.position.x, y: text.position.y, width: text.size.width, height: text.size.height, editable: text.editable, fontSize: text.fontSize, border: text.border, container: paperContainerRef.current, content: text.content, align: text.align, onSelected: function () {
                     setSelectedText(text);
@@ -10003,7 +9985,6 @@ exports.findNearestProjectedPoint = findNearestProjectedPoint;
 exports.generateSubstitutePosition = generateSubstitutePosition;
 exports.generateUniqueId = generateUniqueId;
 exports.getAbsolutePosition = getAbsolutePosition;
-exports.getAnchorAdjustedAbsolutePosition = getAnchorAdjustedAbsolutePosition;
 exports.getCurvePathData = getCurvePathData;
 exports.getElementRotationInfo = getElementRotationInfo;
 exports.getFirstIntersection = getFirstIntersection;

package/dist/cjs/types/utils/positionUtil.d.ts

@@ -48,7 +48,6 @@ export declare const generateSubstitutePosition: (intersectedPosition: IPosition
 export declare const getRelativePosition: (clientPosition: IPosition, relativeElement: Element) => IPosition;
 export declare const getFourVertexesOfBBoxFromElement: (element: IElement) => IPosition[];
 export declare const getAbsolutePosition: (element: IElement) => IPosition;
-export declare const getAnchorAdjustedAbsolutePosition: (element: IElement) => IPosition;
 export declare const getPortAbsolutePosition: (port: IPort, element: IElement) => IPosition;
 export declare const transformAbsPositionToElementRelativePosition: (position: IPosition, element: IElement) => IPosition;
 export declare const transformAbsPositionToRelativePositionInsideElement: (absolutePosition: IPosition, parentAbsolutePosition?: IPosition) => IPosition;

package/dist/esm/index.js

@@ -1244,7 +1244,6 @@ var SelectionFrame = function (props) {
             var newX = mousePosition.x + xFromMouse;
             var newY = mousePosition.y + yFromMouse;
             if (propOnMove) {
-                console.log('newX', newX, 'newY', newY);
                 setX(newX);
                 setY(newY);
                 propOnMove(newX, newY);
@@ -7735,28 +7734,6 @@ var getAbsolutePosition = function (element) {
     };
 };
 //get absolute position of element
-var getAnchorAdjustedAbsolutePosition = function (element) {
-    var parentElement = element.parentElement;
-    var elemenetPositionWithTopLeftAnchor = {
-        x: element.position.x,
-        y: element.position.y,
-    };
-    if (element.positionAnchor === PositioningAnchor.Center) {
-        elemenetPositionWithTopLeftAnchor.x -= element.size.width / 2;
-        elemenetPositionWithTopLeftAnchor.y -= element.size.height / 2;
-    }
-    if (!parentElement) {
-        return __assign({}, elemenetPositionWithTopLeftAnchor);
-    }
-    var absoluteParentElement = getAbsolutePosition(parentElement);
-    var x = elemenetPositionWithTopLeftAnchor.x + absoluteParentElement.x;
-    var y = elemenetPositionWithTopLeftAnchor.y + absoluteParentElement.y;
-    return {
-        x: x,
-        y: y,
-    };
-};
-//get absolute position of element
 var getPortAbsolutePosition = function (port, element) {
     var elementAbsolutePosition = getAbsolutePosition(element);
     return {
@@ -7770,10 +7747,15 @@ var transformAbsPositionToElementRelativePosition = function (position, element)
         return position;
     }
     var absoluteParentElement = getAbsolutePosition(parentElement);
-    return {
+    var result = {
         x: position.x - absoluteParentElement.x,
         y: position.y - absoluteParentElement.y,
     };
+    if (element.positionAnchor === PositioningAnchor.Center) {
+        result.x += element.size.width / 2;
+        result.y += element.size.height / 2;
+    }
+    return result;
 };
 var transformAbsPositionToRelativePositionInsideElement = function (absolutePosition, parentAbsolutePosition) {
     var _a, _b;
@@ -9840,16 +9822,16 @@ var Paper = function (props) {
                 if (!link.targetElement || !link.targetPort)
                     return null;
                 return (React.createElement(ElementLink, { key: link.id, id: link.id, path: link.path, sourcePosition: {
-                        x: getAnchorAdjustedAbsolutePosition(link.sourceElement).x + link.sourcePort.position.x,
-                        y: getAnchorAdjustedAbsolutePosition(link.sourceElement).y + link.sourcePort.position.y
+                        x: getAbsolutePosition(link.sourceElement).x + link.sourcePort.position.x,
+                        y: getAbsolutePosition(link.sourceElement).y + link.sourcePort.position.y
                     }, targetPosition: {
-                        x: getAnchorAdjustedAbsolutePosition(link.targetElement).x + link.targetPort.position.x,
-                        y: getAnchorAdjustedAbsolutePosition(link.targetElement).y + link.targetPort.position.y
+                        x: getAbsolutePosition(link.targetElement).x + link.targetPort.position.x,
+                        y: getAbsolutePosition(link.targetElement).y + link.targetPort.position.y
                     }, points: link.points, onPathChanged: handlePathChange, onClickDelete: handleClickLinkDelete(link, index), onSelected: function () { return handleSelectLink(link); }, onDeselected: function () { return handleDeselectLink(); }, container: paperContainerRef.current, markerStart: link.markerStart, markerEnd: link.markerEnd, markerDistanceFromPort: link.markerDistanceFromPort, markerSize: link.markerSize, label: link.label, sourceLabel: link.sourceLabel, targetLabel: link.targetLabel, onLabelMoved: onLabelMoved(index), onLabelResized: onLabelResized(index), onLabelContentChanged: onLabelContentChanged(index) }));
             }),
             (tempLink === null || tempLink === void 0 ? void 0 : tempLink.tempTargetPosition) && React.createElement(ElementLink, { id: tempLink.id, points: tempLink.points, sourcePosition: {
-                    x: getAnchorAdjustedAbsolutePosition(tempLink.sourceElement).x + tempLink.sourcePort.position.x,
-                    y: getAnchorAdjustedAbsolutePosition(tempLink.sourceElement).y + tempLink.sourcePort.position.y
+                    x: getAbsolutePosition(tempLink.sourceElement).x + tempLink.sourcePort.position.x,
+                    y: getAbsolutePosition(tempLink.sourceElement).y + tempLink.sourcePort.position.y
                 }, targetPosition: tempLink.tempTargetPosition, container: paperContainerRef.current, markerStart: tempLink.markerStart, markerEnd: tempLink.markerEnd, markerDistanceFromPort: tempLink.markerDistanceFromPort, markerSize: tempLink.markerSize }),
             texts.map(function (text, index) { return (React.createElement(Text$1, { key: text.id, id: text.id, x: text.position.x, y: text.position.y, width: text.size.width, height: text.size.height, editable: text.editable, fontSize: text.fontSize, border: text.border, container: paperContainerRef.current, content: text.content, align: text.align, onSelected: function () {
                     setSelectedText(text);
@@ -9967,5 +9949,5 @@ var Editor = function (_a) {
     return (React.createElement(Paper$1, { key: "paper", size: { width: width, height: height }, elements: elements, links: links, texts: texts, onPaperClicked: handlePaperClicked, onPortMouseDown: handlePortMouseDown, onPortMouseUp: handlePortMouseUp, onPortMoved: handlePortMoved, onPortSelected: handlePortSelected, onElementContextMenu: handleElementContextMenu, onElementMoved: handleElementMoved, onElementResized: handleElementResized, onElementSelected: handleElementSelected, onElementMouseLeave: handleElementMouseLeave, onElementMouseMove: handleElementMouseMove, onElementMouseUp: handleElementMouseUp, onElementsChanged: handleElementsChanged, onCreatingLink: handleOnCreatingLink, onCreatingPortByLinking: handleOnCreatingPortByLinking, onLinkSelected: handleLinkSelected, onLinksChanged: handleLinksChanged, onTextSelected: handleTextSelected, onTextsChanged: handleTextsChanged, onPaperMouseMoved: handlePaperMouseMoved, onPaperMouseUp: handlePaperMouseUp, onPaperMouseDown: handlePaperMouseDown, onManuallyTriggerRenderElement: editorContext.onManuallyTriggerRenderElement.bind(editorContext), onManuallyTriggerRenderPort: editorContext.onManuallyTriggerRenderPort.bind(editorContext) }));
 };
 
-export { Circle as CircleRC, Crescent as CrescentRC, CustomShape as CustomShapeRC, EditorContext, Element$2 as Element, ElementLink$1 as ElementLink, ElementLink as ElementLinkRC, Port$1 as Port, Port as PortRC, PositioningAnchor, Rectangle as RectangleRC, RectangularFrame as RectangularFrameRC, ResizingDirection, ShapeWrapper as ShapeWrapperRC, SubObjectDirection, Text$2 as Text, TextAlign, Text$1 as TextRC, addPointToList, calculateAngleWithOx, checkPointContainsPolygon, checkPositionOnLine, checkSamePosition, configureLogger, correctPortPositionInElement, createSmoothPathString, Editor as default, degreeToRadian, diamondEdgeInsideSquare, dist, findNearestPointOnSegment, findNearestPosition, findNearestProjectedPoint, generateSubstitutePosition, generateUniqueId, getAbsolutePosition, getAnchorAdjustedAbsolutePosition, getCurvePathData, getElementRotationInfo, getFirstIntersection, getFourVertexesOfBBoxFromElement, getIntersectionPositions, getPortAbsolutePosition, getRectangleCorners, getRelativePosition, getRotatedRectangleCoordinates, getRotatedSVGBBox, getSVGBBoxOutsideTransformedParent, makePolygonOfElement, pathDataToD, removeDuplicatePosition, transformAbsPositionToElementRelativePosition, transformAbsPositionToRelativePositionInsideElement };
+export { Circle as CircleRC, Crescent as CrescentRC, CustomShape as CustomShapeRC, EditorContext, Element$2 as Element, ElementLink$1 as ElementLink, ElementLink as ElementLinkRC, Port$1 as Port, Port as PortRC, PositioningAnchor, Rectangle as RectangleRC, RectangularFrame as RectangularFrameRC, ResizingDirection, ShapeWrapper as ShapeWrapperRC, SubObjectDirection, Text$2 as Text, TextAlign, Text$1 as TextRC, addPointToList, calculateAngleWithOx, checkPointContainsPolygon, checkPositionOnLine, checkSamePosition, configureLogger, correctPortPositionInElement, createSmoothPathString, Editor as default, degreeToRadian, diamondEdgeInsideSquare, dist, findNearestPointOnSegment, findNearestPosition, findNearestProjectedPoint, generateSubstitutePosition, generateUniqueId, getAbsolutePosition, getCurvePathData, getElementRotationInfo, getFirstIntersection, getFourVertexesOfBBoxFromElement, getIntersectionPositions, getPortAbsolutePosition, getRectangleCorners, getRelativePosition, getRotatedRectangleCoordinates, getRotatedSVGBBox, getSVGBBoxOutsideTransformedParent, makePolygonOfElement, pathDataToD, removeDuplicatePosition, transformAbsPositionToElementRelativePosition, transformAbsPositionToRelativePositionInsideElement };
 //# sourceMappingURL=index.js.map