updates

Author: ellthompson

src/components/Graph/graph-view-node.js

@@ -329,10 +329,10 @@ class GraphViewNode {
 
     mapVectorToArray(v) {
         var arr = [];
-        if (v.x) arr.push(v.x);
-        if (v.y) arr.push(v.y);
-        if (v.z) arr.push(v.z);
-        if (v.w) arr.push(v.w);
+        if (Number.isFinite(v.x)) arr.push(v.x);
+        if (Number.isFinite(v.y)) arr.push(v.y);
+        if (Number.isFinite(v.z)) arr.push(v.z);
+        if (Number.isFinite(v.w)) arr.push(v.w);
         return arr;
     }
 

src/components/Graph/index.js

@@ -25,7 +25,8 @@ var defaultConfig = {
     edgeHoverEffect: true,
     passiveUIEvents: false,
     readOnly: false,
-    restrictTranslate: false
+    restrictTranslate: false,
+    incrementNodeNames: false
 };
 
 class SelectedItem {
@@ -140,12 +141,12 @@ class Graph extends Element {
                             ...item,
                             id: Number(`${Date.now()}${Math.floor(Math.random() * 10000)}`)
                         };
+                        if (item.attributes) {
+                            node.attributes = { ...item.attributes };
+                        }
                         delete node.action;
                         delete node.text;
                         delete node.onClick;
-                        if (node.name) {
-                            node.name = `${node.name} ${Object.keys(this._graphData.get('data.nodes')).length}`;
-                        }
                         var nodeSchema = this._graphSchema.nodes[node.nodeType];
                         if (nodeSchema.attributes && !node.attributes) {
                             node.attributes = {};
@@ -157,6 +158,9 @@ class Graph extends Element {
                                 }
                             });
                         }
+                        if (this._config.incrementNodeNames && node.attributes.name) {
+                            node.attributes.name = `${node.attributes.name} ${Object.keys(this._graphData.get('data.nodes')).length}`;
+                        }
                         let element = e.target;
                         while (!element.classList.contains('pcui-contextmenu')) {
                             element = element.parentElement;
@@ -355,6 +359,8 @@ class Graph extends Element {
             value.forEach((v, i) => {
                 node.attributes[attributeKey][keyMap[i]] = v;
             });
+        } else if (Object.keys(prevAttributeValue).includes('x') && Number.isFinite(value)) {
+            node.attributes[attributeKey].x = value;
         } else {
             node.attributes[attributeKey] = value;
         }