@reekon-tools/boldr-cad 0.1.0 → 1.1.0

package/README.md

@@ -21,9 +21,10 @@ Peer dependencies:
 | `react-native`                | `>=0.74`  | always (react-native-web in a browser)      |
 | `@shopify/react-native-skia`  | `>=2.5`   | the editor on iOS and Android               |
 | `react-native-gesture-handler`| `>=2.31`  | the editor on iOS and Android               |
+| `react-native-reanimated`     | `>=4`     | the editor on iOS and Android (pan and zoom run on the UI thread; its Babel plugin must be in the app's config) |
 | `react-native-svg`            | `>=15`    | the editor's icons on iOS and Android       |
 
-Only `./core` (see below) runs without the three native packages.
+Only `./core` (see below) runs without the four native packages.
 
 ## How it resolves
 
@@ -101,14 +102,15 @@ lives in the browser's own storage, which is what the dev harness uses.
 | ------------- | ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
 | `sync`        | `CadSync`                                                  | The drawing, from `openCadDrawing`. Saved there as it changes.                                            |
 | `onBack`      | `() => void`                                               | The top bar's back button. Without it, Back opens the project's pages.                                    |
-| `headerRight` | `ReactNode`                                                | The host's own buttons in the top bar, such as a Bluetooth status icon.                                   |
+| `headerRight` | `ReactNode \| (buttonSize: number) => ReactNode`          | The host's own buttons in the top bar, such as a Bluetooth status icon. As a function it gets the bar's round-button size (42 pt on a phone, 46 otherwise). |
 | `theme`       | `'light' \| 'dark'`                                        | Canvas colors. The chrome is dark either way. Without it, the person's Theme setting decides.             |
-| `units`       | `{ format: (inches: number) => string; metric: boolean; denom?: number }` | Lengths the host's way. Hides Units in Settings.                                           |
+| `units`       | `{ format: (inches: number) => string; metric: boolean; unit?: Unit; fractions?: boolean; denom?: number }` | Lengths the host's way: how to write one, the unit a bare number is typed in (`unit`: `ftin`, `in`, `ft`, `mm`, `cm` or `m`; `metric` alone means `mm`), whether they're typed with fractions, and the fraction precision. Settings' Units then offers Account beside the editor's own. |
 | `fonts`       | `SkiaFonts`                                                | Typefaces for text on the plan by CSS weight, with a fallback. Device only.                                |
 | `pickImage`   | `() => Promise<{ dataUrl: string; w: number; h: number } \| null>` | A photo or plan to trace. In a browser a file picker is the default.                              |
 | `saveFile`    | `(name: string, mime: string, data: string) => void`       | How exports (PDF, DXF, project file) reach the person, e.g. a share sheet. In a browser they download.     |
-| `readOnly`    | `boolean`                                                  | Pan and zoom only, nothing saved.                                                                         |
+| `readOnly`    | `boolean`                                                  | Pan and zoom only, nothing saved. A tap on a link's tile asks, then opens it.                             |
 | `devTools`    | `boolean`                                                  | Reset to the demo, open and save project files, in Settings. Default `true`; turn off in production.     |
+| `links`       | `CadLinks`                                                 | The job's files to link on the drawing, and its lengths for lines (see below). Without it there's nothing to link. |
 
 Fonts on a device, with react-native-skia:
 
@@ -130,8 +132,8 @@ taken in when they aren't being edited locally.
 
 ```ts
 interface CadDataProvider {
-  subscribeFile(cb: (file: { name: string; meta: CadFileMeta | null } | null) => void): () => void;
-  subscribePages(cb: (pages: Record<string, CadPageDoc>) => void): () => void;
+  subscribeFile(cb: (file: { name: string; meta: CadFileMeta | null } | null, meta?: CadSnapshotMeta) => void): () => void;
+  subscribePages(cb: (pages: Record<string, CadPageDoc>, meta?: CadSnapshotMeta) => void): () => void;
   writeMeta(meta: CadFileMeta): Promise<void>;
   writePage(id: string, page: CadPageDoc): Promise<void>;
   deletePage(id: string): Promise<void>;
@@ -148,19 +150,100 @@ page document per page (`name`, the sketch, the underlay, and the `rev` of
 the session that wrote it last). Storage paths are relative to the drawing's
 own folder, so copying or moving a drawing with its folder keeps it working.
 
-Options: `initialize: true` starts a new drawing when the file has no drawing
-record yet; `onError` hears about failed writes and uploads. The promise
-rejects with `NotACadDrawing` whose `reason` is `'missing'` (no such file) or
-`'legacy'` (a file from the retired layout tool).
+`CadSnapshotMeta` says whether a snapshot is the local cache's word
+(`fromCache: true`) or the server's. Firestore answers from the cache first
+when it's offline, and for a drawing never opened on that device the cache has
+no pages: the editor then waits for the server rather than starting a blank
+first page over the real one. Pass `snapshot.metadata.fromCache` from both
+listeners and subscribe with `includeMetadataChanges: true`, so the server's
+confirmation of an empty collection still arrives.
+
+Options: `initialize: true` says the file was just created here, so its first
+page is made without waiting for the server (and starts a new drawing when the
+file has no drawing record yet); `onError` hears about failed writes and
+uploads; `signal` (an `AbortSignal`) closes the drawing while it's still
+opening, rejecting with `Error('closed')`. The promise rejects with
+`NotACadDrawing` whose `reason` is `'missing'` (no such file) or `'legacy'` (a
+file from the retired layout tool).
 
 The returned `CadSync` has `stop()`, `idle()` (resolves once every write so
 far has finished), `saveThumbnail(pngDataUrl)` and `imageUrl(ref)`.
 
-**Measurements.** When the provider supplies `measurements`, every driving
-dimension in the drawing is kept as a BOLDR measurement: lengths in
-micrometres, angles in degrees. Changing one elsewhere changes the dimension.
-`measurementOf(constraint)` gives a constraint's value in that form, or `null`
-for reference and print dimensions.
+**Measurements.** A dimension drawn in the editor is the drawing's alone: no
+measurement is made for it. The person saves one to the drawing's group from
+its bar (Save to group, through `links.saveMeasurement`), and it's linked to
+that measurement from then on. Drawings made by earlier versions kept every
+driving dimension as a measurement of the drawing's file; when the provider
+supplies `measurements`, those still follow their dimensions both ways
+(`create` is no longer called). `setPlaced(ids, linked)` hears every
+measurement the drawing shows: its own, and the job's it's linked to, each with
+its group (and a form's column). `measurementOf(constraint)` gives a
+constraint's value as BOLDR keeps it — lengths in micrometres, angles in
+degrees — or `null` for reference and print dimensions and linked ones.
+
+### Linking the job's files and measurements
+
+With `links`, Annotate gets a yellow + (under the rail; a phone's in the
+trash's corner while nothing's selected) that puts the job's files on the plan
+as tiles, with leaders, opened from the bar. A measurement comes into a drawing
+only as the dimension it drives: in Draft, a line's length keypad (select the
+line, tap +) offers the job's lengths (a page it swipes to on a touch screen,
+Select from list on a desktop), and the one picked sets the line, linked to
+it. A dimension is saved to the group from its bar (Save to group). A new length for a linked dimension asks first: Change both, Only this
+drawing (unlinks), or Cancel.
+
+```ts
+interface CadLinks {
+  pick(req: { want: 'files'; linked: LinkTarget[] }): Promise<LinkTarget[]>; // [] for nothing
+  measurements?(cb: (list: LinkTarget[]) => void): () => void; // the job's lengths and angles, in the order to show them
+  pickMeasurement?(req: { kind: 'length' | 'angle' }): Promise<LinkTarget | null>; // the host's own list (a side drawer)
+  subscribe(targets: LinkTarget[], cb: (info: Record<string, LinkInfo>) => void): () => void;
+  open(target: LinkTarget): void;
+  update?(target: LinkTarget, value: number, capture?: unknown): void; // µm or degrees, the person having said so
+  saveMeasurement?(m: { kind: 'length' | 'angle'; value: number; capture?: unknown }): Promise<LinkTarget | null>;
+  canSave?: boolean; // false where a measurement can't be saved (a form's group)
+}
+```
+
+- A `LinkTarget` is `{ kind: 'file' | 'measurement', id, groupId, columnId? }`
+  plus what it was when it was linked (`name`, `groupName`, `fileType`,
+  `mkind`, `value`, `text`). Resolve it by `groupId` and `id` in the job open
+  now, never by a stored path, so copied and moved jobs keep working.
+- `pick` offers the job's files to pick. BOLDR's pickers show the measurements
+  too, greyed out, and a tap on one says they're added in Draft; anything but
+  a file handed back is dropped.
+- A line's length keypad and a dimension's angle keypad take the job's
+  measurements. On a touch screen the keypad swipes to a page of them; on a
+  desktop it has Select from list, which calls `pickMeasurement` (the host's
+  own list, those of `kind` pickable and the rest greyed out), or shows that
+  page when the host has none. `measurements` calls back with the job's
+  lengths and angles as measurement targets (with `mkind`, `value` in
+  micrometres or degrees, and `text`), again as they change, and not until
+  the whole job's been heard from; the keypad greys out those that aren't its
+  kind. A host keypad (`keypad`) gets `measurementKind` and `pickMeasurement`
+  on such a request: show the job's measurements a swipe away, greying out
+  the other kind, and hand back the one tapped.
+- To draw that page itself, so the list looks as it does everywhere else in
+  the host, pass `measurementList` to `CadEditor`: a function of
+  `{ kind, pick, width, height }` that returns the list's element (for
+  example `page => <JobList {...page} />`). It's rendered as a component of its
+  own from when the page is first shown, and again when what it's given
+  changes. List the job's measurements at that size, grey out the other kind,
+  and call `pick` with the one tapped. BOLDR does on a tablet, with its phone
+  keypad's list. Without it the page is the editor's own grid, made from
+  `measurements`. Either way the page is there only when `links` has
+  `measurements` or `pickMeasurement`, and a desktop shows it only without
+  `pickMeasurement`.
+- `subscribe` answers by `linkKey(target)`, and again whenever that changes.
+  Say `exists: false` only once it's known to be gone, never while loading.
+  `text` is the value written the host's way; `thumbUrl` a picture to show.
+- Pass one `links` object for as long as the drawing is open (memoize it).
+
+**Laser readings.** `laserReading(inches, capture)` takes the host's own record
+of a reading (anything JSON: its device, its number). It's kept on the
+dimension the reading sets and handed back with `saveMeasurement`, or with
+`update` for a linked one, so a measurement saved from a reading records its
+device. A value typed over it isn't the reading's.
 
 For tests and prototypes, `memoryProvider()` is an in-memory provider with
 `remote()` and `remoteMeasurement()` to change things as another device would.
@@ -171,7 +254,7 @@ For tests and prototypes, `memoryProvider()` is an in-memory provider with
 import { setLaserConnected, laserReading } from '@reekon-tools/boldr-cad';
 
 setLaserConnected(true);        // shows the reading tray, enables the keypad's Laser key
-laserReading(inches);           // into an open keypad, onto the selected wall, or into the tray
+laserReading(inches, capture);  // into an open keypad, onto the selected wall, or into the tray
 ```
 
 `laserReading` returns `false` when no drawing is open to take the value, so

package/dist/app/edit.d.ts

@@ -1,8 +1,14 @@
-import type { Constraint, SelItem } from '../model/types';
+import type { Constraint, SelItem, Sketch } from '../model/types';
 import { type AddResult, type SolveResult } from '../solver';
 export declare function analyze(): void;
 export declare const solveSketch: (heavy?: string[]) => SolveResult;
 export declare function solveOrRevert(): SolveResult;
+/**
+ * Walls made thicker or thinner, or lines turned into walls: what's measured on walls' faces holds, their centrelines
+ * moving to keep it (a face's length depends on the walls at its corners as well as its own). False — and nothing
+ * moved — when it can't hold.
+ */
+export declare function holdFaces(): boolean;
 /** Re-place locked doors/windows from their dimensions (after any geometry change). */
 export declare function resolveOpeningsNow(): void;
 export declare function existsSel(s: SelItem): boolean;
@@ -10,6 +16,11 @@ export declare function existsSel(s: SelItem): boolean;
 export declare function afterEdit(): void;
 export declare function undo(): void;
 export declare function redo(): void;
+/**
+ * The things a constraint ties together, each as the points to hold for it: a cabinet (its corners, when it's one of
+ * its edges or corners), a line (its ends), a point.
+ */
+export declare function holdGroups(sk: Sketch, c: Constraint): string[][];
 /**
  * Add a constraint through the solver and explain the outcome:
  * reference dimension → toast, conflict → conflict sheet (unless silent).

package/dist/app/edit.js

@@ -1,15 +1,21 @@
 import { drivingDim } from '../model/openings';
+import { edgeOf, wallOf } from '../model/planGeom';
 import { CONS_LABEL } from '../model/constraints';
 import { HS, stepRedo, stepUndo } from '../model/history';
+import { pushedOut, syncFaces } from '../model/facesolve';
+import { elevSyncFrame, fitState, overflow, pastWallMsg, restoreFit } from '../editor/elevation';
 import { resolveOpenings } from '../model/openings';
 import { gc, restorePos, snapshotPos } from '../model/sketch';
-import { page, saveSoon, SK } from '../model/store';
+import { page, planSK, saveSoon, SK } from '../model/store';
+import { cabOfPoint, cabPoints } from '../model/faces';
 import { requestDraw } from '../render/view';
 import { solver } from '../solver';
 import { cancelTool } from '../tools/registry';
 import { fmtLen } from '../units';
 import { ed } from './state';
 import { refreshDrawerSoon, renderElevation, showConflict, toast, updateCtx, updateStatus } from '../editor/ports';
+import { refreshLinks } from '../editor/links';
+import { followLinked } from '../editor/linkFollow';
 export function analyze() {
     ed.ana = solver.analyzeDOF(SK());
 }
@@ -21,9 +27,19 @@ export function solveOrRevert() {
         restorePos(sk, snap);
     return s;
 }
+/**
+ * Walls made thicker or thinner, or lines turned into walls: what's measured on walls' faces holds, their centrelines
+ * moving to keep it (a face's length depends on the walls at its corners as well as its own). False — and nothing
+ * moved — when it can't hold.
+ */
+export function holdFaces() {
+    if (!Object.values(SK().cons).some(c => c.face || c.faces))
+        return true;
+    return solveOrRevert().ok;
+}
 /** Re-place locked doors/windows from their dimensions (after any geometry change). */
 export function resolveOpeningsNow() {
-    ed.badOpeningDims = resolveOpenings(SK());
+    ed.badOpeningDims = resolveOpenings(planSK());
 }
 export function existsSel(s) {
     const sk = SK();
@@ -35,21 +51,28 @@ export function existsSel(s) {
         case 'cons':
         case 'dim': return !!sk.cons[s.id];
         case 'room': return !!sk.rooms[s.id];
-        case 'opening': return !!sk.openings[s.id];
+        case 'opening': return !!planSK().openings[s.id];
+        case 'cab': return !!sk.cabs?.[s.id];
+        case 'elev': return true;
+        case 'oanchor': return !!planSK().openings[s.id.split('|')[0]];
+        case 'wface': return !!wallOf(sk, edgeOf(s.id)[0]);
         case 'odim': {
-            const [op, part] = s.id.split('|'), o = sk.openings[op];
-            return !!o && (part.startsWith('d:') ? (o.dims || []).some(d => d.id === part.slice(2)) : !drivingDim(o));
+            const [op, part] = s.id.split('|'), o = planSK().openings[op];
+            return !!o && (part === 'w' || (part.startsWith('d:') ? (o.dims || []).some(d => d.id === part.slice(2)) : !drivingDim(o)));
         }
         case 'note': return sk.notes.some(n => n.id === s.id);
-        case 'underlay': return !!page().underlay;
+        case 'underlay': return page().underlays.some(u => u.id === s.id);
     }
     return false;
 }
 /** Run after every model change: clean up, re-analyze, refresh UI, autosave. */
 export function afterEdit() {
     ed.editSeq++;
-    gc(SK());
+    gc(planSK()); // the plan, and each wall face
     resolveOpeningsNow();
+    // what's drawn on wall faces follows the plan's corners, doors and windows
+    ed.badFaceCons = syncFaces(planSK());
+    elevSyncFrame(); // the open wall's frame (its length, its corners) as the plan has it now
     ed.sel = ed.sel.filter(s => existsSel(s));
     analyze();
     updateCtx();
@@ -57,11 +80,13 @@ export function afterEdit() {
     refreshDrawerSoon();
     requestDraw();
     renderElevation();
+    refreshLinks(); // (what's linked may have changed: the host is asked about it)
+    followLinked(); // (and an undo may have put a linked dimension at something else than the job says)
     saveSoon();
 }
 export function undo() {
     if (!HS().u.length) {
-        toast('Nothing to undo');
+        toast('Nothing to undo', { warn: true });
         return;
     }
     cancelTool();
@@ -75,7 +100,7 @@ export function redo() {
     if (!h.u.length && !h.r.length)
         return;
     if (!h.r.length) {
-        toast('Nothing to redo');
+        toast('Nothing to redo', { warn: true });
         return;
     }
     cancelTool();
@@ -84,12 +109,72 @@ export function redo() {
     afterEdit();
     toast('Redone');
 }
+/** Solve with these points held exactly where they are (fixed for the solve, then as they were). */
+function solveHolding(sk, hold) {
+    const pts = hold.map(id => sk.points[id]).filter(Boolean), had = pts.map(p => p.fixed);
+    pts.forEach(p => { p.fixed = true; });
+    const s = solver.solve(sk);
+    pts.forEach((p, i) => { if (had[i])
+        p.fixed = true;
+    else
+        delete p.fixed; });
+    return s;
+}
+/**
+ * The things a constraint ties together, each as the points to hold for it: a cabinet (its corners, when it's one of
+ * its edges or corners), a line (its ends), a point.
+ */
+export function holdGroups(sk, c) {
+    const face = sk, groups = [], seen = new Set();
+    const add = (key, pts) => { if (!seen.has(key) && pts.length) {
+        seen.add(key);
+        groups.push(pts);
+    } };
+    const point = (pid) => {
+        if (!pid || !sk.points[pid])
+            return;
+        const cab = cabOfPoint(sk, pid);
+        if (cab)
+            add('cab:' + cab, cabPoints(face.cabs[cab]));
+        else
+            add('pt:' + pid, [pid]);
+    };
+    for (const lid of [c.l, c.l1, c.l2, c.line]) {
+        const l = lid ? sk.lines[lid] : undefined;
+        if (!l)
+            continue;
+        if (l.cab && face.cabs?.[l.cab])
+            add('cab:' + l.cab, cabPoints(face.cabs[l.cab]));
+        else
+            add('line:' + lid, [l.a, l.b]);
+    }
+    for (const pid of [c.a, c.b, c.p])
+        point(pid);
+    return groups;
+}
 /**
  * Add a constraint through the solver and explain the outcome:
  * reference dimension → toast, conflict → conflict sheet (unless silent).
  */
 export function tryAddConstraint(c, { silent = false, onResolved = null } = {}) {
-    const r = solver.addConstraint(SK(), c, { explain: !silent });
+    // nothing may be pushed past its wall (in the wall view, past the wall; in the plan, a wall made shorter than
+    // what's on it): a constraint that would is taken back
+    const sk = SK(), was = overflow(sk), held = fitState(sk);
+    const r = solver.addConstraint(sk, c, { explain: !silent });
+    // met by moving everything a little, it ran past the wall: try keeping each thing it ties still in turn, so the
+    // other one moves to meet it (a short cabinet lifted to line up with a tall one, not the tall one sunk into the floor)
+    if (r.ok && r.id && !r.ref && pushedOut(was, overflow(sk))) {
+        for (const hold of holdGroups(sk, c)) {
+            restoreFit(sk, held);
+            if (solveHolding(sk, hold).ok && !pushedOut(was, overflow(sk)))
+                return r;
+        }
+        delete sk.cons[r.id];
+        restoreFit(sk, held);
+        if (!silent)
+            toast(pastWallMsg(), { warn: true });
+        return { ok: false };
+    }
     if (silent)
         return r;
     if (r.ref) {
@@ -98,7 +183,7 @@ export function tryAddConstraint(c, { silent = false, onResolved = null } = {})
             : 'Kept as a reference dimension (' + fmtLen(c.value) + '). Other constraints already set this value — remove one to drive it.', { warn: !r.refSame });
     }
     else if (r.redundant) {
-        toast(CONS_LABEL[c.type] + ' is already true — other constraints set it.');
+        toast(CONS_LABEL[c.type] + ' is already true — other constraints set it.', { warn: true });
     }
     else if (r.conflict === 'dependent') {
         showConflict({ title: 'Can’t add ' + (CONS_LABEL[c.type] || 'constraint').toLowerCase(), msg: 'It fights with constraints already on the drawing. Remove one of these to apply it.', ids: r.culprits || [], pending: c, onResolved });

package/dist/app/edit.js.map

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

package/dist/app/state.d.ts

@@ -1,17 +1,24 @@
+import { type NoteStyle } from '../model/markup';
 import type { Analysis, OpeningEdge, SelItem, SelType } from '../model/types';
 import type { Xform } from '../render/view';
 import type { DrawCtx } from '../render/ctx';
 export type Mode = 'draft' | 'annotate';
 /** Something under the pointer: geometry, or a chip/badge drawn on the canvas. */
 export interface Hit {
-    type: SelType | 'odim' | 'oanchor' | 'uhandle' | 'nhandle';
+    /** 'cabfoot': a cabinet's footprint in the plan (id: its wall face's key, '#', its id) */
+    type: SelType | 'odim' | 'oanchor' | 'uhandle' | 'nhandle' | 'cabfoot';
     id: string;
     /** a print dimension label */
     print?: boolean;
     /** low-priority hit (room fill) */
     weak?: boolean;
-    /** 'odim': 'w' width, 'a'/'b' distance to a wall end, or 'd:<id>' a placed dimension. 'oanchor': 's0'/'s1' edge. */
+    /**
+     * 'odim': 'w' width, 'a'/'b' distance to a wall end, or 'd:<id>' a placed dimension. 'oanchor': 's0'/'s1' edge.
+     * 'note', a link's tile: 'tip' its leader's tip, 'leader' along its leader (unset: its card).
+     */
     part?: string;
+    /** a wall picked whole: the side of its centreline the pointer was on (+1 the left of its A → B; a curved one's, outside) */
+    side?: 1 | -1;
 }
 export type OpeningDimPart = 'w' | 'a' | 'b' | `d:${string}`;
 export interface Guide {
@@ -37,7 +44,8 @@ export interface Snap {
 }
 /** Screen-space hit region registered while drawing chips, badges and labels. */
 export interface HitChip {
-    kind: 'dim' | 'pdim' | 'cons' | 'room' | 'odim';
+    /** 'elev': one of the wall view's dimension chips (id: what it measures, as JSON) */
+    kind: 'dim' | 'pdim' | 'cons' | 'room' | 'odim' | 'elev';
     part?: string;
     id: string;
     x: number;
@@ -69,11 +77,20 @@ export declare const ed: {
     ana: Analysis;
     lastPointerTouch: boolean;
     drawConstr: boolean;
+    /** the rail's Walls toggle: what's drawn (lines, rectangles, circles, arcs, Draw to shape) is walls */
+    drawWalls: boolean;
     dimLayer: 'drive' | 'print';
     openingType: 'door' | 'window';
+    /** new markup's look (the stroke panel sets them; selected markup changes with them) */
     noteColor: string;
+    noteWidth: number;
+    noteStyle: NoteStyle;
+    /** new text notes' letter height on the drawing, inches */
+    noteTextIn: number;
     /** opening dimensions that can't be met (drawn red) */
     badOpeningDims: Set<string>;
+    /** wall-face constraints that can't be met (drawn red in the elevation) */
+    badFaceCons: Set<string>;
     /** dimension tool: an opening edge picked as the first end */
     /** body: the opening itself was tapped (not an edge square), so the edge is chosen from what it's measured to */
     pickedAnchor: {
@@ -83,9 +100,19 @@ export declare const ed: {
     } | null;
     /** bumped on every model change (so a double tap can't span an edit) */
     editSeq: number;
+    /** the side a wall was last tapped on, picking it whole: between two spaces, its length is measured on that side */
+    wallTap: {
+        id: string;
+        side: 1 | -1;
+    } | null;
     /** recently hovered points, used for alignment guides */
     recentPts: string[];
     /** view only: pan and zoom, no tools, nothing saved (people who can't edit this job) */
     readOnly: boolean;
 };
-export declare const isSel: (type: string, id: string) => boolean;
+/**
+ * Whether something is selected. Drawing asks it of everything on the plan, every frame: with many things selected (a
+ * double tap takes in every wall joined to one) that was each against each, so a larger selection is looked up in a
+ * set, made again only when the selection changes (it's replaced, or added to).
+ */
+export declare function isSel(type: string, id: string): boolean;

package/dist/app/state.js

@@ -1,4 +1,5 @@
 import { emptyAnalysis } from '../model/constraints';
+import { DEFAULT_NOTE_COLOR, DEFAULT_NOTE_WIDTH, NOTE_TEXT_IN } from '../model/markup';
 import { sessionState } from '../model/session';
 /** Shared editor state (the prototype's module-level `let`s). */
 export const ed = sessionState(() => ({
@@ -16,20 +17,48 @@ export const ed = sessionState(() => ({
     ana: emptyAnalysis(),
     lastPointerTouch: false,
     drawConstr: false,
+    /** the rail's Walls toggle: what's drawn (lines, rectangles, circles, arcs, Draw to shape) is walls */
+    drawWalls: false,
     dimLayer: 'drive',
     openingType: 'door',
-    noteColor: '#F070EE',
+    /** new markup's look (the stroke panel sets them; selected markup changes with them) */
+    noteColor: DEFAULT_NOTE_COLOR,
+    noteWidth: DEFAULT_NOTE_WIDTH,
+    noteStyle: 'solid',
+    /** new text notes' letter height on the drawing, inches */
+    noteTextIn: NOTE_TEXT_IN,
     /** opening dimensions that can't be met (drawn red) */
     badOpeningDims: new Set(),
+    /** wall-face constraints that can't be met (drawn red in the elevation) */
+    badFaceCons: new Set(),
     /** dimension tool: an opening edge picked as the first end */
     /** body: the opening itself was tapped (not an edge square), so the edge is chosen from what it's measured to */
     pickedAnchor: null,
     /** bumped on every model change (so a double tap can't span an edit) */
     editSeq: 0,
+    /** the side a wall was last tapped on, picking it whole: between two spaces, its length is measured on that side */
+    wallTap: null,
     /** recently hovered points, used for alignment guides */
     recentPts: [],
     /** view only: pan and zoom, no tools, nothing saved (people who can't edit this job) */
     readOnly: false,
 }));
-export const isSel = (type, id) => ed.sel.some(s => s.type === type && s.id === id);
+/**
+ * Whether something is selected. Drawing asks it of everything on the plan, every frame: with many things selected (a
+ * double tap takes in every wall joined to one) that was each against each, so a larger selection is looked up in a
+ * set, made again only when the selection changes (it's replaced, or added to).
+ */
+export function isSel(type, id) {
+    const sel = ed.sel;
+    if (sel.length < 8) {
+        for (const s of sel)
+            if (s.type === type && s.id === id)
+                return true;
+        return false;
+    }
+    if (!selKeys || selKeys.sel !== sel || selKeys.n !== sel.length)
+        selKeys = { sel, n: sel.length, keys: new Set(sel.map(s => s.type + ' ' + s.id)) };
+    return selKeys.keys.has(type + ' ' + id);
+}
+let selKeys = null;
 //# sourceMappingURL=state.js.map

package/dist/app/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/app/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmDhD,iEAAiE;AACjE,MAAM,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;IACpC,IAAI,EAAE,OAAe;IACrB,IAAI,EAAE,QAAQ;IACd,GAAG,EAAE,EAAe;IACpB,KAAK,EAAE,IAAkB;IACzB,SAAS,EAAE,IAAmB;IAC9B,MAAM,EAAE,IAAqB;IAC7B,OAAO,EAAE,IAAsB;IAC/B,SAAS,EAAE,IAAI,GAAG,EAAU;IAC5B,YAAY,EAAE,KAAK;IACnB,+FAA+F;IAC/F,QAAQ,EAAE,EAAe;IACzB,GAAG,EAAE,aAAa,EAAc;IAChC,gBAAgB,EAAE,KAAK;IACvB,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,OAA4B;IACtC,WAAW,EAAE,MAA2B;IACxC,SAAS,EAAE,SAAS;IACpB,uDAAuD;IACvD,cAAc,EAAE,IAAI,GAAG,EAAU;IACjC,8DAA8D;IAC9D,iHAAiH;IACjH,YAAY,EAAE,IAAgE;IAC9E,wEAAwE;IACxE,OAAO,EAAE,CAAC;IACV,yDAAyD;IACzD,SAAS,EAAE,EAAc;IACzB,wFAAwF;IACxF,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAU,EAAW,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/app/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAGvG,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0DhD,iEAAiE;AACjE,MAAM,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;IACpC,IAAI,EAAE,OAAe;IACrB,IAAI,EAAE,QAAQ;IACd,GAAG,EAAE,EAAe;IACpB,KAAK,EAAE,IAAkB;IACzB,SAAS,EAAE,IAAmB;IAC9B,MAAM,EAAE,IAAqB;IAC7B,OAAO,EAAE,IAAsB;IAC/B,SAAS,EAAE,IAAI,GAAG,EAAU;IAC5B,YAAY,EAAE,KAAK;IACnB,+FAA+F;IAC/F,QAAQ,EAAE,EAAe;IACzB,GAAG,EAAE,aAAa,EAAc;IAChC,gBAAgB,EAAE,KAAK;IACvB,UAAU,EAAE,KAAK;IACjB,uGAAuG;IACvG,SAAS,EAAE,KAAK;IAChB,QAAQ,EAAE,OAA4B;IACtC,WAAW,EAAE,MAA2B;IACxC,wFAAwF;IACxF,SAAS,EAAE,kBAAkB;IAC7B,SAAS,EAAE,kBAAkB;IAC7B,SAAS,EAAE,OAAoB;IAC/B,2DAA2D;IAC3D,UAAU,EAAE,YAAY;IACxB,uDAAuD;IACvD,cAAc,EAAE,IAAI,GAAG,EAAU;IACjC,2EAA2E;IAC3E,WAAW,EAAE,IAAI,GAAG,EAAU;IAC9B,8DAA8D;IAC9D,iHAAiH;IACjH,YAAY,EAAE,IAAgE;IAC9E,wEAAwE;IACxE,OAAO,EAAE,CAAC;IACV,oHAAoH;IACpH,OAAO,EAAE,IAA2C;IACpD,yDAAyD;IACzD,SAAS,EAAE,EAAc;IACzB,wFAAwF;IACxF,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAC,CAAC;AAEJ;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,IAAY,EAAE,EAAU;IAC5C,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;IACnB,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,IAAI,GAAG;YAAE,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE;gBAAE,OAAO,IAAI,CAAC;QACrE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,GAAG,IAAI,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,MAAM;QAAE,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACpJ,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC;AAC3C,CAAC;AACD,IAAI,OAAO,GAA4D,IAAI,CAAC"}

package/dist/data/memory.d.ts

@@ -1,5 +1,7 @@
 import type { CadDataProvider, CadFileMeta, CadMeasurementValue, CadPageDoc } from './provider';
-export declare function memoryProvider(name?: string, meta?: CadFileMeta | null, pages?: Record<string, CadPageDoc>): {
+export declare function memoryProvider(name?: string, meta?: CadFileMeta | null, pages?: Record<string, CadPageDoc>, opts?: {
+    fromCache?: boolean;
+}): {
     provider: CadDataProvider;
     state: {
         name: string;
@@ -11,7 +13,13 @@ export declare function memoryProvider(name?: string, meta?: CadFileMeta | null,
         files: Record<string, string>;
         measurements: Record<string, CadMeasurementValue>;
         placed: string[];
+        placedLinked: {
+            groupId: string;
+            id: string;
+            columnId?: string;
+        }[];
     };
     remote: (id: string, p: CadPageDoc) => void;
     remoteMeasurement: (id: string, value: number) => void;
+    confirm: () => void;
 };

package/dist/data/memory.js

@@ -1,16 +1,19 @@
 /* A drawing kept in memory: for tests and the dev harness. `remote` changes it as another device would. */
 const copy = (v) => JSON.parse(JSON.stringify(v));
-export function memoryProvider(name = 'Test drawing', meta = null, pages = {}) {
+export function memoryProvider(name = 'Test drawing', meta = null, pages = {}, opts = {}) {
+    // (fromCache: what's here is the cache's word, as a device offline hears it, until confirm() brings the server's)
+    let fromCache = !!opts.fromCache;
+    const snap = () => ({ fromCache });
     const fileSubs = new Set();
     const pageSubs = new Set();
-    const state = { name, meta: meta && copy(meta), pages: copy(pages), writes: 0, uploads: 0, thumbnail: null, files: {}, measurements: {}, placed: [] };
+    const state = { name, meta: meta && copy(meta), pages: copy(pages), writes: 0, uploads: 0, thumbnail: null, files: {}, measurements: {}, placed: [], placedLinked: [] };
     const measSubs = new Set();
     const emitMeas = () => measSubs.forEach(cb => cb(copy(state.measurements)));
-    const emitFile = () => fileSubs.forEach(cb => cb({ name: state.name, meta: state.meta && copy(state.meta) }));
-    const emitPages = () => pageSubs.forEach(cb => cb(copy(state.pages)));
+    const emitFile = () => fileSubs.forEach(cb => cb({ name: state.name, meta: state.meta && copy(state.meta) }, snap()));
+    const emitPages = () => pageSubs.forEach(cb => cb(copy(state.pages), snap()));
     const provider = {
-        subscribeFile(cb) { fileSubs.add(cb); queueMicrotask(() => cb({ name: state.name, meta: state.meta && copy(state.meta) })); return () => { fileSubs.delete(cb); }; },
-        subscribePages(cb) { pageSubs.add(cb); queueMicrotask(() => cb(copy(state.pages))); return () => { pageSubs.delete(cb); }; },
+        subscribeFile(cb) { fileSubs.add(cb); queueMicrotask(() => cb({ name: state.name, meta: state.meta && copy(state.meta) }, snap())); return () => { fileSubs.delete(cb); }; },
+        subscribePages(cb) { pageSubs.add(cb); queueMicrotask(() => cb(copy(state.pages), snap())); return () => { pageSubs.delete(cb); }; },
         async writeMeta(m) { state.meta = copy(m); state.writes++; emitFile(); },
         async writePage(id, p) { state.pages[id] = copy(p); state.writes++; emitPages(); },
         async deletePage(id) { delete state.pages[id]; state.writes++; emitPages(); },
@@ -23,13 +26,15 @@ export function memoryProvider(name = 'Test drawing', meta = null, pages = {}) {
             async create(m) { const id = 'm' + (Object.keys(state.measurements).length + 1); state.measurements[id] = copy(m); emitMeas(); return id; },
             async update(id, value) { state.measurements[id] = { ...state.measurements[id], value }; emitMeas(); },
             subscribe(cb) { measSubs.add(cb); queueMicrotask(() => cb(copy(state.measurements))); return () => { measSubs.delete(cb); }; },
-            async setPlaced(ids) { state.placed = ids.slice(); },
+            async setPlaced(ids, linked = []) { state.placed = ids.slice(); state.placedLinked = copy(linked); },
         },
     };
     /** Change a page as another device would. */
     const remote = (id, p) => { state.pages[id] = copy(p); emitPages(); };
     /** Change a measurement as someone else would (e.g. in the job's measurement list). */
     const remoteMeasurement = (id, value) => { state.measurements[id] = { ...state.measurements[id], value }; emitMeas(); };
-    return { provider, state, remote, remoteMeasurement };
+    /** The server's word after a start from the cache: everything is sent again, confirmed. */
+    const confirm = () => { fromCache = false; emitFile(); emitPages(); };
+    return { provider, state, remote, remoteMeasurement, confirm };
 }
 //# sourceMappingURL=memory.js.map