@eclipse-lyra/core 0.7.5 → 0.7.7

package/dist/{resizable-grid-BRH3MyZK.js → resizable-grid-oWYRVx30.js}

@@ -15,6 +15,7 @@ const TOOLBAR_BOTTOM = "app-toolbars-bottom";
 const TOOLBAR_BOTTOM_CENTER = "app-toolbars-bottom-center";
 const TOOLBAR_BOTTOM_END = "app-toolbars-bottom-end";
 const SYSTEM_VIEWS = "system-views";
+const SYSTEM_LAYOUTS = "system.layouts";
 const EDITOR_AREA_MAIN = "editor-area-main";
 const SIDEBAR_MAIN = "sidebar-main";
 const SIDEBAR_MAIN_BOTTOM = "sidebar-main-bottom";
@@ -40,6 +41,7 @@ const constants = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePro
   SIDEBAR_AUXILIARY,
   SIDEBAR_MAIN,
   SIDEBAR_MAIN_BOTTOM,
+  SYSTEM_LAYOUTS,
   SYSTEM_VIEWS,
   TOOLBAR_BOTTOM,
   TOOLBAR_BOTTOM_CENTER,
@@ -275,7 +277,7 @@ class TaskService {
 }
 const taskService = new TaskService();
 rootContext.put("taskService", taskService);
