@1agh/maude 0.39.1 → 0.40.0

package/apps/studio/canvas-lib.tsx

@@ -108,6 +108,13 @@ import { useSelectionSetOptional } from './use-selection-set.tsx';
 import { MaybeToolProvider, useToolModeOptional } from './use-tool-mode.tsx';
 import { UndoStackProvider, useUndoSinks, useUndoStackOptional } from './use-undo-stack.tsx';
 
+export type { CompSnapshot, VideoCompMeta, VideoCompProps } from './video-comp.tsx';
+// DDR-148 — video-comp canvas kind. Re-exported so `@maude/canvas-lib` exposes
+// <VideoComp> (Remotion composition mounted in <Player> + the deterministic
+// seek bridge). Its `remotion`/`@remotion/player` imports resolve through the
+// canvas importmap (RUNTIME_PACKAGES), same as react/motion.
+export { VideoComp } from './video-comp.tsx';
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Module constants
 
@@ -1497,6 +1504,18 @@ function DesignCanvasInner({ children, controls }: DesignCanvasProps) {
     return bestId;
   }, [artboards, controller.viewport]);
 
+  // DDR-148 — report the viewport-active artboard (nearest the centre) to the
+  // shell so the Timeline panel FOLLOWS whichever artboard the user pans to,
+  // not just the one they cmd+click. Fires on every pan/zoom that changes it.
+  useEffect(() => {
+    if (typeof window === 'undefined' || window.parent === window) return;
+    try {
+      window.parent.postMessage({ dgn: 'active-artboard', id: activeArtboardId }, '*');
+    } catch {
+      /* cross-origin parent without our listener — no-op */
+    }
+  }, [activeArtboardId]);
+
   // The world's transform is owned by useViewportController (writes straight
   // to `worldRef.current.style.transform`). Rendering the transform from
   // React state instead would race: between React's commit and the

package/apps/studio/canvas-list-watch.ts

@@ -86,7 +86,11 @@ export function createCanvasListWatch(
   // default config newCanvasDir IS a group; a config pointing it outside
   // canvasGroups would have the canvas absent from /_index-data too, so the
   // watcher stays consistent with what the tree can actually show.
-  const groupPaths = (ctx.cfg.canvasGroups ?? []).map((g) => g.path);
+  //
+  // Read at USE time, never captured — `reloadConfig` (context.ts) hot-swaps
+  // ctx.cfg in place when config.json changes on disk, and a group added
+  // mid-session (`/design:setup-ds` adding `system`) must gate correctly.
+  const groupPaths = () => (ctx.cfg.canvasGroups ?? []).map((g) => g.path);
 
   // null = not yet seeded; the first refresh captures the baseline and emits
   // nothing (canvases already on disk at boot aren't "added").
@@ -156,7 +160,7 @@ export function createCanvasListWatch(
   }
 
   const off = ctx.bus.on('fs:any', (rel: string) => {
-    if (!isCanvasCandidate(rel, groupPaths)) return;
+    if (!isCanvasCandidate(rel, groupPaths())) return;
     schedule();
   });
 

package/apps/studio/canvas-shell.tsx

@@ -94,6 +94,7 @@ import {
   useAnnotationSelectionOptional,
 } from './use-annotation-selection.tsx';
 import { AnnotationsVisibilityProvider } from './use-annotations-visibility.tsx';
+import { showCanvasToast } from './use-canvas-media-drop.tsx';
 import { ChromeVisibilityProvider, useChromeVisibility } from './use-chrome-visibility.tsx';
 import { useCollab } from './use-collab.tsx';
 import { useCursorModifiers } from './use-cursor-modifiers.tsx';
@@ -1780,6 +1781,11 @@ function CanvasRouter({
     if (!host) return;
     let editing: HTMLElement | null = null;
     let original = '';
+    // DDR-150 P1 — the committed-but-unconfirmed edit, so a shell rejection
+    // (dynamic/mixed content the engine refuses) can revert the optimistic
+    // contenteditable text instead of letting it silently vanish on the next
+    // reload. Mirrors the reorder-failed revert below. Cleared on revert.
+    let lastTextCommit: { el: HTMLElement; original: string } | null = null;
     const onBlur = (): void => commitEdit(true);
     const onKey = (e: KeyboardEvent): void => {
       if (e.key === 'Escape') {
@@ -1815,6 +1821,8 @@ function CanvasRouter({
       } catch {
         /* detached / cross-origin */
       }
+      // Stash the optimistic edit so a shell rejection can revert it (DDR-150 P1).
+      lastTextCommit = { el: elx, original };
       // Record onto the in-canvas undo stack so Cmd+Z reverts the rewrite. The
       // edit already posted above (record, don't re-run do()). before/after are
       // the trimmed bodies the edit-text endpoint persists.
@@ -1855,10 +1863,29 @@ function CanvasRouter({
         /* selection API unavailable */
       }
     };
+    // The shell rejected the last inline text edit — revert the optimistic
+    // contenteditable text so the canvas reflects the true (unsaved) source
+    // rather than a change that silently disappears on the next reload (DDR-150 P1).
+    const onEditReverted = (e: MessageEvent): void => {
+      if (e.source !== window.parent) return;
+      const m = e.data as { dgn?: string; op?: string; reason?: string } | null;
+      if (m?.dgn !== 'edit-reverted' || m.op !== 'text' || !lastTextCommit) return;
+      try {
+        lastTextCommit.el.textContent = lastTextCommit.original;
+      } catch {
+        /* detached — a subsequent reload re-syncs */
+      }
+      showCanvasToast(
+        `Couldn't save that text — ${m.reason || 'not editable inline'}. Edit it via chat.`
+      );
+      lastTextCommit = null;
+    };
     // Capture phase so we beat the fit-to-view dblclick handler.
     host.addEventListener('dblclick', onDbl, true);
+    window.addEventListener('message', onEditReverted);
     return () => {
       host.removeEventListener('dblclick', onDbl, true);
+      window.removeEventListener('message', onEditReverted);
       if (editing) teardown(editing);
     };
   }, [hostRef]);