react-msaview 7.0.0 → 8.1.0

package/src/util.ts

@@ -29,6 +29,18 @@ export function adjustColorForContrast(color: string, bg: string): string {
   return result
 }
 
+// a wash over the alignment or the tree: a color carrying its own alpha draws
+// at that alpha, and one with none takes `alpha` so the marks under it stay
+// readable
+export function withAlpha(color: string, alpha: number) {
+  const parsed = colord(color)
+  return parsed.alpha() === 1 ? parsed.alpha(alpha).toRgbString() : color
+}
+
+export function outlineColor(fill: string) {
+  return colord(fill).darken(0.1).toHex()
+}
+
 export function transform<T>(
   obj: Record<string, T>,
   cb: (arg0: [string, T]) => [string, T],
@@ -41,12 +53,9 @@ const contrastTextCaches = new WeakMap<Theme, Map<string, string>>()
 /**
  * Readable letter color over a given cell color, memoized per theme.
  *
- * A dynamic scheme colors a cell from its column, so there is no letter->color
- * table to precompute a contrast table from; asking per cell color covers the
- * dynamic schemes, the static ones and a track's own `colors` alike. An
- * uncolored cell sits on the theme's background, where the theme's own text
- * color is what stays readable -- `black` turned every gap and every uncolored
- * cell invisible in the dark theme.
+ * Keyed by cell color, since a dynamic scheme has no letter->color table; this
+ * covers static schemes and a track's own `colors` too. An uncolored cell gets
+ * the theme's text color, which stays readable in the dark theme.
  */
 export function contrastTextFn(theme: Theme) {
   let cache = contrastTextCaches.get(theme)

package/src/version.ts

@@ -1 +1 @@
-export const version = '7.0.0'
+export const version = '8.1.0'

package/dist/components/msa/ColumnStats.js

@@ -1,42 +0,0 @@
-import React from 'react';
-import { observer } from 'mobx-react';
-const pct = (n) => `${Math.round(n * 100)}%`;
-const ColumnStats = observer(function ({ model }) {
-    const stats = model.mouseOverColumnStats;
-    if (!stats) {
-        return null;
-    }
-    const { col, total, conservation, propertyConservation, consensusLetter, consensusFraction, gapFraction, distribution, } = stats;
-    const top = distribution.slice(0, 6);
-    return (React.createElement("div", null,
-        React.createElement("b", null,
-            "Column ",
-            col + 1),
-        " (",
-        total,
-        " seqs)",
-        React.createElement("br", null),
-        "Consensus: ",
-        consensusLetter || '-',
-        " (",
-        pct(consensusFraction),
-        ")",
-        React.createElement("br", null),
-        "Conservation: ",
-        conservation.toFixed(2),
-        propertyConservation === undefined ? null : (React.createElement(React.Fragment, null,
-            React.createElement("br", null),
-            "Property conservation: ",
-            propertyConservation.toFixed(2))),
-        React.createElement("br", null),
-        "Gaps: ",
-        pct(gapFraction),
-        top.length > 0 ? (React.createElement(React.Fragment, null,
-            React.createElement("br", null),
-            top.map(([letter, count]) => (React.createElement("span", { key: letter, style: { marginRight: 8 } },
-                letter,
-                " ",
-                pct(count / total)))))) : null));
-});
-export default ColumnStats;
-//# sourceMappingURL=ColumnStats.js.map

package/dist/components/msa/ColumnStats.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ColumnStats.js","sourceRoot":"","sources":["../../../src/components/msa/ColumnStats.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,CAAA;AAEpD,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,EAAE,KAAK,EAA2B;IACvE,MAAM,KAAK,GAAG,KAAK,CAAC,oBAAoB,CAAA;IACxC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EACJ,GAAG,EACH,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,GACb,GAAG,KAAK,CAAA;IACT,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,OAAO,CACL;QACE;;YAAW,GAAG,GAAG,CAAC,CAAK;;QAAG,KAAK;;QAC/B,+BAAM;;QACM,eAAe,IAAI,GAAG;;QAAI,GAAG,CAAC,iBAAiB,CAAC;;QAC5D,+BAAM;;QACS,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC3C;YACE,+BAAM;;YACkB,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CACtD,CACJ;QACD,+BAAM;;QACC,GAAG,CAAC,WAAW,CAAC;QACtB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAChB;YACE,+BAAM;YACL,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAC5B,8BAAM,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE;gBACzC,MAAM;;gBAAG,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,CACvB,CACR,CAAC,CACD,CACJ,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,WAAW,CAAA"}

package/src/components/msa/ColumnStats.tsx

@@ -1,54 +0,0 @@
-import React from 'react'
-
-import { observer } from 'mobx-react'
-
-import type { MsaViewModel } from '../../model.ts'
-
-const pct = (n: number) => `${Math.round(n * 100)}%`
-
-const ColumnStats = observer(function ({ model }: { model: MsaViewModel }) {
-  const stats = model.mouseOverColumnStats
-  if (!stats) {
-    return null
-  }
-  const {
-    col,
-    total,
-    conservation,
-    propertyConservation,
-    consensusLetter,
-    consensusFraction,
-    gapFraction,
-    distribution,
-  } = stats
-  const top = distribution.slice(0, 6)
-  return (
-    <div>
-      <b>Column {col + 1}</b> ({total} seqs)
-      <br />
-      Consensus: {consensusLetter || '-'} ({pct(consensusFraction)})
-      <br />
-      Conservation: {conservation.toFixed(2)}
-      {propertyConservation === undefined ? null : (
-        <>
-          <br />
-          Property conservation: {propertyConservation.toFixed(2)}
-        </>
-      )}
-      <br />
-      Gaps: {pct(gapFraction)}
-      {top.length > 0 ? (
-        <>
-          <br />
-          {top.map(([letter, count]) => (
-            <span key={letter} style={{ marginRight: 8 }}>
-              {letter} {pct(count / total)}
-            </span>
-          ))}
-        </>
-      ) : null}
-    </div>
-  )
-})
-
-export default ColumnStats