@euphrasiologist/lwphylo 1.2.9 → 1.2.11

package/dist/index.js

@@ -1100,7 +1100,7 @@ function drawPhylogeny(
     const byId = new Map(horizontal.map((d) => [d.thisId, d]));
     const tipById = new Map(tips.map((d) => [d.thisId, d]));
     const tipByLabel = new Map(tips.map((d) => [d.thisLabel, d]));
-    const rootToTip = makeRootToTipGetter(byId, { prefer: "x1" }); 
+    const rootToTip = makeRootToTipGetter(byId, { prefer: "x1" });
 
     const maxY = d3.max(horizontal, (d) => d.y1);
     const minY = d3.min(horizontal, (d) => d.y1);
@@ -1262,7 +1262,10 @@ function drawPhylogeny(
     return svg.node();
   } else if (layout === "radial") {
     const parsedTree = readTree(treeText);
-    const rad = radialLayout(parsedTree);
+    const rad = radialLayout(parsedTree, {
+      angleStrategy: "fan",
+      arcsStyle: "fan"
+    });
 
     // ===== MODE =====
     const TIP_MODE = radialMode; // "phylo" (shorten to original tips) or "outer" (project to one circle)
@@ -1288,6 +1291,7 @@ function drawPhylogeny(
       .scaleLinear()
       .domain([-scaleRadial, scaleRadial])
       .range([h, 0]);
+
     const radiusPx = (r) => r * (w / (2 * scaleRadial));
 
     // ===== INDEXES / HELPERS =====
@@ -1472,7 +1476,7 @@ function drawPhylogeny(
 
       // label hover
       labels
-        .on("mouseenter", function(event, d) {
+        .on("mouseenter", function(_event, d) {
           drawRadialPath(d, hoverLines, hoverArcs, hoverStroke, hoverWidth);
           d3.select(this).select("text").attr("font-weight", 600);
         })
@@ -1529,15 +1533,23 @@ function drawPhylogeny(
         if (a) {
           arcLayer
             .append("path")
-            .attr(
-              "d",
-              describeArc(
-                centerX,
-                centerY,
-                Math.max(0, radiusPx(a.radius)),
-                a.start,
-                a.end
-              )
+            .attr("d", (d) =>
+              d.sweep == null
+                ? describeArc(
+                  centerX,
+                  centerY,
+                  radiusPx(d.radius),
+                  d.start,
+                  d.end
+                )
+                : describeArcSweep(
+                  centerX,
+                  centerY,
+                  radiusPx(d.radius),
+                  d.start,
+                  d.end,
+                  d.sweep
+                )
             )
             .attr("fill", "none")
             .attr("stroke", stroke)