Merge pull request #2004 from nextstrain/selected-branch-labels

Update "Show all labels" only show branch labels for visible branches

Author: joverlee521

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+* "show all branch labels" toggle has been updated to only show labels for visible branches, i.e. branches of selected tips after applying filters ([#2004](https://github.com/nextstrain/auspice/pull/2004))
+
 ## version 2.64.0 - 2025/08/15
 
 

src/components/tree/phyloTree/labels.js

@@ -72,16 +72,16 @@ const branchLabelFontWeight = (key) => {
 
 /** createBranchLabelVisibility (the return value should be passed to d3 style call)
  * @param {str} key e.g. "aa" or "clade"
- * @param {bool} showAll
+ * @param {bool} showAll show all labels for visible nodes
  * @param {str} layout
  * @param {int} totalTipsInView visible tips also in view
  * @return {func} Returns a function with 1 argument: the current node (branch).
  *                This fn will return "visible" or "hidden".
  *                NOTE: the fn should only be provided nodes which have a label.
  */
 const createBranchLabelVisibility = (key, showAll, layout, totalTipsInView) => (d) => {
-  if (showAll) return "visible";
   if (d.visibility !== NODE_VISIBLE) return "hidden";
+  if (showAll) return "visible";
   const magicTipFractionToShowBranchLabel = 0.03;
   /* if the number of _visible_ tips descending from this node are over the
   magicTipFractionToShowBranchLabel (c/w the total number of _visible_ and