Merge branch 'master' into color-branches

Author: d-callan

app/index.html

@@ -690,7 +690,7 @@ <h5 class="modal-title" id="exportModalLabel">Export</h5>
             type: d3.select("#type").node().value,
             colorOptions: 
             { 
-              colorMode: "none",
+              colorMode: "list",
               defaultColor: d3.select("#defaultColor").node().value,
               highlightColor: d3.select("#highlightColor").node().value,
             },
@@ -766,6 +766,9 @@ <h5 class="modal-title" id="exportModalLabel">Export</h5>
       });
 
       d3.select("#highlightColor").on("input", function() {
+        if (!d3.select("#highlightLeaves").property("checked")) {
+            d3.select("#highlightLeaves").property("checked",true);
+        }
         tree.setColorOptions({ 
           colorMode: d3.select("#highlightLeaves").node().value ? "list" : "none",
           defaultColor: d3.select("#defaultColor").node().value,
@@ -775,8 +778,8 @@ <h5 class="modal-title" id="exportModalLabel">Export</h5>
       });
 
       d3.select("#highlightLeaves").on("input", function() {
-        console.log("tree", tree.getNodeGUIDs(true));
-        if (this.value) {
+        // console.log("tree", tree.getNodeGUIDs(this.value));
+        if (d3.select("#highlightLeaves").property("checked")) {
           tree.setColorOptions({
             colorMode: "list",
             defaultColor: d3.select("#defaultColor").node().value,
@@ -787,7 +790,8 @@ <h5 class="modal-title" id="exportModalLabel">Export</h5>
           tree.setColorOptions({
             colorMode: "none",
             defaultColor: d3.select("#defaultColor").node().value,
-            highlightColor: d3.select("#highlightColor").node().value
+            highlightColor: d3.select("#highlightColor").node().value,
+            nodeList: tree.getNodeGUIDs(false)
           })
         }
       });

dist/tidytree.js

@@ -1628,7 +1628,7 @@ var TidyTree = (function () {
 
     let nodeList = colorOptions.nodeList;
 
-    if (nodeList.includes(node.data._guid)) {
+    if (nodeList && nodeList.includes(node.data._guid)) {
       // charcoal
       return colorOptions.highlightColor ?? "#feb640";
     } else {

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.9",
+  "version": "0.6.0",
   "description": "Uncompromisingly Flexible Phylogenetic Trees, Powered by D3.js",
   "name": "tidytree",
   "main": "dist/tidytree.js",

src/main.js

@@ -387,7 +387,7 @@ function findNodeColor(node, colorOptions) {
 
   let nodeList = colorOptions.nodeList;
 
-  if (nodeList.includes(node.data._guid)) {
+  if (nodeList && nodeList.includes(node.data._guid)) {
     // yellowish
     return colorOptions.highlightColor ?? "#feb640";
   } else {