@eclipse-glsp-examples/workflow-glsp 1.1.0-next.e711000.260 → 1.1.0-next.e8bdd69.287

package/lib/direct-task-editing/di.config.d.ts

@@ -1,3 +1,18 @@
-import { ContainerModule } from 'inversify';
-export declare const directTaskEditor: ContainerModule;
+/********************************************************************************
+ * Copyright (c) 2019-2023 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 } from '@eclipse-glsp/client';
+export declare const directTaskEditor: FeatureModule;
 //# sourceMappingURL=di.config.d.ts.map

package/lib/direct-task-editing/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,eAAO,MAAM,gBAAgB,iBAE3B,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAiB,aAAa,EAAS,MAAM,sBAAsB,CAAC;AAG3E,eAAO,MAAM,gBAAgB,eAE3B,CAAC"}

package/lib/direct-task-editing/di.config.js

@@ -17,9 +17,8 @@ exports.directTaskEditor = void 0;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const client_1 = require("@eclipse-glsp/client");
-const inversify_1 = require("inversify");
 const direct_task_editor_1 = require("./direct-task-editor");
-exports.directTaskEditor = new inversify_1.ContainerModule((bind, _unbind, _isBound) => {
+exports.directTaskEditor = new client_1.FeatureModule((bind, _unbind, _isBound) => {
     (0, client_1.bindAsService)(bind, client_1.TYPES.IUIExtension, direct_task_editor_1.TaskEditor);
 });
 //# sourceMappingURL=di.config.js.map

package/lib/direct-task-editing/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA4D;AAC5D,yCAA4C;AAC5C,6DAAkD;AAErC,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC5E,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAK,CAAC,YAAY,EAAE,+BAAU,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA2E;AAC3E,6DAAkD;AAErC,QAAA,gBAAgB,GAAG,IAAI,sBAAa,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1E,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAK,CAAC,YAAY,EAAE,+BAAU,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC"}

package/lib/direct-task-editing/direct-task-editor.d.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { AbstractUIExtension, Action, AutoCompleteWidget, DOMHelper, EditorContextService, GLSPActionDispatcher, ILogger, LabeledAction, Operation, SModelRoot, ValidationStatus, ViewerOptions } from '@eclipse-glsp/client';
+import { AbstractUIExtension, Action, AutoCompleteWidget, DOMHelper, EditorContextService, GLSPActionDispatcher, ILogger, LabeledAction, Operation, GModelRoot, ValidationStatus, ViewerOptions } from '@eclipse-glsp/client';
 import { TaskNode } from '../model';
 /**
  * Is send from the {@link TaskEditor} to the GLSP server
@@ -61,8 +61,8 @@ export declare class TaskEditor extends AbstractUIExtension {
     id(): string;
     containerClass(): string;
     protected initializeContents(containerElement: HTMLElement): void;
-    show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void;
-    protected onBeforeShow(containerElement: HTMLElement, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void;
+    show(root: Readonly<GModelRoot>, ...contextElementIds: string[]): void;
+    protected onBeforeShow(containerElement: HTMLElement, root: Readonly<GModelRoot>, ...contextElementIds: string[]): void;
     protected setPosition(containerElement: HTMLElement): void;
     protected retrieveSuggestions(input: string): Promise<LabeledAction[]>;
     protected validateInput(input: string): Promise<ValidationStatus>;

package/lib/model.d.ts

@@ -13,16 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { DiamondNode, EditableLabel, GEdge, LayoutContainer, Nameable, RectangularNode, SChildElement, SModelElement, SShapeElement, WithEditableLabel } from '@eclipse-glsp/client';
+import { DiamondNode, EditableLabel, GEdge, LayoutContainer, Nameable, RectangularNode, GChildElement, GModelElement, GShapeElement, WithEditableLabel } from '@eclipse-glsp/client';
 export declare class TaskNode extends RectangularNode implements Nameable, WithEditableLabel {
     static readonly DEFAULT_FEATURES: symbol[];
     duration?: number;
     taskType?: string;
     reference?: string;
-    get editableLabel(): (SChildElement & EditableLabel) | undefined;
+    get editableLabel(): (GChildElement & EditableLabel) | undefined;
     get name(): string;
 }
-export declare function isTaskNode(element: SModelElement): element is TaskNode;
+export declare function isTaskNode(element: GModelElement): element is TaskNode;
 export declare class WeightedEdge extends GEdge {
     probability?: string;
 }
@@ -45,7 +45,7 @@ export declare namespace ActivityNode {
         const UNDEFINED = "undefined";
     }
 }
-export declare class Icon extends SShapeElement implements LayoutContainer {
+export declare class Icon extends GShapeElement implements LayoutContainer {
     static readonly DEFAULT_FEATURES: symbol[];
     layout: string;
     layoutOptions?: {
@@ -59,6 +59,6 @@ export declare class Icon extends SShapeElement implements LayoutContainer {
 export declare class CategoryNode extends RectangularNode implements Nameable, WithEditableLabel {
     static readonly DEFAULT_FEATURES: symbol[];
     name: string;
-    get editableLabel(): (SChildElement & EditableLabel) | undefined;
+    get editableLabel(): (GChildElement & EditableLabel) | undefined;
 }
 //# sourceMappingURL=model.d.ts.map

package/lib/model.js

@@ -76,7 +76,7 @@ exports.ActivityNode = ActivityNode;
         Type.UNDEFINED = 'undefined';
     })(Type = ActivityNode.Type || (ActivityNode.Type = {}));
 })(ActivityNode || (exports.ActivityNode = ActivityNode = {}));
-class Icon extends client_1.SShapeElement {
+class Icon extends client_1.GShapeElement {
     constructor() {
         super(...arguments);
         this.size = {

package/lib/workflow-diagram-module.d.ts

@@ -19,6 +19,6 @@ import { Container, ContainerModule } from 'inversify';
 import 'sprotty/css/edit-label.css';
 import '../css/diagram.css';
 export declare const workflowDiagramModule: ContainerModule;
-export declare function createWorkflowDiagramContainer(widgetId: string, ...containerConfiguration: ContainerConfiguration): Container;
-export declare function initializeWorkflowDiagramContainer(container: Container, widgetId: string, ...containerConfiguration: ContainerConfiguration): Container;
+export declare function createWorkflowDiagramContainer(...containerConfiguration: ContainerConfiguration): Container;
+export declare function initializeWorkflowDiagramContainer(container: Container, ...containerConfiguration: ContainerConfiguration): Container;
 //# sourceMappingURL=workflow-diagram-module.d.ts.map

package/lib/workflow-diagram-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-diagram-module.d.ts","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,sBAAsB,EA0BzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,CAAC;AAK5B,eAAO,MAAM,qBAAqB,iBA0BhC,CAAC;AAEH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAE7H;AAED,wBAAgB,kCAAkC,CAC9C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,MAAM,EAChB,GAAG,sBAAsB,EAAE,sBAAsB,GAClD,SAAS,CAOX"}
+{"version":3,"file":"workflow-diagram-module.d.ts","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,sBAAsB,EAwBzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,CAAC;AAK5B,eAAO,MAAM,qBAAqB,iBA0BhC,CAAC;AAEH,wBAAgB,8BAA8B,CAAC,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAE3G;AAED,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAErI"}

package/lib/workflow-diagram-module.js

@@ -34,10 +34,10 @@ exports.workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, i
     (0, client_1.configureDefaultModelElements)(context);
     (0, client_1.configureModelElement)(context, 'task:automated', model_1.TaskNode, client_1.RoundedCornerNodeView);
     (0, client_1.configureModelElement)(context, 'task:manual', model_1.TaskNode, client_1.RoundedCornerNodeView);
-    (0, client_1.configureModelElement)(context, 'label:heading', client_1.SLabel, client_1.SLabelView, { enable: [client_1.editLabelFeature] });
-    (0, client_1.configureModelElement)(context, 'comp:comp', client_1.SCompartment, client_1.SCompartmentView);
-    (0, client_1.configureModelElement)(context, 'comp:header', client_1.SCompartment, client_1.SCompartmentView);
-    (0, client_1.configureModelElement)(context, 'label:icon', client_1.SLabel, client_1.SLabelView);
+    (0, client_1.configureModelElement)(context, 'label:heading', client_1.GLabel, client_1.GLabelView, { enable: [client_1.editLabelFeature] });
+    (0, client_1.configureModelElement)(context, 'comp:comp', client_1.GCompartment, client_1.GCompartmentView);
+    (0, client_1.configureModelElement)(context, 'comp:header', client_1.GCompartment, client_1.GCompartmentView);
+    (0, client_1.configureModelElement)(context, 'label:icon', client_1.GLabel, client_1.GLabelView);
     (0, client_1.configureModelElement)(context, client_1.DefaultTypes.EDGE, client_1.GEdge, workflow_views_1.WorkflowEdgeView);
     (0, client_1.configureModelElement)(context, 'edge:weighted', model_1.WeightedEdge, workflow_views_1.WorkflowEdgeView);
     (0, client_1.configureModelElement)(context, 'icon', model_1.Icon, workflow_views_1.IconView);
@@ -45,21 +45,16 @@ exports.workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, i
     (0, client_1.configureModelElement)(context, 'activityNode:decision', model_1.ActivityNode, client_1.DiamondNodeView);
     (0, client_1.configureModelElement)(context, 'activityNode:fork', model_1.ActivityNode, client_1.RectangularNodeView);
     (0, client_1.configureModelElement)(context, 'activityNode:join', model_1.ActivityNode, client_1.RectangularNodeView);
-    (0, client_1.configureModelElement)(context, client_1.DefaultTypes.GRAPH, client_1.GLSPGraph, client_1.GLSPProjectionView);
+    (0, client_1.configureModelElement)(context, client_1.DefaultTypes.GRAPH, client_1.GGraph, client_1.GLSPProjectionView);
     (0, client_1.configureModelElement)(context, 'category', model_1.CategoryNode, client_1.RoundedCornerNodeView);
-    (0, client_1.configureModelElement)(context, 'struct', client_1.SCompartment, client_1.StructureCompartmentView);
+    (0, client_1.configureModelElement)(context, 'struct', client_1.GCompartment, client_1.StructureCompartmentView);
 });
-function createWorkflowDiagramContainer(widgetId, ...containerConfiguration) {
-    return initializeWorkflowDiagramContainer(new inversify_1.Container(), widgetId, ...containerConfiguration);
+function createWorkflowDiagramContainer(...containerConfiguration) {
+    return initializeWorkflowDiagramContainer(new inversify_1.Container(), ...containerConfiguration);
 }
 exports.createWorkflowDiagramContainer = createWorkflowDiagramContainer;
-function initializeWorkflowDiagramContainer(container, widgetId, ...containerConfiguration) {
-    (0, client_1.initializeDiagramContainer)(container, exports.workflowDiagramModule, di_config_1.directTaskEditor, client_1.accessibilityModule, ...containerConfiguration);
-    (0, client_1.overrideViewerOptions)(container, {
-        baseDiv: widgetId,
-        hiddenDiv: widgetId + '_hidden'
-    });
-    return container;
+function initializeWorkflowDiagramContainer(container, ...containerConfiguration) {
+    return (0, client_1.initializeDiagramContainer)(container, exports.workflowDiagramModule, di_config_1.directTaskEditor, ...containerConfiguration);
 }
 exports.initializeWorkflowDiagramContainer = initializeWorkflowDiagramContainer;
 //# sourceMappingURL=workflow-diagram-module.js.map

package/lib/workflow-diagram-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-diagram-module.js","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-diagram-module.js","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"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"}

package/lib/workflow-views.d.ts

@@ -13,11 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point, PolylineEdgeViewWithGapsOnIntersections, RenderingContext, SEdge, ShapeView } from '@eclipse-glsp/client';
+import { Point, PolylineEdgeViewWithGapsOnIntersections, RenderingContext, GEdge, ShapeView } from '@eclipse-glsp/client';
 import { VNode } from 'snabbdom';
 import { Icon } from './model';
 export declare class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
-    protected renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[];
+    protected renderAdditionals(edge: GEdge, segments: Point[], context: RenderingContext): VNode[];
 }
 export declare class IconView extends ShapeView {
     render(element: Icon, context: RenderingContext): VNode | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-glsp",
-  "version": "1.1.0-next.e711000.260+e711000",
+  "version": "1.1.0-next.e8bdd69.287+e8bdd69",
   "description": "GLSP diagrams for the Workflow DSL",
   "keywords": [
     "glsp",
@@ -43,7 +43,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/client": "1.1.0-next.e711000.260+e711000",
+    "@eclipse-glsp/client": "1.1.0-next.e8bdd69.287+e8bdd69",
     "balloon-css": "^0.5.0"
   },
   "devDependencies": {
@@ -52,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e7110003377eea73ef5572afb7579ca73a3c1d39"
+  "gitHead": "e8bdd696e0c391132c2d43edb1529d171b02b831"
 }

package/src/direct-task-editing/di.config.ts

@@ -13,10 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService, TYPES } from '@eclipse-glsp/client';
-import { ContainerModule } from 'inversify';
+import { bindAsService, FeatureModule, TYPES } from '@eclipse-glsp/client';
 import { TaskEditor } from './direct-task-editor';
 
-export const directTaskEditor = new ContainerModule((bind, _unbind, _isBound) => {
+export const directTaskEditor = new FeatureModule((bind, _unbind, _isBound) => {
     bindAsService(bind, TYPES.IUIExtension, TaskEditor);
 });

package/src/direct-task-editing/direct-task-editor.ts

@@ -26,7 +26,7 @@ import {
     Operation,
     RequestContextActions,
     RequestEditValidationAction,
-    SModelRoot,
+    GModelRoot,
     SetContextActions,
     SetEditValidationResultAction,
     TYPES,
@@ -137,12 +137,12 @@ export class TaskEditor extends AbstractUIExtension {
         this.autoSuggestion.initialize(containerElement);
     }
 
-    override show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
+    override show(root: Readonly<GModelRoot>, ...contextElementIds: string[]): void {
         super.show(root, ...contextElementIds);
         this.autoSuggestion.open(root);
     }
 
-    protected override onBeforeShow(containerElement: HTMLElement, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
+    protected override onBeforeShow(containerElement: HTMLElement, root: Readonly<GModelRoot>, ...contextElementIds: string[]): void {
         this.task = getTask(contextElementIds, root.index)[0];
         this.autoSuggestion.inputField.value = '';
         this.setPosition(containerElement);

package/src/model.ts

@@ -31,10 +31,10 @@ import {
     nameFeature,
     popupFeature,
     RectangularNode,
-    SChildElement,
+    GChildElement,
     selectFeature,
-    SModelElement,
-    SShapeElement,
+    GModelElement,
+    GShapeElement,
     WithEditableLabel,
     withEditLabelFeature
 } from '@eclipse-glsp/client';
@@ -57,7 +57,7 @@ export class TaskNode extends RectangularNode implements Nameable, WithEditableL
     taskType?: string;
     reference?: string;
 
-    get editableLabel(): (SChildElement & EditableLabel) | undefined {
+    get editableLabel(): (GChildElement & EditableLabel) | undefined {
         const label = this.children.find(element => element.type === 'label:heading');
         if (label && isEditableLabel(label)) {
             return label;
@@ -71,7 +71,7 @@ export class TaskNode extends RectangularNode implements Nameable, WithEditableL
     }
 }
 
-export function isTaskNode(element: SModelElement): element is TaskNode {
+export function isTaskNode(element: GModelElement): element is TaskNode {
     return element instanceof TaskNode || false;
 }
 
@@ -100,7 +100,7 @@ export namespace ActivityNode {
     }
 }
 
-export class Icon extends SShapeElement implements LayoutContainer {
+export class Icon extends GShapeElement implements LayoutContainer {
     static readonly DEFAULT_FEATURES = [boundsFeature, layoutContainerFeature, layoutableChildFeature, fadeFeature];
 
     layout: string;
@@ -127,7 +127,7 @@ export class CategoryNode extends RectangularNode implements Nameable, WithEdita
 
     name = '';
 
-    get editableLabel(): (SChildElement & EditableLabel) | undefined {
+    get editableLabel(): (GChildElement & EditableLabel) | undefined {
         const label = this.children.find(element => element.type === 'label:heading');
         if (label && isEditableLabel(label)) {
             return label;

package/src/workflow-diagram-module.ts

@@ -20,27 +20,25 @@ import {
     DeleteElementContextMenuItemProvider,
     DiamondNodeView,
     GEdge,
-    GLSPGraph,
+    GGraph,
     GLSPProjectionView,
     GridSnapper,
     LogLevel,
     RectangularNodeView,
     RevealNamedElementActionProvider,
     RoundedCornerNodeView,
-    SCompartment,
-    SCompartmentView,
-    SLabel,
-    SLabelView,
+    GCompartment,
+    GCompartmentView,
+    GLabel,
+    GLabelView,
     StructureCompartmentView,
     TYPES,
-    accessibilityModule,
     bindAsService,
     bindOrRebind,
     configureDefaultModelElements,
     configureModelElement,
     editLabelFeature,
-    initializeDiagramContainer,
-    overrideViewerOptions
+    initializeDiagramContainer
 } from '@eclipse-glsp/client';
 import 'balloon-css/balloon.min.css';
 import { Container, ContainerModule } from 'inversify';
@@ -62,10 +60,10 @@ export const workflowDiagramModule = new ContainerModule((bind, unbind, isBound,
     configureDefaultModelElements(context);
     configureModelElement(context, 'task:automated', TaskNode, RoundedCornerNodeView);
     configureModelElement(context, 'task:manual', TaskNode, RoundedCornerNodeView);
-    configureModelElement(context, 'label:heading', SLabel, SLabelView, { enable: [editLabelFeature] });
-    configureModelElement(context, 'comp:comp', SCompartment, SCompartmentView);
-    configureModelElement(context, 'comp:header', SCompartment, SCompartmentView);
-    configureModelElement(context, 'label:icon', SLabel, SLabelView);
+    configureModelElement(context, 'label:heading', GLabel, GLabelView, { enable: [editLabelFeature] });
+    configureModelElement(context, 'comp:comp', GCompartment, GCompartmentView);
+    configureModelElement(context, 'comp:header', GCompartment, GCompartmentView);
+    configureModelElement(context, 'label:icon', GLabel, GLabelView);
     configureModelElement(context, DefaultTypes.EDGE, GEdge, WorkflowEdgeView);
     configureModelElement(context, 'edge:weighted', WeightedEdge, WorkflowEdgeView);
     configureModelElement(context, 'icon', Icon, IconView);
@@ -73,24 +71,15 @@ export const workflowDiagramModule = new ContainerModule((bind, unbind, isBound,
     configureModelElement(context, 'activityNode:decision', ActivityNode, DiamondNodeView);
     configureModelElement(context, 'activityNode:fork', ActivityNode, RectangularNodeView);
     configureModelElement(context, 'activityNode:join', ActivityNode, RectangularNodeView);
-    configureModelElement(context, DefaultTypes.GRAPH, GLSPGraph, GLSPProjectionView);
+    configureModelElement(context, DefaultTypes.GRAPH, GGraph, GLSPProjectionView);
     configureModelElement(context, 'category', CategoryNode, RoundedCornerNodeView);
-    configureModelElement(context, 'struct', SCompartment, StructureCompartmentView);
+    configureModelElement(context, 'struct', GCompartment, StructureCompartmentView);
 });
 
-export function createWorkflowDiagramContainer(widgetId: string, ...containerConfiguration: ContainerConfiguration): Container {
-    return initializeWorkflowDiagramContainer(new Container(), widgetId, ...containerConfiguration);
+export function createWorkflowDiagramContainer(...containerConfiguration: ContainerConfiguration): Container {
+    return initializeWorkflowDiagramContainer(new Container(), ...containerConfiguration);
 }
 
-export function initializeWorkflowDiagramContainer(
-    container: Container,
-    widgetId: string,
-    ...containerConfiguration: ContainerConfiguration
-): Container {
-    initializeDiagramContainer(container, workflowDiagramModule, directTaskEditor, accessibilityModule, ...containerConfiguration);
-    overrideViewerOptions(container, {
-        baseDiv: widgetId,
-        hiddenDiv: widgetId + '_hidden'
-    });
-    return container;
+export function initializeWorkflowDiagramContainer(container: Container, ...containerConfiguration: ContainerConfiguration): Container {
+    return initializeDiagramContainer(container, workflowDiagramModule, directTaskEditor, ...containerConfiguration);
 }

package/src/workflow-views.tsx

@@ -20,7 +20,7 @@ import {
     Point,
     PolylineEdgeViewWithGapsOnIntersections,
     RenderingContext,
-    SEdge,
+    GEdge,
     setAttr,
     ShapeView,
     svg,
@@ -35,7 +35,7 @@ const JSX = { createElement: svg };
 
 @injectable()
 export class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
-    protected override renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[] {
+    protected override renderAdditionals(edge: GEdge, segments: Point[], context: RenderingContext): VNode[] {
         const additionals = super.renderAdditionals(edge, segments, context);
         const p1 = segments[segments.length - 2];
         const p2 = segments[segments.length - 1];