refactor(devtools): add dagre-d3-es

add dagre-d3-es for use by the signals graph pane. Additionally, add a patch so that html labels display correctly within d3-zoom
angular · milomg · May 20, 2025 · May 21, 2025 · 07ef112291ae3ea0eb534f463f28bb3351041459
commit 07ef112291ae3ea0eb534f463f28bb3351041459
diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx
@@ -2,10 +2,10 @@
 # Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-1406867100
-package.json=-454885126
+package.json=-987988389
 packages/compiler-cli/package.json=1094415146
 packages/compiler/package.json=1190056499
-pnpm-lock.yaml=1545759099
+pnpm-lock.yaml=604739839
 pnpm-workspace.yaml=353334404
 tools/bazel/rules_angular_store/package.json=-239561259
-yarn.lock=-647880827
+yarn.lock=-1336798803
diff --git a/WORKSPACE b/WORKSPACE
@@ -84,6 +84,7 @@ yarn_install(
         "//:.yarnrc",
         "//:tools/npm-patches/@angular+ng-dev+0.0.0-a6dcd24107d12114198251ee5d20cda814a1986a.patch",
         "//:tools/npm-patches/@bazel+jasmine+5.8.1.patch",
+        "//:tools/npm-patches/dagre-d3-es+7.0.11.patch",
         "//tools:postinstall-patches.js",
         "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch",
         "//tools/esm-interop:patches/npm/@bazel+concatjs+5.8.1.patch",

diff --git a/package.json b/package.json
@@ -110,6 +110,7 @@
     "chokidar": "^4.0.0",
     "convert-source-map": "^1.5.1",
     "d3": "^7.0.0",
+    "dagre-d3-es": "^7.0.11",
     "diff": "^8.0.0",
     "domino": "https://github.com/angular/domino.git#93e720f143d0296dd2726ffbcf4fc12283363a7b",
     "hammerjs": "~2.0.8",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tools/npm-patches/dagre-d3-es+7.0.11.patch b/tools/npm-patches/dagre-d3-es+7.0.11.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/dagre-d3-es/src/dagre-js/label/add-html-label.js b/node_modules/dagre-d3-es/src/dagre-js/label/add-html-label.js
+index 94ee8a3..1983f45 100644
+--- a/node_modules/dagre-d3-es/src/dagre-js/label/add-html-label.js
++++ b/node_modules/dagre-d3-es/src/dagre-js/label/add-html-label.js
+@@ -28,8 +28,8 @@ function addHtmlLabel(root, node) {
+   // Fix for firefox
+   div.style('white-space', 'nowrap');
+
+-  var client = div.node().getBoundingClientRect();
+-  fo.attr('width', client.width).attr('height', client.height);
++  var client = div.node();
++  fo.attr('width', client.offsetWidth).attr('height', client.offsetHeight);
+
+   return fo;
+ }
diff --git a/yarn.lock b/yarn.lock
@@ -7556,7 +7556,7 @@ d3@^7.0.0, d3@^7.9.0:
     d3-transition "3"
     d3-zoom "3"
 
-dagre-d3-es@7.0.11:
+dagre-d3-es@7.0.11, dagre-d3-es@^7.0.11:
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.11.tgz#2237e726c0577bfe67d1a7cfd2265b9ab2c15c40"
   integrity sha512-tvlJLyQf834SylNKax8Wkzco/1ias1OPw8DcUMDE7oUIoSEW25riQVuiu/0OWEFqT0cxHT3Pa9/D82Jr47IONw==
@@ -7952,8 +7952,7 @@ domhandler@^5.0.2, domhandler@^5.0.3:
     domelementtype "^2.3.0"
 
 "domino@https://github.com/angular/domino.git#93e720f143d0296dd2726ffbcf4fc12283363a7b":
-  version "2.1.6+git"
-  uid "93e720f143d0296dd2726ffbcf4fc12283363a7b"
+  version "2.1.6"
   resolved "https://github.com/angular/domino.git#93e720f143d0296dd2726ffbcf4fc12283363a7b"
 
 dompurify@^3.2.4: