react-cheminfo 0.22.0 → 0.23.0

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

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

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

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

@@ -1,6 +1,7 @@
 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 the grid keeps behind the cog is drawn from. */
 interface ProjectionPairsMoreProps {
     /** What the grid is showing, already resolved against the result. */
@@ -9,17 +10,12 @@ interface ProjectionPairsMoreProps {
     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;
+    /** Every grouping the samples carry, which is what `Colour by` offers. */
+    groupings: readonly ProjectionGrouping[];
     /** How many components the run produced, which caps the grid. */
     axisCount: number;
     /** Width of the figure, in pixels, which caps it again. */
     width: number;
-    /**
-     * Whether the samples carry groups at all.
-     * @default false
-     */
-    hasGroups?: boolean;
 }
 /**
  * What the grid keeps behind the cog: how many components it lays out, what

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionPairsMore.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPairsMore.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAK1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AAMtC,wDAAwD;AACxD,UAAU,wBAAwB;IAChC,qEAAqE;IACrE,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,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,YAAY,CAwCd"}
+{"version":3,"file":"ProjectionPairsMore.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPairsMore.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;AAMvE,wDAAwD;AACxD,UAAU,wBAAwB;IAChC,qEAAqE;IACrE,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,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACzC,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,YAAY,CAuCd"}

package/lib/projection/ui/ProjectionPairsMore.js

@@ -1,9 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { OverlayNumber } from "../../overlay/ui/OverlayNumber.js";
 import { OverlayPanel } from "../../overlay/ui/OverlayPanel.js";
-import { OverlaySegmented } from "../../overlay/ui/OverlaySegmented.js";
 import { PROJECTION_TAB_DEFAULTS } from "../core/projectionTabDefaults.js";
-import { projectionColourChoices } from "./projectionMapChoices.js";
+import { ProjectionColourPicker } from "./ProjectionGroupingPickers.js";
 import { projectionPairsCeiling } from "./projectionPairsCeiling.js";
 /**
  * What the grid keeps behind the cog: how many components it lays out, what
@@ -21,10 +20,10 @@ import { projectionPairsCeiling } from "./projectionPairsCeiling.js";
  * @returns The panel behind the cog.
  */
 export function ProjectionPairsMore(props) {
-    const { options, onChange, copy, groupLabel, hasGroups = false } = props;
+    const { options, onChange, copy, groupings } = props;
     const { axisCount, width } = props;
-    const { bar, help, panel, tab } = copy;
+    const { help, panel, tab } = copy;
     const ceiling = projectionPairsCeiling(axisCount, width);
-    return (_jsxs(OverlayPanel, { title: tab.pairs, onReset: () => onChange(PROJECTION_TAB_DEFAULTS.pairs), children: [_jsx(OverlayNumber, { label: panel.name.pairCount, help: help.pairCount, value: options.pairCount, min: ceiling.min, max: ceiling.max, onChange: (pairCount) => onChange({ pairCount }) }), _jsx(OverlaySegmented, { label: panel.name.colorBy, help: help.colorBy, value: options.colorBy, disabled: !hasGroups, options: projectionColourChoices(groupLabel, bar.uncoloured), onChange: (colorBy) => onChange({ colorBy }) }), _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 }) })] }));
+    return (_jsxs(OverlayPanel, { title: tab.pairs, onReset: () => onChange(PROJECTION_TAB_DEFAULTS.pairs), children: [_jsx(OverlayNumber, { label: panel.name.pairCount, help: help.pairCount, value: options.pairCount, min: ceiling.min, max: ceiling.max, onChange: (pairCount) => onChange({ pairCount }) }), _jsx(ProjectionColourPicker, { label: panel.name.colorBy, options: options, onChange: onChange, copy: copy, groupings: groupings }), _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 }) })] }));
 }
 //# sourceMappingURL=ProjectionPairsMore.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionPairsMore.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPairsMore.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAoC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAmC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAuC,CAAC;AAMzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAuBrE;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IACzE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACvC,MAAM,OAAO,GAAG,sBAAsB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAEzD,OAAO,CACL,MAAC,YAAY,IACX,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,KAAK,CAAC,aAEtD,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,EACpB,KAAK,EAAE,OAAO,CAAC,SAAS,EACxB,GAAG,EAAE,OAAO,CAAC,GAAG,EAChB,GAAG,EAAE,OAAO,CAAC,GAAG,EAChB,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,GAChD,EACF,KAAC,gBAAgB,IACf,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EACzB,IAAI,EAAE,IAAI,CAAC,OAAO,EAClB,KAAK,EAAE,OAAO,CAAC,OAAO,EACtB,QAAQ,EAAE,CAAC,SAAS,EACpB,OAAO,EAAE,uBAAuB,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,EAC5D,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,GAC5C,EACF,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,EAC7B,IAAI,EAAE,IAAI,CAAC,WAAW,EACtB,KAAK,EAAE,OAAO,CAAC,WAAW,EAC1B,GAAG,EAAE,CAAC,EACN,GAAG,EAAE,EAAE,EACP,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,CAAC,EACT,IAAI,EAAC,IAAI,EACT,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC,GACpD,IACW,CAChB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ProjectionPairsMore.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPairsMore.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAoC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAmC,CAAC;AAIjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAiC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAkBrE;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACrD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACnC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAClC,MAAM,OAAO,GAAG,sBAAsB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAEzD,OAAO,CACL,MAAC,YAAY,IACX,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,KAAK,CAAC,aAEtD,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,EACpB,KAAK,EAAE,OAAO,CAAC,SAAS,EACxB,GAAG,EAAE,OAAO,CAAC,GAAG,EAChB,GAAG,EAAE,OAAO,CAAC,GAAG,EAChB,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,GAChD,EACF,KAAC,sBAAsB,IACrB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EACzB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,GACpB,EACF,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,EAC7B,IAAI,EAAE,IAAI,CAAC,WAAW,EACtB,KAAK,EAAE,OAAO,CAAC,WAAW,EAC1B,GAAG,EAAE,CAAC,EACN,GAAG,EAAE,EAAE,EACP,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,CAAC,EACT,IAAI,EAAC,IAAI,EACT,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC,GACpD,IACW,CAChB,CAAC;AACJ,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionPairsTab.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPairsTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAU1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAM7E,6CAA6C;AAC7C,UAAU,uBAAuB;IAC/B,6BAA6B;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,4DAA4D;IAC5D,MAAM,EAAE,wBAAwB,CAAC;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B;;;OAGG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,uBAAuB,GAC7B,YAAY,CA+Cd"}
