@figtreejs/core 0.1.0-beta.3 → 0.1.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@figtreejs/core",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.5",
   "description": "A react component library for phylogenetic visualization and app building",
   "repository": {
     "type": "git",

package/src/evo/tree/normalized-tree/immutable-tree.ts

@@ -21,7 +21,7 @@ import { immerable, produce } from "immer";
 import type { Taxon, TaxonSetInterface } from "../taxa/taxon";
 import { TaxonSet } from "../taxa/taxon";
 import { format } from "d3-format";
-import { extent } from "d3-array";
+import { extent, min } from "d3-array";
 
 import {
   MaybeType,
@@ -655,6 +655,7 @@ export class ImmutableTree implements Tree, TaxonSetInterface {
           };
           newNodes.push(newNode);
           draft._data.nodes.allNodes.push(newNode);
+          draft._data.nodeToTaxon.length = number + i + 1; // add an empty elements for the new nodes
         }
       }),
       nodes: newNodes,
@@ -1200,6 +1201,24 @@ export function* preOrderIterator(
   yield* traverse(node);
 }
 
+// we want to traverse the tree in a consistent order
+// this requires ignoring the root when we hit it.
+function stableNodeNumber(tree: Tree, a: NodeRef, node: NodeRef) {
+  let num;
+  if (tree.isRoot(a)) {
+    num = min(
+      tree.getChildren(a).filter((child) => child.number != node.number),
+      (n) => n.number,
+    );
+  } else {
+    num = a.number;
+  }
+  return unNullify(
+    num,
+    "There was an error finding the path through the root. check the children",
+  );
+}
+
 type PseudoNode = NodeRef & {
   pseudoChildren: NodeRef[];
   pseudoLength: number | undefined;
@@ -1223,6 +1242,10 @@ export function* psuedoRootPostOrderIterator(
     const pseudoChildren = branches.filter((n) => n.number !== visited);
     const pseudoParent = branches.find((node) => node.number === visited);
     // branches.sort(sort);
+    pseudoChildren.sort(
+      (a, b) =>
+        stableNodeNumber(tree, a, node) - stableNodeNumber(tree, b, node),
+    );
     let pseudoLength = undefined;
     if (!tree.isRoot(node) && pseudoParent === tree.getParent(node)) {
       // the root will not have a parent
@@ -1264,9 +1287,13 @@ export function* psuedoRootPreOrderIterator(
     if (!tree.isRoot(node)) {
       branches.push(tree.getParent(node));
     }
+
     const pseudoChildren = branches.filter((n) => n.number !== visited);
     const pseudoParent = branches.find((node) => node.number === visited);
-    // branches.sort(sort);
+    pseudoChildren.sort(
+      (a, b) =>
+        stableNodeNumber(tree, a, node) - stableNodeNumber(tree, b, node),
+    );
     let pseudoLength = undefined;
     if (!tree.isRoot(node) && pseudoParent === tree.getParent(node)) {
       // the root will not have a parent
@@ -1310,9 +1337,13 @@ export function* pseudoTipIterator(
     if (!tree.isRoot(node)) {
       branches.push(tree.getParent(node));
     }
+    // branches.sort((a,b)=>a.number-b.number)
     const pseudoChildren = branches.filter((n) => n.number !== visited);
     const pseudoParent = branches.find((node) => node.number === visited);
-    // branches.sort(sort);
+    pseudoChildren.sort(
+      (a, b) =>
+        stableNodeNumber(tree, a, node) - stableNodeNumber(tree, b, node),
+    );
     let pseudoLength = undefined;
     if (!tree.isRoot(node) && pseudoParent === tree.getParent(node)) {
       // the root will not have a parent