@weasel-js/forge 1.10.0 → 1.10.1

package/dist/shell/index.js

@@ -1,11 +1,11 @@
 import { parseRoute, formatRoute, paramsToKnobs, knobPaths, sameKnob, knobsToParams, PLAYHEAD_PARAM, reservedParams } from '../chunk-DKWHGSBZ.js';
 import { DEFAULT_TITLE } from '../chunk-5DXUNLV2.js';
-import { TITLE_LIBRARIES, isIndexId, indexId, indexEntries, librariesFrom, LibrariesContext, schemaFromDescription, LibraryBadge, openChannel, IndexPage } from '../chunk-V4RI7GWD.js';
+import { TITLE_LIBRARIES, isIndexId, indexId, indexEntries, librariesFrom, LibrariesContext, schemaFromDescription, LibraryBadge, openChannel, IndexPage } from '../chunk-BIAEGWGJ.js';
 import { isGallery } from '../chunk-WEQSLPKT.js';
-import { useTrialFrame, createTrialFrames, createTrialClocks, StoryGlobalsContext, TrialFramesContext, TrialClocksContext, StoryTrial, useCssOverrides, useTrialClock, TrialHost } from '../chunk-ENXU34PI.js';
-export { StoryGlobalsContext, StoryTrial, TrialFramesContext, TrialHost, useTrialFrame } from '../chunk-ENXU34PI.js';
+import { useTrialFrame, createTrialFrames, createTrialClocks, StoryGlobalsContext, TrialFramesContext, TrialClocksContext, StoryTrial, useCssOverrides, useTrialClock, TrialHost } from '../chunk-E2FHBDNQ.js';
+export { StoryGlobalsContext, StoryTrial, TrialFramesContext, TrialHost, useTrialFrame } from '../chunk-E2FHBDNQ.js';
 import { labGlobals, withGlobals, followApp, storyConfig, GLOBALS_KEY, effectiveGlobals, PLAYHEAD_KEY, labOptions, isGlobalsPath } from '../chunk-DFKCLZKS.js';
-import { loadStories, indexRenderOf, useNearViewport, IN_VIEW_MARGIN } from '../chunk-4NM3RTYK.js';
+import { loadStories, indexRenderOf, useNearViewport, IN_VIEW_MARGIN } from '../chunk-AP3DRQLI.js';
 import '../chunk-L5XM5VKB.js';
 import '../chunk-ZAWXMUGZ.js';
 import '../chunk-GB6PRJET.js';
@@ -18,9 +18,10 @@ import { createRoot } from 'react-dom/client';
 import { createEmitter } from '@weasel-js/registry';
 import { f, valueAtPath, isConfigBranch } from '@weasel-js/labkit/config';
 import { InfoIcon, ToggleBar, Checkbox, Dialog, TOKEN_CATEGORIES, Icon, DisclosureMark, Button as Button$1, Callout, Slider, Transport, SearchIcon } from '@weasel-js/ui';
-import { TOKEN_MANIFEST, THEME_SOURCES, isByAxis } from '@weasel-js/theme';
+import { themeAxes, weaselTheme, TOKEN_MANIFEST, THEME_SOURCES, resolveTheme, isColorModePreference, isByAxis } from '@weasel-js/theme';
 import { scale, httpThemeApi } from '@weasel-js/theme/engine';
 import { useLatest, historyKey, createHistory, swapOp, isPlainObject } from '@weasel-js/core';