+{"version":3,"file":"ProjectionPairsTab.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPairsTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAU1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAKtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAM7E,6CAA6C;AAC7C,UAAU,uBAAuB;IAC/B,6BAA6B;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,4DAA4D;IAC5D,MAAM,EAAE,wBAAwB,CAAC;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B;;;OAGG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,uBAAuB,GAC7B,YAAY,CA+Cd"}

package/lib/projection/ui/ProjectionPairsTab.js

@@ -5,7 +5,7 @@ import { ScatterMatrix } from "../../scatter/ui/ScatterMatrix.js";
 import { SCATTER_MATRIX_MOST_AXES } from "../../scatter/ui/scatterMatrixLayout.js";
 import { fillCopy } from "../core/fillCopy.js";
 import { PROJECTION_COPY } from "../core/projectionCopy.js";
-import { DEFAULT_PROJECTION_OPTIONS } from "../core/projectionOptions.js";
+import { DEFAULT_PROJECTION_OPTIONS, NO_GROUPING, } from "../core/projectionOptions.js";
 import { ProjectionSurface } from "./ProjectionSurface.js";
 import { MINIMUM_OUTLINE_POINTS } from "./projectionMapModel.js";
 import { PROJECTION_TAB_HEIGHT } from "./projectionTabStyles.js";
