@eclipse-docks/core 0.7.127 → 0.7.132

package/src/parts/resizable-grid.ts

@@ -46,10 +46,10 @@ export class DocksResizableGrid extends DocksElement {
     } | null = null;
     
     private resizeOverlay: HTMLDivElement | null = null;
-    private childrenLoaded = false;
     private childStylesApplied = false;
     private mutationObserver?: MutationObserver;
-    private settingsLoaded = false;
+    private refreshScheduled = false;
+    private layoutGeneration = 0;
 
     createRenderRoot() {
         // intentionally disabling shadow DOM for the resizable grid
@@ -59,87 +59,162 @@ export class DocksResizableGrid extends DocksElement {
     // ============= Lifecycle Methods =============
 
     protected doBeforeUI() {
-        // Only set up observer if children not yet loaded
-        if (!this.childrenLoaded) {
-            // Use MutationObserver to detect when children are added
-            this.mutationObserver = new MutationObserver(() => {
-                if (!this.childrenLoaded) {
-                    this.loadChildren();
-                }
-            });
-            
-            this.mutationObserver.observe(this, { childList: true, subtree: false });
-            
-            // Also try to load immediately
-            this.loadChildren();
+        this.mutationObserver = new MutationObserver(() => {
+            this.scheduleRefreshGridLayout();
+        });
+        this.mutationObserver.observe(this, { childList: true, subtree: false });
+        this.scheduleRefreshGridLayout();
+    }
+
+    private scheduleRefreshGridLayout() {
+        if (this.refreshScheduled) {
+            return;
         }
+        this.refreshScheduled = true;
+        queueMicrotask(() => {
+            this.refreshScheduled = false;
+            void this.refreshGridLayout();
+        });
     }
 
-    private async loadChildren() {
-        const potentialChildren = Array.from(this.children).filter(
-            child => child.tagName !== 'STYLE' && 
-                     child.tagName !== 'SCRIPT' && 
-                     !child.classList.contains('resize-handle')
+    private getGridChildrenFromDom(): HTMLElement[] {
+        return Array.from(this.children).filter(
+            (child) =>
+                child.tagName !== 'STYLE' &&
+                child.tagName !== 'SCRIPT' &&
+                !child.classList.contains('resize-handle'),
         ) as HTMLElement[];
+    }
 
-        if (potentialChildren.length === 0) {
-            return;
+    private static isNestedResizableGrid(child: HTMLElement): boolean {
+        return child.tagName.toLowerCase() === 'docks-resizable-grid';
+    }
+
+    private applyChildLayoutStyles(): void {
+        this.gridChildren.forEach((child, index) => {
+            child.style.overflow = 'hidden';
+            child.style.height = '100%';
+            child.style.width = '100%';
+            child.style.gridColumn = this.orientation === 'horizontal' ? `${index * 2 + 1}` : '1';
+            child.style.gridRow = this.orientation === 'vertical' ? `${index * 2 + 1}` : '1';
+            if (!DocksResizableGrid.isNestedResizableGrid(child)) {
+                child.style.display = 'flex';
+                child.style.flexDirection = 'column';
+            }
+        });
+    }
+
+    private resolveGridSizes(childCount: number): string[] {
+        const parsedSizes = this.sizes?.split(',').map((s) => s.trim()).filter(Boolean) ?? [];
+        if (parsedSizes.length === childCount) {
+            return parsedSizes;
+        }
+        const equalSize = `${100 / childCount}%`;
+        return Array.from({ length: childCount }, () => equalSize);
+    }
+
+    private resolvePersistedSizes(persisted: unknown, childCount: number): string[] | null {
+        if (!persisted || typeof persisted !== 'object') {
+            return null;
         }
 
-        // Mark as loaded and disconnect observer
-        this.childrenLoaded = true;
-        if (this.mutationObserver) {
-            this.mutationObserver.disconnect();
-            this.mutationObserver = undefined;
+        const record = persisted as {
+            sizes?: unknown;
+            sizesByCount?: Record<string, unknown>;
+        };
+        const byCount = record.sizesByCount?.[String(childCount)];
+        if (Array.isArray(byCount) && byCount.length === childCount && byCount.every((size) => typeof size === 'string')) {
+            return byCount;
+        }
+
+        if (Array.isArray(record.sizes) && record.sizes.length === childCount && record.sizes.every((size) => typeof size === 'string')) {
+            return record.sizes;
+        }
+
+        return null;
+    }
+
+    private async refreshGridLayout() {
+        const generation = ++this.layoutGeneration;
+        const potentialChildren = this.getGridChildrenFromDom();
+        if (potentialChildren.length === 0) {
+            this.gridChildren = [];
+            this.gridSizes = [];
+            this.childStylesApplied = false;
+            this.requestUpdate();
+            return;
         }
 
-        // Store children references
+        const countChanged = potentialChildren.length !== this.gridChildren.length;
+        const identityChanged = countChanged
+            || potentialChildren.some((child, index) => child !== this.gridChildren[index]);
         this.gridChildren = potentialChildren;
 
-        // Load persisted sizes once if available
-        if (!this.settingsLoaded) {
-            this.settingsLoaded = true;
-            const persisted = await this.getDialogSetting();
-            if (persisted && Array.isArray(persisted.sizes) && persisted.sizes.length === this.gridChildren.length) {
-                this.gridSizes = persisted.sizes;
-                this.requestUpdate();
-                return;
-            }
+        const persisted = await this.getDialogSetting();
+        if (generation !== this.layoutGeneration) {
+            return;
         }
 
-        // Use sizes attribute or equal distribution (only if not restored from settings)
-        if (this.sizes) {
-            this.gridSizes = this.sizes.split(',').map(s => s.trim());
-        } else {
-            const equalSize = `${100 / this.gridChildren.length}%`;
-            this.gridSizes = this.gridChildren.map(() => equalSize);
+        const restoredSizes = this.resolvePersistedSizes(persisted, this.gridChildren.length);
+        if (restoredSizes) {
+            const sizesChanged = restoredSizes.join('|') !== this.gridSizes.join('|');
+            this.gridSizes = restoredSizes;
+            if (identityChanged || sizesChanged) {
+                this.childStylesApplied = false;
+            }
+            this.requestUpdate();
+            return;
         }
 
+        const nextSizes = this.resolveGridSizes(this.gridChildren.length);
+        const sizesChanged = nextSizes.join('|') !== this.gridSizes.join('|');
+        this.gridSizes = nextSizes;
+
+        if (identityChanged || sizesChanged) {
+            this.childStylesApplied = false;
+        }
         this.requestUpdate();
     }
 
+    protected doInitUI() {
+        this.scheduleRefreshGridLayout();
+    }
+
     private async saveSizes() {
         if (this.gridSizes.length === 0) {
             return;
         }
 
+        const persisted = await this.getDialogSetting();
+        const existingByCount = persisted && typeof persisted === 'object'
+            ? (persisted as { sizesByCount?: Record<string, string[]> }).sizesByCount ?? {}
+            : {};
+
         await this.setDialogSetting({
             sizes: this.gridSizes,
-            orientation: this.orientation
+            sizesByCount: {
+                ...existingByCount,
+                [String(this.gridSizes.length)]: this.gridSizes,
+            },
+            orientation: this.orientation,
         });
     }
 
     updated(changedProperties: Map<string, any>) {
         super.updated(changedProperties);
-        
+
+        if (changedProperties.has('sizes')) {
+            this.scheduleRefreshGridLayout();
+        }
+
         // Only apply child styles once when children are first loaded
         // This prevents interfering with nested resizable grids during resize operations
-        if (changedProperties.has('gridChildren') && !this.childStylesApplied && this.gridChildren.length > 0) {
+        if (!this.childStylesApplied && this.gridChildren.length > 0) {
             this.childStylesApplied = true;
-            
+
             /**
              * Direct style manipulation is intentionally used here.
-             * 
+             *
              * Reasoning:
              * - Grid positioning (gridColumn/gridRow) must be computed dynamically based on
              *   the number of children and orientation at runtime
@@ -149,16 +224,9 @@ export class DocksResizableGrid extends DocksElement {
              *   (e.g., child at index 0 → column 1, index 1 → column 3, etc.)
              * - This is a layout container whose primary job is to programmatically position
              *   its children within a CSS grid system
+             * - Nested resizable grids manage their own display mode and must not receive flex
              */
-            this.gridChildren.forEach((child, index) => {
-                child.style.overflow = 'hidden';
-                child.style.height = '100%';
-                child.style.width = '100%';
-                child.style.gridColumn = this.orientation === 'horizontal' ? `${index * 2 + 1}` : '1';
-                child.style.gridRow = this.orientation === 'vertical' ? `${index * 2 + 1}` : '1';
-                child.style.display = 'flex';
-                child.style.flexDirection = 'column';
-            });
+            this.applyChildLayoutStyles();
         }
     }
 

package/src/parts/tabs.ts

@@ -45,6 +45,14 @@ export class DocksTabs extends DocksContainer {
     @property({ type: Boolean, reflect: true, attribute: 'hide-tabs' })
     hideTabs: boolean = false;
 
+    /** Size to tab content instead of filling the parent height (e.g. About dialog). */
+    @property({ type: Boolean, reflect: true, attribute: 'fit-content' })
+    fitContent: boolean = false;
+
+    /** Fill a fixed-height parent; tab body scrolls instead of resizing the container. */
+    @property({ type: Boolean, reflect: true, attribute: 'fill-height' })
+    fillHeight: boolean = false;
+
     /** Tab and nav-toolbar control sizing (`s` | `m` | `l`). */
     @property({ reflect: true, attribute: 'item-size' })
     itemSize: 's' | 'm' | 'l' = 'm';
@@ -129,6 +137,12 @@ export class DocksTabs extends DocksContainer {
         return this.tabGroup.value.getAttribute("active");
     }
 
+    public getTabPart(tabName: string): DocksPart | null {
+        const tabPanel = this.getTabPanel(tabName);
+        if (!tabPanel) return null;
+        return this.getPartFromPanel(tabPanel);
+    }
+
     open(contribution: TabContribution): void {
         const existing = this.contributions.find(c => c.name === contribution.name);
         if (existing) {
@@ -472,6 +486,95 @@ export class DocksTabs extends DocksContainer {
             width: 100%;
         }
 
+        :host([fit-content]) {
+            display: flex;
+            flex-direction: column;
+            height: auto;
+            max-height: 100%;
+            min-height: 0;
+        }
+
+        :host([fit-content]) wa-tab-group {
+            display: flex;
+            flex-direction: column;
+            flex: 1 1 auto;
+            min-height: 0;
+            height: auto;
+            max-height: 100%;
+        }
+
+        :host([fit-content]) wa-tab-group::part(base) {
+            display: flex;
+            flex-direction: column;
+            flex: 1 1 auto;
+            min-height: 0;
+            max-height: 100%;
+            height: auto;
+        }
+
+        :host([fit-content]) wa-tab-group::part(body) {
+            flex: 1 1 auto;
+            min-height: 0;
+            height: auto;
+            overflow-x: hidden;
+            overflow-y: auto;
+        }
+
+        :host([fit-content]) wa-tab-panel[active] {
+            display: block;
+            height: auto;
+            overflow: visible;
+        }
+
+        :host([fit-content]) wa-tab-panel > * {
+            height: auto;
+            min-height: 0;
+        }
+
+        :host([fill-height]) {
+            display: flex;
+            flex-direction: column;
+            height: 100%;
+            min-height: 0;
+            max-height: 100%;
+        }
+
+        :host([fill-height]) wa-tab-group {
+            display: flex;
+            flex-direction: column;
+            flex: 1 1 auto;
+            min-height: 0;
+            height: 100%;
+            max-height: 100%;
+        }
+
+        :host([fill-height]) wa-tab-group::part(base) {
+            display: flex;
+            flex-direction: column;
+            flex: 1 1 auto;
+            min-height: 0;
+            max-height: 100%;
+            height: 100%;
+        }
+
+        :host([fill-height]) wa-tab-group::part(body) {
+            flex: 1 1 auto;
+            min-height: 0;
+            overflow-x: hidden;
+            overflow-y: auto;
+        }
+
+        :host([fill-height]) wa-tab-panel[active] {
+            display: block;
+            height: auto;
+            overflow: visible;
+        }
+
+        :host([fill-height]) wa-tab-panel > * {
+            height: auto;
+            min-height: 0;
+        }
+
         wa-tab-group {
             height: 100%;
             width: 100%;

package/src/vite-plugin-resolve-deps.ts

@@ -103,20 +103,29 @@ export function resolveDepVersions(
 
 const RESOLVED_PACKAGE_INFO_KEY = '__RESOLVED_PACKAGE_INFO__';
 
-/** Virtual module id; injected into `index.html` before `main.ts` when extension side-effects are enabled. */
+/** Virtual module id; prepended to `src/main.ts` when extension side-effects are enabled. */
 export const VIRTUAL_EXTENSION_IMPORTS = 'virtual:eclipse-docks-extension-imports';
 
 const RESOLVED_VIRTUAL_EXTENSION_IMPORTS = `\0${VIRTUAL_EXTENSION_IMPORTS}`;
 
+/** App entry module transformed by {@link resolveDepVersionsPlugin}. */
+const MAIN_TS_MODULE_RE = /[/\\]src[/\\]main\.ts$/;
+
+const EXTENSION_IMPORT_STATEMENT = `import ${JSON.stringify(VIRTUAL_EXTENSION_IMPORTS)};\n`;
+
+/** Prepends the virtual extension side-effect import when not already present. */
+export function prependExtensionSideEffectImport(code: string): string {
+  if (code.includes(VIRTUAL_EXTENSION_IMPORTS)) {
+    return code;
+  }
+  return EXTENSION_IMPORT_STATEMENT + code;
+}
+
 /** Unscoped `extension-*` or scoped `@namespace/extension-*` (any npm scope). */
 const DEFAULT_EXTENSION_PATTERN = /^(?:@[^/]+\/)?extension-/;
 
 const DEFAULT_PRIORITY_FIRST = ['@eclipse-docks/extension-pwa', 'extension-pwa'];
 
-/** Matches Vite’s default app entry in index.html. */
-const MAIN_TS_SCRIPT_RE =
-  /<script\b[^>]*\btype\s*=\s*["']module["'][^>]*\bsrc\s*=\s*["'][^"']*\/src\/main\.ts["'][^>]*>\s*<\/script>/i;
-
 export interface ExtensionSideEffectsOptions {
   /**
    * When false, disables automatic extension side-effect imports. Omitted or true keeps them on.
@@ -140,8 +149,9 @@ export type ResolveDepVersionsPluginOptions = {
   includeDevDependencies?: boolean;
   /**
    * By default, registers a virtual module that side-effect-imports every matching direct
-   * `dependencies` entry (see `ExtensionSideEffectsOptions`), and injects
-   * `import 'virtual:eclipse-docks-extension-imports'` into `index.html` **before** `/src/main.ts`.
+   * `dependencies` entry (see `ExtensionSideEffectsOptions`), and prepends
+   * `import 'virtual:eclipse-docks-extension-imports'` to `src/main.ts` so extension
+   * registration completes before `registerApp({ autoStart: true })`.
    * Pass `false` or `{ enabled: false }` to disable.
    */
   extensionSideEffects?: boolean | ExtensionSideEffectsOptions;
@@ -287,24 +297,18 @@ export function resolveDepVersionsPlugin(
       }
       return extensionImportPackages.map((pkg) => `import ${JSON.stringify(pkg)};\n`).join('');
     },
-    transformIndexHtml: {
-      order: 'pre',
-      handler(html) {
-        if (!extensionSideEffectsActive) {
-          return html;
-        }
-        if (extensionImportPackages.length === 0) {
-          return html;
-        }
-        if (html.includes(VIRTUAL_EXTENSION_IMPORTS)) {
-          return html;
-        }
-        if (!MAIN_TS_SCRIPT_RE.test(html)) {
-          return html;
-        }
-        const inject = `<script type="module">import ${JSON.stringify(VIRTUAL_EXTENSION_IMPORTS)};</script>\n`;
-        return html.replace(MAIN_TS_SCRIPT_RE, (match) => `${inject}${match}`);
-      },
+    transform(code, id) {
+      if (!extensionSideEffectsActive || extensionImportPackages.length === 0) {
+        return null;
+      }
+      if (!MAIN_TS_MODULE_RE.test(id)) {
+        return null;
+      }
+      const next = prependExtensionSideEffectImport(code);
+      if (next === code) {
+        return null;
+      }
+      return next;
     },
   };
 }