tweak textLayout default

Author: mbostock

docs/marks/tree.md

@@ -159,8 +159,10 @@ Any additional *options* are passed through to the constituent link, dot, and te
 
 The **textLayout** option controls how text labels are anchored to the node. Two layouts are supported:
 
-* *mirrored* - leaf-node labels are left-anchored, and non-leaf nodes right-anchored (with a -dx offset); default unless a **treeLayout** is specified
-* *normal* - all labels are left-anchored; default if a **treeLayout** is specified
+* *mirrored* - leaf-node labels are left-anchored, and non-leaf nodes right-anchored
+* *normal* - all labels are left-anchored
+
+If the **treeLayout** is d3.tree or d3.cluster, the **textLayout** defaults to *mirrored*; otherwise it defaults to *normal*.
 
 ## tree(*data*, *options*)
 

src/marks/tree.js

@@ -1,4 +1,4 @@
-import {cluster as Cluster} from "d3";
+import {cluster as Cluster, tree as Tree} from "d3";
 import {marks} from "../mark.js";
 import {isNoneish} from "../options.js";
 import {maybeTreeAnchor, treeLink, treeNode} from "../transforms/tree.js";
@@ -29,21 +29,20 @@ export function tree(
     dx,
     dy,
     textAnchor,
-    textLayout,
+    treeLayout = Tree,
+    textLayout = treeLayout === Tree || treeLayout === Cluster ? "mirrored" : "normal",
     ...options
   } = {}
 ) {
   if (dx === undefined) dx = maybeTreeAnchor(options.treeAnchor).dx;
   if (textAnchor !== undefined) throw new Error("textAnchor is not a configurable tree option");
-  textLayout = keyword(
-    textLayout === undefined ? (options.treeLayout === undefined ? "mirrored" : "normal") : textLayout,
-    "textLayout",
-    ["mirrored", "normal"]
-  );
+  textLayout = keyword(textLayout, "textLayout", ["mirrored", "normal"]);
+
   function treeText(textOptions) {
     return text(
       data,
       treeNode({
+        treeLayout,
         text: textText,
         fill: fill === undefined ? "currentColor" : fill,
         stroke: textStroke,
@@ -60,6 +59,7 @@ export function tree(
     link(
       data,
       treeLink({
+        treeLayout,
         markerStart,
         markerEnd,
         stroke: stroke !== undefined ? stroke : fill === undefined ? "node:internal" : fill,
@@ -73,7 +73,9 @@ export function tree(
         ...options
       })
     ),
-    dotDot ? dot(data, treeNode({fill: fill === undefined ? "node:internal" : fill, title, ...options})) : null,
+    dotDot
+      ? dot(data, treeNode({treeLayout, fill: fill === undefined ? "node:internal" : fill, title, ...options}))
+      : null,
     textText != null
       ? textLayout === "mirrored"
         ? [
@@ -86,5 +88,5 @@ export function tree(
 }
 
 export function cluster(data, options) {
-  return tree(data, {textLayout: "mirrored", ...options, treeLayout: Cluster});
+  return tree(data, {...options, treeLayout: Cluster});
 }