+import { useResolvedColorMode } from '@weasel-js/theme/react';
 
 function Finding({ finding }) {
   return /* @__PURE__ */ jsxs("li", { className: "fg-a11y__finding", children: [
@@ -553,15 +554,24 @@ function applyTokenEdits(definition, edits, selection) {
   }
   return { ok: true, definition: root };
 }
+function useTrialSelection(axes, globals) {
+  const { mode } = globals;
+  const osMode = useResolvedColorMode(isColorModePreference(mode) ? mode : "auto");
+  return useMemo(() => {
+    const selection = selectionFor(axes, globals);
+    return axes.mode && osMode in axes.mode.values ? { mode: osMode, ...selection } : selection;
+  }, [axes, globals, osMode]);
+}
 
 // src/shell/cssVars/useThemeSave.ts
 var THEME_NAME = "weasel";
 var TOKEN_PREFIX = "--wzl-";
+var NO_AXES = {};
 function useThemeSave({ trialId, globals, themeApi, scales, overrides, history: history2 }) {
+  const definition = THEME_SOURCES[THEME_NAME];
+  const selection = useTrialSelection(definition?.axes ?? NO_AXES, globals);
   const tokens = useMemo(() => {
-    const definition = THEME_SOURCES[THEME_NAME];
     if (!definition) return {};
-    const selection = selectionFor(definition.axes ?? {}, globals);
     const generated = new Set(scales.flatMap((scale) => scale.tokens));
     return Object.fromEntries(
       Object.entries(overrides).flatMap(([name, value]) => {
@@ -570,7 +580,7 @@ function useThemeSave({ trialId, globals, themeApi, scales, overrides, history:
         return writtenOut(definition, token, selection) ? [[token, value]] : [];
       })
     );
-  }, [globals, scales, overrides]);
+  }, [definition, selection, scales, overrides]);
   const [saving, setSaving] = useState(false);
   const [held, setHeld] = useState(null);
   const setNotice = (next) => setHeld(next && { ...next, trialId });
@@ -585,7 +595,6 @@ function useThemeSave({ trialId, globals, themeApi, scales, overrides, history:
         setNotice({ tone: "error", text: `${file} has changed since this page loaded. Reload to edit against it.` });
         return;
       }
-      const selection = selectionFor(stored.definition.axes ?? {}, globals);
       const scaled = applyScaleEdits(stored.definition, Object.fromEntries(scales.map((s) => [s.name, s.edit])), selection);
       const next = scaled.ok ? applyTokenEdits(scaled.definition, tokens, selection) : scaled;
       if (!next.ok) {
@@ -627,6 +636,21 @@ function useThemeSave({ trialId, globals, themeApi, scales, overrides, history:
     save
   };
 }
+var AXES = themeAxes(weaselTheme);
+function useThemeTokens(globals, vars) {
+  const selection = useTrialSelection(AXES, globals);
+  const themed = useMemo(() => resolveTheme(weaselTheme, selection), [selection]);
+  return useMemo(() => {
+    const reported = new Map(vars.map((v) => [v.name, v.value]));
+    return TOKEN_MANIFEST.map((token) => ({
+      name: token.name,
+      type: token.type,
+      group: token.group,
+      value: reported.get(token.name) ?? themed[token.name] ?? token.defaultValue,
+      description: token.description
+    }));
+  }, [vars, themed]);
+}
 var SWAP = "fg.vars.swap";
 var COALESCE_MS = 800;
 var LIMIT = 100;
@@ -743,22 +767,14 @@ function CssVarsPanel({ globals = NO_GLOBALS, themeApi } = {}) {
   const [edited, setEdited] = usePersistedState("fg-css-vars-scales", {}, { scope: "trial" });
   const [tab, setTab] = useState("theme");
   const [filter, setFilter] = useState("");
+  const themeTokens = useThemeTokens(globals, frame.vars);
   const tokens = useMemo(() => {
-    if (tab === "story") {
-      return frame.vars.map(({ name, value }) => {
-        const known = MANIFEST.get(name);
-        return { name, type: known?.type ?? inferTokenType(value), group: known?.group ?? groupOf(name), value };
-      });
-    }
-    const reported = new Map(frame.vars.map((v) => [v.name, v.value]));
-    return TOKEN_MANIFEST.map((token) => ({
-      name: token.name,
-      type: token.type,
-      group: token.group,
-      value: reported.get(token.name) ?? token.defaultValue,
-      description: token.description
-    }));
-  }, [tab, frame.vars]);
+    if (tab === "theme") return themeTokens;
+    return frame.vars.map(({ name, value }) => {
+      const known = MANIFEST.get(name);
+      return { name, type: known?.type ?? inferTokenType(value), group: known?.group ?? groupOf(name), value };
+    });
+  }, [tab, frame.vars, themeTokens]);
   const query = filter.trim().toLowerCase();
   const shown = tokens.map((token) => {
     const override = overrides[token.name];
@@ -1036,10 +1052,10 @@ var whenIdle = (fn) => {
   return () => clearTimeout(handle);
 };
 function createFramePool(frameUrl, size = 2) {
-  const shelf = document.createElement("div");
-  shelf.className = "fg-frame-pool";
-  shelf.setAttribute("aria-hidden", "true");
-  document.body.append(shelf);
+  const shelf2 = document.createElement("div");
+  shelf2.className = "fg-frame-pool";
+  shelf2.setAttribute("aria-hidden", "true");
+  document.body.append(shelf2);
   const warm = [];
   const waits = /* @__PURE__ */ new Set();
   let cancelRefill = null;
@@ -1066,7 +1082,7 @@ function createFramePool(frameUrl, size = 2) {
     }, HELLO_TIMEOUT_MS);
     waits.add(stop);
     window.addEventListener("message", onMessage);
-    shelf.append(frame);
+    shelf2.append(frame);
   };
   const refill = () => {
     if (disposed || cancelRefill) return;
@@ -1087,7 +1103,7 @@ function createFramePool(frameUrl, size = 2) {
       disposed = true;
       cancelRefill?.();
       for (const stop of [...waits]) stop();
-      shelf.remove();
+      shelf2.remove();
     }
   };
 }
@@ -1097,7 +1113,7 @@ var FramePoolContext = createContext(null);
 function routedTrial(trials, focusedTrialId, route) {
   return trials.find((t) => t.id === focusedTrialId && t.instrumentName === route) ?? trials.find((t) => t.instrumentName === route);
 }
-function PlayheadSync({ trialId, route, applied }) {
+function PlayheadSync({ trialId, route, appliedRef }) {
   const clock = useTrialClock(trialId);
   useEffect(() => {
     if (!clock) return;
@@ -1115,8 +1131,8 @@ function PlayheadSync({ trialId, route, applied }) {
       held = next;
       writePlayheadParam(next);
     };
-    if (applied.current !== route) {
-      applied.current = route;
+    if (appliedRef.current !== route) {
+      appliedRef.current = route;
       fromUrl();
     }
     toUrl();
@@ -1132,7 +1148,7 @@ function PlayheadSync({ trialId, route, applied }) {
       off();
       window.removeEventListener("hashchange", onHashChange);
     };
-  }, [clock, route, applied]);
+  }, [clock, route, appliedRef]);
   return null;
 }
 function RoutePlayhead() {
@@ -1141,7 +1157,7 @@ function RoutePlayhead() {
   const applied = useRef(null);
   const trial = route === null ? void 0 : routedTrial(lab.trials, lab.focusedTrialId, route);
   if (!trial || route === null) return null;
-  return /* @__PURE__ */ jsx(PlayheadSync, { trialId: trial.id, route, applied }, `${trial.id} ${route}`);
+  return /* @__PURE__ */ jsx(PlayheadSync, { trialId: trial.id, route, appliedRef: applied }, `${trial.id} ${route}`);
 }
 var RECORD = "fg-globals";
 function useLabGlobals(declarations) {
@@ -1481,13 +1497,13 @@ function StoryTree({ ctx, index }) {
   }, [index]);
   const enabled = (value) => views.some((item) => item.value === value && !item.disabled);
   const view = [chosen, "components", "gallery"].find(enabled) ?? chosen;
-  const kept = useMemo(() => index.filter((entry) => !hidden[table.of(entry)]), [index, hidden, table]);
+  const kept2 = useMemo(() => index.filter((entry) => !hidden[table.of(entry)]), [index, hidden, table]);
   const [galleryEntries, rest] = useMemo(() => {
     const yes = [];
     const no = [];
-    for (const entry of kept) (isGallery(entry) ? yes : no).push(entry);
+    for (const entry of kept2) (isGallery(entry) ? yes : no).push(entry);
     return [yes, no];
-  }, [kept]);
+  }, [kept2]);
   const tree = useMemo(() => buildTree(rest), [rest]);
   const components = useMemo(() => buildComponents(rest, table), [rest, table]);
   const galleries = useMemo(() => buildComponents(galleryEntries, table), [galleryEntries, table]);
@@ -1495,7 +1511,7 @@ function StoryTree({ ctx, index }) {
     () => view === "tree" ? filterTree(tree, query) : componentNodes(filterComponents(view === "gallery" ? galleries : components, query)),
     [view, components, galleries, tree, query]
   );
-  const routable = useMemo(() => [...kept, ...indexEntries(kept)], [kept]);
+  const routable = useMemo(() => [...kept2, ...indexEntries(kept2)], [kept2]);
   const routed = routable.find((entry) => entry.id === route);
   const routeAncestors = useMemo(() => ancestorsOf(routed), [routed]);
   const filtering = query.trim() !== "";
@@ -1786,6 +1802,54 @@ function createAnswerBook() {
 
 // src/shell/readyKey.ts
 var readyKey = (ready) => stableStringify({ schema: ready.schema, layout: ready.layout, viewport: ready.viewport });
+var kept = /* @__PURE__ */ new Map();
+var shelf = null;
+function shelfElement() {
+  if (!shelf) {
+    shelf = document.createElement("div");
+    shelf.className = "fg-frame-pool";
+    shelf.setAttribute("aria-hidden", "true");
+  }
+  if (!shelf.isConnected) document.body.append(shelf);
+  return shelf;
+}
+function adopt({ key, slot, frame, link, onAdopt }) {
+  const waiting = key === null ? void 0 : kept.get(key);
+  if (key === null || !waiting || !slot.current) return;
+  kept.delete(key);
+  moveFrame(slot.current, waiting.frame);
+  frame.current = waiting.frame;
+  link.current = waiting.link;
+  onAdopt(waiting.link);
+}
+function shelve(options) {
+  const { key, frame, link, onDrop } = options.current;
+  const element = frame.current;
+  const current = link.current;
+  if (key === null || !element?.isConnected || !current || !canMoveFrames()) return false;
+  if (current.awaiting === null && current.sent === null) return false;
+  const entry = { frame: element, link: current };
+  moveFrame(shelfElement(), element);
+  kept.set(key, entry);
+  queueMicrotask(() => {
+    if (kept.get(key) !== entry) return;
+    kept.delete(key);
+    onDrop();
+    element.remove();
+  });
+  return true;
+}
+function useKeptFrame(options) {
+  const handedOn = useRef(false);
+  const latest = useLatest(options);
+  useLayoutEffect(() => {
+    adopt(latest.current);
+    return () => {
+      if (shelve(latest)) handedOn.current = true;
+    };
+  }, [latest]);
+  return useCallback(() => handedOn.current, []);
+}
 var START_TIMEOUT_MS = 1e4;
 var requests = 0;
 function closeLink(link) {
@@ -1800,6 +1864,27 @@ function closeLink(link) {
 function mismatchMessage(mismatch) {
   return mismatch.reason === "version" ? `Frame speaks protocol ${String(mismatch.version)}; this workshop speaks ${PROTOCOL_VERSION}` : "Frame sent a message that is not a forge envelope";
 }
+function sendInputs(current, sent, next) {
+  const before = current.inputs;
+  const { state, globals } = next;
+  const config = storyConfig(next.config, sent.config);
+  if (config !== sent.config) {
+    sent.config = config;
+    current.channel.send({ type: "config", config });
+    current.inputs += 1;
+  }
+  if (state !== sent.state) {
+    sent.state = state;
+    current.channel.send({ type: "state", state });
+    current.inputs += 1;
+  }
+  if (globals !== sent.globals && stableStringify(globals) !== stableStringify(sent.globals)) {
+    sent.globals = globals;
+    current.channel.send({ type: "globals", globals });
+    current.inputs += 1;
+  }
+  return current.inputs !== before;
+}
 function FrameView(props) {
   const { entry, frameUrl, answers, descriptionKey, ctx } = props;
   const labGlobals2 = useContext(StoryGlobalsContext);
@@ -1906,6 +1991,7 @@ function FrameView(props) {
     };
     const current = {
       channel,
+      deliver: (msg) => receive(current, msg),
       timer,
       awaiting: null,
       sent: null,
@@ -1916,23 +2002,35 @@ function FrameView(props) {
       queued: []
     };
     link.current = current;
-    channel.on((msg) => receive(current, msg));
+    channel.on((msg) => current.deliver(msg));
     target.postMessage({ type: PORT_HANDOFF, id: latestRef.current.entry.id }, location.origin, [
       port2
     ]);
   };
   const connectRef = useLatest(connect);
+  const handedOn = useKeptFrame({
+    key: trialId ? `${trialId} ${src}` : null,
+    slot: slotRef,
+    frame: iframeRef,
+    link,
+    onAdopt: (adopted) => {
+      adopted.deliver = (msg) => receive(adopted, msg);
+      setPending(!adopted.hasRendered);
+    },
+    onDrop: () => closeLink(link)
+  });
   useEffect(() => {
     const slot = slotRef.current;
     if (!inView || !slot) return;
-    const claimed = latestRef.current.pool?.claim() ?? null;
-    const frame = claimed ?? document.createElement("iframe");
+    const adopted = iframeRef.current;
+    const claimed = adopted ? null : latestRef.current.pool?.claim() ?? null;
+    const frame = adopted ?? claimed ?? document.createElement("iframe");
     frame.className = "fg-frame-view";
     frame.title = latestRef.current.title;
     frame.removeAttribute("tabindex");
     frame.toggleAttribute("data-pending", true);
     iframeRef.current = frame;
-    const unheard = claimed ? void 0 : setTimeout(() => setFault({ phase: null, message: `Frame did not start: ${src}` }), HELLO_TIMEOUT_MS);
+    const unheard = adopted || claimed ? void 0 : setTimeout(() => setFault({ phase: null, message: `Frame did not start: ${src}` }), HELLO_TIMEOUT_MS);
     const onMessage = (event) => {
       if (event.source !== frame.contentWindow || event.origin !== location.origin) return;
       if (event.data?.type !== FRAME_HELLO) return;
@@ -1943,20 +2041,21 @@ function FrameView(props) {
     if (claimed) {
       moveFrame(slot, claimed);
       connectRef.current(claimed);
-    } else {
+    } else if (!adopted) {
       frame.src = src;
       slot.append(frame);
     }
     return () => {
       window.removeEventListener("message", onMessage);
       clearTimeout(unheard);
+      if (handedOn()) return;
       closeLink(link);
       frame.remove();
       iframeRef.current = null;
       setPending(true);
       setFault(null);
     };
-  }, [inView, src, connectRef, latestRef]);
+  }, [inView, src, connectRef, latestRef, handedOn]);
   useEffect(() => {
     iframeRef.current?.toggleAttribute("data-pending", pending && !fault);
   }, [pending, fault, inView, src]);
@@ -1971,29 +2070,9 @@ function FrameView(props) {
       if (current.awaiting === descriptionKey) init(current);
       return;
     }
-    const sent = current.sent;
-    if (!sent) return;
-    let input = false;
-    const config = storyConfig(ctx.config, sent.config);
-    if (config !== sent.config) {
-      sent.config = config;
-      current.channel.send({ type: "config", config });
-      current.inputs += 1;
-      input = true;
-    }
-    if (ctx.state !== sent.state) {
-      sent.state = ctx.state;
-      current.channel.send({ type: "state", state: ctx.state });
-      current.inputs += 1;
-      input = true;
-    }
-    if (globals !== sent.globals && stableStringify(globals) !== stableStringify(sent.globals)) {
-      sent.globals = globals;
-      current.channel.send({ type: "globals", globals });
-      current.inputs += 1;
-      input = true;
+    if (current.sent && sendInputs(current, current.sent, { config: ctx.config, state: ctx.state, globals })) {
+      setFault((shown) => shown?.phase === "render" ? null : shown);
     }
-    if (input) setFault((shown) => shown?.phase === "render" ? null : shown);
   }, [ctx.config, ctx.state, globals, descriptionKey, init]);
   return /* @__PURE__ */ jsxs("div", { ref: hostRef, className: "fg-frame-host", children: [
     /* @__PURE__ */ jsx("div", { ref: slotRef, className: "fg-frame-slot" }),
@@ -2172,7 +2251,7 @@ function useStoryRegistry(index, options) {
       const answers = previous.books.get(entry.id) ?? createAnswerBook();
       books.set(entry.id, answers);
       const held = previous.built.get(entry.id);
-      const kept = held && held.entryKey === entryKey && held.ready === ready && held.loaded === had && held.fault === fault && held.frameUrl === frameUrl && held.globals === globals && held.setup === setup && held.inDocument === inDocument && held.generation === generation && held.revision === revision ? held : {
+      const kept2 = held && held.entryKey === entryKey && held.ready === ready && held.loaded === had && held.fault === fault && held.frameUrl === frameUrl && held.globals === globals && held.setup === setup && held.inDocument === inDocument && held.generation === generation && held.revision === revision ? held : {
         entryKey,
         ready,
         loaded: had,
@@ -2185,8 +2264,8 @@ function useStoryRegistry(index, options) {
         revision,
         instrument: !inDocument ? storyInstrument({ entry, ready, answers, frameUrl, onReady, globals }) : had ? documentInstrument({ entry, loaded: had, setup, globals }) : pendingInstrument({ entry, globals, load: request, generation, ...fault ? { fault } : {} })
       };
-      built.set(entry.id, kept);
-      return kept.instrument;
+      built.set(entry.id, kept2);
+      return kept2.instrument;
     });
     const unchanged = list.length === previous.list.length && list.every((i, n) => i === previous.list[n]);
     return { built, books, list: unchanged ? previous.list : list };