react-cheminfo 0.22.0 → 0.24.0

package/lib/projection/core/resolveProjectionOptions.js

@@ -1,6 +1,6 @@
 import { clampAxisIndex, clampAxisPair, } from "../../chart/core/chartAxisPair.js";
 import { clamp } from "../../format/core/clamp.js";
-import { DEFAULT_PROJECTION_OPTIONS } from "./projectionOptions.js";
+import { DEFAULT_PROJECTION_OPTIONS, NO_GROUPING, } from "./projectionOptions.js";
 import { drawableVariablesView } from "./variablesView.js";
 /**
  * The options the viewer will use, with a caller's overrides merged in and
@@ -9,22 +9,28 @@ import { drawableVariablesView } from "./variablesView.js";
  * A saved option outlives the data it was made on: reload with fewer samples
  * and axis eight no longer exists. Rather than let a plot ask for a column
  * that is not there, the two axes are pulled back inside what was computed and
- * kept apart, the counts are held inside what exists, and a view whose data is
- * missing falls back to `weights`.
+ * kept apart, the counts are held inside what exists, a view whose data is
+ * missing falls back to `weights`, and the colour and the shape name groupings
+ * the samples actually carry.
  * @param overrides - What the caller asked for.
  * @param result - The reduced space the options will be applied to.
+ * @param groupings - The groupings the samples carry.
+ * @default undefined — the colour and the shape are left as they were asked
+ * for, since nothing says which groupings exist
  * @returns Every option, complete and safe.
  */
