npm - @metadev/daga - Versions diffs - 4.2.5 → 4.2.6 - Mend

@metadev/daga 4.2.5 → 4.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/Changelog.md CHANGED Viewed

@@ -6,6 +6,12 @@ List of releases and changes.
 ## Next release Joyeuse
+## v. 4.2.6
+- Fix bug where editing a property with a root attribute fails in React [#323](https://github.com/metadevpro/daga/pull/323)
+- Fix bug where nodes dragged from the palette are off center in React [#324](https://github.com/metadevpro/daga/pull/324)
+- Adjust connection label locations [#326](https://github.com/metadevpro/daga/pull/326)
 ## v. 4.2.5
 - Add methods `getZoomLevel()` and `getViewCoordinates()` in `canvas` to obtain the current zoom and pan level of the view [#317](https://github.com/metadevpro/daga/pull/317)

package/index.cjs.js CHANGED Viewed

@@ -5,20 +5,20 @@ var rxjs = require('rxjs');
 var uuid = require('uuid');
 function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
         });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
+    }
+    n.default = e;
+    return Object.freeze(n);
 }
 var d3__namespace = /*#__PURE__*/_interopNamespaceDefault(d3);
@@ -1479,6 +1479,9 @@ class ValueSet {
    * @returns The value if it could be found, `undefined` if nothing could be found.
    */
   getRootElementValue(rootAttribute) {
+    if (!this.rootElement) {
+      return;
+    }
     if (typeof rootAttribute === 'string') {
       return this.rootElement[rootAttribute];
     }
@@ -1505,6 +1508,9 @@ class ValueSet {
    * @param value The value to set the root element's attribute to.
    */
   setRootElementValue(rootAttribute, value) {
+    if (!this.rootElement) {
+      return;
+    }
     if (typeof rootAttribute === 'string') {
       this.rootElement[rootAttribute] = value;
     }
@@ -8383,63 +8389,60 @@ class DiagramCanvas {
         const deltaY = connection.endCoords[1] - connection.startCoords[1];
         switch (connection.startDirection) {
           case exports.Side.Top:
-            startLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = startLabelShiftX;
+            startLabelShiftX = deltaX >= 0 ? -0.5 : 0.5;
             endLabelShiftX = startLabelShiftX;
-            startLabelShiftY = -1;
+            startLabelShiftY = -0.5;
             break;
           case exports.Side.Bottom:
-            startLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = startLabelShiftX;
+            startLabelShiftX = deltaX >= 0 ? -0.5 : 0.5;
             endLabelShiftX = startLabelShiftX;
-            startLabelShiftY = 1;
+            startLabelShiftY = 0.5;
             break;
           case exports.Side.Left:
-            startLabelShiftX = -1;
-            startLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = startLabelShiftY;
+            startLabelShiftX = -0.5;
+            startLabelShiftY = deltaY > 0 ? -0.5 : 0.5;
             endLabelShiftY = startLabelShiftY;
             break;
           case exports.Side.Right:
-            startLabelShiftX = 1;
-            startLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = startLabelShiftY;
+            startLabelShiftX = 0.5;
+            startLabelShiftY = deltaY > 0 ? -0.5 : 0.5;
             endLabelShiftY = startLabelShiftY;
             break;
           default:
-            startLabelShiftX = 1;
-            middleLabelShiftX = startLabelShiftX;
+            startLabelShiftX = 0.5;
             endLabelShiftX = startLabelShiftX;
-            startLabelShiftY = -1;
-            middleLabelShiftY = startLabelShiftY;
+            startLabelShiftY = -0.5;
             endLabelShiftY = startLabelShiftY;
         }
         switch (connection.endDirection) {
           case exports.Side.Top:
-            endLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = endLabelShiftX;
-            endLabelShiftY = 1;
+            endLabelShiftX = deltaX >= 0 ? 0.5 : -0.5;
+            endLabelShiftY = 0.5;
             break;
           case exports.Side.Bottom:
-            endLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = endLabelShiftX;
-            endLabelShiftY = -1;
+            endLabelShiftX = deltaX >= 0 ? 0.5 : -0.5;
+            endLabelShiftY = -0.5;
             break;
           case exports.Side.Left:
-            endLabelShiftX = -1;
-            endLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = endLabelShiftY;
+            endLabelShiftX = -0.5;
+            endLabelShiftY = deltaY > 0 ? 0.5 : -0.5;
             break;
           case exports.Side.Right:
-            endLabelShiftX = 1;
-            endLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = endLabelShiftY;
+            endLabelShiftX = 0.5;
+            endLabelShiftY = deltaY > 0 ? 0.5 : -0.5;
             break;
           default:
-            endLabelShiftX = 1;
-            middleLabelShiftX = endLabelShiftX;
-            endLabelShiftY = -1;
-            middleLabelShiftY = endLabelShiftY;
+            endLabelShiftX = 0.5;
+            endLabelShiftY = -0.5;
+        }
+        if (Math.abs(deltaX) >= Math.abs(deltaY)) {
+          // horizontal quadrant
+          middleLabelShiftX = deltaX > 0 ? -0.5 : 0.5;
+          middleLabelShiftY = deltaY > 0 ? 0.5 : -0.5;
+        } else {
+          // vertical quadrant
+          middleLabelShiftX = deltaX > 0 ? 0.5 : -0.5;
+          middleLabelShiftY = deltaY > 0 ? -0.5 : 0.5;
         }
       }
       // bind start labels

package/index.esm.js CHANGED Viewed

@@ -1458,6 +1458,9 @@ class ValueSet {
    * @returns The value if it could be found, `undefined` if nothing could be found.
    */
   getRootElementValue(rootAttribute) {
+    if (!this.rootElement) {
+      return;
+    }
     if (typeof rootAttribute === 'string') {
       return this.rootElement[rootAttribute];
     }
@@ -1484,6 +1487,9 @@ class ValueSet {
    * @param value The value to set the root element's attribute to.
    */
   setRootElementValue(rootAttribute, value) {
+    if (!this.rootElement) {
+      return;
+    }
     if (typeof rootAttribute === 'string') {
       this.rootElement[rootAttribute] = value;
     }
@@ -8362,63 +8368,60 @@ class DiagramCanvas {
         const deltaY = connection.endCoords[1] - connection.startCoords[1];
         switch (connection.startDirection) {
           case Side.Top:
-            startLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = startLabelShiftX;
+            startLabelShiftX = deltaX >= 0 ? -0.5 : 0.5;
             endLabelShiftX = startLabelShiftX;
-            startLabelShiftY = -1;
+            startLabelShiftY = -0.5;
             break;
           case Side.Bottom:
-            startLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = startLabelShiftX;
+            startLabelShiftX = deltaX >= 0 ? -0.5 : 0.5;
             endLabelShiftX = startLabelShiftX;
-            startLabelShiftY = 1;
+            startLabelShiftY = 0.5;
             break;
           case Side.Left:
-            startLabelShiftX = -1;
-            startLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = startLabelShiftY;
+            startLabelShiftX = -0.5;
+            startLabelShiftY = deltaY > 0 ? -0.5 : 0.5;
             endLabelShiftY = startLabelShiftY;
             break;
           case Side.Right:
-            startLabelShiftX = 1;
-            startLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = startLabelShiftY;
+            startLabelShiftX = 0.5;
+            startLabelShiftY = deltaY > 0 ? -0.5 : 0.5;
             endLabelShiftY = startLabelShiftY;
             break;
           default:
-            startLabelShiftX = 1;
-            middleLabelShiftX = startLabelShiftX;
+            startLabelShiftX = 0.5;
             endLabelShiftX = startLabelShiftX;
-            startLabelShiftY = -1;
-            middleLabelShiftY = startLabelShiftY;
+            startLabelShiftY = -0.5;
             endLabelShiftY = startLabelShiftY;
         }
         switch (connection.endDirection) {
           case Side.Top:
-            endLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = endLabelShiftX;
-            endLabelShiftY = 1;
+            endLabelShiftX = deltaX >= 0 ? 0.5 : -0.5;
+            endLabelShiftY = 0.5;
             break;
           case Side.Bottom:
-            endLabelShiftX = deltaX >= 0 ? 1 : -1;
-            middleLabelShiftX = endLabelShiftX;
-            endLabelShiftY = -1;
+            endLabelShiftX = deltaX >= 0 ? 0.5 : -0.5;
+            endLabelShiftY = -0.5;
             break;
           case Side.Left:
-            endLabelShiftX = -1;
-            endLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = endLabelShiftY;
+            endLabelShiftX = -0.5;
+            endLabelShiftY = deltaY > 0 ? 0.5 : -0.5;
             break;
           case Side.Right:
-            endLabelShiftX = 1;
-            endLabelShiftY = deltaY > 0 ? 1 : -1;
-            middleLabelShiftY = endLabelShiftY;
+            endLabelShiftX = 0.5;
+            endLabelShiftY = deltaY > 0 ? 0.5 : -0.5;
             break;
           default:
-            endLabelShiftX = 1;
-            middleLabelShiftX = endLabelShiftX;
-            endLabelShiftY = -1;
-            middleLabelShiftY = endLabelShiftY;
+            endLabelShiftX = 0.5;
+            endLabelShiftY = -0.5;
+        }
+        if (Math.abs(deltaX) >= Math.abs(deltaY)) {
+          // horizontal quadrant
+          middleLabelShiftX = deltaX > 0 ? -0.5 : 0.5;
+          middleLabelShiftY = deltaY > 0 ? 0.5 : -0.5;
+        } else {
+          // vertical quadrant
+          middleLabelShiftX = deltaX > 0 ? 0.5 : -0.5;
+          middleLabelShiftY = deltaY > 0 ? -0.5 : 0.5;
         }
       }
       // bind start labels

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@metadev/daga",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "dependencies": {},
   "peerDependencies": {
     "d3": "^7.9.0",