@floegence/floe-webapp-core 0.36.32 → 0.36.34

package/dist/components/editor/CodeEditor.d.ts

@@ -1,25 +1,30 @@
 import { type JSX } from 'solid-js';
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import type * as Monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
 import 'monaco-editor/min/vs/editor/editor.main.css';
 import { type CodeEditorRuntimeOptions } from './monacoStandaloneRuntime';
+type MonacoEditorOptions = Monaco.editor.IStandaloneEditorConstructionOptions;
+type MonacoStandaloneCodeEditor = Monaco.editor.IStandaloneCodeEditor;
+type MonacoTextModel = Monaco.editor.ITextModel;
+type MonacoModelContentChangedEvent = Monaco.editor.IModelContentChangedEvent;
 export interface CodeEditorProps {
     path: string;
     language?: string;
     value: string;
-    options?: monaco.editor.IStandaloneEditorConstructionOptions;
+    options?: MonacoEditorOptions;
     runtimeOptions?: CodeEditorRuntimeOptions;
     class?: string;
     style?: JSX.CSSProperties;
     onReady?: (api: CodeEditorApi) => void;
-    onContentChange?: (e: monaco.editor.IModelContentChangedEvent, api: CodeEditorApi) => void;
+    onContentChange?: (e: MonacoModelContentChangedEvent, api: CodeEditorApi) => void;
     onSelectionChange?: (selectionText: string, api: CodeEditorApi) => void;
     onChange?: (value: string) => void;
 }
 export interface CodeEditorApi {
-    editor: monaco.editor.IStandaloneCodeEditor;
-    model: monaco.editor.ITextModel;
+    editor: MonacoStandaloneCodeEditor;
+    model: MonacoTextModel;
     getValue: () => string;
     getSelectedText: () => string;
     focus: () => void;
 }
 export declare function CodeEditor(props: CodeEditorProps): JSX.Element;
+export {};

package/dist/components/editor/CodeEditor.js

@@ -1,14 +1,13 @@
-import { use as L, effect as O, className as D, style as F, template as V } from "solid-js/web";
-import { onMount as b, onCleanup as q, createEffect as g } from "solid-js";
-import { useTheme as w } from "../../context/ThemeContext.js";
-import { useResizeObserver as A } from "../../hooks/useResizeObserver.js";
-import * as f from "monaco-editor/esm/vs/editor/editor.api.js";
+import { use as L, effect as O, className as A, style as D, template as F } from "solid-js/web";
+import { onMount as V, onCleanup as b, createEffect as g } from "solid-js";
+import { useTheme as q } from "../../context/ThemeContext.js";
+import { useResizeObserver as w } from "../../hooks/useResizeObserver.js";
 import "monaco-editor/min/vs/editor/editor.main.css";
 import { resolveCodeEditorLanguageSpec as U } from "./languages.js";
 import { ensureMonacoEnvironment as p } from "./monacoEnvironment.js";
