@yanqirenshi/d3.deployment 0.5.1 → 0.6.0

package/dist/js/datamodels/Edge.js

@@ -58,7 +58,11 @@ var Edge = exports["default"] = /*#__PURE__*/function () {
     value: function normalize(data) {
       var new_data = this.dataTemplate();
       new_data._core = data;
-      if (data.id) new_data._id = data.id;
+
+      // 入力に id があればそれを、無ければ Rectum.makeEdges が採番した _id を引き継ぐ。
+      // (これを落とすと _id=null → data-edge-id="null" になり、
+      //  ドラッグ時の redraw が対象 path を特定できず接続線が追従しない)
+      if (data.id || data.id === 0) new_data._id = data.id;else if (data._id || data._id === 0) new_data._id = data._id;
       if (data.from.id) new_data.from.id = data.from.id;
       if (data.to.id) new_data.to.id = data.to.id;
       if (data.stroke) {

package/dist/js/datamodels/Node.js

@@ -86,6 +86,7 @@ var Node = exports["default"] = /*#__PURE__*/function () {
             color: '#333333'
           }
         },
+        description: '',
         position: null,
         size: null,
         background: null,
@@ -103,6 +104,7 @@ var Node = exports["default"] = /*#__PURE__*/function () {
       var core = data._core;
       if (core.id || core.id === 0) data._id = core.id;
       if (core.type) data.type = core.type;
+      if (core.description) data.description = core.description;
       if (core.link) data.link = core.link;else data.link = {
         url: null
       };

package/dist/js/painters/Nodes.js

@@ -37,13 +37,21 @@ var Nodes = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "drawGroup",
     value: function drawGroup(place, data, type) {
-      return place.selectAll('g.' + type).data([data], function (d) {
+      var groups = place.selectAll('g.' + type).data([data], function (d) {
         return d._id;
       }).enter().append('g').attr('class', type).attr("transform", function (d) {
         return "translate(" + d._position.x + "," + d._position.y + ")";
       }).attr('level', function (d) {
         return d._level;
       });
+
+      // description はホバーツールチップ(SVG <title>)として表示する
+      groups.filter(function (d) {
+        return !!d.description;
+      }).append('title').text(function (d) {
+        return d.description;
+      });
+      return groups;
     }
   }, {
     key: "drawBody",

package/package.json

@@ -1,11 +1,10 @@
 {
     "name": "@yanqirenshi/d3.deployment",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "description": "See [Documents](https://yanqirenshi.github.io/D3.Deployment/)",
     "main": "dist/index.js",
     "directories": {
-        "doc": "docs",
-        "example": "example"
+        "doc": "docs"
     },
     "peerDependencies": {
         "react": "^18.2.0",

package/tests/Rectum.test.js

@@ -6,6 +6,7 @@ const NESTED_SAMPLE = () => ({
         {
             type: 'NODE', id: 1,
             label: { text: 'P', position: { x: 20, y: 20 } },
+            description: '親ノードの説明',
             size: { w: 300, h: 300 }, position: { x: 0, y: 0 },
             children: [
                 {
@@ -53,6 +54,36 @@ const buildData = () => {
     return { rectum, data: rectum.data() };
 };
 
+test('edges without an explicit id inherit the auto-numbered _id (drag redraw needs it)', () => {
+    const rectum = new Rectum({});
+
+    // 入力エッジに id を与えない → makeEdges が _id を採番、normalize が引き継ぐべき。
+    rectum.data({
+        nodes: [
+            { type: 'NODE', id: 1, label: { text: 'A' }, size: { w: 100, h: 100 }, position: { x: 0,   y: 0 } },
+            { type: 'NODE', id: 2, label: { text: 'B' }, size: { w: 100, h: 100 }, position: { x: 300, y: 0 } },
+        ],
+        edges: [
+            { from: { id: 1, position: 0 }, to: { id: 2, position: 180 }, port: 45 },
+        ],
+    });
+
+    const edges = rectum.data().edges.list;
+
+    expect(edges).toHaveLength(1);
+    // _id が null のままだと data-edge-id="null" になり redraw が対象を見つけられない。
+    expect(edges[0]._id).not.toBeNull();
+    expect(edges[0]._id).not.toBeUndefined();
+    expect(typeof edges[0]._id).toBe('number');
+});
+
+test('node description is normalized (kept when given, empty by default)', () => {
+    const { data } = buildData();
+
+    expect(data.nodes.ht[1].description).toBe('親ノードの説明');
+    expect(data.nodes.ht[2].description).toBe('');   // 未指定は空文字
+});
+
 test('collectSubtree gathers a node and all descendants', () => {
     const { rectum, data } = buildData();