@eclipse-lyra/core 0.7.8 → 0.7.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-lyra/core",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "description": "Eclipse Lyra platform core: registries, services, parts, widgets, and API",
   "type": "module",
   "license": "EPL-2.0",

package/src/api/index.ts

@@ -27,5 +27,5 @@ export * from './constants';
 export * from './types';
 
 // Re-export AppDefinition for convenience
-export type { AppDefinition, AppContributions, ReleaseEntry, ReleaseHistory, RenderDescriptor } from '../core/apploader';
+export type { AppDefinition, AppContributions, LayoutDescriptor, ReleaseEntry, ReleaseHistory, RenderDescriptor } from '../core/apploader';
 

package/src/api/types.ts

@@ -1,5 +1,5 @@
 // Re-export framework types for app usage
-export type { AppDefinition, AppContributions, ReleaseEntry, ReleaseHistory, RenderDescriptor } from '../core/apploader';
+export type { AppDefinition, AppContributions, LayoutDescriptor, ReleaseEntry, ReleaseHistory, RenderDescriptor } from '../core/apploader';
 export type { 
     Command, 
     Parameter, 

package/src/components/layout-switcher.ts

@@ -61,6 +61,9 @@ export class LyraLayoutSwitcher extends LyraElement {
                             value="${layout.id}"
                             type="checkbox"
                             ?checked=${layout.id === this.currentLayoutId}>
+                            ${layout.icon
+                                ? html`<wa-icon slot="icon" name="${layout.icon}" label="${layout.name}"></wa-icon>`
+                                : ''}
                             ${layout.name}
                         </wa-dropdown-item>
                     `

package/src/contributions/default-layout-contributions.ts

@@ -2,9 +2,40 @@ import "../layouts/standard-layout";
 import { contributionRegistry } from "../core/contributionregistry";
 import { SYSTEM_LAYOUTS } from "../core/constants";
 
-contributionRegistry.registerContribution(SYSTEM_LAYOUTS, {
-    id: "standard",
-    name: "Standard",
-    label: "Standard",
-    component: "lyra-standard-layout",
-});
+const standardLayouts: Array<{
+    id: string;
+    name: string;
+    label: string;
+    icon?: string;
+    component: string | { tag: string; attributes?: Record<string, string> };
+}> = [
+    { id: "standard", name: "Standard", label: "Standard", icon: "layout", component: "lyra-standard-layout" },
+    {
+        id: "standard-bottom-panel",
+        name: "Standard (bottom panel)",
+        label: "Standard (bottom panel)",
+        icon: "window-maximize",
+        component: { tag: "lyra-standard-layout", attributes: { "show-bottom-panel": "true" } },
+    },
+    {
+        id: "standard-bottom-sidebar",
+        name: "Standard (bottom sidebar)",
+        label: "Standard (bottom sidebar)",
+        icon: "columns",
+        component: { tag: "lyra-standard-layout", attributes: { "show-bottom-sidebar": "true" } },
+    },
+    {
+        id: "standard-full",
+        name: "Standard (panel + sidebar)",
+        label: "Standard (panel + sidebar)",
+        icon: "th-large",
+        component: {
+            tag: "lyra-standard-layout",
+            attributes: { "show-bottom-panel": "true", "show-bottom-sidebar": "true" },
+        },
+    },
+];
+
+for (const layout of standardLayouts) {
+    contributionRegistry.registerContribution(SYSTEM_LAYOUTS, layout);
+}

package/src/core/apploader.ts

@@ -24,6 +24,23 @@ import { marketplaceRegistry } from "./marketplaceregistry";
 
 const logger = createLogger('AppLoader');
 
+/** Layout reference: layout id string, or id + props to parameterize the layout (e.g. show-bottom-panel). */
+export type LayoutDescriptor = string | { id: string; props?: Record<string, string | boolean> };
+
+function getLayoutIdFromApp(app: AppDefinition | undefined): string {
+    if (!app) return 'standard';
+    const l = app.layout ?? app.layoutId;
+    return typeof l === 'object' ? l.id : (l ?? 'standard');
+}
+
+function propsToAttributes(props: Record<string, string | boolean>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [k, v] of Object.entries(props)) {
+        out[k] = typeof v === 'boolean' ? (v ? 'true' : 'false') : v;
+    }
+    return out;
+}
+
 /**
  * Extracts error message from an error object.
  */
@@ -172,9 +189,13 @@ export interface AppDefinition {
     releaseHistory?: ReleaseHistory | (() => ReleaseHistory | Promise<ReleaseHistory>);
 
     /**
-     * Id of a layout registered to the system.layouts contribution slot.
-     * The app root is always the chosen layout's component. Defaults to 'standard' when omitted.
+     * Layout: id (string) or { id, props } to parameterize the layout.
+     * App root is the chosen layout's component. Props are merged as attributes when rendering (e.g. show-bottom-panel).
+     * Defaults to 'standard' when omitted.
      */
+    layout?: LayoutDescriptor;
+
+    /** @deprecated Use layout (string or { id, props }) instead. */
     layoutId?: string;
 
     /**
@@ -515,7 +536,7 @@ class AppLoaderService {
             throw new Error('No app loaded. Call loadApp() first.');
         }
 
-        const layoutId = this.preferredLayoutId ?? this.currentApp.layoutId ?? 'standard';
+        const layoutId = this.preferredLayoutId ?? getLayoutIdFromApp(this.currentApp);
         const layouts = contributionRegistry.getContributions<LayoutContribution>(SYSTEM_LAYOUTS);
         let layout = layouts.find((c) => c.id === layoutId);
         if (!layout) {
@@ -527,12 +548,25 @@ class AppLoaderService {
         }
 
         const r = layout.component;
+        let effectiveAttributes: Record<string, string> = {};
+        if (r && typeof r === 'object' && 'tag' in r && r.attributes) {
+            effectiveAttributes = { ...r.attributes };
+        }
+        const appLayout = this.currentApp?.layout;
+        if (typeof appLayout === 'object' && appLayout.id === layoutId && appLayout.props) {
+            Object.assign(effectiveAttributes, propsToAttributes(appLayout.props));
+        }
+
         container.innerHTML = '';
         if (typeof r === 'string') {
-            container.appendChild(document.createElement(r));
+            const el = document.createElement(r);
+            for (const [key, value] of Object.entries(effectiveAttributes)) {
+                el.setAttribute(key, value);
+            }
+            container.appendChild(el);
         } else if (r && typeof r === 'object' && 'tag' in r) {
             const el = document.createElement(r.tag);
-            for (const [key, value] of Object.entries(r.attributes ?? {})) {
+            for (const [key, value] of Object.entries(effectiveAttributes)) {
                 el.setAttribute(key, value);
             }
             container.appendChild(el);
@@ -600,7 +634,7 @@ class AppLoaderService {
     }
 
     getCurrentLayoutId(): string {
-        return this.preferredLayoutId ?? this.currentApp?.layoutId ?? 'standard';
+        return this.preferredLayoutId ?? getLayoutIdFromApp(this.currentApp);
     }
 
     async getPreferredLayoutId(): Promise<string | undefined> {

package/src/core/contributionregistry.ts

@@ -48,6 +48,8 @@ export interface IconContribution extends Contribution {
 export interface LayoutContribution extends Contribution {
     id: string;
     name: string;
+    /** Optional icon name (e.g. Font Awesome) for the layout switcher. */
+    icon?: string;
     component: string | { tag: string; attributes?: Record<string, string> } | (() => TemplateResult);
     onShow?: () => void | Promise<void>;
 }