-import { ensureMonacoStandaloneRuntime as N } from "./monacoStandaloneRuntime.js";
-var _ = /* @__PURE__ */ V("<div>");
-const E = {
+import { loadMonacoEditorApi as N } from "./monacoStandaloneRuntime.js";
+var _ = /* @__PURE__ */ F("<div>");
+const T = {
   readOnly: !0,
   automaticLayout: !1,
   minimap: {
@@ -21,21 +20,21 @@ const E = {
   fontFamily: "var(--font-mono)"
 };
 let $ = 0;
-function k(t, c) {
-  return f.Uri.parse(`inmemory://model/${t}/${encodeURIComponent(c)}`);
+function k(t, d, a) {
+  return t.Uri.parse(`inmemory://model/${d}/${encodeURIComponent(a)}`);
 }
-function B(t, c) {
-  if (!t || !c) return "";
-  const r = t.getSelection();
-  return !r || r.isEmpty() ? "" : c.getValueInRange(r);
+function B(t, d) {
+  if (!t || !d) return "";
+  const a = t.getSelection();
+  return !a || a.isEmpty() ? "" : d.getValueInRange(a);
 }
 function X(t) {
-  const c = w();
-  let r;
-  const R = ++$;
-  let n, o, d, S = null, v = 0;
-  const x = A(() => r), y = () => {
-    f.editor.setTheme(c.resolvedTheme() === "dark" ? "vs-dark" : "vs");
+  const d = q();
+  let a;
+  const x = ++$;
+  let l, n, o, s, y = null, v = 0;
+  const R = w(() => a), S = () => {
+    l && l.editor.setTheme(d.resolvedTheme() === "dark" ? "vs-dark" : "vs");
   }, m = () => !n || !o ? null : {
     editor: n,
     model: o,
@@ -45,73 +44,73 @@ function X(t) {
   }, C = () => {
     const e = m();
     if (!e) return;
-    const a = e.model.uri.toString();
-    a !== S && (S = a, t.onReady?.(e));
+    const r = e.model.uri.toString();
+    r !== y && (y = r, t.onReady?.(e));
   }, M = () => {
     const e = m();
     e && t.onSelectionChange?.(e.getSelectedText(), e);
-  }, I = async () => {
-    if (!n) return;
-    const e = ++v, a = U(t.language);
-    let i = a.id;
+  }, E = async () => {
+    if (!n || !l) return;
+    const e = ++v, r = U(t.language);
+    let i = r.id;
     try {
-      await a.load?.();
+      await r.load?.();
     } catch {
       if (e !== v) return;
       i = "plaintext";
     }
     if (!n || e !== v) return;
-    const u = k(R, t.path);
+    const u = k(l, x, t.path);
     if (o && o.uri.toString() === u.toString()) {
-      o.getLanguageId() !== i && f.editor.setModelLanguage(o, i), o.getValue() !== t.value && o.setValue(t.value), C(), M();
+      o.getLanguageId() !== i && l.editor.setModelLanguage(o, i), o.getValue() !== t.value && o.setValue(t.value), C(), M();
       return;
     }
-    const l = f.editor.createModel(t.value, i, u);
-    o?.dispose(), o = l, n.setModel(o), C(), M();
+    const c = l.editor.createModel(t.value, i, u);
+    o?.dispose(), o = c, n.setModel(o), C(), M();
   };
-  return b(() => {
-    let e = !1, a, i;
+  return V(() => {
+    let e = !1, r, i;
     (async () => {
-      if (!r || (p(), await N(t.runtimeOptions), e || !r) || (n = f.editor.create(r, {
+      if (!a || (p(), l = await N(t.runtimeOptions), e || !a) || (n = l.editor.create(a, {
         model: null,
-        ...E,
+        ...T,
         ...t.options ?? {}
-      }), y(), await I(), e || !n)) return;
-      const l = t.onContentChange, T = t.onChange, z = t.onSelectionChange;
-      a = n.onDidChangeModelContent((s) => {
+      }), S(), await E(), e || !n)) return;
+      const c = t.onContentChange, I = t.onChange, z = t.onSelectionChange;
+      r = n.onDidChangeModelContent((f) => {
         const h = m();
-        h && (l?.(s, h), T && T(h.getValue()));
+        h && (c?.(f, h), I && I(h.getValue()));
       }), i = n.onDidChangeCursorSelection(() => {
-        const s = m();
-        s && z?.(s.getSelectedText(), s);
+        const f = m();
+        f && z?.(f.getSelectedText(), f);
       });
-    })().catch((l) => {
-      console.error("Failed to initialize Monaco editor runtime", l);
-    }), q(() => {
-      e = !0, a?.dispose(), i?.dispose(), d && cancelAnimationFrame(d), n?.dispose(), o?.dispose(), n = void 0, o = void 0;
+    })().catch((c) => {
+      console.error("Failed to initialize Monaco editor runtime", c);
+    }), b(() => {
+      e = !0, r?.dispose(), i?.dispose(), s && cancelAnimationFrame(s), n?.dispose(), o?.dispose(), l = void 0, n = void 0, o = void 0;
     });
   }), g(() => {
-    y();
+    S();
   }), g(() => {
     n && n.updateOptions({
-      ...E,
+      ...T,
       ...t.options ?? {}
     });
   }), g(() => {
-    t.path, t.language, t.value, I();
+    t.path, t.language, t.value, E();
   }), g(() => {
-    const e = x();
-    !e || !n || (d && cancelAnimationFrame(d), d = requestAnimationFrame(() => {
+    const e = R();
+    !e || !n || (s && cancelAnimationFrame(s), s = requestAnimationFrame(() => {
       n?.layout({
         width: e.width,
         height: e.height
       });
     }));
   }), (() => {
-    var e = _(), a = r;
-    return typeof a == "function" ? L(a, e) : r = e, O((i) => {
-      var u = t.class, l = t.style;
-      return u !== i.e && D(e, i.e = u), i.t = F(e, l, i.t), i;
+    var e = _(), r = a;
+    return typeof r == "function" ? L(r, e) : a = e, O((i) => {
+      var u = t.class, c = t.style;
+      return u !== i.e && A(e, i.e = u), i.t = D(e, c, i.t), i;
     }, {
       e: void 0,
       t: void 0

package/dist/components/editor/monacoStandaloneRuntime.d.ts

@@ -1,3 +1,4 @@
+type MonacoEditorApi = typeof import('monaco-editor/esm/vs/editor/editor.api.js');
 export interface MonacoRuntimeFeatureSet {
     suggestMemory: boolean;
     codeLensCache: boolean;
@@ -25,11 +26,12 @@ export interface ResolvedMonacoRuntimeRequest {
     cacheKey: string;
     blueprint: MonacoStandaloneRuntimeBlueprint;
 }
-type MonacoStandaloneRuntimeLoader = (request: ResolvedMonacoRuntimeRequest) => Promise<unknown>;
+type MonacoStandaloneRuntimeLoader = (request: ResolvedMonacoRuntimeRequest) => Promise<void>;
 export declare function normalizeMonacoRuntimeFeatureSet(standaloneFeatures?: Partial<MonacoRuntimeFeatureSet>): MonacoRuntimeFeatureSet;
 export declare const MONACO_RUNTIME_BLUEPRINTS: Record<MonacoRuntimeProfileName, MonacoStandaloneRuntimeBlueprint>;
 export declare function resolveMonacoRuntimeProfile(options?: CodeEditorRuntimeOptions): MonacoRuntimeProfileName;
 export declare function resolveMonacoRuntimeRequest(options?: CodeEditorRuntimeOptions): ResolvedMonacoRuntimeRequest;
 export declare function createMonacoStandaloneRuntime(loader: MonacoStandaloneRuntimeLoader): (options?: CodeEditorRuntimeOptions) => Promise<void>;
 export declare const ensureMonacoStandaloneRuntime: (options?: CodeEditorRuntimeOptions) => Promise<void>;
+export declare function loadMonacoEditorApi(options?: CodeEditorRuntimeOptions): Promise<MonacoEditorApi>;
 export {};

package/dist/components/editor/monacoStandaloneRuntime.js

@@ -1,32 +1,52 @@
-const l = {
+const s = {
   suggestMemory: !0,
   codeLensCache: !0,
   inlayHintsCache: !0,
   treeViewsDnd: !0,
   actionWidget: !0
 }, a = "editor_full";
-function u(e) {
+function d(e) {
   return {
-    ...l,
+    ...s,
     ...e ?? {}
   };
 }
-const s = [
+const c = [
   {
-    id: "editor.main",
-    load: () => import("monaco-editor/esm/vs/editor/editor.main.js")
+    id: "edcore.main",
+    load: () => import("monaco-editor/esm/vs/editor/edcore.main.js")
+  },
+  {
+    id: "suggestMemory",
+    load: () => import("monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestMemory.js")
+  },
+  {
+    id: "codeLensCache",
+    load: () => import("monaco-editor/esm/vs/editor/contrib/codelens/browser/codeLensCache.js")
+  },
+  {
+    id: "inlayHintsContribution",
+    load: () => import("monaco-editor/esm/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.js")
+  },
+  {
+    id: "treeViewsDndService",
+    load: () => import("monaco-editor/esm/vs/editor/common/services/treeViewsDndService.js")
+  },
+  {
+    id: "actionWidget",
+    load: () => import("monaco-editor/esm/vs/platform/actionWidget/browser/actionWidget.js")
   }
-], d = {
+], f = c, m = c, p = {
   editor_full: {
     profile: "editor_full",
-    modules: s
+    modules: f
   },
   preview_basic: {
     profile: "preview_basic",
-    modules: []
+    modules: m
   }
 };
-function f(e) {
+function M(e) {
   return e.suggestMemory === !1 && e.codeLensCache === !1 && e.inlayHintsCache === !1 && e.treeViewsDnd === !1 && e.actionWidget === !1;
 }
 function _(e) {
@@ -34,42 +54,50 @@ function _(e) {
     return e.profile;
   if (!e?.standaloneFeatures)
     return a;
-  const n = u(e.standaloneFeatures);
-  return f(n) ? "preview_basic" : a;
+  const n = d(e.standaloneFeatures);
+  return M(n) ? "preview_basic" : a;
 }
-function m(e) {
+function E(e) {
   const n = _(e);
   return {
     profile: n,
     cacheKey: `profile:${n}`,
-    blueprint: d[n]
+    blueprint: p[n]
   };
 }
-function M(e) {
+function O(e) {
   const n = /* @__PURE__ */ new Map();
-  return (i) => {
-    const t = m(i), o = n.get(t.cacheKey);
-    if (o) return o;
-    const r = e(t).then(() => {
-    }).catch((c) => {
-      throw n.delete(t.cacheKey), c;
+  return (l) => {
+    const o = E(l), i = n.get(o.cacheKey);
+    if (i) return i;
+    const r = e(o).then(() => {
+    }).catch((u) => {
+      throw n.delete(o.cacheKey), u;
     });
-    return n.set(t.cacheKey, r), r;
+    return n.set(o.cacheKey, r), r;
   };
 }
-function p(e) {
-  return Promise.all(e.blueprint.modules.map((n) => n.load()));
+function A(e) {
+  return Promise.all(e.blueprint.modules.map((n) => n.load())).then(() => {
+  });
 }
-const R = M(
-  p
+const h = O(
+  A
 );
+let t = null;
+async function L(e) {
+  return await h(e), t || (t = import("monaco-editor/esm/vs/editor/editor.api.js").catch((n) => {
+    throw t = null, n;
+  }), t);
+}
 export {
   a as DEFAULT_MONACO_RUNTIME_PROFILE,
-  l as DEFAULT_MONACO_STANDALONE_FEATURES,
-  d as MONACO_RUNTIME_BLUEPRINTS,
-  M as createMonacoStandaloneRuntime,
-  R as ensureMonacoStandaloneRuntime,
-  u as normalizeMonacoRuntimeFeatureSet,
+  s as DEFAULT_MONACO_STANDALONE_FEATURES,
+  p as MONACO_RUNTIME_BLUEPRINTS,
+  O as createMonacoStandaloneRuntime,
+  h as ensureMonacoStandaloneRuntime,
+  L as loadMonacoEditorApi,
+  d as normalizeMonacoRuntimeFeatureSet,
   _ as resolveMonacoRuntimeProfile,
-  m as resolveMonacoRuntimeRequest
+  E as resolveMonacoRuntimeRequest
 };

package/dist/components/workbench/WorkbenchSurface.d.ts

@@ -1,4 +1,12 @@
-import type { WorkbenchState, WorkbenchInteractionAdapter, WorkbenchWidgetDefinition, WorkbenchWidgetItem, WorkbenchWidgetType } from './types';
+import { type WorkbenchContextMenuItem } from './WorkbenchContextMenu';
+import type { WorkbenchState, WorkbenchContextMenuState, WorkbenchInteractionAdapter, WorkbenchWidgetDefinition, WorkbenchWidgetItem, WorkbenchWidgetType } from './types';
+export type WorkbenchContextMenuItemsResolver = (context: Readonly<{
+    menu: WorkbenchContextMenuState;
+    items: readonly WorkbenchContextMenuItem[];
+    widgets: readonly WorkbenchWidgetItem[];
+    widget: WorkbenchWidgetItem | null;
+    closeMenu: () => void;
+}>) => readonly WorkbenchContextMenuItem[];
 export interface WorkbenchSurfaceApi {
     ensureWidget: (type: WorkbenchWidgetType, options?: {
         centerViewport?: boolean;
@@ -41,6 +49,7 @@ export interface WorkbenchSurfaceProps {
     widgetDefinitions?: readonly WorkbenchWidgetDefinition[];
     launcherWidgetTypes?: readonly WorkbenchWidgetType[];
     interactionAdapter?: WorkbenchInteractionAdapter;
+    resolveContextMenuItems?: WorkbenchContextMenuItemsResolver;
     onApiReady?: (api: WorkbenchSurfaceApi | null) => void;
     onRequestDelete?: (widgetId: string) => void;
     onLayoutInteractionStart?: () => void;

package/dist/components/workbench/WorkbenchSurface.js

@@ -1,17 +1,18 @@
-import { use as T, spread as _, mergeProps as B, insert as f, createComponent as u, Portal as q, addEventListener as z, template as A, delegateEvents as $ } from "solid-js/web";
-import { createSignal as S, createMemo as w, untrack as h, createEffect as m, onCleanup as v, Show as V } from "solid-js";
-import { clientToCanvasWorld as N } from "../ui/canvasGeometry.js";
-import { WorkbenchCanvas as P } from "./WorkbenchCanvas.js";
-import { WorkbenchContextMenu as H } from "./WorkbenchContextMenu.js";
-import { WorkbenchFilterBar as X } from "./WorkbenchFilterBar.js";
-import { WorkbenchHud as Y } from "./WorkbenchHud.js";
-import { WorkbenchLockButton as K } from "./WorkbenchLockButton.js";
-import { installWorkbenchContextMenuDismissListeners as U } from "./workbenchContextMenuDismiss.js";
-import { useWorkbenchModel as Z } from "./useWorkbenchModel.js";
-import { resolveWorkbenchInteractionAdapter as G } from "./workbenchInteractionAdapter.js";
-var j = /* @__PURE__ */ A("<div class=workbench-menu-backdrop data-floe-workbench-boundary=true>"), J = /* @__PURE__ */ A("<div><div class=workbench-surface__body data-floe-workbench-canvas-frame=true>");
-const Q = "F1";
-function I(i) {
+import { use as _, spread as B, mergeProps as q, insert as m, createComponent as u, Portal as N, addEventListener as z, template as A, delegateEvents as H } from "solid-js/web";
+import { createSignal as M, createMemo as w, untrack as W, createEffect as v, onCleanup as h, Show as P } from "solid-js";
+import { clientToCanvasWorld as X } from "../ui/canvasGeometry.js";
+import { WorkbenchCanvas as $ } from "./WorkbenchCanvas.js";
+import { WorkbenchContextMenu as V } from "./WorkbenchContextMenu.js";
+import { WorkbenchFilterBar as Y } from "./WorkbenchFilterBar.js";
+import { WorkbenchHud as K } from "./WorkbenchHud.js";
+import { WorkbenchLockButton as U } from "./WorkbenchLockButton.js";
+import { installWorkbenchContextMenuDismissListeners as Z } from "./workbenchContextMenuDismiss.js";
+import { createContextMenuPosition as G, WORKBENCH_CONTEXT_MENU_WIDTH_PX as j, estimateContextMenuHeight as J } from "./workbenchHelpers.js";
+import { useWorkbenchModel as Q } from "./useWorkbenchModel.js";
+import { resolveWorkbenchInteractionAdapter as ee } from "./workbenchInteractionAdapter.js";
+var te = /* @__PURE__ */ A("<div class=workbench-menu-backdrop data-floe-workbench-boundary=true>"), ne = /* @__PURE__ */ A("<div><div class=workbench-surface__body data-floe-workbench-canvas-frame=true>");
+const re = "F1";
+function x(i) {
   if (i)
     try {
       i.focus({
@@ -21,186 +22,205 @@ function I(i) {
       i.focus();
     }
 }
-function ge(i) {
-  const t = Z({
+function he(i) {
+  const t = Q({
     state: () => i.state(),
     setState: (e) => i.setState(e),
     widgetDefinitions: () => i.widgetDefinitions,
     onClose: () => {
     }
-  }), [s, x] = S(null), a = w(() => G(i.interactionAdapter)), [p, l] = S(h(() => a().createInitialInputOwner())), W = w(() => {
+  }), [d, E] = M(null), s = w(() => ee(i.interactionAdapter)), [p, l] = M(W(() => s().createInitialInputOwner())), k = w(() => {
     const e = i.launcherWidgetTypes;
     return !e || e.length <= 0 ? null : new Set(e);
   }), D = w(() => {
-    const e = t.widgetDefinitions(), r = W();
-    return r ? e.filter((n) => r.has(n.type)) : e;
-  }), E = w(() => {
-    const e = t.contextMenu.items(), r = W();
-    return r ? e.filter((n) => {
-      if (n.kind !== "action")
+    const e = t.widgetDefinitions(), n = k();
+    return n ? e.filter((r) => n.has(r.type)) : e;
+  }), C = w(() => {
+    const e = t.contextMenu.state(), n = t.contextMenu.items(), r = k(), o = r ? n.filter((c) => {
+      if (c.kind !== "action")
         return !0;
-      const o = /^add-(.+)$/.exec(String(n.id ?? ""));
-      return o ? r.has(o[1]) : !0;
-    }) : e;
-  }), k = (e, r, n) => {
-    const o = a(), c = o.findWidgetRoot(e), d = o.readWidgetId(c);
-    if (d) {
-      l(o.createWidgetInputOwner(d, r));
+      const f = /^add-(.+)$/.exec(String(c.id ?? ""));
+      return f ? r.has(f[1]) : !0;
+    }) : n;
+    if (!e || !i.resolveContextMenuItems)
+      return o;
+    const a = e.widgetId ? t.queries.findWidgetById(e.widgetId) : null;
+    return i.resolveContextMenuItems({
+      menu: e,
+      items: o,
+      widgets: t.widgets(),
+      widget: a,
+      closeMenu: t.contextMenu.close
+    });
+  }), b = w(() => {
+    const e = t.contextMenu.state();
+    if (!e) return;
+    const n = C(), r = n.filter((a) => a.kind === "action").length, o = n.filter((a) => a.kind === "separator").length;
+    return G({
+      clientX: e.clientX,
+      clientY: e.clientY,
+      menuWidth: j,
+      menuHeight: J(r, o)
+    });
+  }), I = (e, n, r) => {
+    const o = s(), a = o.findWidgetRoot(e), c = o.readWidgetId(a);
+    if (c) {
+      l(o.createWidgetInputOwner(c, n));
       return;
     }
-    const y = s();
-    y && e instanceof Node && y.contains(e) && l(o.createCanvasInputOwner(n));
-  }, b = (e = "selection_cleared") => {
-    const r = a(), n = s();
-    t.selection.clear(), l(r.createCanvasInputOwner(e)), queueMicrotask(() => {
-      if (!n || typeof document > "u") return;
+    const f = d();
+    f && e instanceof Node && f.contains(e) && l(o.createCanvasInputOwner(r));
+  }, y = (e = "selection_cleared") => {
+    const n = s(), r = d();
+    t.selection.clear(), l(n.createCanvasInputOwner(e)), queueMicrotask(() => {
+      if (!r || typeof document > "u") return;
       const o = document.activeElement;
-      if (!(o instanceof HTMLElement) || !n.contains(o)) {
-        I(n);
+      if (!(o instanceof HTMLElement) || !r.contains(o)) {
+        x(r);
         return;
       }
-      const c = r.findWidgetRoot(o);
-      I(n), c && document.activeElement === o && o.isConnected && o.blur();
+      const a = n.findWidgetRoot(o);
+      x(r), a && document.activeElement === o && o.isConnected && o.blur();
     });
   }, R = () => {
-    const e = s()?.querySelector('[data-floe-workbench-canvas-frame="true"]'), r = t.viewport(), n = e?.getBoundingClientRect(), o = n?.width ?? 0, c = n?.height ?? 0;
+    const e = d()?.querySelector('[data-floe-workbench-canvas-frame="true"]'), n = t.viewport(), r = e?.getBoundingClientRect(), o = r?.width ?? 0, a = r?.height ?? 0;
     return {
-      worldX: o > 0 ? (o / 2 - r.x) / r.scale : 240,
-      worldY: c > 0 ? (c / 2 - r.y) / r.scale : 180
+      worldX: o > 0 ? (o / 2 - n.x) / n.scale : 240,
+      worldY: a > 0 ? (a / 2 - n.y) / n.scale : 180
     };
   }, g = (e) => {
-    const r = h(a), n = h(s);
+    const n = W(s), r = W(d);
     queueMicrotask(() => {
-      r.focusWidgetElement(n, e), l(r.createWidgetInputOwner(e, "activation"));
+      n.focusWidgetElement(r, e), l(n.createWidgetInputOwner(e, "activation"));
     });
-  }, M = (e) => {
-    const r = t.navigation.fitWidget(e);
-    g(r.id);
-  }, L = (e) => {
-    const r = t.navigation.overviewWidget(e);
-    g(r.id);
+  }, O = (e) => {
+    const n = t.navigation.fitWidget(e);
+    g(n.id);
+  }, T = (e) => {
+    const n = t.navigation.overviewWidget(e);
+    g(n.id);
   };
-  m(() => {
+  v(() => {
     i.onApiReady?.({
-      ensureWidget: (e, r) => t.widgetActions.ensureWidget(e, r) ?? null,
-      createWidget: (e, r) => {
-        const n = R(), o = t.widgetActions.addWidgetAtCursor(e, r?.worldX ?? n.worldX, r?.worldY ?? n.worldY) ?? null;
-        return o && r?.centerViewport !== !1 && t.navigation.centerOnWidget(o), o;
-      },
-      clearSelection: () => b("selection_cleared"),
-      focusWidget: (e, r) => {
-        const n = t.navigation.focusWidget(e, r);
-        return g(n.id), n;
+      ensureWidget: (e, n) => t.widgetActions.ensureWidget(e, n) ?? null,
+      createWidget: (e, n) => {
+        const r = R(), o = t.widgetActions.addWidgetAtCursor(e, n?.worldX ?? r.worldX, n?.worldY ?? r.worldY) ?? null;
+        return o && n?.centerViewport !== !1 && t.navigation.centerOnWidget(o), o;
+      },
+      clearSelection: () => y("selection_cleared"),
+      focusWidget: (e, n) => {
+        const r = t.navigation.focusWidget(e, n);
+        return g(r.id), r;
       },
       fitWidget: (e) => {
-        const r = t.navigation.fitWidget(e);
-        return g(r.id), r;
+        const n = t.navigation.fitWidget(e);
+        return g(n.id), n;
       },
       overviewWidget: (e) => {
-        const r = t.navigation.overviewWidget(e);
-        return g(r.id), r;
+        const n = t.navigation.overviewWidget(e);
+        return g(n.id), n;
       },
       findWidgetByType: (e) => t.queries.findWidgetByType(e),
       findWidgetById: (e) => t.queries.findWidgetById(e),
-      updateWidgetTitle: (e, r) => {
-        const n = String(e ?? "").trim(), o = String(r ?? "").trim();
-        !n || !o || i.setState((c) => ({
-          ...c,
-          widgets: c.widgets.map((d) => d.id === n && d.title !== o ? {
-            ...d,
+      updateWidgetTitle: (e, n) => {
+        const r = String(e ?? "").trim(), o = String(n ?? "").trim();
+        !r || !o || i.setState((a) => ({
+          ...a,
+          widgets: a.widgets.map((c) => c.id === r && c.title !== o ? {
+            ...c,
             title: o
-          } : d)
+          } : c)
         }));
       }
-    }), v(() => {
+    }), h(() => {
       i.onApiReady?.(null);
     });
   });
-  const C = () => i.lockShortcut === void 0 ? Q : i.lockShortcut;
-  m(() => {
+  const S = () => i.lockShortcut === void 0 ? re : i.lockShortcut;
+  v(() => {
     if (typeof window > "u" || !t.contextMenu.state()) return;
-    const e = U({
+    const e = Z({
       ownerWindow: window,
       onDismiss: t.contextMenu.close
     });
-    v(() => e());
-  }), m(() => {
+    h(() => e());
+  }), v(() => {
     const e = p();
     if (e.kind !== "widget") return;
-    t.widgets().some((n) => n.id === e.widgetId) || l(a().createCanvasInputOwner("widget_removed"));
-  }), m(() => {
-    const e = s();
+    t.widgets().some((r) => r.id === e.widgetId) || l(s().createCanvasInputOwner("widget_removed"));
+  }), v(() => {
+    const e = d();
     if (!e) return;
-    const r = (o) => {
-      k(o.target, "pointer", "background_pointer");
-    }, n = (o) => {
-      k(o.target, "focus", "background_focus");
+    const n = (o) => {
+      I(o.target, "pointer", "background_pointer");
+    }, r = (o) => {
+      I(o.target, "focus", "background_focus");
     };
-    e.addEventListener("pointerdown", r, !0), e.addEventListener("focusin", n), v(() => {
-      e.removeEventListener("pointerdown", r, !0), e.removeEventListener("focusin", n);
+    e.addEventListener("pointerdown", n, !0), e.addEventListener("focusin", r), h(() => {
+      e.removeEventListener("pointerdown", n, !0), e.removeEventListener("focusin", r);
     });
-  }), m(() => {
+  }), v(() => {
     if (i.enableKeyboard === !1 || typeof document > "u") return;
-    const e = C(), r = (n) => {
-      if (!(n.defaultPrevented || n.isComposing)) {
-        if (e !== null && n.key === e) {
-          n.preventDefault(), t.lock.toggle();
+    const e = S(), n = (r) => {
+      if (!(r.defaultPrevented || r.isComposing)) {
+        if (e !== null && r.key === e) {
+          r.preventDefault(), t.lock.toggle();
           return;
         }
-        if (!a().shouldBypassGlobalHotkeys({
-          root: s(),
-          target: n.target,
+        if (!s().shouldBypassGlobalHotkeys({
+          root: d(),
+          target: r.target,
           owner: p(),
-          interactiveSelector: a().interactiveSelector
+          interactiveSelector: s().interactiveSelector
         }))
-          switch (n.key) {
+          switch (r.key) {
             case "ArrowUp":
-              n.preventDefault(), t.navigation.handleArrowNavigation("up");
+              r.preventDefault(), t.navigation.handleArrowNavigation("up");
               break;
             case "ArrowDown":
-              n.preventDefault(), t.navigation.handleArrowNavigation("down");
+              r.preventDefault(), t.navigation.handleArrowNavigation("down");
               break;
             case "ArrowLeft":
-              n.preventDefault(), t.navigation.handleArrowNavigation("left");
+              r.preventDefault(), t.navigation.handleArrowNavigation("left");
               break;
             case "ArrowRight":
-              n.preventDefault(), t.navigation.handleArrowNavigation("right");
+              r.preventDefault(), t.navigation.handleArrowNavigation("right");
               break;
             case "Delete":
             case "Backspace":
-              t.selectedWidgetId() && (n.preventDefault(), t.widgetActions.deleteSelected());
+              t.selectedWidgetId() && (r.preventDefault(), t.widgetActions.deleteSelected());
               break;
           }
       }
     };
-    document.addEventListener("keydown", r, !0), v(() => document.removeEventListener("keydown", r, !0));
+    document.addEventListener("keydown", n, !0), h(() => document.removeEventListener("keydown", n, !0));
   });
-  const F = (e, r) => {
-    const n = s()?.querySelector('[data-floe-workbench-canvas-frame="true"]');
-    if (!n) return null;
-    const o = n.getBoundingClientRect();
-    return N(o, t.viewport(), {
+  const L = (e, n) => {
+    const r = d()?.querySelector('[data-floe-workbench-canvas-frame="true"]');
+    if (!r) return null;
+    const o = r.getBoundingClientRect();
+    return X(o, t.viewport(), {
       clientX: e,
-      clientY: r
+      clientY: n
     });
-  }, O = (e, r, n) => {
-    const o = F(r, n);
+  }, F = (e, n, r) => {
+    const o = L(n, r);
     o && t.widgetActions.addWidgetAtCursor(e, o.worldX, o.worldY);
   };
   return (() => {
-    var e = J(), r = e.firstChild;
-    return T(x, e), _(e, B({
+    var e = ne(), n = e.firstChild;
+    return _(E, e), B(e, q({
       get class() {
         return `workbench-surface${i.class ? ` ${i.class}` : ""}`;
       }
     }, () => ({
-      [a().surfaceRootAttr]: "true"
+      [s().surfaceRootAttr]: "true"
     }), {
       get "data-workbench-theme"() {
         return t.theme();
       },
       tabIndex: -1
-    }), !1, !0), f(r, u(P, {
+    }), !1, !0), m(n, u($, {
       get widgetDefinitions() {
         return t.widgetDefinitions();
       },
@@ -226,7 +246,7 @@ function ge(i) {
         return t.filters();
       },
       get interactionAdapter() {
-        return a();
+        return s();
       },
       get setCanvasFrameRef() {
         return t.setCanvasFrameRef;
@@ -240,7 +260,7 @@ function ge(i) {
       get onCanvasContextMenu() {
         return t.canvas.openCanvasContextMenu;
       },
-      onCanvasPointerDown: () => b("background_pointer"),
+      onCanvasPointerDown: () => y("background_pointer"),
       get onSelectWidget() {
         return t.canvas.selectWidget;
       },
@@ -259,8 +279,8 @@ function ge(i) {
       get onCommitResize() {
         return t.canvas.commitResize;
       },
-      onRequestOverview: L,
-      onRequestFit: M,
+      onRequestOverview: T,
+      onRequestFit: O,
       get onRequestDelete() {
         return i.onRequestDelete ?? t.widgetActions.deleteWidget;
       },
@@ -270,7 +290,7 @@ function ge(i) {
       get onLayoutInteractionEnd() {
         return i.onLayoutInteractionEnd;
       }
-    })), f(e, u(K, {
+    })), m(e, u(U, {
       get locked() {
         return t.locked();
       },
@@ -278,9 +298,9 @@ function ge(i) {
         return t.lock.toggle;
       },
       get shortcutLabel() {
-        return C() ?? void 0;
+        return S() ?? void 0;
       }
-    }), null), f(e, u(X, {
+    }), null), m(e, u(Y, {
       get widgetDefinitions() {
         return D();
       },
@@ -296,8 +316,8 @@ function ge(i) {
       get onShowAll() {
         return t.filter.showAll;
       },
-      onCreateAt: O
-    }), null), f(e, u(Y, {
+      onCreateAt: F
+    }), null), m(e, u(K, {
       get scaleLabel() {
         return t.scaleLabel();
       },
@@ -310,26 +330,26 @@ function ge(i) {
       get activeTheme() {
         return t.theme();
       },
-      onSelectTheme: (n) => t.appearance.setTheme(n)
-    }), null), f(e, u(V, {
+      onSelectTheme: (r) => t.appearance.setTheme(r)
+    }), null), m(e, u(P, {
       get when() {
         return t.contextMenu.state();
       },
       get children() {
-        return u(q, {
+        return u(N, {
           get children() {
             return [(() => {
-              var n = j();
-              return z(n, "contextmenu", t.contextMenu.retarget, !0), n;
-            })(), u(H, {
+              var r = te();
+              return z(r, "contextmenu", t.contextMenu.retarget, !0), r;
+            })(), u(V, {
               get x() {
-                return t.contextMenu.position()?.left ?? 0;
+                return b()?.left ?? 0;
               },
               get y() {
-                return t.contextMenu.position()?.top ?? 0;
+                return b()?.top ?? 0;
               },
               get items() {
-                return E();
+                return C();
               }
             })];
           }
@@ -338,7 +358,7 @@ function ge(i) {
     }), null), e;
   })();
 }
-$(["contextmenu"]);
+H(["contextmenu"]);
 export {
-  ge as WorkbenchSurface
+  he as WorkbenchSurface
 };

package/dist/components/workbench/index.d.ts

@@ -1,5 +1,5 @@
 export { WorkbenchOverlay, type WorkbenchOverlayProps, } from './WorkbenchOverlay';
-export { WorkbenchSurface, type WorkbenchSurfaceApi, type WorkbenchSurfaceProps, } from './WorkbenchSurface';
+export { WorkbenchSurface, type WorkbenchSurfaceApi, type WorkbenchContextMenuItemsResolver, type WorkbenchSurfaceProps, } from './WorkbenchSurface';
 export { WorkbenchContextMenu, type WorkbenchContextMenuItem, type WorkbenchContextMenuProps, } from './WorkbenchContextMenu';
 export { useWorkbenchModel, type UseWorkbenchModelOptions } from './useWorkbenchModel';
 export { WIDGET_REGISTRY, createWorkbenchFilterState, getWidgetEntry, isValidWorkbenchWidgetType, resolveWorkbenchWidgetDefinitions, type WidgetRegistryEntry, } from './widgets/widgetRegistry';

package/dist/components/workbench/useWorkbenchModel.js

@@ -1,6 +1,6 @@
 import { createSignal as A, createMemo as r, onCleanup as Ct } from "solid-js";
 import { ArrowUp as bt, Copy as kt, Trash as Ft } from "../icons/index.js";
-import { getTopZIndex as It, createContextMenuPosition as Mt, createWorkbenchId as vt, createWorkbenchViewportCenteredOnWidget as K, findNearestWidget as Xt, clampScale as Yt, WORKBENCH_CANVAS_ZOOM_STEP as L, WORKBENCH_MIN_SCALE as yt, createWorkbenchViewportFitForWidget as Ot, WORKBENCH_CONTEXT_MENU_WIDTH_PX as _t, estimateContextMenuHeight as zt } from "./workbenchHelpers.js";
+import { getTopZIndex as It, createContextMenuPosition as Mt, createWorkbenchId as vt, createWorkbenchViewportCenteredOnWidget as K, findNearestWidget as Xt, WORKBENCH_CONTEXT_MENU_WIDTH_PX as Yt, estimateContextMenuHeight as yt, clampScale as Ot, WORKBENCH_CANVAS_ZOOM_STEP as L, WORKBENCH_MIN_SCALE as _t, createWorkbenchViewportFitForWidget as zt } from "./workbenchHelpers.js";
 import { resolveWorkbenchWidgetDefinitions as Tt, getWidgetEntry as j, createWorkbenchFilterState as Vt } from "./widgets/widgetRegistry.js";
 function Kt(c) {
   const [x, S] = A(null), [U, N] = A(null), [D, G] = A({ width: 0, height: 0 });
@@ -107,8 +107,8 @@ function Kt(c) {
     return Mt({
       clientX: t.clientX,
       clientY: t.clientY,
-      menuWidth: _t,
-      menuHeight: zt(n, i)
+      menuWidth: Yt,
+      menuHeight: yt(n, i)
     });
   }), v = (t, e, n) => {
     const i = j(t, w()), o = i.singleton ? C(t) : null;
@@ -167,7 +167,7 @@ function Kt(c) {
   }, y = (t) => {
     c.setState((e) => ({ ...e, viewport: t }));
   }, q = (t) => {
-    const e = h(), n = a(), i = (n.width / 2 - e.x) / e.scale, o = (n.height / 2 - e.y) / e.scale, s = Yt(
+    const e = h(), n = a(), i = (n.width / 2 - e.x) / e.scale, o = (n.height / 2 - e.y) / e.scale, s = Ot(
       t === "in" ? e.scale * L : e.scale / L
     ), u = {
       x: n.width / 2 - i * s,
@@ -232,7 +232,7 @@ function Kt(c) {
     }));
   }, Wt = (t) => {
     const e = a();
-    e.width === 0 || e.height === 0 || _(Ot({
+    e.width === 0 || e.height === 0 || _(zt({
       widget: t,
       frameWidth: e.width,
       frameHeight: e.height
@@ -241,7 +241,7 @@ function Kt(c) {
     const e = a();
     e.width === 0 || e.height === 0 || _(K({
       widget: t,
-      scale: yt,
+      scale: _t,
       frameWidth: e.width,
       frameHeight: e.height
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-core",
-  "version": "0.36.32",
+  "version": "0.36.34",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",