@eclipse-glsp/client 2.5.0-next.428 → 2.5.0-next.433

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "2.5.0-next.428+ab936c7",
+  "version": "2.5.0-next.433+281be34",
   "description": "A sprotty-based client for GLSP",
   "keywords": [
     "eclipse",
@@ -46,7 +46,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/sprotty": "2.5.0-next.428+ab936c7",
+    "@eclipse-glsp/sprotty": "2.5.0-next.433+281be34",
     "autocompleter": "^9.1.2",
     "file-saver": "^2.0.5",
     "lodash": "4.17.21",
@@ -63,5 +63,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab936c708ffa231e8aa57386385018c470d54b4f"
+  "gitHead": "281be3495934edbb3f87bda6fa51d76947cf57db"
 }

package/src/default-modules.ts

@@ -27,8 +27,7 @@ import {
     expandModule,
     fadeModule,
     modelSourceModule,
-    resolveContainerConfiguration,
-    zorderModule
+    resolveContainerConfiguration
 } from '@eclipse-glsp/sprotty';
 import { Container } from 'inversify';
 import { defaultModule } from './base/default.module';
@@ -62,6 +61,7 @@ import { nodeCreationToolModule } from './features/tools/node-creation/node-crea
 import { toolFocusLossModule } from './features/tools/tool-focus-loss-module';
 import { markerNavigatorModule, validationModule } from './features/validation/validation-modules';
 import { viewportModule } from './features/viewport/viewport-modules';
+import { zorderModule } from './features/zorder/zorder-module';
 
 export const DEFAULT_MODULES = [
     defaultModule,

package/src/features/zorder/bring-to-front-command.ts

@@ -0,0 +1,46 @@
+/********************************************************************************
+ * Copyright (c) 2025 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import {
+    LayoutContainer,
+    LayoutRegistry,
+    SprottyBringToFrontCommand,
+    TYPES,
+    ZOrderElement,
+    isLayoutContainer
+} from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
+
+@injectable()
+export class BringToFrontCommand extends SprottyBringToFrontCommand {
+    @inject(TYPES.LayoutRegistry) protected layoutRegistry: LayoutRegistry;
+
+    protected getLayoutContainer(zorder: ZOrderElement): LayoutContainer | undefined {
+        return isLayoutContainer(zorder.element.parent) ? zorder.element.parent : undefined;
+    }
+
+    protected shouldBringToFront(zorder: ZOrderElement): boolean {
+        // only re-order children if the layout supports it
+        const layoutContainer = this.getLayoutContainer(zorder);
+        return !layoutContainer || (this.layoutRegistry.get(layoutContainer.layout)?.orderAgnostic ?? true);
+    }
+
+    protected override bringToFront(zorder: ZOrderElement): void {
+        if (this.shouldBringToFront(zorder)) {
+            super.bringToFront(zorder);
+        }
+    }
+}

package/src/features/zorder/zorder-module.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2025 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { FeatureModule, configureCommand } from '@eclipse-glsp/sprotty';
+import { boundsModule } from '../bounds/bounds-module';
+import { BringToFrontCommand } from './bring-to-front-command';
+
+export const zorderModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        configureCommand(context, BringToFrontCommand);
+    },
+    { featureId: Symbol('zorder'), requires: [boundsModule] }
+);

package/src/index.ts

@@ -36,6 +36,7 @@ export * from './base/focus/focus-tracker';
 export * from './base/messages';
 export * from './base/model/diagram-loader';
 export * from './base/model/glsp-model-source';
+export * from './base/model/model-change-service';
 export * from './base/model/model-initialization-constraint';
 export * from './base/model/model-registry';
 export * from './base/mouse-position-tracker';
@@ -226,6 +227,8 @@ export * from './features/viewport/viewport-key-listener';
 export * from './features/viewport/viewport-modules';
 export * from './features/viewport/viewport-tool';
 export * from './features/viewport/zoom-viewport-action';
+export * from './features/zorder/bring-to-front-command';
+export * from './features/zorder/zorder-module';
 export * from './model';
 export * from './re-exports';
 export * from './standalone-modules';