-export function resolveProjectionOptions(overrides, result) {
+export function resolveProjectionOptions(overrides, result, groupings) {
     const axisCount = result.axes.length;
     const lastAxis = Math.max(0, axisCount - 1);
     const { x: xAxis, y: yAxis } = clampAxisPair(pick(overrides, 'xAxis'), pick(overrides, 'yAxis'), axisCount);
+    const colorBy = colourChoice(pick(overrides, 'colorBy'), groupings);
     return {
         xAxis,
         yAxis,
         zAxis: apartFrom(clampAxisIndex(pick(overrides, 'zAxis'), lastAxis), [xAxis, yAxis], lastAxis),
         cloudGesture: pick(overrides, 'cloudGesture'),
-        colorBy: pick(overrides, 'colorBy'),
+        colorBy,
+        shapeBy: shapeChoice(pick(overrides, 'shapeBy'), groupings, colorBy),
         ellipse: pick(overrides, 'ellipse'),
         pointRadius: atLeast(pick(overrides, 'pointRadius'), 3.5, 0),
         showGroupMeans: pick(overrides, 'showGroupMeans'),
@@ -49,6 +55,53 @@ function pick(overrides, key) {
     const value = overrides?.[key];
     return value === undefined ? DEFAULT_PROJECTION_OPTIONS[key] : value;
 }
+/**
+ * The grouping the colour will actually stand for.
+ *
+ * A saved choice outlives the data it was made on, so an id no grouping
+ * carries — or the empty string, which is how "the usual one" is asked for —
+ * falls to the first grouping, while `none` stays none.
+ * @param wanted - The id asked for.
+ * @param groupings - The groupings the samples carry.
+ * @returns A grouping's id, or `none`.
+ */
+function colourChoice(wanted, groupings) {
+    if (wanted === NO_GROUPING || groupings === undefined)
+        return wanted;
+    const ids = groupingIds(groupings);
+    return ids.includes(wanted) ? wanted : (ids[0] ?? NO_GROUPING);
+}
+/**
+ * The grouping the shape will actually stand for.
+ *
+ * The usual one is the second grouping, since the first is the colour's; it is
+ * never read as "whichever the colour leaves free", or turning the colour off
+ * would suddenly give the dots shapes they did not have. Only when the colour
+ * has taken the second does the shape fall back to the first.
+ * @param wanted - The id asked for.
+ * @param groupings - The groupings the samples carry.
+ * @param colorBy - The grouping the colour already stands for.
+ * @returns A grouping's id, or `none`.
+ */
+function shapeChoice(wanted, groupings, colorBy) {
+    if (wanted === NO_GROUPING || groupings === undefined)
+        return wanted;
+    const ids = groupingIds(groupings);
+    if (wanted !== colorBy && ids.includes(wanted))
+        return wanted;
+    const [first, second] = ids;
+    if (second === undefined)
+        return NO_GROUPING;
+    if (second !== colorBy)
+        return second;
+    return first ?? NO_GROUPING;
+}
+function groupingIds(groupings) {
+    const ids = [];
+    for (const { id } of groupings)
+        ids.push(id);
+    return ids;
+}
 /**
  * An axis that is none of the ones already drawn.
  *

package/lib/projection/core/resolveProjectionOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveProjectionOptions.js","sourceRoot":"","sources":["../../../src/projection/core/resolveProjectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAMnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAAiD,EACjD,MAAwB;IAExB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;IAC5C,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,aAAa,CAC1C,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EACxB,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EACxB,SAAS,CACV,CAAC;IAEF,OAAO;QACL,KAAK;QACL,KAAK;QACL,KAAK,EAAE,SAAS,CACd,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAClD,CAAC,KAAK,EAAE,KAAK,CAAC,EACd,QAAQ,CACT;QACD,YAAY,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC;QAC7C,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QACnC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QACnC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5D,cAAc,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC;QACjD,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC;QACnD,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QACnC,SAAS,EAAE,UAAU,CACnB,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAC5B,0BAA0B,CAAC,SAAS,EACpC,kBAAkB,EAClB,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CACxC;QACD,aAAa,EAAE,qBAAqB,CAClC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EAChC,MAAM,CAAC,QAAQ,CAChB;QACD,cAAc,EAAE,UAAU,CACxB,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACjC,0BAA0B,CAAC,cAAc,EACzC,oBAAoB,EACpB,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAC1C;QACD,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC;QAC3C,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC;QAC3C,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAChD,aAAa,EAAE,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC;QAC/C,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1E,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,SAAS,IAAI,CACX,SAAiD,EACjD,GAAQ;IAER,sEAAsE;IACtE,qEAAqE;IACrE,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACvE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,SAAS,CAChB,MAAc,EACd,KAAwB,EACxB,QAAgB;IAEhB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC3C,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;QAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;IACzC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CACjB,KAAa,EACb,QAAgB,EAChB,MAAc,EACd,OAAe;IAEf,OAAO,KAAK,CACV,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EACrD,MAAM,EACN,OAAO,CACR,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,KAAa,EAAE,QAAgB,EAAE,KAAa;IAC7D,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"resolveProjectionOptions.js","sourceRoot":"","sources":["../../../src/projection/core/resolveProjectionOptions.ts"],"names":[],"mappings":"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"}

package/lib/projection/ui/ProjectionBar.d.ts

@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import type { ProjectionCopy } from '../core/projectionCopy.ts';
 import type { ProjectionResult } from '../core/projectionResult.ts';
 import type { ProjectionMapView } from './projectionMapView.ts';
+import type { ProjectionStateApi } from './projectionStateApi.ts';
 import type { ProjectionModels } from './projectionTabModels.ts';
-import type { ProjectionStateApi } from './useProjectionState.ts';
 /** What {@link ProjectionBar} needs. */
 interface ProjectionBarProps {
     /** The tab, the options and the selection every tab shares. */

package/lib/projection/ui/ProjectionBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionBar.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAa,MAAM,OAAO,CAAC;AASrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAkBpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,wCAAwC;AACxC,UAAU,kBAAkB;IAC1B,+DAA+D;IAC/D,KAAK,EAAE,kBAAkB,CAAC;IAC1B,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IACzB,qEAAqE;IACrE,IAAI,EAAE,cAAc,CAAC;IACrB,wDAAwD;IACxD,MAAM,EAAE,gBAAgB,CAAC;IACzB,4DAA4D;IAC5D,GAAG,EAAE,iBAAiB,CAAC;IACvB,+EAA+E;IAC/E,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,QAAQ,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,YAAY,CA2FrE"}
+{"version":3,"file":"ProjectionBar.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAa,MAAM,OAAO,CAAC;AASrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAkBpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,wCAAwC;AACxC,UAAU,kBAAkB;IAC1B,+DAA+D;IAC/D,KAAK,EAAE,kBAAkB,CAAC;IAC1B,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IACzB,qEAAqE;IACrE,IAAI,EAAE,cAAc,CAAC;IACrB,wDAAwD;IACxD,MAAM,EAAE,gBAAgB,CAAC;IACzB,4DAA4D;IAC5D,GAAG,EAAE,iBAAiB,CAAC;IACvB,+EAA+E;IAC/E,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,QAAQ,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,YAAY,CA6FrE"}

package/lib/projection/ui/ProjectionBar.js

@@ -40,7 +40,8 @@ import { PROJECTION_CAPTION_TEXT_STYLE, projectionBarEndStyle, projectionBarRowS
 export function ProjectionBar(props) {
     const { state, result, copy, models, map, baseId, panelId } = props;
     const { fileName, width } = props;
-    const { tab, tabs, options, groups, selected, setOptions, setTab } = state;
+    const { tab, tabs, options, groups, groupings, selected } = state;
+    const { setOptions, setTab } = state;
     // Read here rather than off the surface below, because the row the bar is
     // laid into is the surface's own parent: it has to know how tall a control
     // will be before there is a surface to ask.
@@ -66,6 +67,7 @@ export function ProjectionBar(props) {
         map,
         options,
         groups,
+        groupings,
         selected,
         width,
         readings,

package/lib/projection/ui/ProjectionBar.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionBar.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionBar.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProjectionBar.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionBar.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAsC,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAiC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAkC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAKtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAyB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAA0B,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAA0B,CAAC;AAC9D,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AA2BlC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,aAAa,CAAC,KAAyB;IACrD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACpE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAClC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAClE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAErC,0EAA0E;IAC1E,2EAA2E;IAC3E,4CAA4C;IAC5C,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IACvD,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EACpD,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CACpB,CAAC;IACF,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EACzD,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CACpB,CAAC;IAEF,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG;QACX,SAAS,EAAE,MAAM;QACjB,cAAc,EAAE,WAAW;QAC3B,QAAQ;QACR,MAAM,EAAE,mBAAmB,CAAC,GAAG,CAAC;KACjC,CAAC;IACF,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CACzB,OAAO,CAAC,UAAU,EAClB,KAAK,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAClD,CAAC;IAEF,MAAM,KAAK,GAAG,kBAAkB,CAAC;QAC/B,GAAG;QACH,MAAM;QACN,IAAI;QACJ,MAAM;QACN,GAAG;QACH,OAAO;QACP,MAAM;QACN,SAAS;QACT,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,IAAI;QACJ,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC;IAEpD,OAAO,CACL,KAAC,iBAAiB,IAAC,KAAK,EAAE,KAAK,YAC7B,cAAK,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,YACxC,KAAC,UAAU,IACT,SAAS,EAAC,SAAS,EACnB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAC1B,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,GAAG,EAAE,cAAK,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,YAAG,KAAK,CAAC,GAAG,GAAO,EAClE,IAAI,EACF,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAEpE,KAAK,EACH,KAAC,cAAc,IACb,QAAQ,EAAE,OAAO,EACjB,QAAQ,EAAE,GAAG,QAAQ,IAAI,GAAG,EAAE,EAC9B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,GAC3B,EAEJ,IAAI,EACF,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACxC,KAAC,WAAW,cAAE,KAAK,CAAC,IAAI,GAAe,CACxC,YAGF,KAAK,CAAC,CAAC,CAAC,CACP,KAAC,kBAAkB,IACjB,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,IAAI,CAAC,GAAG,EAChB,WAAW,EAAE,IAAI,CAAC,QAAQ,EAC1B,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GAChB,CACH,CAAC,CAAC,CAAC,IAAI,GACG,GACT,GACY,CACrB,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,QAAQ,CACf,IAA8B,EAC9B,KAA8C;IAE9C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,GAAG,IAAI,IAAI;QAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,WAAW,CAClB,OAAe,EACf,IAAe,EACf,OAAuB;IAEvB,OAAO,CACL,8BACE,cAAK,KAAK,EAAE,4BAA4B,CAAC,OAAO,CAAC,YAC/C,YAAG,KAAK,EAAE,6BAA6B,YAAG,OAAO,GAAK,GAClD,EACL,IAAI,IACJ,CACJ,CAAC;AACJ,CAAC;AAED,mDAAmD;AACnD,MAAM,SAAS,GAAsB,EAAE,CAAC"}

package/lib/projection/ui/ProjectionGroupingPickers.d.ts

@@ -0,0 +1,38 @@
+import type { ReactElement } from 'react';
+import type { ProjectionCopy } from '../core/projectionCopy.ts';
+import type { ProjectionOptions } from '../core/projectionOptions.ts';
+import type { ProjectionGrouping } from '../core/projectionSamples.ts';
+/** What a grouping picker needs. */
+interface ProjectionGroupingPickerProps {
+    /** What the figure is showing, already resolved against the result. */
+    options: ProjectionOptions;
+    /** Called with only the options that changed. */
+    onChange: (patch: Partial<ProjectionOptions>) => void;
+    /** The words the viewer writes. */
+    copy: ProjectionCopy;
+    /** Every grouping the samples carry. */
+    groupings: readonly ProjectionGrouping[];
+    /** What the setting is called beside the control. */
+    label: string;
+}
+/** What the shape picker needs on top of what every grouping picker takes. */
+interface ProjectionShapePickerProps extends ProjectionGroupingPickerProps {
+    /** How many rows there are, which is what a grouping is cut over. */
+    rows: number;
+}
+/**
+ * What the colour stands for, as segments while the choices fit on one row
+ * and as a list past that.
+ * @param props - See {@link ProjectionGroupingPickerProps}.
+ * @returns The picker, greyed while the samples carry no grouping.
+ */
+export declare function ProjectionColourPicker(props: ProjectionGroupingPickerProps): ReactElement;
+/**
+ * What the shape stands for. It is always a list, so a grouping that cannot be
+ * shaped keeps its name, greyed, with the reason on the pointer.
+ * @param props - See {@link ProjectionShapePickerProps}.
+ * @returns The picker, greyed while the samples carry no grouping.
+ */
+export declare function ProjectionShapePicker(props: ProjectionShapePickerProps): ReactElement;
+export {};
+//# sourceMappingURL=ProjectionGroupingPickers.d.ts.map

package/lib/projection/ui/ProjectionGroupingPickers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectionGroupingPickers.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionGroupingPickers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAI1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAQvE,oCAAoC;AACpC,UAAU,6BAA6B;IACrC,uEAAuE;IACvE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,iDAAiD;IACjD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IACtD,mCAAmC;IACnC,IAAI,EAAE,cAAc,CAAC;IACrB,wCAAwC;IACxC,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACzC,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;CACf;AAED,8EAA8E;AAC9E,UAAU,0BAA2B,SAAQ,6BAA6B;IACxE,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,6BAA6B,GACnC,YAAY,CAkBd;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,0BAA0B,GAChC,YAAY,CAad"}

package/lib/projection/ui/ProjectionGroupingPickers.js

@@ -0,0 +1,33 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { OverlaySegmented } from "../../overlay/ui/OverlaySegmented.js";
+import { OverlaySelect } from "../../overlay/ui/OverlaySelect.js";
+import { projectionColourChoices, projectionColourPatch, projectionShapeChoices, } from "./projectionMapChoices.js";
+/**
+ * What the colour stands for, as segments while the choices fit on one row
+ * and as a list past that.
+ * @param props - See {@link ProjectionGroupingPickerProps}.
+ * @returns The picker, greyed while the samples carry no grouping.
+ */
+export function ProjectionColourPicker(props) {
+    const { options, onChange, copy, groupings, label } = props;
+    const choices = projectionColourChoices(groupings, copy.bar.uncoloured);
+    const Picker = choices.length > MOST_SEGMENTS ? OverlaySelect : OverlaySegmented;
+    return (_jsx(Picker, { label: label, help: copy.help.colorBy, value: options.colorBy, disabled: groupings.length === 0, options: choices, onChange: (colorBy) => onChange(projectionColourPatch(options, colorBy)) }));
+}
+/**
+ * What the shape stands for. It is always a list, so a grouping that cannot be
+ * shaped keeps its name, greyed, with the reason on the pointer.
+ * @param props - See {@link ProjectionShapePickerProps}.
+ * @returns The picker, greyed while the samples carry no grouping.
+ */
+export function ProjectionShapePicker(props) {
+    const { options, onChange, copy, groupings, label, rows } = props;
+    return (_jsx(OverlaySelect, { label: label, help: copy.help.shapeBy, value: options.shapeBy, disabled: groupings.length === 0, options: projectionShapeChoices(groupings, options, rows, copy), onChange: (shapeBy) => onChange({ shapeBy }) }));
+}
+/**
+ * How many choices a row of segments holds before it is written as a list: a
+ * segment carries a grouping's whole name, and past three they no longer fit
+ * the width of a panel.
+ */
+const MOST_SEGMENTS = 3;
+//# sourceMappingURL=ProjectionGroupingPickers.js.map

package/lib/projection/ui/ProjectionGroupingPickers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectionGroupingPickers.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionGroupingPickers.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAuC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAoC,CAAC;AAKnE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AAsBnC;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAoC;IAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAC5D,MAAM,OAAO,GAAG,uBAAuB,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxE,MAAM,MAAM,GACV,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAEpE,OAAO,CACL,KAAC,MAAM,IACL,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EACvB,KAAK,EAAE,OAAO,CAAC,OAAO,EACtB,QAAQ,EAAE,SAAS,CAAC,MAAM,KAAK,CAAC,EAChC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,OAAe,EAAE,EAAE,CAC5B,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAEnD,CACH,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACnC,KAAiC;IAEjC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAElE,OAAO,CACL,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EACvB,KAAK,EAAE,OAAO,CAAC,OAAO,EACtB,QAAQ,EAAE,SAAS,CAAC,MAAM,KAAK,CAAC,EAChC,OAAO,EAAE,sBAAsB,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAC/D,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,GAC5C,CACH,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC"}

package/lib/projection/ui/ProjectionMapControls.d.ts

@@ -2,6 +2,7 @@ import type { ReactElement } from 'react';
 import type { OverlayTier } from '../../overlay/core/overlayTiers.ts';
 import type { ProjectionCopy } from '../core/projectionCopy.ts';
 import type { ProjectionOptions } from '../core/projectionOptions.ts';
+import type { ProjectionGrouping } from '../core/projectionSamples.ts';
 import type { ProjectionReading } from './projectionBarReadings.ts';
 /** What the map's controls are drawn from, wherever in the bar they sit. */
 export interface ProjectionMapControlsProps {
@@ -11,15 +12,13 @@ export interface ProjectionMapControlsProps {
     onChange: (patch: Partial<ProjectionOptions>) => void;
     /** The words the bar writes, already merged over the defaults. */
     copy: ProjectionCopy;
-    /** What the set of groups is called, which is what `Colour by` offers. */
-    groupLabel: string;
     /**
-     * Whether the samples carry groups at all. Without them the colour and the
-     * outlines stand for nothing, so their controls are greyed rather than
-     * removed: a reader who cannot find a control assumes the figure has none.
-     * @default false
+     * Every grouping the samples carry, which is what `Colour by` offers.
+     * Without one the colour and the outlines stand for nothing, so their
+     * controls are greyed rather than removed: a reader who cannot find a
+     * control assumes the figure has none.
      */
-    hasGroups?: boolean;
+    groupings: readonly ProjectionGrouping[];
     /**
      * What the two settings currently read, with the figure's own colours. They
      * are built once for the bar and handed down rather than spelled again here,

package/lib/projection/ui/ProjectionMapControls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapControls.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapControls.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAMtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAYpE,4EAA4E;AAC5E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IACtD,kEAAkE;IAClE,IAAI,EAAE,cAAc,CAAC;IACrB,0EAA0E;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACxC;;;OAGG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,0BAA0B,GAChC,YAAY,CA+Ed"}
+{"version":3,"file":"ProjectionMapControls.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapControls.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAKtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAapE,4EAA4E;AAC5E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IACtD,kEAAkE;IAClE,IAAI,EAAE,cAAc,CAAC;IACrB;;;;;OAKG;IACH,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACzC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACxC;;;OAGG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,0BAA0B,GAChC,YAAY,CAiFd"}

package/lib/projection/ui/ProjectionMapControls.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { OverlayChip } from "../../overlay/ui/OverlayChip.js";
-import { OverlaySegmented } from "../../overlay/ui/OverlaySegmented.js";
 import { OverlaySelect } from "../../overlay/ui/OverlaySelect.js";
 import { OverlayToggle } from "../../overlay/ui/OverlayToggle.js";
 import { OverlayValueMenu } from "../../overlay/ui/OverlayValueMenu.js";
+import { NO_GROUPING } from "../core/projectionOptions.js";
+import { ProjectionColourPicker } from "./ProjectionGroupingPickers.js";
 import { projectionChipSettings } from "./projectionBarReadings.js";
 import { ellipseChoices, ellipseKey, ellipseSize, } from "./projectionEllipse.js";
-import { projectionColourChoices, projectionOutlineChoices, } from "./projectionMapChoices.js";
+import { projectionColourChoices, projectionColourPatch, projectionOutlineChoices, } from "./projectionMapChoices.js";
 /**
  * The map settings a reader changes while looking at the picture.
  *
@@ -37,16 +38,17 @@ import { projectionColourChoices, projectionOutlineChoices, } from "./projection
  * @returns The controls.
  */
 export function ProjectionMapControls(props) {
-    const { options, onChange, copy, groupLabel, hasGroups = false } = props;
+    const { options, onChange, copy, groupings } = props;
     const { readings = NO_READINGS, tier = 'full' } = props;
     const { bar, help, reason } = copy;
-    const uncoloured = !hasGroups || options.colorBy === 'none';
-    const settings = (_jsx(MapSettings, { options: options, onChange: onChange, copy: copy, groupLabel: groupLabel, hasGroups: hasGroups }));
+    const hasGroups = groupings.length > 0;
+    const uncoloured = !hasGroups || options.colorBy === NO_GROUPING;
+    const settings = (_jsx(MapSettings, { options: options, onChange: onChange, copy: copy, groupings: groupings }));
     const names = (_jsxs(_Fragment, { children: [_jsx(OverlayToggle, { label: bar.switches.showGroupLabels, help: help.showGroupLabels, icon: GROUP_LABELS_GLYPH, hideLabel: true, checked: options.showGroupLabels, disabled: uncoloured, onChange: (showGroupLabels) => onChange({ showGroupLabels }) }), _jsx(OverlayToggle, { label: bar.switches.showIds, help: help.showIds, icon: IDS_GLYPH, hideLabel: true, checked: options.showIds, onChange: (showIds) => onChange({ showIds }) })] }));
     if (tier === 'chip' || tier === 'tiny') {
         return (_jsxs(_Fragment, { children: [_jsx(OverlayChip, { label: bar.settings, settings: projectionChipSettings(readings), disabled: !hasGroups, children: settings }), names] }));
     }
-    return (_jsxs(_Fragment, { children: [_jsx(OverlayValueMenu, { label: help.colorBy.title, keyWord: bar.key.colorBy, showKey: tier === 'full', value: options.colorBy, swatches: swatchesOf(readings), disabled: !hasGroups, disabledReason: reason.noGroups, options: projectionColourChoices(groupLabel, bar.uncoloured), onChange: (colorBy) => onChange({ colorBy }) }), _jsx(OverlayValueMenu, { label: help.ellipse.title, keyWord: bar.key.ellipse, showKey: tier === 'full', value: ellipseKey(options.ellipse), disabled: uncoloured, disabledReason: reason.uncolouredOutlines, options: projectionOutlineChoices(options, copy), onChange: (value) => onChange({ ellipse: ellipseSize(value) }) }), names] }));
+    return (_jsxs(_Fragment, { children: [_jsx(OverlayValueMenu, { label: help.colorBy.title, keyWord: bar.key.colorBy, showKey: tier === 'full', value: options.colorBy, swatches: swatchesOf(readings), disabled: !hasGroups, disabledReason: reason.noGroups, options: projectionColourChoices(groupings, bar.uncoloured), onChange: (colorBy) => onChange(projectionColourPatch(options, colorBy)) }), _jsx(OverlayValueMenu, { label: help.ellipse.title, keyWord: bar.key.ellipse, showKey: tier === 'full', value: ellipseKey(options.ellipse), disabled: uncoloured, disabledReason: reason.uncolouredOutlines, options: projectionOutlineChoices(options, copy), onChange: (value) => onChange({ ellipse: ellipseSize(value) }) }), names] }));
 }
 /**
  * The figure's own colours, from whichever setting decides them.
@@ -71,9 +73,9 @@ function swatchesOf(readings) {
  * @returns The captioned controls.
  */
 function MapSettings(props) {
-    const { options, onChange, copy, groupLabel, hasGroups } = props;
-    const { bar, help, outline } = copy;
-    return (_jsxs(_Fragment, { children: [_jsx(OverlaySegmented, { label: help.colorBy.title, help: help.colorBy, value: options.colorBy, disabled: !hasGroups, options: projectionColourChoices(groupLabel, bar.uncoloured), onChange: (colorBy) => onChange({ colorBy }) }), _jsx(OverlaySelect, { label: help.ellipse.title, help: help.ellipse, value: ellipseKey(options.ellipse), disabled: !hasGroups || options.colorBy === 'none', options: ellipseChoices(options.ellipse, outline), onChange: (value) => onChange({ ellipse: ellipseSize(value) }) })] }));
+    const { options, onChange, copy, groupings } = props;
+    const { help, outline } = copy;
+    return (_jsxs(_Fragment, { children: [_jsx(ProjectionColourPicker, { label: help.colorBy.title, options: options, onChange: onChange, copy: copy, groupings: groupings }), _jsx(OverlaySelect, { label: help.ellipse.title, help: help.ellipse, value: ellipseKey(options.ellipse), disabled: groupings.length === 0 || options.colorBy === NO_GROUPING, options: ellipseChoices(options.ellipse, outline), onChange: (value) => onChange({ ellipse: ellipseSize(value) }) })] }));
 }
 /**
  * The two glyphs the switches ride as.

package/lib/projection/ui/ProjectionMapControls.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapControls.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapControls.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProjectionMapControls.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapControls.tsx"],"names":[],"mappings":"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"}

package/lib/projection/ui/ProjectionMapLegend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapLegend.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapLegend.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAG7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAOlE,8CAA8C;AAC9C,UAAU,wBAAwB;IAChC,gEAAgE;IAChE,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACvC,6DAA6D;IAC7D,KAAK,EAAE,kBAAkB,CAAC;IAC1B,4CAA4C;IAC5C,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,0CAA0C;IAC1C,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,YAAY,CAoBd"}
+{"version":3,"file":"ProjectionMapLegend.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapLegend.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAI7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAMlE,8CAA8C;AAC9C,UAAU,wBAAwB;IAChC,gEAAgE;IAChE,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACvC,6DAA6D;IAC7D,KAAK,EAAE,kBAAkB,CAAC;IAC1B,4CAA4C;IAC5C,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,0CAA0C;IAC1C,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,YAAY,CAoBd"}

package/lib/projection/ui/ProjectionMapLegend.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { OverlayLegend } from "../../overlay/ui/OverlayLegend.js";
-import { projectionMapCorner } from "./projectionMapModel.js";
+import { projectionMapCorner } from "./projectionMapCorner.js";
 import { PROJECTION_PLOT_AREA_STYLE, PROJECTION_PLOT_ROOM, } from "./projectionTabStyles.js";
 /**
  * The key, floating in the emptiest corner of the plot itself.

package/lib/projection/ui/ProjectionMapLegend.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapLegend.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapLegend.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAoC,CAAC;AAGnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAoBlC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAA+B;IAE/B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEzE,MAAM,SAAS,GACb,KAAK,GAAG,oBAAoB,CAAC,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC;IACjE,MAAM,UAAU,GACd,MAAM,GAAG,oBAAoB,CAAC,GAAG,GAAG,oBAAoB,CAAC,MAAM,CAAC;IAClE,MAAM,MAAM,GAAG,mBAAmB,CAChC,KAAK,EACL,OAAO,EACP,OAAO,EACP,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,EACtB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,OAAO,CACL,cAAK,KAAK,EAAE,0BAA0B,YACpC,KAAC,aAAa,IAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAI,GAChE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ProjectionMapLegend.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapLegend.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAoC,CAAC;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAoBlC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAA+B;IAE/B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEzE,MAAM,SAAS,GACb,KAAK,GAAG,oBAAoB,CAAC,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC;IACjE,MAAM,UAAU,GACd,MAAM,GAAG,oBAAoB,CAAC,GAAG,GAAG,oBAAoB,CAAC,MAAM,CAAC;IAClE,MAAM,MAAM,GAAG,mBAAmB,CAChC,KAAK,EACL,OAAO,EACP,OAAO,EACP,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,EACtB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,OAAO,CACL,cAAK,KAAK,EAAE,0BAA0B,YACpC,KAAC,aAAa,IAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAI,GAChE,CACP,CAAC;AACJ,CAAC"}

package/lib/projection/ui/ProjectionMapMore.d.ts

@@ -19,8 +19,8 @@ interface ProjectionMapMoreProps extends ProjectionMapControlsProps {
     onClearSelection: () => void;
 }
 /**
- * What the map keeps behind the cog: the axes, the dot size, what a drag does,
- * and the three buttons that act rather than change.
+ * What the map keeps behind the cog: the axes, the dot size and shape, what a
+ * drag does, and the three buttons that act rather than change.
  *
  * Five settings is where a flat list stops being scannable, so they are filed
  * under three headings — the two directions of the picture, the marks drawn in

package/lib/projection/ui/ProjectionMapMore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapMore.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapMore.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAU1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAI9E,0EAA0E;AAC1E,UAAU,sBAAuB,SAAQ,0BAA0B;IACjE,8EAA8E;IAC9E,MAAM,EAAE,gBAAgB,CAAC;IACzB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,+CAA+C;IAC/C,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,YAAY,CA0F7E"}
+{"version":3,"file":"ProjectionMapMore.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapMore.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAW1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAIpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAI9E,0EAA0E;AAC1E,UAAU,sBAAuB,SAAQ,0BAA0B;IACjE,8EAA8E;IAC9E,MAAM,EAAE,gBAAgB,CAAC;IACzB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,+CAA+C;IAC/C,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,YAAY,CAkG7E"}

package/lib/projection/ui/ProjectionMapMore.js

@@ -6,12 +6,14 @@ import { OverlayPanel } from "../../overlay/ui/OverlayPanel.js";
 import { OverlaySegmented } from "../../overlay/ui/OverlaySegmented.js";
 import { OverlaySelect } from "../../overlay/ui/OverlaySelect.js";
 import { OverlayToggle } from "../../overlay/ui/OverlayToggle.js";
+import { NO_GROUPING } from "../core/projectionOptions.js";
 import { PROJECTION_TAB_DEFAULTS } from "../core/projectionTabDefaults.js";
+import { ProjectionShapePicker } from "./ProjectionGroupingPickers.js";
 import { projectionAxisChoices } from "./projectionAxisChoices.js";
 import { projectionSelectModeChoices } from "./projectionWordChoices.js";
 /**
- * What the map keeps behind the cog: the axes, the dot size, what a drag does,
- * and the three buttons that act rather than change.
+ * What the map keeps behind the cog: the axes, the dot size and shape, what a
+ * drag does, and the three buttons that act rather than change.
  *
  * Five settings is where a flat list stops being scannable, so they are filed
  * under three headings — the two directions of the picture, the marks drawn in
@@ -30,12 +32,12 @@ import { projectionSelectModeChoices } from "./projectionWordChoices.js";
  * @returns The panel behind the cog.
  */
 export function ProjectionMapMore(props) {
-    const { result, options, onChange, copy, hasGroups = false } = props;
+    const { result, options, onChange, copy, groupings } = props;
     const { selectedCount = 0, onZoomToSelection } = props;
     const { onResetView, onClearSelection } = props;
     const { action, help, panel, reason, tab } = copy;
     const nothingPicked = selectedCount === 0;
-    const uncoloured = !hasGroups || options.colorBy === 'none';
-    return (_jsxs(OverlayPanel, { title: tab.map, onReset: () => onChange(PROJECTION_TAB_DEFAULTS.map), actions: _jsxs(_Fragment, { children: [_jsx(OverlayAction, { text: action.zoomToSelection, icon: "zoom-to-fit", disabled: nothingPicked, onClick: onZoomToSelection }), _jsx(OverlayAction, { text: action.resetView, icon: "reset", onClick: onResetView }), _jsx(OverlayAction, { text: action.clearSelection, icon: "cross", disabled: nothingPicked, onClick: onClearSelection })] }), children: [_jsxs(OverlayGroup, { label: panel.section.axes, divider: false, children: [_jsx(OverlaySelect, { label: panel.name.xAxis, help: help.xAxis, value: String(options.xAxis), options: projectionAxisChoices(result, [options.yAxis], reason.axisTakenOnMap), onChange: (value) => onChange({ xAxis: Number(value) }) }), _jsx(OverlaySelect, { label: panel.name.yAxis, help: help.yAxis, value: String(options.yAxis), options: projectionAxisChoices(result, [options.xAxis], reason.axisTakenOnMap), onChange: (value) => onChange({ yAxis: Number(value) }) })] }), _jsxs(OverlayGroup, { label: panel.section.drawing, children: [_jsx(OverlayNumber, { label: panel.name.pointRadius, help: help.pointRadius, value: options.pointRadius, min: 1, max: 12, step: 0.5, digits: 1, unit: "px", onChange: (pointRadius) => onChange({ pointRadius }) }), _jsx(OverlayToggle, { label: panel.name.showGroupMeans, help: help.showGroupMeans, checked: options.showGroupMeans, disabled: uncoloured, onChange: (showGroupMeans) => onChange({ showGroupMeans }) })] }), _jsx(OverlayGroup, { label: panel.section.selecting, children: _jsx(OverlaySegmented, { label: panel.name.selectMode, help: help.selectMode, value: options.selectMode, options: projectionSelectModeChoices(copy), onChange: (selectMode) => onChange({ selectMode }) }) })] }));
+    const uncoloured = groupings.length === 0 || options.colorBy === NO_GROUPING;
+    return (_jsxs(OverlayPanel, { title: tab.map, onReset: () => onChange(PROJECTION_TAB_DEFAULTS.map), actions: _jsxs(_Fragment, { children: [_jsx(OverlayAction, { text: action.zoomToSelection, icon: "zoom-to-fit", disabled: nothingPicked, onClick: onZoomToSelection }), _jsx(OverlayAction, { text: action.resetView, icon: "reset", onClick: onResetView }), _jsx(OverlayAction, { text: action.clearSelection, icon: "cross", disabled: nothingPicked, onClick: onClearSelection })] }), children: [_jsxs(OverlayGroup, { label: panel.section.axes, divider: false, children: [_jsx(OverlaySelect, { label: panel.name.xAxis, help: help.xAxis, value: String(options.xAxis), options: projectionAxisChoices(result, [options.yAxis], reason.axisTakenOnMap), onChange: (value) => onChange({ xAxis: Number(value) }) }), _jsx(OverlaySelect, { label: panel.name.yAxis, help: help.yAxis, value: String(options.yAxis), options: projectionAxisChoices(result, [options.xAxis], reason.axisTakenOnMap), onChange: (value) => onChange({ yAxis: Number(value) }) })] }), _jsxs(OverlayGroup, { label: panel.section.drawing, children: [_jsx(OverlayNumber, { label: panel.name.pointRadius, help: help.pointRadius, value: options.pointRadius, min: 1, max: 12, step: 0.5, digits: 1, unit: "px", onChange: (pointRadius) => onChange({ pointRadius }) }), _jsx(ProjectionShapePicker, { label: panel.name.shapeBy, options: options, onChange: onChange, copy: copy, groupings: groupings, rows: result.scores.rows }), _jsx(OverlayToggle, { label: panel.name.showGroupMeans, help: help.showGroupMeans, checked: options.showGroupMeans, disabled: uncoloured, onChange: (showGroupMeans) => onChange({ showGroupMeans }) })] }), _jsx(OverlayGroup, { label: panel.section.selecting, children: _jsx(OverlaySegmented, { label: panel.name.selectMode, help: help.selectMode, value: options.selectMode, options: projectionSelectModeChoices(copy), onChange: (selectMode) => onChange({ selectMode }) }) })] }));
 }
 //# sourceMappingURL=ProjectionMapMore.js.map

package/lib/projection/ui/ProjectionMapMore.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapMore.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapMore.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProjectionMapMore.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapMore.tsx"],"names":[],"mappings":"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"}

package/lib/projection/ui/ProjectionMapTab.d.ts

@@ -5,15 +5,23 @@ import type { SelectionChange } from '../../scatter/ui/useScatterSelection.ts';
 import type { ProjectionCopy } from '../core/projectionCopy.ts';
 import type { ProjectionOptions } from '../core/projectionOptions.ts';
 import type { ProjectionResult } from '../core/projectionResult.ts';
-import type { ResolvedProjectionGroups } from '../core/projectionSamples.ts';
+import type { ResolvedProjectionGroups, ResolvedProjectionShapes } from '../core/projectionSamples.ts';
 import type { SelectionReport } from './ProjectionMapCaption.tsx';
 import type { ProjectionMapChrome } from './projectionMapChrome.ts';
 /** What {@link ProjectionMapTab} needs. */
 interface ProjectionMapTabProps {
     /** What the run produced, whatever produced it. */
     result: ProjectionResult;
-    /** The groups, resolved once by the viewer so every tab colours alike. */
+    /**
+     * The grouping the dots are coloured by, resolved once by the viewer so every
+     * tab colours alike; empty while the colour stands for nothing.
+     */
     groups: ResolvedProjectionGroups;
+    /**
+     * The grouping the dots are shaped by, resolved once by the viewer.
+     * @default null — every dot is a disc
+     */
+    shapes?: ResolvedProjectionShapes | null;
     /** What the map is showing, already resolved against `result`. */
     options: ProjectionOptions;
     /** The words the map writes, already merged over the defaults. */
@@ -25,7 +33,7 @@ interface ProjectionMapTabProps {
      * "Sample ID" setting to write beside its dot.
      * @default undefined — the setting has nothing to write and draws nothing
      */
-    ids?: readonly string[];
+    names?: readonly string[];
     /** Width of the figure, in pixels. */
     width: number;
     /** Height of the figure, in pixels. */
@@ -90,9 +98,10 @@ interface ProjectionMapTabProps {
  * The map: one dot per sample, an outline per group, and a key floating in the
  * emptiest corner of the plot.
  *
- * Colour stands for the group and for nothing else, and a selected dot keeps
- * its colour and gains a ring — recolouring it would trade the answer the
- * reader came for against the question they have just asked. A sample the
+ * Colour stands for one grouping and shape, when there is a second, for that
+ * one, and a selected dot keeps both and gains a ring — recolouring it would
+ * trade the answer the reader came for against the question they have just
+ * asked. A sample the
  * model was built from is drawn filled and one placed into the finished model
  * afterwards is drawn hollow, because the second kind can land anywhere and
  * its landing far out is the finding rather than a fault.

package/lib/projection/ui/ProjectionMapTab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectionMapTab.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAIlE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAUpE,2CAA2C;AAC3C,UAAU,qBAAqB;IAC7B,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IACzB,0EAA0E;IAC1E,MAAM,EAAE,wBAAwB,CAAC;IACjC,kEAAkE;IAClE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,kEAAkE;IAClE,IAAI,EAAE,cAAc,CAAC;IACrB,0EAA0E;IAC1E,MAAM,EAAE,mBAAmB,CAAC;IAC5B;;;;OAIG;IACH,GAAG,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAChC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5D;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACvD;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CAqF3E"}
+{"version":3,"file":"ProjectionMapTab.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionMapTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAIlE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAWpE,2CAA2C;AAC3C,UAAU,qBAAqB;IAC7B,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IACzB;;;OAGG;IACH,MAAM,EAAE,wBAAwB,CAAC;IACjC;;;OAGG;IACH,MAAM,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;IACzC,kEAAkE;IAClE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,kEAAkE;IAClE,IAAI,EAAE,cAAc,CAAC;IACrB,0EAA0E;IAC1E,MAAM,EAAE,mBAAmB,CAAC;IAC5B;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IAChC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5D;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACvD;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CAyF3E"}

package/lib/projection/ui/ProjectionMapTab.js

@@ -1,17 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo, useState } from 'react';
 import { ScatterPlot } from "../../scatter/ui/ScatterPlot.js";
+import { NO_GROUPING } from "../core/projectionOptions.js";
 import { ProjectionMapCaption } from "./ProjectionMapCaption.js";
 import { ProjectionMapLegend } from "./ProjectionMapLegend.js";
 import { ProjectionSurface } from "./ProjectionSurface.js";
-import { MINIMUM_OUTLINE_POINTS, projectionAxisTitle, projectionMapCloud, projectionMapDomain, projectionMapMarkers, projectionScatterGroups, } from "./projectionMapModel.js";
+import { MINIMUM_OUTLINE_POINTS, projectionAxisTitle, projectionMapCloud, projectionMapDomain, projectionMapMarkers, projectionScatterGroups, projectionScatterShapes, } from "./projectionMapModel.js";
 /**
  * The map: one dot per sample, an outline per group, and a key floating in the
  * emptiest corner of the plot.
  *
- * Colour stands for the group and for nothing else, and a selected dot keeps
- * its colour and gains a ring — recolouring it would trade the answer the
- * reader came for against the question they have just asked. A sample the
+ * Colour stands for one grouping and shape, when there is a second, for that
+ * one, and a selected dot keeps both and gains a ring — recolouring it would
+ * trade the answer the reader came for against the question they have just
+ * asked. A sample the
  * model was built from is drawn filled and one placed into the finished model
  * afterwards is drawn hollow, because the second kind can land anywhere and
  * its landing far out is the finding rather than a fault.
@@ -24,7 +26,8 @@ import { MINIMUM_OUTLINE_POINTS, projectionAxisTitle, projectionMapCloud, projec
  */
 export function ProjectionMapTab(props) {
     const { result, groups, options, copy, chrome, width, height } = props;
-    const { ids, selected, viewport = null, report = null } = props;
+    const { names, shapes = null, selected } = props;
+    const { viewport = null, report = null } = props;
     const { onSelectionChange, onHoverChange, hoverCard } = props;
     const { onPointDoubleClick } = props;
     const { onViewportChange, wheelZoom, touchLasso, testId } = props;
@@ -35,9 +38,10 @@ export function ProjectionMapTab(props) {
     const cloud = useMemo(() => projectionMapCloud(scores, xAxis, yAxis), [scores, xAxis, yAxis]);
     const xDomain = useMemo(() => projectionMapDomain(scores, xAxis), [scores, xAxis]);
     const yDomain = useMemo(() => projectionMapDomain(scores, yAxis), [scores, yAxis]);
-    const colored = colorBy === 'group' && groups.entries.length > 0;
+    const shapeList = useMemo(() => projectionScatterShapes(shapes), [shapes]);
+    const colored = colorBy !== NO_GROUPING && groups.entries.length > 0;
     const ellipse = colored ? outlines : null;
-    return (_jsx(ScatterPlot, { x: cloud.x, y: cloud.y, width: width, height: height, xAxis: { domain: xDomain, label: projectionAxisTitle(result, xAxis) }, yAxis: { domain: yDomain, label: projectionAxisTitle(result, yAxis) }, groupOf: colored ? groups.groupOf : undefined, groups: colored ? projectionScatterGroups(groups) : undefined, ellipse: ellipse, ellipseMinimumPoints: MINIMUM_OUTLINE_POINTS, showGroupMeans: colored && showGroupMeans, showGroupLabels: colored && showGroupLabels, pointLabels: showIds ? ids : undefined, markers: projectionMapMarkers(markers ?? NO_MARKERS, groups, xAxis, yAxis), pointRadius: pointRadius, outlinedFrom: fittedCount, selected: selected, viewport: viewport, onViewportChange: onViewportChange, wheelZoom: wheelZoom, onSelectionChange: onSelectionChange, selectMode: selectMode, onHoverChange: onHoverChange, onPointDoubleClick: onPointDoubleClick, onLassoChange: setDrawing, touchLasso: touchLasso, testId: testId, overlay: _jsxs(ProjectionSurface, { children: [chrome.entries.length === 0 ? null : (_jsx(ProjectionMapLegend, { title: chrome.title, entries: chrome.entries, cloud: cloud, xDomain: viewport?.x ?? xDomain, yDomain: viewport?.y ?? yDomain, width: width, height: height })), _jsx(ProjectionMapCaption, { report: report, copy: copy, mode: selectMode, drawing: drawing }), hoverCard] }) }));
+    return (_jsx(ScatterPlot, { x: cloud.x, y: cloud.y, width: width, height: height, xAxis: { domain: xDomain, label: projectionAxisTitle(result, xAxis) }, yAxis: { domain: yDomain, label: projectionAxisTitle(result, yAxis) }, groupOf: colored ? groups.groupOf : undefined, groups: colored ? projectionScatterGroups(groups) : undefined, shapeOf: shapes?.shapeOf, shapes: shapeList, ellipse: ellipse, ellipseMinimumPoints: MINIMUM_OUTLINE_POINTS, showGroupMeans: colored && showGroupMeans, showGroupLabels: colored && showGroupLabels, pointLabels: showIds ? names : undefined, markers: projectionMapMarkers(markers ?? NO_MARKERS, groups, xAxis, yAxis), pointRadius: pointRadius, outlinedFrom: fittedCount, selected: selected, viewport: viewport, onViewportChange: onViewportChange, wheelZoom: wheelZoom, onSelectionChange: onSelectionChange, selectMode: selectMode, onHoverChange: onHoverChange, onPointDoubleClick: onPointDoubleClick, onLassoChange: setDrawing, touchLasso: touchLasso, testId: testId, overlay: _jsxs(ProjectionSurface, { children: [chrome.entries.length === 0 ? null : (_jsx(ProjectionMapLegend, { title: chrome.title, entries: chrome.entries, cloud: cloud, xDomain: viewport?.x ?? xDomain, yDomain: viewport?.y ?? yDomain, width: width, height: height })), _jsx(ProjectionMapCaption, { report: report, copy: copy, mode: selectMode, drawing: drawing }), hoverCard] }) }));
 }
 const NO_MARKERS = [];
 //# sourceMappingURL=ProjectionMapTab.js.map