orcasvn-react-diagrams 0.1.38 → 0.1.39

package/dist/cjs/index.js

@@ -7331,13 +7331,13 @@ var getElementRotationInfo = function (element) {
 //     //calculate a2 equal cos of rotation * width
 //     const a2 = Math.abs(Math.cos(rotationInRadians) * rectWidth);
 //     const a = a1 + a2;
-//     console.info(`a1: ${a1}, a2: ${a2}, a: ${a}`);
+//     logger.info(`a1: ${a1}, a2: ${a2}, a: ${a}`);
 //     //calculate b1 equal cos of rotation * height
 //     const b1 = Math.abs(Math.cos(rotationInRadians) * rectHeight);
 //     //calculate b2 equal sin of rotation * width
 //     const b2 = Math.abs(Math.sin(rotationInRadians) * rectWidth);
 //     const b = b1 + b2;
-//     console.info(`b1: ${b1}, b2: ${b2}, b: ${b}`);
+//     logger.info(`b1: ${b1}, b2: ${b2}, b: ${b}`);
 //     //const squareEdge = Math.max(rectWidth, rectHeight);
 //     return {x, y};
 //     return { x: x - (b - rectWidth) / 2, y: y - (a - rectHeight) / 2 };        
@@ -7378,6 +7378,65 @@ function calculateAngleWithOx(pStart, pEnd) {
     return angleInDegrees;
 }
 
+var Logger = /** @class */ (function () {
+    function Logger() {
+        this.level = 'info';
+        this.customLogger = null;
+    }
+    Logger.prototype.setLevel = function (level) {
+        this.level = level;
+    };
+    Logger.prototype.setCustomLogger = function (logger) {
+        this.customLogger = logger;
+    };
+    Logger.prototype.log = function (level, message) {
+        var _a;
+        var optionalParams = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            optionalParams[_i - 2] = arguments[_i];
+        }
+        var levels = ['error', 'warn', 'info', 'debug'];
+        if (this.level && levels.indexOf(level) <= levels.indexOf(this.level)) {
+            if (this.customLogger) {
+                this.customLogger.apply(this, __spreadArray([level, message], optionalParams, false));
+            }
+            else {
+                console[level] ? (_a = console)[level].apply(_a, __spreadArray([message], optionalParams, false)) : console.log.apply(console, __spreadArray([message], optionalParams, false));
+            }
+        }
+    };
+    Logger.prototype.error = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['error', msg], optionalParams, false));
+    };
+    Logger.prototype.warn = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['warn', msg], optionalParams, false));
+    };
+    Logger.prototype.info = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['info', msg], optionalParams, false));
+    };
+    Logger.prototype.debug = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['debug', msg], optionalParams, false));
+    };
+    return Logger;
+}());
+var logger = new Logger();
+
 /**
  * Check if position 1 is within the radius r of position 2
  * @returns boolean
@@ -7751,7 +7810,7 @@ var correctPortPositionInElement = function (elementRelativePosition, elementWid
                 [c, d],
                 [d, a]
             ];
-            console.info("Port's moveable areas parsed from svg ".concat(portSlideRailSVGClassName), moveableAreas);
+            logger.info("Port's moveable areas parsed from svg ".concat(portSlideRailSVGClassName), moveableAreas);
             var newPosition_3 = normalizePortPositionOnMoveableAreas(moveableAreas, position);
             if (newPosition_3) {
                 moveTo = newPosition_3;
@@ -8257,65 +8316,6 @@ var getRotatedSVGBBox = function (svgElement) {
     }
 };
 
-var Logger = /** @class */ (function () {
-    function Logger() {
-        this.level = 'info';
-        this.customLogger = null;
-    }
-    Logger.prototype.setLevel = function (level) {
-        this.level = level;
-    };
-    Logger.prototype.setCustomLogger = function (logger) {
-        this.customLogger = logger;
-    };
-    Logger.prototype.log = function (level, message) {
-        var _a;
-        var optionalParams = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            optionalParams[_i - 2] = arguments[_i];
-        }
-        var levels = ['error', 'warn', 'info', 'debug'];
-        if (this.level && levels.indexOf(level) <= levels.indexOf(this.level)) {
-            if (this.customLogger) {
-                this.customLogger.apply(this, __spreadArray([level, message], optionalParams, false));
-            }
-            else {
-                console[level] ? (_a = console)[level].apply(_a, __spreadArray([message], optionalParams, false)) : console.log.apply(console, __spreadArray([message], optionalParams, false));
-            }
-        }
-    };
-    Logger.prototype.error = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['error', msg], optionalParams, false));
-    };
-    Logger.prototype.warn = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['warn', msg], optionalParams, false));
-    };
-    Logger.prototype.info = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['info', msg], optionalParams, false));
-    };
-    Logger.prototype.debug = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['debug', msg], optionalParams, false));
-    };
-    return Logger;
-}());
-var logger = new Logger();
-
 function configureLogger(_a) {
     var level = _a.level, customLogger = _a.customLogger;
     if (level !== undefined)
@@ -9042,14 +9042,21 @@ var automationAddPointsToLink = function (eleLink, elements, limitPoint) {
     return eleLink;
 };
 
-function adjustElementPositionOnParentPortArea(element, toBeAdjustedRelativePosition) {
+function adjustElementPositionOnParentPortArea(element, toBeAdjustedPosition, isAbsolutePosition) {
     var _a;
+    if (isAbsolutePosition === void 0) { isAbsolutePosition = false; }
     if (element.moveAsPortOnParent && element.parentElement) {
         var parentDOM = (_a = element.parentElementInTree) === null || _a === void 0 ? void 0 : _a.DOM;
-        var newRelativePosition = transformAbsPositionToElementRelativePosition(toBeAdjustedRelativePosition, element);
+        var newRelativePosition = {
+            x: toBeAdjustedPosition.x,
+            y: toBeAdjustedPosition.y
+        };
+        if (isAbsolutePosition) {
+            newRelativePosition = transformAbsPositionToElementRelativePosition(toBeAdjustedPosition, element);
+        }
         return correctPortPositionInElement(newRelativePosition, element.size.width, element.size.height, element.parentElement.portMoveableAreas, element.parentElement.portSlideRailSVGClassName, parentDOM);
     }
-    return toBeAdjustedRelativePosition;
+    return toBeAdjustedPosition;
 }
 function convertElementsToTree(elements) {
     //Find child elements in the child elements, that is possible child of element, then return element with child of it.
@@ -9603,10 +9610,10 @@ var Paper = function (props) {
                 x: newX,
                 y: newY
             };
-            console.info("Element ".concat(selectedElement.id, " is dragging to position ").concat(JSON.stringify(newPosition)));
+            logger.info("Element ".concat(selectedElement.id, " is dragging to position ").concat(JSON.stringify(newPosition)));
             //Adjust position of element if it should move as a port on parent port area
             if (selectedElement.moveAsPortOnParent && selectedElement.parentElement) {
-                newPosition = adjustElementPositionOnParentPortArea(selectedElement, newPosition);
+                newPosition = adjustElementPositionOnParentPortArea(selectedElement, newPosition, true);
                 updateElementPosition(selectedElement, newPosition.x, newPosition.y, true);
             }
             else {
@@ -9614,7 +9621,7 @@ var Paper = function (props) {
             }
             //let newElementPosition = updateElementPosition(selectedElement, newPosition.x, newPosition.y, true)
             var indexSelectedElement = elements.findIndex(function (e) { return e.id === selectedElement.id; });
-            console.info("Element ".concat(selectedElement.id, " is moving to relative position ").concat(JSON.stringify(selectedElement.position)));
+            logger.info("Element ".concat(selectedElement.id, " is moving to relative position ").concat(JSON.stringify(selectedElement.position)));
             //Set state to re-render UI with new position
             setElementsInTree(function (prev) { return __spreadArray([], prev, true); });
             if (props.onElementMoved) {

package/dist/esm/index.js

@@ -7327,13 +7327,13 @@ var getElementRotationInfo = function (element) {
 //     //calculate a2 equal cos of rotation * width
 //     const a2 = Math.abs(Math.cos(rotationInRadians) * rectWidth);
 //     const a = a1 + a2;
-//     console.info(`a1: ${a1}, a2: ${a2}, a: ${a}`);
+//     logger.info(`a1: ${a1}, a2: ${a2}, a: ${a}`);
 //     //calculate b1 equal cos of rotation * height
 //     const b1 = Math.abs(Math.cos(rotationInRadians) * rectHeight);
 //     //calculate b2 equal sin of rotation * width
 //     const b2 = Math.abs(Math.sin(rotationInRadians) * rectWidth);
 //     const b = b1 + b2;
-//     console.info(`b1: ${b1}, b2: ${b2}, b: ${b}`);
+//     logger.info(`b1: ${b1}, b2: ${b2}, b: ${b}`);
 //     //const squareEdge = Math.max(rectWidth, rectHeight);
 //     return {x, y};
 //     return { x: x - (b - rectWidth) / 2, y: y - (a - rectHeight) / 2 };        
@@ -7374,6 +7374,65 @@ function calculateAngleWithOx(pStart, pEnd) {
     return angleInDegrees;
 }
 
+var Logger = /** @class */ (function () {
+    function Logger() {
+        this.level = 'info';
+        this.customLogger = null;
+    }
+    Logger.prototype.setLevel = function (level) {
+        this.level = level;
+    };
+    Logger.prototype.setCustomLogger = function (logger) {
+        this.customLogger = logger;
+    };
+    Logger.prototype.log = function (level, message) {
+        var _a;
+        var optionalParams = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            optionalParams[_i - 2] = arguments[_i];
+        }
+        var levels = ['error', 'warn', 'info', 'debug'];
+        if (this.level && levels.indexOf(level) <= levels.indexOf(this.level)) {
+            if (this.customLogger) {
+                this.customLogger.apply(this, __spreadArray([level, message], optionalParams, false));
+            }
+            else {
+                console[level] ? (_a = console)[level].apply(_a, __spreadArray([message], optionalParams, false)) : console.log.apply(console, __spreadArray([message], optionalParams, false));
+            }
+        }
+    };
+    Logger.prototype.error = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['error', msg], optionalParams, false));
+    };
+    Logger.prototype.warn = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['warn', msg], optionalParams, false));
+    };
+    Logger.prototype.info = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['info', msg], optionalParams, false));
+    };
+    Logger.prototype.debug = function (msg) {
+        var optionalParams = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            optionalParams[_i - 1] = arguments[_i];
+        }
+        this.log.apply(this, __spreadArray(['debug', msg], optionalParams, false));
+    };
+    return Logger;
+}());
+var logger = new Logger();
+
 /**
  * Check if position 1 is within the radius r of position 2
  * @returns boolean
@@ -7747,7 +7806,7 @@ var correctPortPositionInElement = function (elementRelativePosition, elementWid
                 [c, d],
                 [d, a]
             ];
-            console.info("Port's moveable areas parsed from svg ".concat(portSlideRailSVGClassName), moveableAreas);
+            logger.info("Port's moveable areas parsed from svg ".concat(portSlideRailSVGClassName), moveableAreas);
             var newPosition_3 = normalizePortPositionOnMoveableAreas(moveableAreas, position);
             if (newPosition_3) {
                 moveTo = newPosition_3;
@@ -8253,65 +8312,6 @@ var getRotatedSVGBBox = function (svgElement) {
     }
 };
 
-var Logger = /** @class */ (function () {
-    function Logger() {
-        this.level = 'info';
-        this.customLogger = null;
-    }
-    Logger.prototype.setLevel = function (level) {
-        this.level = level;
-    };
-    Logger.prototype.setCustomLogger = function (logger) {
-        this.customLogger = logger;
-    };
-    Logger.prototype.log = function (level, message) {
-        var _a;
-        var optionalParams = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            optionalParams[_i - 2] = arguments[_i];
-        }
-        var levels = ['error', 'warn', 'info', 'debug'];
-        if (this.level && levels.indexOf(level) <= levels.indexOf(this.level)) {
-            if (this.customLogger) {
-                this.customLogger.apply(this, __spreadArray([level, message], optionalParams, false));
-            }
-            else {
-                console[level] ? (_a = console)[level].apply(_a, __spreadArray([message], optionalParams, false)) : console.log.apply(console, __spreadArray([message], optionalParams, false));
-            }
-        }
-    };
-    Logger.prototype.error = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['error', msg], optionalParams, false));
-    };
-    Logger.prototype.warn = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['warn', msg], optionalParams, false));
-    };
-    Logger.prototype.info = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['info', msg], optionalParams, false));
-    };
-    Logger.prototype.debug = function (msg) {
-        var optionalParams = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            optionalParams[_i - 1] = arguments[_i];
-        }
-        this.log.apply(this, __spreadArray(['debug', msg], optionalParams, false));
-    };
-    return Logger;
-}());
-var logger = new Logger();
-
 function configureLogger(_a) {
     var level = _a.level, customLogger = _a.customLogger;
     if (level !== undefined)
@@ -9038,14 +9038,21 @@ var automationAddPointsToLink = function (eleLink, elements, limitPoint) {
     return eleLink;
 };
 
-function adjustElementPositionOnParentPortArea(element, toBeAdjustedRelativePosition) {
+function adjustElementPositionOnParentPortArea(element, toBeAdjustedPosition, isAbsolutePosition) {
     var _a;
+    if (isAbsolutePosition === void 0) { isAbsolutePosition = false; }
     if (element.moveAsPortOnParent && element.parentElement) {
         var parentDOM = (_a = element.parentElementInTree) === null || _a === void 0 ? void 0 : _a.DOM;
-        var newRelativePosition = transformAbsPositionToElementRelativePosition(toBeAdjustedRelativePosition, element);
+        var newRelativePosition = {
+            x: toBeAdjustedPosition.x,
+            y: toBeAdjustedPosition.y
+        };
+        if (isAbsolutePosition) {
+            newRelativePosition = transformAbsPositionToElementRelativePosition(toBeAdjustedPosition, element);
+        }
         return correctPortPositionInElement(newRelativePosition, element.size.width, element.size.height, element.parentElement.portMoveableAreas, element.parentElement.portSlideRailSVGClassName, parentDOM);
     }
-    return toBeAdjustedRelativePosition;
+    return toBeAdjustedPosition;
 }
 function convertElementsToTree(elements) {
     //Find child elements in the child elements, that is possible child of element, then return element with child of it.
@@ -9599,10 +9606,10 @@ var Paper = function (props) {
                 x: newX,
                 y: newY
             };
-            console.info("Element ".concat(selectedElement.id, " is dragging to position ").concat(JSON.stringify(newPosition)));
+            logger.info("Element ".concat(selectedElement.id, " is dragging to position ").concat(JSON.stringify(newPosition)));
             //Adjust position of element if it should move as a port on parent port area
             if (selectedElement.moveAsPortOnParent && selectedElement.parentElement) {
-                newPosition = adjustElementPositionOnParentPortArea(selectedElement, newPosition);
+                newPosition = adjustElementPositionOnParentPortArea(selectedElement, newPosition, true);
                 updateElementPosition(selectedElement, newPosition.x, newPosition.y, true);
             }
             else {
@@ -9610,7 +9617,7 @@ var Paper = function (props) {
             }
             //let newElementPosition = updateElementPosition(selectedElement, newPosition.x, newPosition.y, true)
             var indexSelectedElement = elements.findIndex(function (e) { return e.id === selectedElement.id; });
-            console.info("Element ".concat(selectedElement.id, " is moving to relative position ").concat(JSON.stringify(selectedElement.position)));
+            logger.info("Element ".concat(selectedElement.id, " is moving to relative position ").concat(JSON.stringify(selectedElement.position)));
             //Set state to re-render UI with new position
             setElementsInTree(function (prev) { return __spreadArray([], prev, true); });
             if (props.onElementMoved) {