-const logger$2 = createLogger("EsmShService");
+const logger$3 = createLogger("EsmShService");
 const _EsmShService = class _EsmShService {
   isEsmShUrl(url) {
     try {
@@ -492,7 +494,7 @@ const _EsmShService = class _EsmShService {
     }
     const parsed = this.parseSource(source);
     if (!parsed) {
-      logger$2.warn(`Could not parse source identifier: ${source}`);
+      logger$3.warn(`Could not parse source identifier: ${source}`);
       return source;
     }
     return this.buildEsmShUrl(parsed, options);
@@ -1193,7 +1195,7 @@ _LyraDialogContent.styles = [
         `
 ];
 let LyraDialogContent = _LyraDialogContent;
-const logger$1 = createLogger("DialogService");
+const logger$2 = createLogger("DialogService");
 const DIALOG_CONTRIBUTION_TARGET = "dialogs";
 const OK_BUTTON = {
   id: "ok",
@@ -1234,26 +1236,26 @@ class DialogService {
     this.contributions.clear();
     for (const contribution of contributions) {
       if (!contribution.id) {
-        logger$1.warn("Dialog contribution missing id, skipping");
+        logger$2.warn("Dialog contribution missing id, skipping");
         continue;
       }
       if (!contribution.component) {
-        logger$1.warn(`Dialog contribution "${contribution.id}" has no component function, skipping`);
+        logger$2.warn(`Dialog contribution "${contribution.id}" has no component function, skipping`);
         continue;
       }
       if (!contribution.onButton) {
-        logger$1.warn(`Dialog contribution "${contribution.id}" has no onButton callback, skipping`);
+        logger$2.warn(`Dialog contribution "${contribution.id}" has no onButton callback, skipping`);
         continue;
       }
       this.contributions.set(contribution.id, contribution);
-      logger$1.debug(`Loaded dialog contribution: ${contribution.id}`);
+      logger$2.debug(`Loaded dialog contribution: ${contribution.id}`);
     }
-    logger$1.info(`Loaded ${this.contributions.size} dialog contributions`);
+    logger$2.info(`Loaded ${this.contributions.size} dialog contributions`);
   }
   async open(dialogId, state2) {
     const contribution = this.contributions.get(dialogId);
     if (!contribution) {
-      logger$1.error(`Dialog "${dialogId}" not found`);
+      logger$2.error(`Dialog "${dialogId}" not found`);
       throw new Error(`Dialog "${dialogId}" not found`);
     }
     return new Promise((resolve) => {
@@ -1268,7 +1270,7 @@ class DialogService {
             await dialogContentElement.dispose();
           } catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
-            logger$1.error(`Error disposing dialog content for "${dialogId}": ${errorMessage}`);
+            logger$2.error(`Error disposing dialog content for "${dialogId}": ${errorMessage}`);
           }
         }
         try {
@@ -1276,7 +1278,7 @@ class DialogService {
           await contribution.onButton("close", result, stateWithClose);
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
-          logger$1.error(`Error executing close callback for dialog "${dialogId}": ${errorMessage}`);
+          logger$2.error(`Error executing close callback for dialog "${dialogId}": ${errorMessage}`);
         }
         render(html``, container);
         resolve();
@@ -1290,7 +1292,7 @@ class DialogService {
           }
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
-          logger$1.error(`Error executing button callback for dialog "${dialogId}": ${errorMessage}`);
+          logger$2.error(`Error executing button callback for dialog "${dialogId}": ${errorMessage}`);
           cleanup();
         }
       };
@@ -1523,6 +1525,152 @@ class LyraPart extends LyraContainer {
 __decorateClass$9([
   property()
 ], LyraPart.prototype, "dirty");
+const logger$1 = createLogger("MarketplaceRegistry");
+const TOPIC_MARKETPLACE_CHANGED = "events/marketplaceregistry/changed";
+const KEY_CATALOG_URLS = "marketplace.catalogUrls";
+class MarketplaceRegistry {
+  constructor() {
+    this.catalogUrls = [];
+    this.loadingPromises = /* @__PURE__ */ new Map();
+    this.loadCatalogUrls().then(() => {
+      this.refreshCatalogs().catch((err) => {
+        logger$1.error(`Failed to refresh catalogs on init: ${err.message}`);
+      });
+    });
+  }
+  async loadCatalogUrls() {
+    try {
+      const urls = await appSettings.get(KEY_CATALOG_URLS);
+      this.catalogUrls = Array.isArray(urls) ? urls : [];
+      logger$1.debug(`Loaded ${this.catalogUrls.length} catalog URLs`);
+    } catch (error) {
+      logger$1.error(`Failed to load catalog URLs: ${error}`);
+      this.catalogUrls = [];
+    }
+  }
+  async saveCatalogUrls() {
+    await appSettings.set(KEY_CATALOG_URLS, this.catalogUrls);
+    publish(TOPIC_MARKETPLACE_CHANGED, { type: "catalogs", urls: this.catalogUrls });
+  }
+  async addCatalogUrl(url) {
+    if (!this.isValidUrl(url)) {
+      throw new Error(`Invalid catalog URL: ${url}`);
+    }
+    if (this.catalogUrls.includes(url)) {
+      logger$1.debug(`Catalog URL already exists: ${url}`);
+      return;
+    }
+    this.catalogUrls.push(url);
+    await this.saveCatalogUrls();
+    logger$1.info(`Added catalog URL: ${url}`);
+    try {
+      await this.refreshCatalogs();
+    } catch (error) {
+      logger$1.warn(`Failed to refresh catalogs immediately after adding: ${error}`);
+    }
+  }
+  async removeCatalogUrl(url) {
+    const index = this.catalogUrls.indexOf(url);
+    if (index === -1) {
+      return;
+    }
+    this.catalogUrls.splice(index, 1);
+    await this.saveCatalogUrls();
+    logger$1.info(`Removed catalog URL: ${url}`);
+  }
+  getCatalogUrls() {
+    return [...this.catalogUrls];
+  }
+  isValidUrl(url) {
+    try {
+      const parsed = new URL(url);
+      return parsed.protocol === "http:" || parsed.protocol === "https:";
+    } catch {
+      return false;
+    }
+  }
+  async fetchCatalog(url) {
+    const existingPromise = this.loadingPromises.get(url);
+    if (existingPromise) {
+      return existingPromise;
+    }
+    const fetchPromise = (async () => {
+      try {
+        logger$1.debug(`Fetching catalog from: ${url}`);
+        const response = await fetch(url, {
+          method: "GET",
+          headers: {
+            "Accept": "application/json"
+          }
+        });
+        if (!response.ok) {
+          throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+        }
+        const data = await response.json();
+        if (!data.extensions || !Array.isArray(data.extensions)) {
+          throw new Error("Invalid catalog format: extensions array is required");
+        }
+        const catalog = {
+          name: data.name,
+          description: data.description,
+          extensions: data.extensions || []
+        };
+        const extCount = catalog.extensions?.length || 0;
+        logger$1.debug(`Successfully fetched catalog from ${url}: ${extCount} extensions`);
+        return catalog;
+      } catch (error) {
+        logger$1.error(`Failed to fetch catalog from ${url}: ${error}`);
+        throw error;
+      } finally {
+        this.loadingPromises.delete(url);
+      }
+    })();
+    this.loadingPromises.set(url, fetchPromise);
+    return fetchPromise;
+  }
+  async refreshCatalogs() {
+    logger$1.info(`Refreshing ${this.catalogUrls.length} catalogs...`);
+    const promises = this.catalogUrls.map(
+      (url) => this.fetchCatalog(url).catch((error) => {
+        logger$1.warn(`Failed to refresh catalog ${url}: ${error.message}`);
+        return null;
+      })
+    );
+    const catalogs = await Promise.allSettled(promises);
+    catalogs.forEach((result, index) => {
+      if (result.status === "fulfilled" && result.value) {
+        const catalog = result.value;
+        if (catalog.extensions) {
+          catalog.extensions.forEach((marketplaceExt) => {
+            if (!extensionRegistry.getExtensions().find((e) => e.id === marketplaceExt.id)) {
+              const extension = {
+                ...marketplaceExt,
+                external: true
+              };
+              extensionRegistry.registerExtension(extension);
+              logger$1.debug(`Registered marketplace extension: ${marketplaceExt.id}`);
+            }
+          });
+        }
+      }
+    });
+    publish(TOPIC_MARKETPLACE_CHANGED, { type: "refreshed" });
+    logger$1.info("Catalog refresh completed");
+  }
+  getMarketplaceExtension(extensionId) {
+    const extension = extensionRegistry.getExtensions().find((e) => e.id === extensionId);
+    if (extension && extension.external) {
+      return extension;
+    }
+    return void 0;
+  }
+  isMarketplaceExtension(extensionId) {
+    const extension = extensionRegistry.getExtensions().find((e) => e.id === extensionId);
+    return extension !== void 0 && extension.external === true;
+  }
+}
+const marketplaceRegistry = new MarketplaceRegistry();
+rootContext.put("marketplaceRegistry", marketplaceRegistry);
 const logger = createLogger("AppLoader");
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
@@ -1564,13 +1712,27 @@ const _AppLoaderService = class _AppLoaderService {
    * @param options - Optional configuration for registration and auto-starting
    */
   registerApp(app, options) {
-    if (this.apps.has(app.id)) {
-      logger.warn(`App '${app.id}' is already registered. Overwriting.`);
-    }
-    this.apps.set(app.id, app);
-    logger.info(`Registered app: ${app.name} (${app.id}) v${app.version}`);
-    if (options?.defaultAppId) {
-      this.defaultAppId = options.defaultAppId;
+    if (options?.hostConfig === true && typeof __RESOLVED_PACKAGE_INFO__ !== "undefined") {
+      const resolved = __RESOLVED_PACKAGE_INFO__;
+      if (app.name === void 0) app.name = resolved.name;
+      if (app.version === void 0) app.version = resolved.version;
+      if (app.description === void 0) app.description = resolved.description;
+      if (app.dependencies === void 0) app.dependencies = resolved.dependencies;
+      if (app.marketplaceCatalogUrls === void 0) app.marketplaceCatalogUrls = resolved.marketplaceCatalogUrls;
+    }
+    app.name = app.name ?? "app";
+    app.version = app.version ?? "0.0.0";
+    if (this.apps.has(app.name)) {
+      logger.warn(`App '${app.name}' is already registered. Overwriting.`);
+    }
+    if (app.marketplaceCatalogUrls?.length) {
+      app.marketplaceCatalogUrls.forEach((url) => marketplaceRegistry.addCatalogUrl(url).catch(() => {
+      }));
+    }
+    this.apps.set(app.name, app);
+    logger.info(`Registered app: ${app.name} v${app.version}`);
+    if (options?.defaultAppName) {
+      this.defaultAppName = options.defaultAppName;
     }
     if (options?.container) {
       this.container = options.container;
@@ -1600,10 +1762,10 @@ const _AppLoaderService = class _AppLoaderService {
         throw new Error(`Module at ${url} does not have a default export`);
       }
       const app = module.default;
-      if (!app.id || !app.name || !app.version) {
-        throw new Error(`Module at ${url} does not export a valid AppDefinition`);
+      if (!app.name || !app.version) {
+        throw new Error(`Module at ${url} does not export a valid AppDefinition (name and version required)`);
       }
-      logger.info(`Successfully loaded app definition from URL: ${app.name} (${app.id})`);
+      logger.info(`Successfully loaded app definition from URL: ${app.name}`);
       return app;
     } catch (error) {
       logger.error(`Failed to load app from URL ${url}: ${getErrorMessage(error)}`);
@@ -1613,7 +1775,7 @@ const _AppLoaderService = class _AppLoaderService {
   /**
    * Start the application loader.
    * Checks URL parameters for app=URL, loads that extension or app if found.
-   * URL parameter has higher precedence than defaultAppId.
+   * URL parameter has higher precedence than defaultAppName.
    * Then loads the default app or first registered app.
    * This method is idempotent - calling it multiple times only starts once.
    */
@@ -1650,7 +1812,8 @@ const _AppLoaderService = class _AppLoaderService {
           try {
             const app = await this.loadAppFromUrl(appUrl);
             this.registerApp(app);
-            await this.loadApp(app.id, this.container);
+            if (!app.name) throw new Error("App from URL has no name after registration");
+            await this.loadApp(app.name, this.container);
             logger.info(`Successfully loaded app from URL: ${appUrl}`);
             return;
           } catch (appError) {
@@ -1673,17 +1836,25 @@ const _AppLoaderService = class _AppLoaderService {
     }
     await this.loadApp(appToLoad, this.container);
   }
+  /**
+   * Resolve a path/URL segment to an app name (map key). Matches app.path, app.name, or name ending with /segment.
+   */
+  findAppNameBySegment(segment) {
+    if (this.apps.has(segment)) return segment;
+    for (const app of this.apps.values()) {
+      if (app.path === segment || app.name && app.name.endsWith("/" + segment)) return app.name ?? void 0;
+    }
+    return void 0;
+  }
   /**
    * Load and initialize an application.
-   * 
-   * @param appId - Application identifier (must be already registered)
+   * @param appName - Application name (must be already registered)
    * @param container - Optional DOM element to render into (if provided, auto-renders after loading)
-   * @returns Promise that resolves when app is initialized and rendered
    */
-  async loadApp(appId, container) {
-    const app = this.apps.get(appId);
+  async loadApp(appName, container) {
+    const app = this.apps.get(appName);
     if (!app) {
-      throw new Error(`App '${appId}' not found. Make sure it's registered.`);
+      throw new Error(`App '${appName}' not found. Make sure it's registered.`);
     }
     logger.info(`Loading app: ${app.name}...`);
     if (this.currentApp) {
@@ -1731,17 +1902,18 @@ const _AppLoaderService = class _AppLoaderService {
     }
     this.currentApp = app;
     logger.info(`App ${app.name} loaded successfully`);
+    this.preferredLayoutId = await this.getPreferredLayoutId();
     this.updateDocumentMetadata(app);
     if (container) {
       this.renderApp(container);
     }
-    window.dispatchEvent(new CustomEvent("app-loaded", { detail: { appId: app.id } }));
+    window.dispatchEvent(new CustomEvent("app-loaded", { detail: { appName: app.name } }));
   }
   /**
    * Updates document title and favicon from app metadata
    */
   updateDocumentMetadata(app) {
-    document.title = app.name;
+    document.title = app.name ?? "";
     if (app.metadata?.favicon) {
       const faviconPath = app.metadata.favicon;
       let link = document.querySelector("link[rel*='icon']");
@@ -1756,30 +1928,45 @@ const _AppLoaderService = class _AppLoaderService {
   }
   /**
    * Render the current application to the DOM.
-   * 
+   * Resolves the layout by layoutId (default 'standard'), renders its component, then calls layout.onShow if defined.
+   *
    * @param container - DOM element to render into
    */
   renderApp(container) {
     if (!this.currentApp) {
       throw new Error("No app loaded. Call loadApp() first.");
     }
-    const r = this.currentApp.render;
+    const layoutId = this.preferredLayoutId ?? this.currentApp.layoutId ?? "standard";
+    const layouts = contributionRegistry.getContributions(SYSTEM_LAYOUTS);
+    let layout = layouts.find((c) => c.id === layoutId);
+    if (!layout) {
+      logger.warn(`Layout '${layoutId}' not found, falling back to 'standard'`);
+      layout = layouts.find((c) => c.id === "standard");
+    }
+    if (!layout) {
+      throw new Error(`No layout found for layoutId '${layoutId}' and no 'standard' layout registered.`);
+    }
+    const r = layout.component;
+    container.innerHTML = "";
     if (typeof r === "string") {
-      const el = document.createElement(r);
-      container.innerHTML = "";
-      container.appendChild(el);
+      container.appendChild(document.createElement(r));
     } else if (r && typeof r === "object" && "tag" in r) {
       const el = document.createElement(r.tag);
       for (const [key, value] of Object.entries(r.attributes ?? {})) {
         el.setAttribute(key, value);
       }
-      container.innerHTML = "";
       container.appendChild(el);
     } else if (typeof r === "function") {
-      const template = r();
-      render(template, container);
+      render(r(), container);
     } else {
-      render(html`<lyra-standard-layout></lyra-standard-layout>`, container);
+      throw new Error(`Layout '${layout.id}' has invalid component.`);
+    }
+    if (layout.onShow) {
+      requestAnimationFrame(() => {
+        void Promise.resolve(layout.onShow()).catch(
+          (err) => logger.error(`Layout onShow failed for '${layout.id}': ${getErrorMessage(err)}`)
+        );
+      });
     }
     logger.info(`Rendered ${this.currentApp.name}`);
   }
@@ -1815,74 +2002,110 @@ const _AppLoaderService = class _AppLoaderService {
     }
     try {
       await appSettings.set(_AppLoaderService.PREFERRED_APP_KEY, appId);
-      this.defaultAppId = appId;
+      this.defaultAppName = appId;
       logger.info(`Set preferred app to: ${appId}`);
     } catch (error) {
-      logger.error(`Failed to persist preferred app ID: ${getErrorMessage(error)}`);
+      logger.error(`Failed to persist preferred app: ${getErrorMessage(error)}`);
+      throw error;
+    }
+  }
+  getRegisteredLayouts() {
+    return contributionRegistry.getContributions(SYSTEM_LAYOUTS);
+  }
+  getCurrentLayoutId() {
+    return this.preferredLayoutId ?? this.currentApp?.layoutId ?? "standard";
+  }
+  async getPreferredLayoutId() {
+    try {
+      return await appSettings.get(_AppLoaderService.PREFERRED_LAYOUT_KEY);
+    } catch (error) {
+      logger.debug(`Failed to get preferred layout ID: ${getErrorMessage(error)}`);
+      return void 0;
+    }
+  }
+  async setPreferredLayoutId(layoutId) {
+    const layouts = this.getRegisteredLayouts();
+    if (!layouts.some((l) => l.id === layoutId)) {
+      throw new Error(`Layout '${layoutId}' not found.`);
+    }
+    try {
+      await appSettings.set(_AppLoaderService.PREFERRED_LAYOUT_KEY, layoutId);
+      this.preferredLayoutId = layoutId;
+      logger.info(`Set preferred layout to: ${layoutId}`);
+      if (this.currentApp && this.container) {
+        this.renderApp(this.container);
+      }
+      window.dispatchEvent(new CustomEvent("layout-changed", { detail: { layoutId } }));
+    } catch (error) {
+      logger.error(`Failed to persist preferred layout: ${getErrorMessage(error)}`);
       throw error;
     }
   }
   /**
    * Select which app to load based on priority:
    * 1. appId URL parameter (?appId=...)
-   * 2. App ID from current page URL path (/geospace)
-   * 3. App ID extracted from app URL parameter (?app=...)
+   * 2. App from current page URL path (/geospace)
+   * 3. App from app URL parameter (?app=...)
    * 4. App registered by extension
-   * 5. Preferred app ID from settings
-   * 6. Default app ID
+   * 5. Preferred app from settings
+   * 6. Default app
    * 7. First registered app
    */
   async selectAppToLoad(options) {
     const { appIdFromUrl, appIdFromPath, appIdFromAppUrl, appsBeforeExtension } = options;
     if (appIdFromUrl) {
-      if (this.apps.has(appIdFromUrl)) {
-        logger.info(`Loading app specified by URL parameter 'appId': ${appIdFromUrl}`);
-        return appIdFromUrl;
+      const name = this.findAppNameBySegment(appIdFromUrl) ?? appIdFromUrl;
+      if (this.apps.has(name)) {
+        logger.info(`Loading app specified by URL parameter 'appId': ${name}`);
+        return name;
       }
-      logger.warn(`App ID '${appIdFromUrl}' from URL parameter not found`);
+      logger.warn(`App '${appIdFromUrl}' from URL parameter not found`);
     }
     if (appIdFromPath) {
-      if (this.apps.has(appIdFromPath)) {
+      const name = this.findAppNameBySegment(appIdFromPath);
+      if (name) {
         logger.info(`Loading app from URL path: ${appIdFromPath}`);
-        return appIdFromPath;
+        return name;
       }
-      logger.debug(`App ID '${appIdFromPath}' from URL path not found, continuing search`);
+      logger.debug(`App for path '${appIdFromPath}' not found, continuing search`);
     }
     if (appIdFromAppUrl) {
-      if (this.apps.has(appIdFromAppUrl)) {
-        logger.info(`Loading app using ID extracted from app URL path: ${appIdFromAppUrl}`);
-        return appIdFromAppUrl;
+      const name = this.findAppNameBySegment(appIdFromAppUrl) ?? appIdFromAppUrl;
+      if (this.apps.has(name)) {
+        logger.info(`Loading app using segment from app URL path: ${name}`);
+        return name;
       }
     }
     if (this.apps.size > appsBeforeExtension) {
       const newlyRegisteredApps = Array.from(this.apps.values()).slice(appsBeforeExtension);
       if (newlyRegisteredApps.length > 0) {
         const app = newlyRegisteredApps[0];
-        logger.info(`Loading app registered by extension: ${app.name} (${app.id})`);
-        return app.id;
+        logger.info(`Loading app registered by extension: ${app.name}`);
+        return app.name;
       }
     }
-    const preferredAppId = await this.getPreferredAppId();
-    if (preferredAppId && this.apps.has(preferredAppId)) {
-      logger.info(`Loading preferred app from settings: ${preferredAppId}`);
-      return preferredAppId;
+    const preferred = await this.getPreferredAppId();
+    if (preferred && this.apps.has(preferred)) {
+      logger.info(`Loading preferred app from settings: ${preferred}`);
+      return preferred;
     }
-    if (this.defaultAppId) {
-      if (this.apps.has(this.defaultAppId)) {
-        return this.defaultAppId;
-      }
-      logger.warn(`Default app '${this.defaultAppId}' not found`);
+    if (this.defaultAppName && this.apps.has(this.defaultAppName)) {
+      return this.defaultAppName;
+    }
+    if (this.defaultAppName) {
+      logger.warn(`Default app '${this.defaultAppName}' not found`);
     }
     const registeredApps = this.getRegisteredApps();
     if (registeredApps.length > 0) {
       const app = registeredApps[0];
-      logger.info(`Loading first registered app: ${app.name} (${app.id})`);
-      return app.id;
+      logger.info(`Loading first registered app: ${app.name}`);
+      return app.name;
     }
     return void 0;
   }
 };
-_AppLoaderService.PREFERRED_APP_KEY = "preferredAppId";
+_AppLoaderService.PREFERRED_APP_KEY = "preferredAppName";
+_AppLoaderService.PREFERRED_LAYOUT_KEY = "preferredLayoutId";
 let AppLoaderService = _AppLoaderService;
 const appLoaderService = new AppLoaderService();
 rootContext.put("appLoaderService", appLoaderService);
@@ -2501,7 +2724,7 @@ let LyraToolbar = class extends LyraElement {
     this.contributions = [...wildcard, ...categoryMatches, ...specific];
   }
   isToolbarItem(contribution) {
-    return "command" in contribution || "html" in contribution;
+    return "command" in contribution || "component" in contribution;
   }
   contributionCreator(contribution) {
     if ("command" in contribution) {
@@ -2517,8 +2740,8 @@ let LyraToolbar = class extends LyraElement {
                 </wa-button>
             `;
     }
-    if ("html" in contribution) {
-      const contents = contribution.html;
+    if ("component" in contribution) {
+      const contents = contribution.component;
       if (contents instanceof Function) {
         return contents();
       }
@@ -2678,9 +2901,9 @@ let LyraCommand = class extends LyraWidget {
                 </lyra-command>
             `;
     }
-    if ("html" in contribution) {
+    if ("component" in contribution) {
       const htmlContribution = contribution;
-      const contents = htmlContribution.html;
+      const contents = htmlContribution.component;
       if (contents instanceof Function) {
         return contents();
       }
@@ -2975,8 +3198,8 @@ let LyraContextMenu = class extends LyraElement {
                     ${commandContribution.label}
                 </lyra-command>
             `;
-    } else if ("html" in contribution) {
-      const contents = contribution.html;
+    } else if ("component" in contribution) {
+      const contents = contribution.component;
       if (contents instanceof Function) {
         return contents();
       }
@@ -3775,7 +3998,6 @@ LyraResizableGrid = __decorateClass([
 ], LyraResizableGrid);
 export {
   COMMAND_SAVE as C,
-  DIALOG_CONTRIBUTION_TARGET as D,
   EDITOR_AREA_MAIN as E,
   HIDE_DOT_RESOURCE as H,
   LyraContainer as L,
@@ -3788,26 +4010,25 @@ export {
   LyraPart as c,
   SIDEBAR_MAIN as d,
   SIDEBAR_MAIN_BOTTOM as e,
-  SYSTEM_VIEWS as f,
-  TOOLBAR_BOTTOM_CENTER as g,
-  TOOLBAR_BOTTOM_END as h,
-  TOOLBAR_MAIN as i,
-  TOOLBAR_MAIN_CENTER as j,
-  TOOLBAR_MAIN_RIGHT as k,
-  TOPIC_SETTINGS_CHANGED as l,
-  appLoaderService as m,
-  appSettings as n,
-  confirmDialog as o,
-  esmShService as p,
-  extensionRegistry as q,
-  infoDialog as r,
-  navigableInfoDialog as s,
-  persistenceService as t,
-  promptDialog as u,
-  taskService as v,
-  TOPIC_EXTENSIONS_CHANGED as w,
-  CLOSE_BUTTON as x,
-  dialogService as y,
-  constants as z
+  SYSTEM_LAYOUTS as f,
+  SYSTEM_VIEWS as g,
+  TOOLBAR_BOTTOM_CENTER as h,
+  TOOLBAR_BOTTOM_END as i,
+  TOOLBAR_MAIN as j,
+  TOOLBAR_MAIN_CENTER as k,
+  TOOLBAR_MAIN_RIGHT as l,
+  TOPIC_SETTINGS_CHANGED as m,
+  appLoaderService as n,
+  appSettings as o,
+  confirmDialog as p,
+  esmShService as q,
+  extensionRegistry as r,
+  infoDialog as s,
+  navigableInfoDialog as t,
+  persistenceService as u,
+  promptDialog as v,
+  taskService as w,
+  TOPIC_EXTENSIONS_CHANGED as x,
+  constants as y
 };
-//# sourceMappingURL=resizable-grid-BRH3MyZK.js.map
+//# sourceMappingURL=resizable-grid-oWYRVx30.js.map