react-cheminfo 0.22.0 → 0.24.0

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionViewer.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAazD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGxE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CAyE3E"}
+{"version":3,"file":"ProjectionViewer.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAazD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGxE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CA0E3E"}

package/lib/projection/ui/ProjectionViewer.js

@@ -57,6 +57,7 @@ export function ProjectionViewer(props) {
         result,
         copy,
         groups: state.groups,
+        shapes: state.shapes,
         options: state.options,
         selected: state.selected,
         onSettle: state.settleSelection,

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectionViewer.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionViewer.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC3D,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IACtE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,qBAAqB,EAAE,GAAG,KAAK,CAAC;IAC5E,MAAM,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IACnC,MAAM,EAAE,WAAW,GAAG,qBAAqB,EAAE,QAAQ,GAAG,YAAY,EAAE,GACpE,KAAK,CAAC;IAER,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;IAElE,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACjC,MAAM;QACN,OAAO;QACP,IAAI;QACJ,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,oBAAoB,CAAC;QAC/B,MAAM;QACN,IAAI;QACJ,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,eAAe;KAChC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,GAAG,MAAM,QAAQ,CAAC;IAClC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAEpC,OAAO,CACL,eACE,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,cAAc,CAAC,mBAAmB,EAAE,SAAS,CAAC,iBAC5C,MAAM,EACnB,KAAK,EAAE,YAAY,aAEnB,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,GACZ,EACF,KAAC,eAAe,IACd,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,GACpB,IACE,CACP,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,aAAa,GAAG,GAAG,CAAC;AAE1B;;;;;;GAMG;AACH,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,QAAQ;IACvB,KAAK,EAAE,MAAM;CACmB,CAAC"}
+{"version":3,"file":"ProjectionViewer.js","sourceRoot":"","sources":["../../../src/projection/ui/ProjectionViewer.tsx"],"names":[],"mappings":"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"}

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

@@ -42,7 +42,10 @@ interface ProjectionReadingsInput {
     copy: ProjectionCopy;
     /** What the figure is showing, already made safe against the result. */
     options: ProjectionOptions;
-    /** The groups as every figure draws them, whose colours the map writes. */
+    /**
+     * The grouping the figures are coloured by, whose colours the map writes;
+     * empty while nothing colours them.
+     */
     groups: ResolvedProjectionGroups;
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"projectionBarReadings.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionBarReadings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,2DAA2D;AAC3D,UAAU,uBAAuB;IAC/B,yEAAyE;IACzE,GAAG,EAAE,aAAa,CAAC;IACnB,qEAAqE;IACrE,IAAI,EAAE,cAAc,CAAC;IACrB,wEAAwE;IACxE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,2EAA2E;IAC3E,MAAM,EAAE,wBAAwB,CAAC;CAClC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,uBAAuB,GAC7B,SAAS,iBAAiB,EAAE,CAoD9B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,EACtC,OAAO,EAAE,cAAc,GACtB,MAAM,CAQR;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,GACrC,SAAS,kBAAkB,EAAE,CAU/B"}
+{"version":3,"file":"projectionBarReadings.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionBarReadings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,2DAA2D;AAC3D,UAAU,uBAAuB;IAC/B,yEAAyE;IACzE,GAAG,EAAE,aAAa,CAAC;IACnB,qEAAqE;IACrE,IAAI,EAAE,cAAc,CAAC;IACrB,wEAAwE;IACxE,OAAO,EAAE,iBAAiB,CAAC;IAC3B;;;OAGG;IACH,MAAM,EAAE,wBAAwB,CAAC;CAClC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,uBAAuB,GAC7B,SAAS,iBAAiB,EAAE,CAmD9B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,EACtC,OAAO,EAAE,cAAc,GACtB,MAAM,CAQR;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,GACrC,SAAS,kBAAkB,EAAE,CAU/B"}

package/lib/projection/ui/projectionBarReadings.js

@@ -8,6 +8,7 @@
  * `Colour by species` and folding the bar at the wrong width.
  */
 import { chartShare } from "../../chart/core/chartLabels.js";
+import { NO_GROUPING } from "../core/projectionOptions.js";
 import { ellipseCoverageText } from "./projectionEllipse.js";
 /**
  * What the tab showing writes at the far end of the bar.
@@ -37,7 +38,7 @@ export function projectionBarReadings(input) {
         ];
     }
     if (tab === 'space') {
-        const coverage = options.colorBy === 'group' && groups.entries.length > 0
+        const coverage = isColoured(options, groups)
             ? ellipseCoverageText(options.ellipse, 'space')
             : '';
         return [
@@ -108,11 +109,11 @@ export function projectionChipSettings(readings) {
  * Empty while the colour stands for nothing, so a bar that says `Nothing`
  * does not carry a row of dots contradicting it.
  * @param options - What the figure is showing.
- * @param groups - The groups as every figure draws them.
+ * @param groups - The grouping the figures are coloured by.
  * @returns The colours, in the order the figure draws them.
  */
 function projectionGroupColors(options, groups) {
-    if (options.colorBy !== 'group')
+    if (!isColoured(options, groups))
         return NO_COLORS;
     const colors = [];
     for (const entry of groups.entries)
@@ -134,7 +135,7 @@ function projectionGroupColors(options, groups) {
  */
 function mapReadings(copy, options, groups) {
     const { bar, help } = copy;
-    const colored = options.colorBy === 'group';
+    const colored = isColoured(options, groups);
     const coverage = ellipseCoverageText(options.ellipse);
     return [
         {
@@ -150,6 +151,15 @@ function mapReadings(copy, options, groups) {
         },
     ];
 }
+/**
+ * Whether the colour stands for a grouping at all.
+ * @param options - What the figure is showing.
+ * @param groups - The grouping the figures are coloured by.
+ * @returns `true` when the dots are painted by group.
+ */
+function isColoured(options, groups) {
+    return options.colorBy !== NO_GROUPING && groups.entries.length > 0;
+}
 /** No colours at all, which is what an uncoloured map paints. */
 const NO_COLORS = [];
 //# sourceMappingURL=projectionBarReadings.js.map

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

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

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

@@ -3,7 +3,7 @@ import type { OverlayTier } from '../../overlay/core/overlayTiers.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 { ProjectionGrouping, ResolvedProjectionGroups } from '../core/projectionSamples.ts';
 import type { ProjectionTab } from '../core/projectionTabs.ts';
 import type { ProjectionReading } from './projectionBarReadings.ts';
 import type { ProjectionMapView } from './projectionMapView.ts';
@@ -31,8 +31,10 @@ interface ProjectionBarSlotsInput {
     map: ProjectionMapView;
     /** Every option, already made safe against the result. */
     options: ProjectionOptions;
-    /** The groups as every figure draws them. */
+    /** The grouping the figures are coloured by; empty while nothing colours them. */
     groups: ResolvedProjectionGroups;
+    /** Every grouping the samples carry, which the pickers choose between. */
+    groupings: readonly ProjectionGrouping[];
     /** The selected rows, as indices. */
     selected: readonly number[];
     /** Width of the viewer, in pixels. */

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

@@ -1 +1 @@
-{"version":3,"file":"projectionBarSlots.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionBarSlots.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAY/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAMhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,gDAAgD;AAChD,UAAU,kBAAkB;IAC1B,0EAA0E;IAC1E,GAAG,EAAE,SAAS,CAAC;IACf,8DAA8D;IAC9D,IAAI,EAAE,SAAS,CAAC;IAChB,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;CACd;AAED,+DAA+D;AAC/D,UAAU,uBAAuB;IAC/B,uBAAuB;IACvB,GAAG,EAAE,aAAa,CAAC;IACnB,6BAA6B;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,mCAAmC;IACnC,IAAI,EAAE,cAAc,CAAC;IACrB,wCAAwC;IACxC,MAAM,EAAE,gBAAgB,CAAC;IACzB,sDAAsD;IACtD,GAAG,EAAE,iBAAiB,CAAC;IACvB,0DAA0D;IAC1D,OAAO,EAAE,iBAAiB,CAAC;IAC3B,6CAA6C;IAC7C,MAAM,EAAE,wBAAwB,CAAC;IACjC,qCAAqC;IACrC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACvC,2DAA2D;IAC3D,IAAI,EAAE,WAAW,CAAC;IAClB,iDAAiD;IACjD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;CACvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CA8EpB"}
+{"version":3,"file":"projectionBarSlots.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionBarSlots.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAY/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAMhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,gDAAgD;AAChD,UAAU,kBAAkB;IAC1B,0EAA0E;IAC1E,GAAG,EAAE,SAAS,CAAC;IACf,8DAA8D;IAC9D,IAAI,EAAE,SAAS,CAAC;IAChB,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAC;CACd;AAED,+DAA+D;AAC/D,UAAU,uBAAuB;IAC/B,uBAAuB;IACvB,GAAG,EAAE,aAAa,CAAC;IACnB,6BAA6B;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,mCAAmC;IACnC,IAAI,EAAE,cAAc,CAAC;IACrB,wCAAwC;IACxC,MAAM,EAAE,gBAAgB,CAAC;IACzB,sDAAsD;IACtD,GAAG,EAAE,iBAAiB,CAAC;IACvB,0DAA0D;IAC1D,OAAO,EAAE,iBAAiB,CAAC;IAC3B,kFAAkF;IAClF,MAAM,EAAE,wBAAwB,CAAC;IACjC,0EAA0E;IAC1E,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACzC,qCAAqC;IACrC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACvC,2DAA2D;IAC3D,IAAI,EAAE,WAAW,CAAC;IAClB,iDAAiD;IACjD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;CACvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CA0EpB"}

package/lib/projection/ui/projectionBarSlots.js

@@ -23,14 +23,12 @@ import { projectionPairsInfo, projectionSharesInfo, projectionVariablesInfo, } f
  */
 export function projectionBarSlots(input) {
     const { tab, result, copy, models, map, readings, tier } = input;
-    const { options, groups, selected, width, onChange } = input;
-    const hasGroups = groups.entries.length > 0;
-    const colored = options.colorBy === 'group' && hasGroups;
-    const shared = { options, onChange, copy, groupLabel: groups.label };
+    const { options, groups, groupings, selected, width, onChange } = input;
+    const colored = groups.entries.length > 0;
+    const shared = { options, onChange, copy, groupings };
     if (tab === 'pairs') {
         const pairs = {
             ...shared,
-            hasGroups,
             axisCount: result.axes.length,
             width,
         };
@@ -44,7 +42,6 @@ export function projectionBarSlots(input) {
         const space = {
             ...shared,
             result,
-            hasGroups,
             selectedCount: selected.length,
             onResetView: map.resetSpaceView,
             onClearSelection: map.clearSelection,
@@ -83,7 +80,6 @@ export function projectionBarSlots(input) {
     const forMap = {
         ...shared,
         result,
-        hasGroups,
         selectedCount: selected.length,
         onZoomToSelection: map.zoomToSelection,
         onResetView: map.resetView,

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

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

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

@@ -1,5 +1,5 @@
 /**
- * What the map's two settings offer, in the two lengths the bar needs.
+ * What the map's settings offer, in the lengths the bar needs.
  *
  * The same choices are written twice — once as bare shares on a value menu
  * whose own heading already says what they are shares of, and once as whole
@@ -8,14 +8,39 @@
  */
 import type { OverlayOption } from '../../overlay/ui/OverlayRow.tsx';
 import type { ProjectionCopy } from '../core/projectionCopy.ts';
-import type { ProjectionColorBy, ProjectionOptions } from '../core/projectionOptions.ts';
+import type { ProjectionOptions } from '../core/projectionOptions.ts';
+import type { ProjectionGrouping } from '../core/projectionSamples.ts';
 /**
- * What the colour may stand for.
- * @param groupLabel - What the set of groups is called.
+ * What the colour may stand for: each grouping the samples carry, or nothing.
+ * @param groupings - The groupings the samples carry.
  * @param uncoloured - What "the colour stands for nothing" reads.
- * @returns The two choices.
+ * @returns The choices, in the order the groupings were handed in.
  */
-export declare function projectionColourChoices(groupLabel: string, uncoloured: string): ReadonlyArray<OverlayOption<ProjectionColorBy>>;
+export declare function projectionColourChoices(groupings: readonly ProjectionGrouping[], uncoloured: string): readonly OverlayOption[];
+/**
+ * What the shape may stand for: each grouping the samples carry, or nothing.
+ *
+ * A grouping the colour already stands for is kept in the list but greyed, as
+ * is one of more groups than there are shapes, so the reader sees why it cannot
+ * be picked rather than wondering where it went.
+ * @param groupings - The groupings the samples carry.
+ * @param options - What the figure is showing, whose colour is taken.
+ * @param rows - How many rows there are, which is what a grouping is cut over.
+ * @param copy - The words the viewer writes.
+ * @returns The choices, in the order the groupings were handed in.
+ */
+export declare function projectionShapeChoices(groupings: readonly ProjectionGrouping[], options: ProjectionOptions, rows: number, copy: ProjectionCopy): readonly OverlayOption[];
+/**
+ * What changes when the colour is given to another grouping.
+ *
+ * A grouping drawn as the shape that is picked for the colour swaps places
+ * with it rather than being dropped, so the reader never loses one of the two
+ * groupings they were comparing by trading them round.
+ * @param options - What the figure is showing.
+ * @param colorBy - The grouping picked for the colour.
+ * @returns The options that change.
+ */
+export declare function projectionColourPatch(options: ProjectionOptions, colorBy: string): Partial<ProjectionOptions>;
 /**
  * How large the outlines may be, written as bare shares.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"projectionMapChoices.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapChoices.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AAQtC;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,aAAa,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAKjD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,cAAc,GACnB,SAAS,aAAa,EAAE,CAW1B"}
+{"version":3,"file":"projectionMapChoices.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapChoices.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAQvE;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,kBAAkB,EAAE,EACxC,UAAU,EAAE,MAAM,GACjB,SAAS,aAAa,EAAE,CAK1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,kBAAkB,EAAE,EACxC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,GACnB,SAAS,aAAa,EAAE,CAmB1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CAI5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,cAAc,GACnB,SAAS,aAAa,EAAE,CAW1B"}

package/lib/projection/ui/projectionMapChoices.js

@@ -1,23 +1,72 @@
 /**
- * What the map's two settings offer, in the two lengths the bar needs.
+ * What the map's settings offer, in the lengths the bar needs.
  *
  * The same choices are written twice — once as bare shares on a value menu
  * whose own heading already says what they are shares of, and once as whole
  * sentences in the panel a reader opens with room to read them — so both are
  * built here and neither file spells the other's list for itself.
  */
+import { resolveProjectionShapes } from "../core/projectionGroupings.js";
+import { NO_GROUPING } from "../core/projectionOptions.js";
 import { ellipseChoices, ellipseCoverageText, ellipseSize, } from "./projectionEllipse.js";
 /**
- * What the colour may stand for.
- * @param groupLabel - What the set of groups is called.
+ * What the colour may stand for: each grouping the samples carry, or nothing.
+ * @param groupings - The groupings the samples carry.
  * @param uncoloured - What "the colour stands for nothing" reads.
- * @returns The two choices.
+ * @returns The choices, in the order the groupings were handed in.
  */
-export function projectionColourChoices(groupLabel, uncoloured) {
-    return [
-        { value: 'group', label: groupLabel },
-        { value: 'none', label: uncoloured },
-    ];
+export function projectionColourChoices(groupings, uncoloured) {
+    const choices = [];
+    for (const { id, label } of groupings)
+        choices.push({ value: id, label });
+    choices.push({ value: NO_GROUPING, label: uncoloured });
+    return choices;
+}
+/**
+ * What the shape may stand for: each grouping the samples carry, or nothing.
+ *
+ * A grouping the colour already stands for is kept in the list but greyed, as
+ * is one of more groups than there are shapes, so the reader sees why it cannot
+ * be picked rather than wondering where it went.
+ * @param groupings - The groupings the samples carry.
+ * @param options - What the figure is showing, whose colour is taken.
+ * @param rows - How many rows there are, which is what a grouping is cut over.
+ * @param copy - The words the viewer writes.
+ * @returns The choices, in the order the groupings were handed in.
+ */
+export function projectionShapeChoices(groupings, options, rows, copy) {
+    const choices = [];
+    for (const grouping of groupings) {
+        const { id, label } = grouping;
+        const reason = id === options.colorBy
+            ? copy.reason.shapeIsColour
+            : resolveProjectionShapes(grouping, rows) === null
+                ? copy.reason.tooManyShapes
+                : undefined;
+        choices.push({
+            value: id,
+            label,
+            disabled: reason !== undefined,
+            title: reason,
+        });
+    }
+    choices.push({ value: NO_GROUPING, label: copy.bar.unshaped });
+    return choices;
+}
+/**
+ * What changes when the colour is given to another grouping.
+ *
+ * A grouping drawn as the shape that is picked for the colour swaps places
+ * with it rather than being dropped, so the reader never loses one of the two
+ * groupings they were comparing by trading them round.
+ * @param options - What the figure is showing.
+ * @param colorBy - The grouping picked for the colour.
+ * @returns The options that change.
+ */
+export function projectionColourPatch(options, colorBy) {
+    return colorBy !== NO_GROUPING && colorBy === options.shapeBy
+        ? { colorBy, shapeBy: options.colorBy }
+        : { colorBy };
 }
 /**
  * How large the outlines may be, written as bare shares.

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

@@ -1 +1 @@
-{"version":3,"file":"projectionMapChoices.js","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapChoices.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,WAAW,GACZ,MAAM,wBAAwB,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAAkB,EAClB,UAAkB;IAElB,OAAO;QACL,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE;QACrC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE;KACrC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAA0B,EAC1B,IAAoB;IAEpB,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACnE,MAAM,KAAK,GAAG,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;YACjD,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"projectionMapChoices.js","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapChoices.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG3D,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,WAAW,GACZ,MAAM,wBAAwB,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,SAAwC,EACxC,UAAkB;IAElB,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1E,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IACxD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,sBAAsB,CACpC,SAAwC,EACxC,OAA0B,EAC1B,IAAY,EACZ,IAAoB;IAEpB,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;QAC/B,MAAM,MAAM,GACV,EAAE,KAAK,OAAO,CAAC,OAAO;YACpB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAC3B,CAAC,CAAC,uBAAuB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAI;gBAChD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;gBAC3B,CAAC,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,EAAE;YACT,KAAK;YACL,QAAQ,EAAE,MAAM,KAAK,SAAS;YAC9B,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;IACL,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/D,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAA0B,EAC1B,OAAe;IAEf,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,KAAK,OAAO,CAAC,OAAO;QAC3D,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;QACvC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAA0B,EAC1B,IAAoB;IAEpB,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACnE,MAAM,KAAK,GAAG,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;YACjD,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -11,7 +11,7 @@ import type { OverlayLegendEntry } from '../../overlay/ui/OverlayLegend.tsx';
 import type { EllipseSize } from '../../scatter/core/confidenceEllipse.ts';
 import type { ProjectionCopy } from '../core/projectionCopy.ts';
 import type { ProjectionMarker } from '../core/projectionResult.ts';
-import type { ResolvedProjectionGroups } from '../core/projectionSamples.ts';
+import type { ResolvedProjectionGroups, ResolvedProjectionShapes } from '../core/projectionSamples.ts';
 /** What the map's chrome is built from. */
 interface ProjectionMapChromeInput {
     /** The words the map writes, already merged over the defaults. */
@@ -20,6 +20,8 @@ interface ProjectionMapChromeInput {
     groups: ResolvedProjectionGroups;
     /** Whether colour stands for the group at all. */
     colored: boolean;
+    /** The grouping the dots are shaped by, or `null` while they are all discs. */
+    shapes: ResolvedProjectionShapes | null;
     /** How large the group outlines are, or `null` for none. */
     ellipse: EllipseSize | null;
     /** How many samples a group needs before it is outlined at all. */
@@ -70,13 +72,5 @@ export interface ProjectionMapChrome {
  * @returns The legend's title and entries, and the standing caption.
  */
 export declare function projectionMapChrome(input: ProjectionMapChromeInput): ProjectionMapChrome;
-/**
- * The sentence reporting what a gesture picked out.
- * @param copy - The words the map writes.
- * @param count - How many samples are selected.
- * @param total - How many there are in all.
- * @returns The sentence.
- */
-export declare function projectionSelectionSentence(copy: ProjectionCopy, count: number, total: number): string;
 export {};
 //# sourceMappingURL=projectionMapChrome.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"projectionMapChrome.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapChrome.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAK7E,2CAA2C;AAC3C,UAAU,wBAAwB;IAChC,kEAAkE;IAClE,IAAI,EAAE,cAAc,CAAC;IACrB,0CAA0C;IAC1C,MAAM,EAAE,wBAAwB,CAAC;IACjC,kDAAkD;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,4DAA4D;IAC5D,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,mEAAmE;IACnE,aAAa,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,cAAc,EAAE,OAAO,CAAC;IACxB,iDAAiD;IACjD,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACrC,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CAC1B;AAED,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAClC;;;;;;;OAOG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,wDAAwD;IACxD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,mBAAmB,CAqDrB;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,MAAM,CAMR"}
+{"version":3,"file":"projectionMapChrome.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapChrome.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAKtC,2CAA2C;AAC3C,UAAU,wBAAwB;IAChC,kEAAkE;IAClE,IAAI,EAAE,cAAc,CAAC;IACrB,0CAA0C;IAC1C,MAAM,EAAE,wBAAwB,CAAC;IACjC,kDAAkD;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,MAAM,EAAE,wBAAwB,GAAG,IAAI,CAAC;IACxC,4DAA4D;IAC5D,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,mEAAmE;IACnE,aAAa,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,cAAc,EAAE,OAAO,CAAC;IACxB,iDAAiD;IACjD,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACrC,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CAC1B;AAED,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAClC;;;;;;;OAOG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,wDAAwD;IACxD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,mBAAmB,CAuDrB"}

package/lib/projection/ui/projectionMapChrome.js

@@ -7,7 +7,6 @@
  * only way a promise like "this outline covers 95 % of the group" stays
  * honest as the controls around it change.
  */
-import { formatInteger } from "../../format/core/numbers.js";
 import { fillCopy } from "../core/fillCopy.js";
 import { ellipseCoverageText } from "./projectionEllipse.js";
 import { UNGROUPED_INK } from "./projectionMapModel.js";
@@ -25,6 +24,7 @@ import { UNGROUPED_INK } from "./projectionMapModel.js";
  */
 export function projectionMapChrome(input) {
     const { copy, groups, colored, ellipse, showGroupMeans, markers } = input;
+    const { shapes } = input;
     const { minimumPoints, fittedCount, total, figure = 'map' } = input;
     const entries = [];
     const skipped = [];
@@ -51,6 +51,7 @@ export function projectionMapChrome(input) {
             });
         }
     }
+    appendShapeEntries(entries, shapes);
     appendMarkerEntries(entries, markers, groups);
     const hollow = fittedCount < total;
     if (hollow) {
@@ -62,43 +63,54 @@ export function projectionMapChrome(input) {
         });
     }
     return {
-        title: legendTitle(copy, groups, colored),
+        title: legendTitle(copy, groups, colored, shapes),
         entries,
         caption: captionFor(copy, groups, colored, ellipse, skipped, hollow, figure),
     };
 }
 /**
- * The sentence reporting what a gesture picked out.
- * @param copy - The words the map writes.
- * @param count - How many samples are selected.
- * @param total - How many there are in all.
- * @returns The sentence.
- */
-export function projectionSelectionSentence(copy, count, total) {
-    if (count === 0)
-        return copy.sentence.selectionNone;
-    return fillCopy(copy.sentence.selection, {
-        count: formatInteger(count),
-        total: formatInteger(total),
-    });
-}
-/**
- * The sentence over the legend.
+ * The sentence over the legend, naming what the colour and the shape stand
+ * for.
  *
- * When colour stands for nothing the entries left are all shape, so the title
- * names the shape channel: a legend naming no encoding at all is the one fault
- * this title exists to prevent, and it is not fixed by leaving the title out.
+ * When neither stands for a grouping the entries left are all marks, so the
+ * title names the shape channel: a legend naming no encoding at all is the one
+ * fault this title exists to prevent, and it is not fixed by leaving it out.
  * @param copy - The words the map writes.
  * @param groups - The groups as the map colours them.
  * @param colored - Whether colour stands for the group at all.
+ * @param shapes - The grouping the dots are shaped by, or `null`.
  * @returns The title.
  */
-function legendTitle(copy, groups, colored) {
-    if (!colored || groups.entries.length === 0)
-        return copy.legend.shapes;
-    return fillCopy(copy.legend.mapNoEllipse, {
-        groups: groups.label.toLowerCase(),
-    });
+function legendTitle(copy, groups, colored, shapes) {
+    const parts = [];
+    if (colored && groups.entries.length > 0) {
+        parts.push(fillCopy(copy.legend.mapNoEllipse, {
+            groups: groups.label.toLowerCase(),
+        }));
+    }
+    if (shapes !== null) {
+        parts.push(fillCopy(copy.legend.shapedBy, { shapes: shapes.label.toLowerCase() }));
+    }
+    return parts.length === 0 ? copy.legend.shapes : parts.join(' ');
+}
+/**
+ * One entry per shape, drawn in the muted ink: a colour on a shape's entry
+ * would claim a group of the colour grouping it does not stand for.
+ * @param entries - The legend, appended to in place.
+ * @param shapes - The grouping the dots are shaped by, or `null`.
+ */
+function appendShapeEntries(entries, shapes) {
+    if (shapes === null)
+        return;
+    for (const entry of shapes.entries) {
+        entries.push({
+            id: `shape-${entry.id}`,
+            label: entry.label,
+            color: SHAPE_INK,
+            shape: entry.shape,
+            count: entry.count,
+        });
+    }
 }
 function captionFor(copy, groups, colored, ellipse, skipped, hollow, figure) {
     const solid = figure === 'space';
@@ -134,4 +146,6 @@ function appendMarkerEntries(entries, markers, groups) {
         });
     }
 }
+/** The ink a shape's entry is drawn in, the one the key uses for marks that name no colour. */
+const SHAPE_INK = 'var(--text-muted)';
 //# sourceMappingURL=projectionMapChrome.js.map

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

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

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

@@ -0,0 +1,25 @@
+/**
+ * Which corner of the map the floating key takes.
+ *
+ * It is a module of its own because it is the one piece of the map that has to
+ * know where the dots fall before anything is drawn over them, and it is all
+ * arithmetic that can be checked without rendering anything.
+ */
+import type { OverlayCorner } from '../../overlay/core/overlayPlacement.ts';
+import type { ProjectionMapCloud } from './projectionMapModel.ts';
+/**
+ * The corner of the map with the fewest dots under it.
+ *
+ * All four are offered. The chrome that asks is laid out inside the plot
+ * rectangle rather than over the figure's box, so no corner of it costs the
+ * reader an axis label, and the only thing left to weigh is how many samples
+ * each one would cover.
+ * @param cloud - Where every sample sits, in data units.
+ * @param xDomain - The range the horizontal axis covers.
+ * @param yDomain - The range the vertical axis covers.
+ * @param width - Width of the plot rectangle, in pixels.
+ * @param height - Its height.
+ * @returns The corner the card sits in.
+ */
+export declare function projectionMapCorner(cloud: ProjectionMapCloud, xDomain: readonly [number, number], yDomain: readonly [number, number], width: number, height: number): OverlayCorner;
+//# sourceMappingURL=projectionMapCorner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"projectionMapCorner.d.ts","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapCorner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAE5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,aAAa,CAMf"}

package/lib/projection/ui/projectionMapCorner.js

@@ -0,0 +1,46 @@
+/**
+ * Which corner of the map the floating key takes.
+ *
+ * It is a module of its own because it is the one piece of the map that has to
+ * know where the dots fall before anything is drawn over them, and it is all
+ * arithmetic that can be checked without rendering anything.
+ */
+import { emptiestCorner } from "../../overlay/core/emptiestCorner.js";
+/**
+ * The corner of the map with the fewest dots under it.
+ *
+ * All four are offered. The chrome that asks is laid out inside the plot
+ * rectangle rather than over the figure's box, so no corner of it costs the
+ * reader an axis label, and the only thing left to weigh is how many samples
+ * each one would cover.
+ * @param cloud - Where every sample sits, in data units.
+ * @param xDomain - The range the horizontal axis covers.
+ * @param yDomain - The range the vertical axis covers.
+ * @param width - Width of the plot rectangle, in pixels.
+ * @param height - Its height.
+ * @returns The corner the card sits in.
+ */
+export function projectionMapCorner(cloud, xDomain, yDomain, width, height) {
+    return emptiestCorner(placeAlong(cloud.x, xDomain, width, false), placeAlong(cloud.y, yDomain, height, true), { width, height, cardWidth: CARD_WIDTH, cardHeight: CARD_HEIGHT });
+}
+function placeAlong(values, domain, size, flip) {
+    const span = domain[1] - domain[0];
+    const factor = span === 0 ? 0 : size / span;
+    const pixels = new Float64Array(values.length);
+    for (let index = 0; index < values.length; index++) {
+        const along = ((values[index] ?? Number.NaN) - domain[0]) * factor;
+        pixels[index] = flip ? size - along : along;
+    }
+    return pixels;
+}
+/**
+ * How much of the plot the floating key is expected to cover.
+ *
+ * It is an estimate on purpose — the card has not been laid out when the
+ * corner is chosen — and it is the compact key's size rather than the roomier
+ * card the overlay domain assumes: a corner counted as three species wide
+ * would call a corner busy that the key never reaches.
+ */
+const CARD_WIDTH = 170;
+const CARD_HEIGHT = 84;
+//# sourceMappingURL=projectionMapCorner.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"projectionMapCorner.js","sourceRoot":"","sources":["../../../src/projection/ui/projectionMapCorner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAKtE;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAAyB,EACzB,OAAkC,EAClC,OAAkC,EAClC,KAAa,EACb,MAAc;IAEd,OAAO,cAAc,CACnB,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,EAC1C,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAC1C,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,CAClE,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CACjB,MAAoB,EACpB,MAAiC,EACjC,IAAY,EACZ,IAAa;IAEb,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,GAAG,GAAG,CAAC;AACvB,MAAM,WAAW,GAAG,EAAE,CAAC"}