fixup! Add tree-related types

src/components/tree/index.ts

@@ -1,8 +1,7 @@
 import { connect, MapStateToProps } from "react-redux";
 import UnconnectedTree from "./tree";
 import { RootState } from "../../store";
-import { TreeComponentStateProps } from "./tree";
-import { TreeComponentOwnProps } from "./tree";
+import { TreeComponentOwnProps, TreeComponentStateProps } from "./types";
 
 const mapStateToProps: MapStateToProps<TreeComponentStateProps, TreeComponentOwnProps, RootState> = (
   state: RootState,

src/components/tree/reactD3Interface/change.ts

@@ -1,6 +1,6 @@
 import { calculateStrokeColors, getBrighterColor } from "../../../util/colorHelpers";
 import { ChangeParams, PhyloTreeType } from "../phyloTree/types";
-import { TreeComponentProps, TreeComponentState } from "../tree";
+import { TreeComponentProps, TreeComponentState } from "../types";
 
 export const changePhyloTreeViaPropsComparison = (
   mainTree: boolean,

src/components/tree/reactD3Interface/initialRender.ts

@@ -4,7 +4,8 @@ import { calculateStrokeColors, getBrighterColor } from "../../../util/colorHelp
 import * as callbacks from "./callbacks";
 import { makeTipLabelFunc } from "../phyloTree/labels";
 import { PhyloTreeType } from "../phyloTree/types";
-import { TreeComponent, TreeComponentProps } from "../tree";
+import { TreeComponent } from "../tree";
+import { TreeComponentProps } from "../types";
 
 export const renderTree = (
   that: TreeComponent,

src/components/tree/tree.tsx

@@ -1,14 +1,11 @@
 import React from "react";
-import { withTranslation, WithTranslation } from "react-i18next";
+import { withTranslation } from "react-i18next";
 import { FaSearchMinus } from "react-icons/fa";
 import { Root, updateVisibleTipsAndBranchThicknesses } from "../../actions/tree";
-import { ColorScale, Layout, PerformanceFlags, ScatterVariables, SelectedNode, TemporalConfidence } from "../../reducers/controls";
-import { TreeState, TreeTooState } from "../../reducers/tree/types";
-import { AppDispatch } from "../../store";
+import { SelectedNode } from "../../reducers/controls";
 import Card from "../framework/card";
 import Legend from "./legend/legend";
 import PhyloTree from "./phyloTree/phyloTree";
-import { Distance, PhyloNode, PhyloTreeType } from "./phyloTree/types";
 import { getParentBeyondPolytomy } from "./phyloTree/helpers";
 import HoverInfoPanel from "./infoPanels/hover";
 import NodeClickedPanel from "./infoPanels/click";
@@ -21,63 +18,12 @@ import { attemptUntangle } from "../../util/globals";
 import ErrorBoundary from "../../util/errorBoundary";
 import { untangleTreeToo } from "./tangle/untangling";
 import { sortByGeneOrder } from "../../util/treeMiscHelpers";
+import { TreeComponentProps, TreeComponentState } from "./types";
 
 export const spaceBetweenTrees = 100;
 export const lhsTreeId = "LEFT";
 const rhsTreeId = "RIGHT";
 
-export interface TreeComponentOwnProps {
-  dispatch: AppDispatch
-  height: number
-  width: number
-}
-
-export interface TreeComponentProps extends WithTranslation, TreeComponentStateProps, TreeComponentOwnProps {}
-
-// This is duplicated from RootState, but good to be explicit about what's
-// expected here.
-export interface TreeComponentStateProps {
-  animationPlayPauseButton: "Play" | "Pause"
-  canRenderBranchLabels: boolean
-  colorBy: string
-  colorByConfidence: boolean
-  colorings: unknown
-  colorScale: ColorScale
-  dateMaxNumeric: number
-  dateMinNumeric: number
-  distanceMeasure: Distance
-  explodeAttr: string
-  filters: Record<string, Array<{ value: string, active: boolean }>>
-  focus: boolean
-  genomeMap: unknown
-  layout: Layout
-  narrativeMode: boolean
-  panelsToDisplay: string[]
-  performanceFlags: PerformanceFlags
-  quickdraw: boolean
-  scatterVariables: ScatterVariables
-  selectedBranchLabel: string
-  selectedNode: SelectedNode | null
-  showAllBranchLabels: boolean
-  showOnlyPanels: boolean
-  showTangle: boolean
-  showTreeToo: boolean
-  temporalConfidence: TemporalConfidence
-  tipLabelKey: string | symbol
-  tree: TreeState
-  treeToo: TreeTooState
-}
-
-export interface TreeComponentState {
-  hoveredNode: {
-    node: PhyloNode
-    isBranch: boolean
-  } | null
-  tree: PhyloTreeType | null
-  treeToo: PhyloTreeType | null
-  geneSortFn?: (a: number, b: number) => number | (() => 0)
-}
-
 export class TreeComponent extends React.Component<TreeComponentProps, TreeComponentState> {
 
   domRefs: {

src/components/tree/types.ts

@@ -0,0 +1,57 @@
+import { WithTranslation } from "react-i18next"
+import { ColorScale, Layout, PerformanceFlags, ScatterVariables, SelectedNode, TemporalConfidence } from "../../reducers/controls";
+import { TreeState, TreeTooState } from "../../reducers/tree/types";
+import { AppDispatch } from "../../store";
+import { Distance, PhyloNode, PhyloTreeType } from "./phyloTree/types";
+
+export interface TreeComponentOwnProps {
+  dispatch: AppDispatch
+  height: number
+  width: number
+}
+
+export interface TreeComponentProps extends WithTranslation, TreeComponentStateProps, TreeComponentOwnProps {}
+
+// This is duplicated from RootState, but good to be explicit about what's
+// expected here.
+export interface TreeComponentStateProps {
+  animationPlayPauseButton: "Play" | "Pause"
+  canRenderBranchLabels: boolean
+  colorBy: string
+  colorByConfidence: boolean
+  colorings: unknown
+  colorScale: ColorScale
+  dateMaxNumeric: number
+  dateMinNumeric: number
+  distanceMeasure: Distance
+  explodeAttr: string
+  filters: Record<string, Array<{ value: string, active: boolean }>>
+  focus: boolean
+  genomeMap: unknown
+  layout: Layout
+  narrativeMode: boolean
+  panelsToDisplay: string[]
+  performanceFlags: PerformanceFlags
+  quickdraw: boolean
+  scatterVariables: ScatterVariables
+  selectedBranchLabel: string
+  selectedNode: SelectedNode | null
+  showAllBranchLabels: boolean
+  showOnlyPanels: boolean
+  showTangle: boolean
+  showTreeToo: boolean
+  temporalConfidence: TemporalConfidence
+  tipLabelKey: string | symbol
+  tree: TreeState
+  treeToo: TreeTooState
+}
+
+export interface TreeComponentState {
+  hoveredNode: {
+    node: PhyloNode
+    isBranch: boolean
+  } | null
+  tree: PhyloTreeType | null
+  treeToo: PhyloTreeType | null
+  geneSortFn?: (a: number, b: number) => number | (() => 0)
+}