@oh-just-another/state 0.59.0 → 0.60.0

package/dist/editor/render-orchestrator.d.ts

@@ -1,11 +1,183 @@
-import type { Editor } from "../editor.js";
+import { type Scene, type Element, type Link, type SpatialGrid } from "@oh-just-another/scene";
+import { type AnimationClock, type RenderTarget, type ElementCache } from "@oh-just-another/renderer-core";
+import { type PeerCursor, type PeerSelection } from "../overlay.js";
+import type { Bounds, ElementId, LinkId, LayerId, AnnotationId, Vec2 } from "@oh-just-another/types";
+import type { Mode } from "../modes.js";
+import type { ContainerHover, EdgePreview, HoveredLinkTarget, LinkDragFromAnchor, PanGesture } from "./interaction-state.js";
+import type { BrushStrokeState } from "./public/brush.js";
+import type { LaserStroke } from "./public/laser.js";
+import type { TileComposeFn } from "../editor.js";
+/**
+ * Live brush-stroke preview: the in-progress stroke's smoothed geometry plus the
+ * paint colour and opacity it will commit with, so the overlay preview matches
+ * the committed stroke exactly (no colour / opacity snap on release).
+ */
+export interface BrushPreview extends BrushStrokeState {
+    readonly fill: string;
+    readonly opacity: number;
+}
+/**
+ * Flat, self-contained data bag the {@link renderEditor} orchestrator paints
+ * from — every field the render pass reads, precomputed by the Editor. Breaks
+ * the Editor ↔ orchestrator import cycle: the orchestrator no longer imports
+ * (nor reaches into) the `Editor` class, it just consumes this snapshot.
+ *
+ * All derived viewport/dirty/dim/hide inputs and the shared spatial index are
+ * resolved up front (same call order as before) so painting is side-effect
+ * free. The two runtime-parameterised lookups the overlay path still needs —
+ * click-create preview and GIF playback state — come in as narrow callbacks.
+ */
+export interface RenderSnapshot {
+    readonly mainTarget: RenderTarget;
+    readonly overlayTarget: RenderTarget;
+    readonly backgroundTarget: RenderTarget | null;
+    readonly scene: Scene;
+    readonly selection: ReadonlySet<ElementId>;
+    readonly selectedLinks: ReadonlySet<LinkId>;
+    /** Sole selected link (handles shown) or `null` for multi/mixed/none. */
+    readonly selectedLink: LinkId | null;
+    readonly selectedAnnotation: AnnotationId | null;
+    readonly enteredGroup: ElementId | null;
+    readonly gridEnabled: boolean;
+    readonly viewportWorld: Bounds | null;
+    readonly dirtyWorld: Bounds | null;
+    readonly dimElements: ReadonlySet<ElementId> | undefined;
+    /**
+     * `true` while an eraser sweep has marked shapes for deletion — the dim set
+     * then fades at {@link ERASE_DIM_OPACITY} (strong "about to delete") instead
+     * of the gentler group-isolation {@link ISOLATION_DIM_OPACITY}.
+     */
+    readonly eraseActive: boolean;
+    readonly hideElements: ReadonlySet<ElementId> | undefined;
+    readonly sharedIndex: SpatialGrid | null;
+    readonly boundsCache: ElementCache<Bounds>;
+    /**
+     * Per-instance animated-content playback clock. Threaded into `renderScene`
+     * via {@link RenderSceneOptions.clock} so this editor's per-shape GIF
+     * playback (pause / offset) doesn't leak through the process-global
+     * `setAnimationClock`. The tile path can't carry a render context, so it
+     * bridges this onto the module fallback right before compositing.
+     */
+    readonly animationClock: AnimationClock;
+    readonly tileComposeFn: TileComposeFn | null;
+    readonly tileDirtyElements: Map<ElementId, {
+        before: Bounds | null;
+        after: Bounds | null;
+    }>;
+    readonly mode: Mode;
+    readonly activeLayerId: LayerId;
+    /** World-space corners of the pending image-crop frame, or null. */
+    readonly cropFrame: readonly Vec2[] | null;
+    /**
+     * Crop-mode ghost: the original image element (transform + live bitmap
+     * handle via `metadata.image`) and the virtual full-image LOCAL rect. The
+     * overlay paints the full bitmap faintly over this rect so hidden parts stay
+     * visible while cropping. `null` when not cropping.
+     */
+    readonly cropGhost: {
+        readonly element: Element;
+        readonly fullRect: Bounds;
+    } | null;
+    /**
+     * Pending flowchart-create preview: the not-yet-committed nodes + links drawn
+     * faintly on the overlay while a `Cmd/Ctrl+Arrow` grow session is open.
+     * `null` when no session is active.
+     */
+    readonly flowchartPreview: {
+        readonly elements: readonly Element[];
+        readonly links: readonly Link[];
+    } | null;
+    /**
+     * Pending stroke-erase preview: the fragments each touched brush would be cut
+     * into while a Shift-held eraser gesture drags. Drawn on the overlay; the
+     * touched originals are already in `hideElements`. `null` when no such
+     * gesture is active. Fragment ids are ephemeral (never enter history).
+     */
+    readonly strokeErasePreview: {
+        readonly elements: readonly Element[];
+        readonly hidden: ReadonlySet<ElementId>;
+    } | null;
+    readonly lassoPreview: Bounds | null;
+    readonly drawingPreview: Bounds | null;
+    readonly edgePreview: EdgePreview | null;
+    readonly linkDragFromAnchor: LinkDragFromAnchor | null;
+    readonly hoveredLinkTarget: HoveredLinkTarget | null;
+    readonly panGesture: PanGesture | null;
+    readonly pinchActive: boolean;
+    readonly gestureActive: boolean;
+    readonly linkEndpointDrag: {
+        linkId: LinkId;
+        side: "from" | "to";
+        toPoint: Vec2;
+    } | null;
+    readonly linkSegmentDrag: {
+        linkId: LinkId;
+        axis: "h" | "v";
+        at: number;
+    } | null;
+    readonly linkWaypointDrag: {
+        linkId: LinkId;
+        index: number;
+        pendingInsert: boolean;
+    } | null;
+    readonly hoverCursorWorld: Vec2 | null;
+    readonly anchorStartHitSlop: number;
+    readonly anchorClickRadius: number;
+    readonly containerHover: ContainerHover | null;
+    readonly brushStroke: BrushPreview | null;
+    readonly laserStrokes: readonly LaserStroke[];
+    /** Fading eraser drag trail (laser-style), painted in neutral grey. */
+    readonly eraserTrail: readonly LaserStroke[];
+    /**
+     * Eraser cursor ring: the world-space hover centre and its SCREEN-px radius
+     * (the panel's eraser width). `null` unless the erase tool is active with a
+     * live hover point and the editor is editable. The overlay hides the OS
+     * cursor in erase mode and paints this ring in its place.
+     */
+    readonly eraserCursor: {
+        readonly center: Vec2;
+        readonly radius: number;
+    } | null;
+    readonly peerCursors: readonly PeerCursor[];
+    readonly peerSelections: readonly PeerSelection[];
+    readonly debugHitZones: boolean;
+    /**
+     * Read-only / view mode. When true the overlay paints selection outlines
+     * (halo) but suppresses every interactive handle — resize / rotate grips,
+     * group-bounds handles and link endpoint/bend handles — so a viewer can't
+     * grab an affordance that would mutate the scene.
+     */
+    readonly readOnly: boolean;
+    readonly groupMoveOrigin: ReadonlyMap<ElementId, Vec2> | null;
+    readonly aspectLocked: boolean;
+    readonly combinedSelectionBounds: Bounds | null;
+    readonly editingText: {
+        caret: {
+            x: number;
+            y: number;
+            height: number;
+        } | null;
+        caretColor: string;
+        selectionRects: readonly Bounds[];
+    } | null;
+    readonly previewClickCreate: (fromElement: ElementId, anchorName: string) => {
+        bounds: Bounds;
+        path: readonly Vec2[];
+        element: Element;
+        ghostScene: Scene;
+        ghostLinkId: LinkId;
+    } | null;
+    readonly isPlaybackPaused: (id: ElementId) => boolean;
+}
 /**
  * Render orchestrator: background grid pass, tile-cache vs full renderScene
  * path, and the overlay options builder (drawing / lasso preview, edge
  * preview, hovered ports, group handles, container drop zone, brush stroke,
- * edge endpoint drag, peer cursors, annotations). Typed against the full
- * `Editor` class via a type-only import erased at runtime; the single call
- * site is editor.ts's own private `render()` wrapper.
+ * edge endpoint drag, peer cursors, annotations). Consumes a flat
+ * {@link RenderSnapshot} the Editor builds each frame — no coupling to the
+ * `Editor` class. The single call site is editor.ts's own private `render()`
+ * wrapper. Side-effect free apart from the paint itself: the caller owns the
+ * `lastRendered*` bookkeeping and the tile-dirty reset.
  */
-export declare const renderEditor: (editor: Editor) => void;
+export declare const renderEditor: (editor: RenderSnapshot) => void;
 //# sourceMappingURL=render-orchestrator.d.ts.map

package/dist/editor/render-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-orchestrator.d.ts","sourceRoot":"","sources":["../../src/editor/render-orchestrator.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAc3C;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,KAAG,IAqc7C,CAAC"}
+{"version":3,"file":"render-orchestrator.d.ts","sourceRoot":"","sources":["../../src/editor/render-orchestrator.ts"],"names":[],"mappings":"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"}