@weasel-js/labkit 1.6.0 → 1.6.1

package/dist/_dts/{types-B7y8hX1D.d.ts → types-DTuViBvc.d.ts}

@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 import { ToolPrefNumberFormat, ToolPrefNumberUnit, ToolPrefLeaf, ToolPrefGroup } from '@weasel-js/core';
 import { P as PrefRenderer } from './PrefsRow.d-DFpPIeIC.js';
 
@@ -94,6 +95,21 @@ interface ResolvedConfig {
     showIf: ReadonlyMap<string, (config: Record<string, unknown>) => boolean>;
     /** Node-level `.render` overrides, keyed by path. */
     renderers: Readonly<Record<string, ControlRenderer>>;
+    /** Node-level `.dialog` rows, keyed by path. */
+    dialogs: Readonly<Record<string, DialogSpec>>;
+}
+/** Options for a row drawn as a button that opens a dialog. */
+interface InDialogOptions {
+    /** What the row's button shows of the value. Defaults to a list joined with
+     *  commas, or the value itself. */
+    summary?: (value: unknown) => ReactNode;
+    /** The dialog's heading. Defaults to the row's label. */
+    title?: ReactNode;
+}
+/** A `.dialog` row: `body` is the dialog's content, handed the context a row
+ *  renderer gets. */
+interface DialogSpec extends InDialogOptions {
+    body: ControlRenderer;
 }
 /** How a node names the section it belongs to: the heading, and how that
  *  section opens. Every node in one section repeats the heading; only one of
@@ -109,6 +125,9 @@ interface SectionOption {
 /** Per-node extras that do not belong on a `PrefLeaf`. */
 interface NodeOptions extends BranchOptions {
     render?: ControlRenderer;
+    /** Draw the row as a button that opens a dialog. Set by `.dialog`; the
+     *  config entry records it, and `ControlPanel` draws it. */
+    dialog?: DialogSpec;
     /** Errors for this leaf under `config`, the instrument's whole config. */
     validate?: (leaf: ToolPrefLeaf, config: Record<string, unknown>) => string[];
     /** Computes this leaf's value while it is auto. Attaching one is what gives
@@ -250,4 +269,4 @@ interface ColorField extends ConfigFieldBase {
  *  panel renders, and what `validateConfigSchema` checks. */
 type ConfigField = SliderField | CheckboxField | SelectField | NumberField | TextField | ColorField;
 
-export type { Annotations as A, BranchAnnotations as B, ControlRenderer as C, EntryValue as E, InferConfig as I, LeafPatch as L, NodeOptions as N, ResolvedConfig as R, SectionSpec as S, TextField as T, ValueAtPath as V, ConfigPath as a, ConfigField as b, ConfigSchema as c, ConfigRule as d, BranchOptions as e, CheckboxField as f, ColorField as g, ConfigBranch as h, ConfigEntry as i, ConfigFieldBase as j, ConfigFieldType as k, ConfigNode as l, ConfigOf as m, ConfigOption as n, ConfigRuleContext as o, ConfigShape as p, NodeValue as q, NumberField as r, SelectField as s, SelectOption as t, SliderField as u, SectionOption as v };
+export type { Annotations as A, BranchAnnotations as B, ConfigPath as C, DialogSpec as D, EntryValue as E, InDialogOptions as I, LeafPatch as L, NodeOptions as N, ResolvedConfig as R, SectionOption as S, TextField as T, ValueAtPath as V, ConfigField as a, ConfigSchema as b, ConfigRule as c, ControlRenderer as d, BranchOptions as e, CheckboxField as f, ColorField as g, ConfigBranch as h, ConfigEntry as i, ConfigFieldBase as j, ConfigFieldType as k, ConfigNode as l, ConfigOf as m, ConfigOption as n, ConfigRuleContext as o, ConfigShape as p, InferConfig as q, NodeValue as r, NumberField as s, SectionSpec as t, SelectField as u, SelectOption as v, SliderField as w };

package/dist/_dts/{useTrialState-CP4jfuKl.d.ts → useTrialState-CMaV6UD4.d.ts}

@@ -1,8 +1,7 @@
-import { d as StorageAdapter, f as LabStoreState, T as TrialRecord, g as SavedSnapshot, s as LabMode, j as UndockedPanel, t as InstrumentList, v as InstrumentHooks, C as CreateLabStoreOptions, i as TrialStateHandle } from './frac-DTRq7Xpb.js';
+import { c as StorageAdapter, e as LabStoreState, T as TrialRecord, f as SavedSnapshot, s as LabMode, i as UndockedPanel, t as InstrumentList, v as InstrumentHooks, C as CreateLabStoreOptions, h as TrialStateHandle } from './types-B7yBTTF9.js';
 import * as react from 'react';
 import { ReactNode, ReactElement, Dispatch, SetStateAction } from 'react';
 import { StoreApi } from 'zustand/vanilla';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 
 /** Persist to `localStorage`, one JSON value per record. Survives a reload and
  *  reaches other tabs through the `storage` event. */
@@ -182,7 +181,7 @@ interface PersistenceProps {
 }
 /** Persisted values for a page with no lab: `usePersistedState` below it keeps
  *  what it holds across a reload. Both props are read once, at mount. */
-declare function Persistence({ storageKey, storage, fallback, children }: PersistenceProps): react_jsx_runtime.JSX.Element;
+declare function Persistence({ storageKey, storage, fallback, children }: PersistenceProps): react.JSX.Element;
 
 /** Options for `usePersistedState`. */
 interface PersistedStateOptions {

package/dist/canvas/index.d.ts

@@ -1,12 +1,13 @@
+export { C as CameraContext, a as CameraContextValue, b as CameraInput, c as CameraInputProps, d as CameraScope, e as CameraScopeContext, f as CameraViewOptions, g as CanvasStack, h as CanvasStackProps, S as STAGE_VIEW_ID, i as Stage, j as StageProps, Z as ZoomAtOptions, k as centerOn, l as fitStage, s as screenToWorld, u as useCameraView, w as worldToScreen, z as zoomAt } from '../_dts/Stage-DWBBi8IU.js';
 import * as react from 'react';
-export { C as CanvasStack, a as CanvasStackProps, P as PanZoomHandlers, S as Stage, b as StageProps, U as UsePanZoomOptions, Z as ZoomAtOptions, c as centerOn, f as fitStage, s as screenToWorld, u as usePanZoom, w as worldToScreen, z as zoomAt } from '../_dts/usePanZoom-Bq73pwFe.js';
-export { C as CanvasLayerDescriptor, a as CanvasStackContext, b as CanvasStackContextValue, c as CanvasStackSurface } from '../_dts/CanvasStackContext-DQgcH1ny.js';
-export { D as DEFAULT_FRAME, V as ViewportSize, W as WorldFrame, b as WorldSpec, c as applyCamera, r as resolveFrame } from '../_dts/frac-DTRq7Xpb.js';
-import 'react/jsx-runtime';
+export { C as CanvasLayerDescriptor, a as CanvasStackContext, b as CanvasStackContextValue, c as CanvasStackSurface } from '../_dts/CanvasStackContext-Wo6OwIVM.js';
+import { View } from '@weasel-js/core';
+import { W as WorldFrame } from '../_dts/types-B7yBTTF9.js';
+import { Point, ViewTransform } from '../index.js';
+export { D as DEFAULT_FRAME, V as ViewportSize, l as WorldSpec, m as applyCamera, r as resolveFrame } from '../_dts/types-B7yBTTF9.js';
 import '../_dts/PrefsRow.d-DFpPIeIC.js';
 import '@weasel-js/theme';
-import '@weasel-js/core';
-import '../_dts/types-B7y8hX1D.js';
+import '../_dts/types-DTuViBvc.js';
 import '../_dts/types-DJ79Tg5J.js';
 
 /** Where a trial's camera takes a wheel event from outside its own element. */
@@ -21,5 +22,36 @@ type CameraWheelSlot = {
  */
 declare const CameraWheelContext: react.Context<CameraWheelSlot | null>;
 
-export { CameraWheelContext };
+/**
+ * labkit's camera as a weasel `View`, so core's viewport actions drive it.
+ *
+ * labkit places a world point on screen at
+ * `originPx + pan + zoom * (x, yDir * y)`. A weasel `View` places one at
+ * `(p - (x, y)) * scale`. Over *frame-local* coordinates — the world with `y`
+ * multiplied by `yDir` — the two are the same affine map, which is all a pan
+ * or a zoom about a screen point needs.
+ */
+
+/** The weasel `View` equal to `view` under `frame`. */
+declare function toCameraView(view: ViewTransform, frame?: WorldFrame): View;
+/** The labkit camera equal to weasel `view` under `frame`. */
+declare function fromCameraView(view: View, frame?: WorldFrame): ViewTransform;
+/** A frame-local point in the instrument's world, and back — the map is its
+ *  own inverse. */
+declare function frameLocalToWorld(p: Point, frame?: WorldFrame): Point;
+/**
+ * `next` with its zoom held to [`min`, `max`], about the screen point the step
+ * from `prev` was anchored on, so a zoom that hits a bound stays anchored where
+ * the pointer is. A pan (equal scales) passes through.
+ */
+declare function clampZoomAbout(prev: View, next: View, min: number, max: number): View;
+
+/**
+ * The other side of a linked cursor: a crosshair on the camera's own element
+ * wherever the shared pointer is over some other view — an overview, say. The
+ * same crosshair core paints on a weasel canvas.
+ */
+declare function LinkedCursor(): react.JSX.Element | null;
+
+export { CameraWheelContext, LinkedCursor, WorldFrame, clampZoomAbout, frameLocalToWorld, fromCameraView, toCameraView };
 export type { CameraWheelSlot };

package/dist/canvas/index.js

@@ -1,7 +1,9 @@
-export { CameraWheelContext, CanvasStack, Stage, fitStage, usePanZoom } from '../chunk-TT5C5S6R.js';
-export { centerOn, zoomAt } from '../chunk-H6ZAOWNE.js';
-export { DEFAULT_FRAME, applyCamera, resolveFrame, screenToWorld, worldToScreen } from '../chunk-2AYGEN57.js';
+export { CanvasStack, LinkedCursor, Stage, fitStage } from '../chunk-CGHF6RZV.js';
+export { centerOn, zoomAt } from '../chunk-JVBYV6TL.js';
+export { screenToWorld, worldToScreen } from '../chunk-AWQG7FCC.js';
 import '../chunk-WIG6XHJ7.js';
+export { CameraContext, CameraInput, CameraScope, CameraScopeContext, CameraWheelContext, STAGE_VIEW_ID, clampZoomAbout, frameLocalToWorld, fromCameraView, toCameraView, useCameraView } from '../chunk-DWMSB4CA.js';
+export { DEFAULT_FRAME, applyCamera, resolveFrame } from '../chunk-24W5VEJW.js';
 export { CanvasStackContext } from '../chunk-CQLQPQ4P.js';
 import '../chunk-2YILQ7Y5.js';
 //# sourceMappingURL=index.js.map

package/dist/chrome/index.d.ts

@@ -1,9 +1,8 @@
-export { a as LabAsideRegion, b as LabChromeContext, L as LabContribution, e as LabFooterRegion, f as LabHeaderRegion, g as LabRegion, h as LabRegionProps, i as LabSidebarRegion, P as PaletteRegion, j as PaletteRegionProps, S as SidebarRegion, k as SidebarRegionProps, l as StatusRegion, m as StatusRegionProps, T as TitleBarPlacement, n as TitleBarRegion, o as TitleBarRegionProps, p as ToolbarRegion, q as ToolbarRegionProps, V as ViewportRegion, r as ViewportRegionProps, t as builtinContributions, w as contributionsIn, x as labContributions, y as mergeContributions, C as suppressContributions, D as toolContributions, E as useLabChromeContext } from '../_dts/index-B0--8PEM.js';
-export { a6 as ContributionBase, aa as IconComponent, af as RegionContribution, aj as SidebarSection, ak as SidebarSlotContext, am as StatusReadout, ap as ToolItem, aq as ToolSlotContext, ar as ToolbarItem, as as TrialChromeContext, R as TrialContribution, at as TrialRegion, av as ViewportControl } from '../_dts/frac-DTRq7Xpb.js';
-import '../_dts/types-B7y8hX1D.js';
+export { a as LabAsideRegion, b as LabChromeContext, L as LabContribution, e as LabFooterRegion, f as LabHeaderRegion, g as LabRegion, h as LabRegionProps, i as LabSidebarRegion, P as PaletteRegion, j as PaletteRegionProps, S as SidebarRegion, k as SidebarRegionProps, l as StatusRegion, m as StatusRegionProps, T as TitleBarPlacement, n as TitleBarRegion, o as TitleBarRegionProps, p as ToolbarRegion, q as ToolbarRegionProps, V as ViewportRegion, r as ViewportRegionProps, t as builtinContributions, w as contributionsIn, x as labContributions, y as mergeContributions, C as suppressContributions, D as toolContributions, E as useLabChromeContext } from '../_dts/index-CKyX0ME_.js';
+export { a9 as ContributionBase, ad as IconComponent, ak as RegionContribution, ao as SidebarSection, ap as SidebarSlotContext, ar as StatusReadout, au as ToolItem, av as ToolSlotContext, aw as ToolbarItem, ax as TrialChromeContext, Y as TrialContribution, ay as TrialRegion, aA as ViewportControl } from '../_dts/types-B7yBTTF9.js';
+import '../_dts/types-DTuViBvc.js';
+import 'react';
 import '@weasel-js/core';
 import '../_dts/PrefsRow.d-DFpPIeIC.js';
 import '@weasel-js/theme';
-import 'react';
-import 'react/jsx-runtime';
 import '../_dts/types-DJ79Tg5J.js';

package/dist/chrome/index.js

@@ -1,13 +1,15 @@
-export { LabAsideRegion, LabFooterRegion, LabHeaderRegion, LabSidebarRegion, PaletteRegion, SidebarRegion, StatusRegion, TitleBarRegion, ToolbarRegion, ViewportRegion, builtinContributions, contributionsIn, labContributions, mergeContributions, suppressContributions, toolContributions, useLabChromeContext } from '../chunk-H5VIV7MQ.js';
-import '../chunk-3FI7Y4R4.js';
+export { LabAsideRegion, LabFooterRegion, LabHeaderRegion, LabSidebarRegion, PaletteRegion, SidebarRegion, StatusRegion, TitleBarRegion, ToolbarRegion, ViewportRegion, builtinContributions, contributionsIn, labContributions, mergeContributions, suppressContributions, toolContributions, useLabChromeContext } from '../chunk-4TT3PNPR.js';
+import '../chunk-3RY6WL5T.js';
+import '../chunk-SLAQPUI4.js';
 import '../chunk-SBXNQW4G.js';
 import '../chunk-RWNDDKOH.js';
-import '../chunk-HFRE4QQV.js';
+import '../chunk-ASOK76ZH.js';
 import '../chunk-Z76KEZAX.js';
-import '../chunk-VQ47KWD5.js';
-import '../chunk-AWH3SRPW.js';
+import '../chunk-IRTGUQ5O.js';
+import '../chunk-TJ77A4A3.js';
 import '../chunk-CQLQPQ4P.js';
 import '../chunk-2YILQ7Y5.js';
-import '../chunk-WUJXJC5O.js';
+import '../chunk-TYN6MLXX.js';
+import '../chunk-QGMOA2YE.js';
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/chunk-24W5VEJW.js

@@ -0,0 +1,18 @@
+// src/canvas/worldSpec.ts
+var DEFAULT_FRAME = { originPx: { x: 0, y: 0 }, yDir: 1 };
+function resolveFrame(spec, size) {
+  if (!spec) return DEFAULT_FRAME;
+  const origin = spec.origin ?? { x: 0, y: 0 };
+  return {
+    originPx: { x: origin.x * size.width, y: origin.y * size.height },
+    yDir: spec.yAxis === "up" ? -1 : 1
+  };
+}
+function applyCamera(ctx, view, frame = DEFAULT_FRAME) {
+  ctx.translate(frame.originPx.x + view.pan.x, frame.originPx.y + view.pan.y);
+  ctx.scale(view.zoom, view.zoom * frame.yDir);
+}
+
+export { DEFAULT_FRAME, applyCamera, resolveFrame };
+//# sourceMappingURL=chunk-24W5VEJW.js.map
+//# sourceMappingURL=chunk-24W5VEJW.js.map

package/dist/chunk-24W5VEJW.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/canvas/worldSpec.ts"],"names":[],"mappings":";AA2BO,IAAM,aAAA,GAA4B,EAAE,QAAA,EAAU,EAAE,CAAA,EAAG,GAAG,CAAA,EAAG,CAAA,EAAE,EAAG,IAAA,EAAM,CAAA;AAEpE,SAAS,YAAA,CAAa,MAA6B,IAAA,EAAgC;AACxF,EAAA,IAAI,CAAC,MAAM,OAAO,aAAA;AAClB,EAAA,MAAM,SAAS,IAAA,CAAK,MAAA,IAAU,EAAE,CAAA,EAAG,CAAA,EAAG,GAAG,CAAA,EAAE;AAC3C,EAAA,OAAO;AAAA,IACL,QAAA,EAAU,EAAE,CAAA,EAAG,MAAA,CAAO,CAAA,GAAI,IAAA,CAAK,KAAA,EAAO,CAAA,EAAG,MAAA,CAAO,CAAA,GAAI,IAAA,CAAK,MAAA,EAAO;AAAA,IAChE,IAAA,EAAM,IAAA,CAAK,KAAA,KAAU,IAAA,GAAO,EAAA,GAAK;AAAA,GACnC;AACF;AAIO,SAAS,WAAA,CACd,GAAA,EACA,IAAA,EACA,KAAA,GAAoB,aAAA,EACd;AACN,EAAA,GAAA,CAAI,SAAA,CAAU,KAAA,CAAM,QAAA,CAAS,CAAA,GAAI,IAAA,CAAK,GAAA,CAAI,CAAA,EAAG,KAAA,CAAM,QAAA,CAAS,CAAA,GAAI,IAAA,CAAK,GAAA,CAAI,CAAC,CAAA;AAC1E,EAAA,GAAA,CAAI,MAAM,IAAA,CAAK,IAAA,EAAM,IAAA,CAAK,IAAA,GAAO,MAAM,IAAI,CAAA;AAC7C","file":"chunk-24W5VEJW.js","sourcesContent":["import type { Point, ViewTransform } from '../instrument/types';\n\n/** How an instrument's world sits on the canvas, independent of the camera.\n *  The defaults reproduce the convention labkit shipped before this existed:\n *  world (0,0) at the element's top-left, y growing downward. */\nexport interface WorldSpec {\n  /** Where world (0,0) sits at `pan` zero, as a fraction of the viewport.\n   *  `{x:0,y:0}` top-left (default); `{x:0.5,y:0.5}` centre. */\n  origin?: Point;\n  /** Which way the world y axis runs on screen. Default `'down'`. */\n  yAxis?: 'down' | 'up';\n}\n\n/** A viewport's CSS-pixel size. */\nexport interface ViewportSize {\n  width: number;\n  height: number;\n}\n\n/** A `WorldSpec` resolved against a viewport: what the coordinate helpers,\n *  the camera and the wheel all read. */\nexport interface WorldFrame {\n  /** Screen position of world (0,0) at `pan` zero. */\n  originPx: Point;\n  yDir: 1 | -1;\n}\n\nexport const DEFAULT_FRAME: WorldFrame = { originPx: { x: 0, y: 0 }, yDir: 1 };\n\nexport function resolveFrame(spec: WorldSpec | undefined, size: ViewportSize): WorldFrame {\n  if (!spec) return DEFAULT_FRAME;\n  const origin = spec.origin ?? { x: 0, y: 0 };\n  return {\n    originPx: { x: origin.x * size.width, y: origin.y * size.height },\n    yDir: spec.yAxis === 'up' ? -1 : 1,\n  };\n}\n\n/** Put a 2D context into the instrument's world coordinates, so a layer's\n *  `draw` works in them. Must stay the exact inverse of `screenToWorld`. */\nexport function applyCamera(\n  ctx: CanvasRenderingContext2D,\n  view: ViewTransform,\n  frame: WorldFrame = DEFAULT_FRAME,\n): void {\n  ctx.translate(frame.originPx.x + view.pan.x, frame.originPx.y + view.pan.y);\n  ctx.scale(view.zoom, view.zoom * frame.yDir);\n}\n"]}

package/dist/chunk-3RY6WL5T.js

@@ -0,0 +1,38 @@
+import { createContext, useContext, useRef, useSyncExternalStore, useCallback } from 'react';
+
+// src/annotations/AnnotationsContext.ts
+var AnnotationsContext = createContext(null);
+function useMarkVersion(api) {
+  const version = useRef(0);
+  useSyncExternalStore(
+    useCallback(
+      (fn) => api?.subscribe(() => {
+        version.current += 1;
+        fn();
+      }) ?? (() => {
+      }),
+      [api]
+    ),
+    useCallback(() => version.current, []),
+    () => 0
+  );
+}
+function useAnnotations() {
+  const api = useContext(AnnotationsContext);
+  useMarkVersion(api);
+  if (!api) {
+    throw new Error(
+      "[labkit] useAnnotations requires an instrument that declares the `annotations` capability"
+    );
+  }
+  return api;
+}
+function useAnnotationsOptional() {
+  const api = useContext(AnnotationsContext);
+  useMarkVersion(api);
+  return api;
+}
+
+export { AnnotationsContext, useAnnotations, useAnnotationsOptional };
+//# sourceMappingURL=chunk-3RY6WL5T.js.map
+//# sourceMappingURL=chunk-3RY6WL5T.js.map

package/dist/chunk-3RY6WL5T.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/annotations/AnnotationsContext.ts"],"names":[],"mappings":";;;AAIO,IAAM,kBAAA,GAAqB,cAAqC,IAAI;AAO3E,SAAS,eAAe,GAAA,EAAkC;AACxD,EAAA,MAAM,OAAA,GAAU,OAAO,CAAC,CAAA;AACxB,EAAA,oBAAA;AAAA,IACE,WAAA;AAAA,MACE,CAAC,EAAA,KACC,GAAA,EAAK,SAAA,CAAU,MAAM;AACnB,QAAA,OAAA,CAAQ,OAAA,IAAW,CAAA;AACnB,QAAA,EAAA,EAAG;AAAA,MACL,CAAC,MAAM,MAAM;AAAA,MAAC,CAAA,CAAA;AAAA,MAChB,CAAC,GAAG;AAAA,KACN;AAAA,IACA,WAAA,CAAY,MAAM,OAAA,CAAQ,OAAA,EAAS,EAAE,CAAA;AAAA,IACrC,MAAM;AAAA,GACR;AACF;AAMO,SAAS,cAAA,GAAiC;AAC/C,EAAA,MAAM,GAAA,GAAM,WAAW,kBAAkB,CAAA;AACzC,EAAA,cAAA,CAAe,GAAG,CAAA;AAClB,EAAA,IAAI,CAAC,GAAA,EAAK;AACR,IAAA,MAAM,IAAI,KAAA;AAAA,MACR;AAAA,KACF;AAAA,EACF;AACA,EAAA,OAAO,GAAA;AACT;AAIO,SAAS,sBAAA,GAAgD;AAC9D,EAAA,MAAM,GAAA,GAAM,WAAW,kBAAkB,CAAA;AACzC,EAAA,cAAA,CAAe,GAAG,CAAA;AAClB,EAAA,OAAO,GAAA;AACT","file":"chunk-3RY6WL5T.js","sourcesContent":["import { createContext, useCallback, useContext, useRef, useSyncExternalStore } from 'react';\nimport type { AnnotationsApi } from './types';\n\n/** Null in a trial whose instrument declares no `annotations`. */\nexport const AnnotationsContext = createContext<AnnotationsApi | null>(null);\n\n/** Re-render the caller whenever any of the store's scenes changes.\n *\n *  The API is a stable facade over mutable scenes, so nothing about its\n *  identity says a mark was added — a component reading `query()` without this\n *  renders one answer and never revises it. */\nfunction useMarkVersion(api: AnnotationsApi | null): void {\n  const version = useRef(0);\n  useSyncExternalStore(\n    useCallback(\n      (fn: () => void) =>\n        api?.subscribe(() => {\n          version.current += 1;\n          fn();\n        }) ?? (() => {}),\n      [api],\n    ),\n    useCallback(() => version.current, []),\n    () => 0,\n  );\n}\n\n/** The marks on this trial's targets. Reached through a hook rather than the\n *  chrome context, which carries no instrument state — a sidebar panel listing\n *  marks pulls it the way `useTrialState()` does. Throws outside a trial whose\n *  instrument declares the capability. */\nexport function useAnnotations(): AnnotationsApi {\n  const api = useContext(AnnotationsContext);\n  useMarkVersion(api);\n  if (!api) {\n    throw new Error(\n      '[labkit] useAnnotations requires an instrument that declares the `annotations` capability',\n    );\n  }\n  return api;\n}\n\n/** The marks on this trial's targets, or null. For chrome that renders in\n *  every trial and does something else where there are none. */\nexport function useAnnotationsOptional(): AnnotationsApi | null {\n  const api = useContext(AnnotationsContext);\n  useMarkVersion(api);\n  return api;\n}\n"]}

package/dist/{chunk-H5VIV7MQ.js → chunk-4TT3PNPR.js}

@@ -1,44 +1,14 @@
-import { Toolbar, ZoomControl, ScaleIndicator, FpsMeter, StatusBar, useRovingTabIndex } from './chunk-3FI7Y4R4.js';
+import { useAnnotationsOptional, useAnnotations } from './chunk-3RY6WL5T.js';
+import { Toolbar, ZoomControl, ScaleIndicator, FpsMeter, StatusBar, useRovingTabIndex } from './chunk-SLAQPUI4.js';
 import { usePersistedState } from './chunk-RWNDDKOH.js';
-import { ControlPanel } from './chunk-HFRE4QQV.js';
+import { ControlPanel } from './chunk-ASOK76ZH.js';
 import { useLabContext } from './chunk-Z76KEZAX.js';
 import { LabStoreContext } from './chunk-2YILQ7Y5.js';
-import { Q, g2, u4, U, F, Te, fe, ie, pe, d2, X, Z, me, re, n8, o3, n3 } from './chunk-WUJXJC5O.js';
-import { createContext, useContext, useState, useId, useMemo, useRef, useSyncExternalStore, useCallback } from 'react';
+import { b, A, E, C, o, O, h, P, H, g2, u4, F, k, fe, X, U, Z, d2, z, B, Q, V, n8, o4, n3 } from './chunk-TYN6MLXX.js';
+import { useState, useId, useContext, useMemo } from 'react';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { useStore } from 'zustand/react';
 
-var AnnotationsContext = createContext(null);
-function useMarkVersion(api) {
-  const version = useRef(0);
-  useSyncExternalStore(
-    useCallback(
-      (fn) => api?.subscribe(() => {
-        version.current += 1;
-        fn();
-      }) ?? (() => {
-      }),
-      [api]
-    ),
-    useCallback(() => version.current, []),
-    () => 0
-  );
-}
-function useAnnotations() {
-  const api = useContext(AnnotationsContext);
-  useMarkVersion(api);
-  if (!api) {
-    throw new Error(
-      "[labkit] useAnnotations requires an instrument that declares the `annotations` capability"
-    );
-  }
-  return api;
-}
-function useAnnotationsOptional() {
-  const api = useContext(AnnotationsContext);
-  useMarkVersion(api);
-  return api;
-}
 var SCALES = [1, 2, 4];
 var FORMATS = [
   { id: "png", label: "PNG" },
@@ -97,7 +67,7 @@ function ExportMenu() {
         "aria-label": "Export",
         title: "Export",
         onClick: () => setOpen((was) => !was),
-        children: /* @__PURE__ */ jsx(Q, { size: 16 })
+        children: /* @__PURE__ */ jsx(H, { size: 16 })
       }
     ),
     /* @__PURE__ */ jsx(
@@ -237,7 +207,7 @@ function builtinContributions(instrument, ctx, controls) {
       region: "toolbar",
       group: "history",
       item: {
-        icon: U,
+        icon: F,
         label: "Undo",
         shortcut: "Mod+Z",
         disabled: !ctx.canUndo,
@@ -249,7 +219,7 @@ function builtinContributions(instrument, ctx, controls) {
       region: "toolbar",
       group: "history",
       item: {
-        icon: F,
+        icon: k,
         label: "Redo",
         shortcut: "Mod+Shift+Z",
         disabled: !ctx.canRedo,
@@ -271,7 +241,7 @@ function builtinContributions(instrument, ctx, controls) {
       region: "toolbar",
       group: "view",
       item: {
-        icon: Te,
+        icon: fe,
         label: "Loupe",
         pressed: ctx.loupeOn,
         onActivate: ctx.toggleLoupe
@@ -284,7 +254,7 @@ function builtinContributions(instrument, ctx, controls) {
       region: "viewport",
       group: "zoom",
       item: {
-        icon: fe,
+        icon: X,
         label: "Zoom out",
         onActivate: () => ctx.setZoom(zoom / ZOOM_STEP)
       }
@@ -294,7 +264,7 @@ function builtinContributions(instrument, ctx, controls) {
       region: "viewport",
       group: "zoom",
       item: {
-        icon: ie,
+        icon: U,
         label: "Zoom in",
         onActivate: () => ctx.setZoom(zoom * ZOOM_STEP)
       }
@@ -303,7 +273,7 @@ function builtinContributions(instrument, ctx, controls) {
       id: "actual-size",
       region: "viewport",
       group: "zoom",
-      item: { icon: pe, label: "Actual size", onActivate: () => ctx.setZoom(1) }
+      item: { icon: Z, label: "Actual size", onActivate: () => ctx.setZoom(1) }
     });
     out.push({
       id: "zoom-control",
@@ -386,20 +356,20 @@ function builtinContributions(instrument, ctx, controls) {
     id: "clone",
     region: "titlebar",
     end: true,
-    item: { icon: X, label: "Clone trial", onActivate: ctx.clone }
+    item: { icon: z, label: "Clone trial", onActivate: ctx.clone }
   });
   out.push({
     id: "reset",
     region: "titlebar",
     end: true,
-    item: { icon: Z, label: "Reset trial", onActivate: ctx.reset }
+    item: { icon: B, label: "Reset trial", onActivate: ctx.reset }
   });
   out.push({
     id: "snapshot",
     region: "titlebar",
     end: true,
     item: {
-      icon: me,
+      icon: Q,
       label: "Save snapshot",
       shortcut: "Mod+S",
       onActivate: () => ctx.saveSnapshot()
@@ -410,7 +380,7 @@ function builtinContributions(instrument, ctx, controls) {
     region: "titlebar",
     end: true,
     item: {
-      icon: re,
+      icon: V,
       label: ctx.isLastTrial ? "Cannot close the last trial" : "Close trial",
       danger: true,
       disabled: ctx.isLastTrial,
@@ -420,10 +390,49 @@ function builtinContributions(instrument, ctx, controls) {
   return out;
 }
 
+// src/annotations/toolMap.ts
+var TOOLS = {
+  select: { weaselTool: "select" },
+  stroke: { weaselTool: "pencil", kind: "stroke" },
+  line: { weaselTool: "line", kind: "line" },
+  arrow: { weaselTool: "line", kind: "arrow" },
+  rect: { weaselTool: "rect", kind: "rect" },
+  ellipse: { weaselTool: "ellipse", kind: "ellipse" },
+  text: { weaselTool: "text", kind: "text" }
+};
+var ANNOTATION_TOOLS = [
+  // Not in `TOOLS`: an id the map does not carry is what leaves the overlay idle.
+  { id: "pointer", label: "Interact", icon: b, group: "annotate" },
+  { id: "select", label: "Select", icon: A, group: "annotate" },
+  { id: "stroke", label: "Freehand", icon: E, group: "annotate" },
+  { id: "line", label: "Line", icon: C, group: "annotate" },
+  { id: "arrow", label: "Arrow", icon: o, group: "annotate" },
+  { id: "rect", label: "Rectangle", icon: O, group: "annotate" },
+  { id: "ellipse", label: "Ellipse", icon: h, group: "annotate" },
+  { id: "text", label: "Text", icon: P, group: "annotate" }
+];
+function labAnnotationTools(instruments) {
+  const wanted = /* @__PURE__ */ new Set();
+  for (const i of instruments) {
+    if (i.annotations == null) continue;
+    if (i.annotations.tools == null) return ANNOTATION_TOOLS;
+    for (const id of i.annotations.tools) wanted.add(id);
+  }
+  return ANNOTATION_TOOLS.filter((t) => wanted.has(t.id));
+}
+function annotationToolInfo(id) {
+  return id === null ? void 0 : TOOLS[id];
+}
+var ANNOTATION_WEASEL_TOOLS = [
+  ...new Set(Object.values(TOOLS).map((t) => t.weaselTool))
+];
+
 // src/tools/labTool.ts
 function resolveLabTool(slot, instruments) {
   if (slot !== null) return slot;
-  return instruments.some((i) => i.annotations != null) ? "pointer" : null;
+  const tools = labAnnotationTools(instruments);
+  if (tools.some((t) => t.id === "pointer")) return "pointer";
+  return tools[0]?.id ?? null;
 }
 
 // src/chrome/merge.ts
@@ -695,7 +704,7 @@ function PaletteRegion({
         if (c.region !== region || !c.item) return null;
         const { icon: Icon, label, shortcut, disabled, onActivate } = c.item;
         return /* @__PURE__ */ jsx(
-          o3,
+          o4,
           {
             icon: /* @__PURE__ */ jsx(Icon, { size: 16 }),
             label,
@@ -769,6 +778,6 @@ function ViewportRegion({ contributions, ctx }) {
   );
 }
 
-export { AnnotationsContext, ExportMenu, LabAsideRegion, LabFooterRegion, LabHeaderRegion, LabSidebarRegion, MarkList, PaletteRegion, SidebarRegion, StatusRegion, TitleBarRegion, ToolbarRegion, ViewportRegion, builtinContributions, contributionsIn, labContributions, mergeContributions, resolveLabTool, suppressContributions, toolContributions, useAnnotations, useAnnotationsOptional, useLabChromeContext };
-//# sourceMappingURL=chunk-H5VIV7MQ.js.map
-//# sourceMappingURL=chunk-H5VIV7MQ.js.map
+export { ANNOTATION_TOOLS, ANNOTATION_WEASEL_TOOLS, ExportMenu, LabAsideRegion, LabFooterRegion, LabHeaderRegion, LabSidebarRegion, MarkList, PaletteRegion, SidebarRegion, StatusRegion, TitleBarRegion, ToolbarRegion, ViewportRegion, annotationToolInfo, builtinContributions, contributionsIn, labAnnotationTools, labContributions, mergeContributions, resolveLabTool, suppressContributions, toolContributions, useLabChromeContext };
+//# sourceMappingURL=chunk-4TT3PNPR.js.map
+//# sourceMappingURL=chunk-4TT3PNPR.js.map