@@ -30,7 +30,7 @@ export function ProjectionPairsTab(props) {
     const { width = 0, height = PROJECTION_TAB_HEIGHT, selected } = props;
     const axes = useMemo(() => result.axes.map((axis) => ({ name: axis.name, share: axis.share })), [result.axes]);
     const inks = useMemo(() => groups.entries.map(({ id, label, color }) => ({ id, label, color })), [groups]);
-    const colored = options.colorBy === 'group' && inks.length > 0;
+    const colored = options.colorBy !== NO_GROUPING && inks.length > 0;
     return (_jsx("div", { style: { minHeight: height }, "data-testid": testId, children: _jsx(ScatterMatrix, { scores: result.scores, axes: axes, count: Math.min(options.pairCount, SCATTER_MATRIX_MOST_AXES), width: width, groupOf: colored ? groups.groupOf : undefined, groups: colored ? inks : undefined, ellipse: colored ? options.ellipse : null, ellipseMinimumPoints: MINIMUM_OUTLINE_POINTS, selected: selected, pointRadius: Math.max(1, options.pointRadius - CROWDED_CELL), onSelectPair: onSelectPair, overlay: colored ? (_jsx(ProjectionSurface, { children: _jsx(OverlayLegend, { placement: "top-right", title: fillCopy(copy.legend.mapNoEllipse, {
                         groups: groups.label,
                     }), entries: legendEntries(groups) }) })) : undefined }) }));

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

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

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

@@ -3,10 +3,10 @@ import type { ProjectionCopy } from '../core/projectionCopy.ts';
 import type { ProjectionResult } from '../core/projectionResult.ts';
 import type { ProjectionSamples } from '../core/projectionSamples.ts';
 import type { ProjectionMapView } from './projectionMapView.ts';
+import type { ProjectionStateApi } from './projectionStateApi.ts';
 import type { ProjectionModels } from './projectionTabModels.ts';
 import type { ProjectionVariableTrack } from './projectionVariablesModel.ts';
 import type { ProjectionSampleOpen } from './projectionViewerProps.ts';
-import type { ProjectionStateApi } from './useProjectionState.ts';
 /** What {@link ProjectionPanel} needs. */
 interface ProjectionPanelProps {
     /** The tab, the options and the selection every tab shares. */

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionPanel.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,OAAO,CAAC;AAIxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,0CAA0C;AAC1C,UAAU,oBAAoB;IAC5B,+DAA+D;IAC/D,KAAK,EAAE,kBAAkB,CAAC;IAC1B,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IACzB,wBAAwB;IACxB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,qEAAqE;IACrE,IAAI,EAAE,cAAc,CAAC;IACrB,wDAAwD;IACxD,MAAM,EAAE,gBAAgB,CAAC;IACzB,iEAAiE;IACjE,GAAG,EAAE,iBAAiB,CAAC;IACvB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,6DAA6D;IAC7D,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACvC,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,KAAK,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC7D;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,GAAG,IAAI,KAAK,IAAI,CAAC;IAClE;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,YAAY,CA8JzE"}
+{"version":3,"file":"ProjectionPanel.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,OAAO,CAAC;AAIxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQtE,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;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,0CAA0C;AAC1C,UAAU,oBAAoB;IAC5B,+DAA+D;IAC/D,KAAK,EAAE,kBAAkB,CAAC;IAC1B,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IACzB,wBAAwB;IACxB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,qEAAqE;IACrE,IAAI,EAAE,cAAc,CAAC;IACrB,wDAAwD;IACxD,MAAM,EAAE,gBAAgB,CAAC;IACzB,iEAAiE;IACjE,GAAG,EAAE,iBAAiB,CAAC;IACvB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,6DAA6D;IAC7D,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACvC,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,KAAK,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC7D;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,GAAG,IAAI,KAAK,IAAI,CAAC;IAClE;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,YAAY,CAkKzE"}

package/lib/projection/ui/ProjectionPanel.js

@@ -55,7 +55,7 @@ export function ProjectionPanel(props) {
                 return;
             onSampleDoubleClick({ ...point, id });
         };
-    return (_jsxs("div", { ref: box, id: panelId, role: strip ? 'tabpanel' : undefined, "aria-labelledby": strip ? `${baseId}-${state.tab}` : undefined, onPointerMove: trackPointer, children: [state.tab === 'pairs' ? (_jsx(ProjectionPairsTab, { result: result, groups: state.groups, options: state.options, copy: copy, width: width, height: height, selected: state.selected, onSelectPair: state.selectPair })) : null, state.tab === 'variables' ? (_jsx(ProjectionVariablesTab, { profiles: models.profiles, options: state.options, copy: copy, sampleName: models.sampleName, width: width, height: height, onTrackVariable: onTrackVariable, formatValue: formatValue })) : null, state.tab === 'shares' ? (_jsx(ProjectionSharesTab, { result: result, shares: models.shares, copy: copy, width: width, height: height })) : null, state.tab === 'space' ? (_jsx(ProjectionSpaceTab, { result: result, groups: state.groups, options: state.options, copy: copy, chrome: map.spaceChrome, ids: samples.ids, width: width, height: height, selected: state.selected, camera: map.camera, onCameraChange: map.setCamera, zoom: map.zoom, onZoomChange: map.setZoom, wheelZoom: wheelZoom, report: map.report, onSelectionChange: map.settle, onHoverChange: noteHover, onPointDoubleClick: openSample, hoverCard: anchor.index < 0 ? null : (_jsx(ProjectionReadout, { index: anchor.index, result: result, samples: samples, groups: state.groups, xAxis: state.options.xAxis, yAxis: state.options.yAxis, zAxis: state.options.zAxis, x: anchor.x, y: anchor.y, boxWidth: width, boxHeight: height, formatValue: formatValue })) })) : null, state.tab === 'map' ? (_jsx(ProjectionMapTab, { result: result, groups: state.groups, options: state.options, copy: copy, chrome: map.chrome, ids: samples.ids, viewport: map.viewport, onViewportChange: map.setViewport, wheelZoom: wheelZoom, report: map.report, width: width, height: height, selected: state.selected, onSelectionChange: map.settle, onHoverChange: noteHover, onPointDoubleClick: openSample, touchLasso: touchLasso, hoverCard: anchor.index < 0 ? null : (_jsx(ProjectionReadout, { index: anchor.index, result: result, samples: samples, groups: state.groups, xAxis: state.options.xAxis, yAxis: state.options.yAxis, x: anchor.x, y: anchor.y, boxWidth: width, boxHeight: height, formatValue: formatValue })) })) : null] }));
+    return (_jsxs("div", { ref: box, id: panelId, role: strip ? 'tabpanel' : undefined, "aria-labelledby": strip ? `${baseId}-${state.tab}` : undefined, onPointerMove: trackPointer, children: [state.tab === 'pairs' ? (_jsx(ProjectionPairsTab, { result: result, groups: state.groups, options: state.options, copy: copy, width: width, height: height, selected: state.selected, onSelectPair: state.selectPair })) : null, state.tab === 'variables' ? (_jsx(ProjectionVariablesTab, { profiles: models.profiles, options: state.options, copy: copy, sampleName: models.sampleName, width: width, height: height, onTrackVariable: onTrackVariable, formatValue: formatValue })) : null, state.tab === 'shares' ? (_jsx(ProjectionSharesTab, { result: result, shares: models.shares, copy: copy, width: width, height: height })) : null, state.tab === 'space' ? (_jsx(ProjectionSpaceTab, { result: result, groups: state.groups, options: state.options, copy: copy, chrome: map.spaceChrome, shapes: state.shapes, names: samples.labels ?? samples.ids, width: width, height: height, selected: state.selected, camera: map.camera, onCameraChange: map.setCamera, zoom: map.zoom, onZoomChange: map.setZoom, wheelZoom: wheelZoom, report: map.report, onSelectionChange: map.settle, onHoverChange: noteHover, onPointDoubleClick: openSample, hoverCard: anchor.index < 0 ? null : (_jsx(ProjectionReadout, { index: anchor.index, result: result, samples: samples, groups: state.groups, colorBy: state.options.colorBy, xAxis: state.options.xAxis, yAxis: state.options.yAxis, zAxis: state.options.zAxis, x: anchor.x, y: anchor.y, boxWidth: width, boxHeight: height, formatValue: formatValue })) })) : null, state.tab === 'map' ? (_jsx(ProjectionMapTab, { result: result, groups: state.groups, options: state.options, copy: copy, chrome: map.chrome, shapes: state.shapes, names: samples.labels ?? samples.ids, viewport: map.viewport, onViewportChange: map.setViewport, wheelZoom: wheelZoom, report: map.report, width: width, height: height, selected: state.selected, onSelectionChange: map.settle, onHoverChange: noteHover, onPointDoubleClick: openSample, touchLasso: touchLasso, hoverCard: anchor.index < 0 ? null : (_jsx(ProjectionReadout, { index: anchor.index, result: result, samples: samples, groups: state.groups, colorBy: state.options.colorBy, xAxis: state.options.xAxis, yAxis: state.options.yAxis, x: anchor.x, y: anchor.y, boxWidth: width, boxHeight: height, formatValue: formatValue })) })) : null] }));
 }
 /** Where the pointer is before it has been anywhere. */
 const NOWHERE = { x: 0, y: 0 };

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

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

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

@@ -9,8 +9,14 @@ interface ProjectionReadoutProps {
     result: ProjectionResult;
     /** Who the rows are. */
     samples: ProjectionSamples;
-    /** The groups as the figure draws them, for the row's group and its colour. */
+    /** The grouping the figure is coloured by, for the colour of the row's group. */
     groups: ResolvedProjectionGroups;
+    /**
+     * Which grouping colours the figure, so the row of that grouping carries the
+     * colour its dot is drawn in.
+     * @default undefined — no row carries a colour
+     */
+    colorBy?: string;
     /** Which axis is drawn horizontally, from 0. */
     xAxis: number;
     /** Which axis is drawn vertically. */

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionReadout.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionReadout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAK1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAItC,sDAAsD;AACtD,UAAU,sBAAsB;IAC9B,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,MAAM,EAAE,gBAAgB,CAAC;IACzB,wBAAwB;IACxB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,+EAA+E;IAC/E,MAAM,EAAE,wBAAwB,CAAC;IACjC,gDAAgD;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8DAA8D;IAC9D,CAAC,EAAE,MAAM,CAAC;IACV,6DAA6D;IAC7D,CAAC,EAAE,MAAM,CAAC;IACV,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,YAAY,CA2C7E"}
+{"version":3,"file":"ProjectionReadout.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionReadout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAK1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAItC,sDAAsD;AACtD,UAAU,sBAAsB;IAC9B,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,MAAM,EAAE,gBAAgB,CAAC;IACzB,wBAAwB;IACxB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,iFAAiF;IACjF,MAAM,EAAE,wBAAwB,CAAC;IACjC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gDAAgD;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8DAA8D;IAC9D,CAAC,EAAE,MAAM,CAAC;IACV,6DAA6D;IAC7D,CAAC,EAAE,MAAM,CAAC;IACV,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,YAAY,CAgD7E"}