@eclipse-glsp/client 1.1.0-next.335bc3d.213 → 1.1.0-next.35bf56e.230
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/css/decoration.css +1 -1
- package/lib/base/auto-complete/auto-complete-widget.d.ts +2 -2
- package/lib/base/auto-complete/auto-complete-widget.js +3 -3
- package/lib/base/command-stack.d.ts +1 -2
- package/lib/base/command-stack.d.ts.map +1 -1
- package/lib/base/command-stack.js +5 -14
- package/lib/base/command-stack.js.map +1 -1
- package/lib/base/container-modules.d.ts +15 -7
- package/lib/base/container-modules.d.ts.map +1 -1
- package/lib/base/container-modules.js +15 -5
- package/lib/base/container-modules.js.map +1 -1
- package/lib/base/editor-context-service.d.ts +3 -3
- package/lib/base/editor-context-service.d.ts.map +1 -1
- package/lib/base/editor-context-service.js +3 -3
- package/lib/base/editor-context-service.js.map +1 -1
- package/lib/base/selection-clearing-mouse-listener.js +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.d.ts +4 -5
- package/lib/base/tool-manager/glsp-tool-manager.d.ts.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.js +15 -8
- package/lib/base/tool-manager/glsp-tool-manager.js.map +1 -1
- package/lib/features/bounds/di.config.d.ts +1 -2
- package/lib/features/bounds/di.config.d.ts.map +1 -1
- package/lib/features/bounds/di.config.js +7 -5
- package/lib/features/bounds/di.config.js.map +1 -1
- package/lib/features/{layout → bounds}/freeform-layout.d.ts +2 -2
- package/lib/features/{layout → bounds}/freeform-layout.d.ts.map +1 -1
- package/lib/features/{layout → bounds}/freeform-layout.js +2 -2
- package/lib/features/{layout → bounds}/freeform-layout.js.map +1 -1
- package/lib/features/bounds/freeform-layout.spec.d.ts.map +1 -0
- package/lib/features/{layout/tests → bounds}/freeform-layout.spec.js +37 -37
- package/lib/features/bounds/freeform-layout.spec.js.map +1 -0
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts +1 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts.map +1 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.js +3 -2
- package/lib/features/bounds/glsp-hidden-bounds-updater.js.map +1 -1
- package/lib/features/{layout → bounds}/hbox-layout.d.ts +1 -1
- package/lib/features/{layout → bounds}/hbox-layout.d.ts.map +1 -1
- package/lib/features/{layout → bounds}/hbox-layout.js +1 -1
- package/lib/features/{layout → bounds}/hbox-layout.js.map +1 -1
- package/lib/features/bounds/hbox-layout.spec.d.ts.map +1 -0
- package/lib/features/{layout/tests → bounds}/hbox-layout.spec.js +18 -18
- package/lib/features/bounds/hbox-layout.spec.js.map +1 -0
- package/lib/features/{layout/tests/layouter-test-util.d.ts → bounds/layouter-test-util.spec.d.ts} +2 -3
- package/lib/features/bounds/layouter-test-util.spec.d.ts.map +1 -0
- package/lib/features/{layout/tests/layouter-test-util.js → bounds/layouter-test-util.spec.js} +4 -5
- package/lib/features/bounds/layouter-test-util.spec.js.map +1 -0
- package/lib/features/{layout → bounds}/layouter.d.ts +1 -1
- package/lib/features/{layout → bounds}/layouter.d.ts.map +1 -1
- package/lib/features/{layout → bounds}/layouter.js +1 -1
- package/lib/features/{layout → bounds}/layouter.js.map +1 -1
- package/lib/features/{layout → bounds}/vbox-layout.d.ts +1 -1
- package/lib/features/{layout → bounds}/vbox-layout.d.ts.map +1 -1
- package/lib/features/{layout → bounds}/vbox-layout.js +1 -1
- package/lib/features/{layout → bounds}/vbox-layout.js.map +1 -1
- package/lib/features/bounds/vbox-layout.spec.d.ts.map +1 -0
- package/lib/features/{layout/tests → bounds}/vbox-layout.spec.js +18 -18
- package/lib/features/bounds/vbox-layout.spec.js.map +1 -0
- package/lib/features/command-palette/command-palette-tool.d.ts +1 -1
- package/lib/features/command-palette/command-palette-tool.d.ts.map +1 -1
- package/lib/features/command-palette/command-palette-tool.js +3 -3
- package/lib/features/command-palette/command-palette-tool.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.d.ts +2 -2
- package/lib/features/copy-paste/copy-paste-handler.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.js +5 -5
- package/lib/features/copy-paste/copy-paste-handler.js.map +1 -1
- package/lib/features/export/glsp-svg-exporter.d.ts +1 -1
- package/lib/features/export/glsp-svg-exporter.d.ts.map +1 -1
- package/lib/features/export/glsp-svg-exporter.js +1 -2
- package/lib/features/export/glsp-svg-exporter.js.map +1 -1
- package/lib/features/layout/di.config.d.ts +1 -1
- package/lib/features/layout/di.config.d.ts.map +1 -1
- package/lib/features/layout/di.config.js +1 -9
- package/lib/features/layout/di.config.js.map +1 -1
- package/lib/features/navigation/di.config.d.ts +2 -1
- package/lib/features/navigation/di.config.d.ts.map +1 -1
- package/lib/features/navigation/di.config.js +3 -3
- package/lib/features/navigation/di.config.js.map +1 -1
- package/lib/features/navigation/navigation-action-handler.d.ts +2 -2
- package/lib/features/navigation/navigation-action-handler.js +2 -2
- package/lib/features/save/model.d.ts +1 -1
- package/lib/features/select/selection-service.spec.js +1 -1
- package/lib/features/select/selection-service.spec.js.map +1 -1
- package/lib/features/source-model-watcher/di.config.js +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts +2 -2
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js +3 -3
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts +6 -6
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.js +4 -8
- package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/di.config.d.ts +1 -1
- package/lib/features/tool-feedback/di.config.js +2 -2
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts +1 -2
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js +1 -7
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/tools/change-bounds-tool.d.ts +1 -1
- package/lib/features/tools/change-bounds-tool.d.ts.map +1 -1
- package/lib/features/tools/change-bounds-tool.js +6 -6
- package/lib/features/tools/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/di.config.js +2 -2
- package/lib/features/tools/glsp-manhattan-edge-router.d.ts +2 -2
- package/lib/features/tools/glsp-manhattan-edge-router.d.ts.map +1 -1
- package/lib/features/tools/glsp-manhattan-edge-router.js +4 -4
- package/lib/features/tools/glsp-manhattan-edge-router.js.map +1 -1
- package/lib/features/validation/issue-marker.d.ts +1 -1
- package/lib/features/validation/issue-marker.js +1 -1
- package/lib/index.d.ts +26 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +33 -4
- package/lib/index.js.map +1 -1
- package/lib/lib/model.d.ts +7 -3
- package/lib/lib/model.d.ts.map +1 -1
- package/lib/lib/model.js +48 -1
- package/lib/lib/model.js.map +1 -1
- package/lib/sprotty-reexport.d.ts +2 -2
- package/lib/sprotty-reexport.d.ts.map +1 -1
- package/lib/sprotty-reexport.js +4 -4
- package/lib/sprotty-reexport.js.map +1 -1
- package/lib/utils/html-utils.d.ts +1 -1
- package/lib/utils/html-utils.js +1 -1
- package/lib/utils/smodel-util.d.ts +1 -1
- package/lib/utils/smodel-util.d.ts.map +1 -1
- package/lib/utils/smodel-util.js +1 -1
- package/lib/utils/smodel-util.js.map +1 -1
- package/lib/views/base-view-module.js +1 -1
- package/lib/views/glsp-edge-view.d.ts +2 -2
- package/lib/views/glsp-edge-view.d.ts.map +1 -1
- package/lib/views/glsp-edge-view.js +2 -2
- package/lib/views/glsp-edge-view.js.map +1 -1
- package/lib/views/glsp-projection-view.d.ts +1 -1
- package/lib/views/glsp-projection-view.js +1 -1
- package/lib/views/index.d.ts +1 -1
- package/lib/views/index.js +1 -1
- package/lib/views/rounded-corner-view.js +2 -2
- package/lib/views/rounded-corner.d.ts +1 -1
- package/lib/views/rounded-corner.js +1 -1
- package/package.json +17 -17
- package/src/base/auto-complete/auto-complete-widget.ts +3 -3
- package/src/base/command-stack.ts +13 -11
- package/src/base/container-modules.ts +22 -10
- package/src/base/editor-context-service.ts +4 -4
- package/src/base/selection-clearing-mouse-listener.ts +1 -1
- package/src/base/tool-manager/glsp-tool-manager.ts +15 -12
- package/src/features/bounds/di.config.ts +16 -7
- package/src/features/{layout/tests → bounds}/freeform-layout.spec.ts +2 -2
- package/src/features/{layout → bounds}/freeform-layout.ts +2 -2
- package/src/features/bounds/glsp-hidden-bounds-updater.ts +4 -7
- package/src/features/{layout/tests → bounds}/hbox-layout.spec.ts +2 -2
- package/src/features/{layout → bounds}/hbox-layout.ts +1 -1
- package/src/features/{layout/tests/layouter-test-util.ts → bounds/layouter-test-util.spec.ts} +3 -4
- package/src/features/{layout → bounds}/layouter.ts +1 -1
- package/src/features/{layout/tests → bounds}/vbox-layout.spec.ts +2 -2
- package/src/features/{layout → bounds}/vbox-layout.ts +1 -1
- package/src/features/command-palette/command-palette-tool.ts +3 -3
- package/src/features/copy-paste/copy-paste-handler.ts +5 -5
- package/src/features/export/glsp-svg-exporter.ts +8 -7
- package/src/features/layout/di.config.ts +2 -11
- package/src/features/navigation/di.config.ts +4 -2
- package/src/features/navigation/navigation-action-handler.ts +2 -2
- package/src/features/save/model.ts +1 -1
- package/src/features/select/selection-service.spec.ts +2 -2
- package/src/features/source-model-watcher/di.config.ts +1 -1
- package/src/features/tool-feedback/change-bounds-tool-feedback.ts +3 -3
- package/src/features/tool-feedback/creation-tool-feedback.ts +20 -14
- package/src/features/tool-feedback/di.config.ts +2 -2
- package/src/features/tool-feedback/edge-edit-tool-feedback.ts +1 -9
- package/src/features/tools/change-bounds-tool.ts +7 -7
- package/src/features/tools/di.config.ts +3 -3
- package/src/features/tools/glsp-manhattan-edge-router.ts +8 -5
- package/src/features/validation/issue-marker.ts +1 -1
- package/src/index.ts +33 -4
- package/src/lib/model.ts +35 -3
- package/src/sprotty-reexport.ts +18 -8
- package/src/utils/html-utils.ts +1 -1
- package/src/utils/smodel-util.ts +12 -5
- package/src/views/base-view-module.ts +1 -1
- package/src/views/glsp-edge-view.tsx +3 -3
- package/src/views/glsp-projection-view.tsx +1 -1
- package/src/views/index.ts +1 -2
- package/src/views/rounded-corner-view.tsx +2 -2
- package/src/views/rounded-corner.ts +2 -2
- package/lib/features/layout/tests/freeform-layout.spec.d.ts.map +0 -1
- package/lib/features/layout/tests/freeform-layout.spec.js.map +0 -1
- package/lib/features/layout/tests/hbox-layout.spec.d.ts.map +0 -1
- package/lib/features/layout/tests/hbox-layout.spec.js.map +0 -1
- package/lib/features/layout/tests/layouter-test-util.d.ts.map +0 -1
- package/lib/features/layout/tests/layouter-test-util.js.map +0 -1
- package/lib/features/layout/tests/vbox-layout.spec.d.ts.map +0 -1
- package/lib/features/layout/tests/vbox-layout.spec.js.map +0 -1
- /package/lib/features/{layout/tests → bounds}/freeform-layout.spec.d.ts +0 -0
- /package/lib/features/{layout/tests → bounds}/hbox-layout.spec.d.ts +0 -0
- /package/lib/features/{layout/tests → bounds}/vbox-layout.spec.d.ts +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smodel-util.js","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"smodel-util.js","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureDefaultModelElements = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2021 EclipseSource and others.
|
|
5
|
+
* Copyright (c) 2021-2022 EclipseSource and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2021-
|
|
2
|
+
* Copyright (c) 2021-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -18,7 +18,7 @@ import { Classes, VNode } from 'snabbdom';
|
|
|
18
18
|
import { PolylineEdgeView, RenderingContext, SEdge } from 'sprotty';
|
|
19
19
|
export declare class GEdgeView extends PolylineEdgeView {
|
|
20
20
|
render(edge: Readonly<SEdge>, context: RenderingContext): VNode;
|
|
21
|
-
protected
|
|
21
|
+
protected additionalClasses(_edge: Readonly<SEdge>, _context: RenderingContext): Classes;
|
|
22
22
|
protected renderLine(_edge: SEdge, segments: Point[], _context: RenderingContext): VNode;
|
|
23
23
|
protected renderAdditionals(edge: SEdge, segments: Point[], _context: RenderingContext): VNode[];
|
|
24
24
|
protected renderMouseHandle(segments: Point[], padding: number): VNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-edge-view.d.ts","sourceRoot":"","sources":["../../src/views/glsp-edge-view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,EAAO,MAAM,SAAS,CAAC;AAMzE,qBACa,SAAU,SAAQ,gBAAgB;IAClC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAgBxE,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"glsp-edge-view.d.ts","sourceRoot":"","sources":["../../src/views/glsp-edge-view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,EAAO,MAAM,SAAS,CAAC;AAMzE,qBACa,SAAU,SAAQ,gBAAgB;IAClC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAgBxE,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO;cAIrE,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,KAAK;cAI9E,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,KAAK,EAAE;IAMzG,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;IAatE,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM;CAS7D"}
|
|
@@ -19,12 +19,12 @@ let GEdgeView = class GEdgeView extends sprotty_1.PolylineEdgeView {
|
|
|
19
19
|
if (route.length === 0) {
|
|
20
20
|
return this.renderDanglingEdge('Cannot compute route', edge, context);
|
|
21
21
|
}
|
|
22
|
-
return (JSX.createElement("g", Object.assign({ "class-sprotty-edge": true, "class-mouseover": edge.hoverFeedback }, this.
|
|
22
|
+
return (JSX.createElement("g", Object.assign({ "class-sprotty-edge": true, "class-mouseover": edge.hoverFeedback }, this.additionalClasses(edge, context)),
|
|
23
23
|
this.renderLine(edge, route, context),
|
|
24
24
|
this.renderAdditionals(edge, route, context),
|
|
25
25
|
context.renderChildren(edge, { route })));
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
additionalClasses(_edge, _context) {
|
|
28
28
|
return {};
|
|
29
29
|
}
|
|
30
30
|
renderLine(_edge, segments, _context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-edge-view.js","sourceRoot":"","sources":["../../src/views/glsp-edge-view.tsx"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AAEvC,qCAAyE;AACzE,4DAAsD;AAEtD,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,0BAAgB;IAClC,MAAM,CAAC,IAAqB,EAAE,OAAyB;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACzE;QAED,OAAO,CACH,6DAAuB,IAAI,qBAAmB,IAAI,CAAC,aAAa,IAAM,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"glsp-edge-view.js","sourceRoot":"","sources":["../../src/views/glsp-edge-view.tsx"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AAEvC,qCAAyE;AACzE,4DAAsD;AAEtD,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,0BAAgB;IAClC,MAAM,CAAC,IAAqB,EAAE,OAAyB;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACzE;QAED,OAAO,CACH,6DAAuB,IAAI,qBAAmB,IAAI,CAAC,aAAa,IAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC;YACtG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;YACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;YAC5C,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CACxC,CACP,CAAC;IACN,CAAC;IAES,iBAAiB,CAAC,KAAsB,EAAE,QAA0B;QAC1E,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,UAAU,CAAC,KAAY,EAAE,QAAiB,EAAE,QAA0B;QACrF,OAAO,4BAAM,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAI,CAAC;IAC7D,CAAC;IAEkB,iBAAiB,CAAC,IAAW,EAAE,QAAiB,EAAE,QAA0B;QAC3F,mFAAmF;QACnF,MAAM,WAAW,GAAG,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,CAAC;IAES,iBAAiB,CAAC,QAAiB,EAAE,OAAe;QAC1D,OAAO,CACH,wDAEI,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,wBACnB,OAAO,GAAG,CAAC,kBAClB,aAAa,4BACH,MAAM,6BACL,GAAG,GAC7B,CACL,CAAC;IACN,CAAC;IAES,qBAAqB,CAAC,QAAiB;QAC7C,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,IAAI,GAAG,KAAK,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC;QAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AArDY,SAAS;IADrB,IAAA,sBAAU,GAAE;GACA,SAAS,CAqDrB;AArDY,8BAAS"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2017-
|
|
2
|
+
* Copyright (c) 2017-2022 TypeFox and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/********************************************************************************
|
|
3
|
-
* Copyright (c) 2017-
|
|
3
|
+
* Copyright (c) 2017-2022 TypeFox and others.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made available under the
|
|
6
6
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
package/lib/views/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2019-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
package/lib/views/index.js
CHANGED
|
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
/********************************************************************************
|
|
18
|
-
* Copyright (c)
|
|
18
|
+
* Copyright (c) 2019-2023 EclipseSource and others.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made available under the
|
|
21
21
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.toClipPathId = exports.RoundedCornerNodeView = void 0;
|
|
10
10
|
/********************************************************************************
|
|
11
|
-
* Copyright (c) 2021-
|
|
11
|
+
* Copyright (c) 2021-2023 EclipseSource and others.
|
|
12
12
|
*
|
|
13
13
|
* This program and the accompanying materials are made available under the
|
|
14
14
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -55,7 +55,7 @@ let RoundedCornerNodeView = class RoundedCornerNodeView extends sprotty_1.Rectan
|
|
|
55
55
|
return {};
|
|
56
56
|
}
|
|
57
57
|
renderPath(wrapper, _context, inset) {
|
|
58
|
-
//
|
|
58
|
+
// Calculate length of straight line segments
|
|
59
59
|
const topLineLength = Math.max(0, wrapper.size.width - wrapper.cornerRadius.topLeft - wrapper.cornerRadius.topRight);
|
|
60
60
|
const rightLineLength = Math.max(0, wrapper.size.height - wrapper.cornerRadius.topRight - wrapper.cornerRadius.bottomRight);
|
|
61
61
|
const bottomLineLength = Math.max(0, wrapper.size.width - wrapper.cornerRadius.bottomLeft - wrapper.cornerRadius.bottomRight);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2021 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2021-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -48,7 +48,7 @@ class RoundedCornerWrapper {
|
|
|
48
48
|
}
|
|
49
49
|
exports.RoundedCornerWrapper = RoundedCornerWrapper;
|
|
50
50
|
/*
|
|
51
|
-
* Scales the radius if necessary. (
|
|
51
|
+
* Scales the radius if necessary. (Percentile down scaling if the radius is bigger then the maximal allowed length)
|
|
52
52
|
*/
|
|
53
53
|
function scaledRadius(radius, maximalLength) {
|
|
54
54
|
if (radius <= maximalLength) {
|
package/package.json
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "1.1.0-next.
|
|
3
|
+
"version": "1.1.0-next.35bf56e.230+35bf56e",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
|
-
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
6
5
|
"keywords": [
|
|
7
6
|
"eclipse",
|
|
8
7
|
"graphics",
|
|
@@ -12,15 +11,16 @@
|
|
|
12
11
|
"glsp",
|
|
13
12
|
"diagram editor"
|
|
14
13
|
],
|
|
15
|
-
"author": {
|
|
16
|
-
"name": "Eclipse GLSP"
|
|
17
|
-
},
|
|
18
14
|
"homepage": "https://www.eclipse.org/glsp/",
|
|
15
|
+
"bugs": "https://github.com/eclipse-glsp/glsp/issues",
|
|
19
16
|
"repository": {
|
|
20
17
|
"type": "git",
|
|
21
18
|
"url": "https://github.com/eclipse-glsp/glsp-client.git"
|
|
22
19
|
},
|
|
23
|
-
"
|
|
20
|
+
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
21
|
+
"author": {
|
|
22
|
+
"name": "Eclipse GLSP"
|
|
23
|
+
},
|
|
24
24
|
"contributors": [
|
|
25
25
|
{
|
|
26
26
|
"name": "Eclipse GLSP Project",
|
|
@@ -28,19 +28,13 @@
|
|
|
28
28
|
"url": "https://projects.eclipse.org/projects/ecd.glsp"
|
|
29
29
|
}
|
|
30
30
|
],
|
|
31
|
+
"main": "lib/index",
|
|
32
|
+
"types": "lib/index",
|
|
31
33
|
"files": [
|
|
32
34
|
"lib",
|
|
33
35
|
"src",
|
|
34
36
|
"css"
|
|
35
37
|
],
|
|
36
|
-
"dependencies": {
|
|
37
|
-
"@eclipse-glsp/protocol": "1.1.0-next.335bc3d.213+335bc3d",
|
|
38
|
-
"autocompleter": "5.1.0",
|
|
39
|
-
"sprotty": "0.13.0-next.f4445dd.342"
|
|
40
|
-
},
|
|
41
|
-
"devDependencies": {
|
|
42
|
-
"@vscode/codicons": "^0.0.25"
|
|
43
|
-
},
|
|
44
38
|
"scripts": {
|
|
45
39
|
"build": "tsc -b",
|
|
46
40
|
"clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
|
|
@@ -52,10 +46,16 @@
|
|
|
52
46
|
"test:coverage": "nyc yarn test",
|
|
53
47
|
"watch": "tsc -w"
|
|
54
48
|
},
|
|
49
|
+
"dependencies": {
|
|
50
|
+
"@eclipse-glsp/protocol": "1.1.0-next.35bf56e.230+35bf56e",
|
|
51
|
+
"autocompleter": "5.1.0",
|
|
52
|
+
"sprotty": "0.13.0-next.f4445dd.342"
|
|
53
|
+
},
|
|
54
|
+
"devDependencies": {
|
|
55
|
+
"@vscode/codicons": "^0.0.25"
|
|
56
|
+
},
|
|
55
57
|
"publishConfig": {
|
|
56
58
|
"access": "public"
|
|
57
59
|
},
|
|
58
|
-
"
|
|
59
|
-
"types": "lib/index",
|
|
60
|
-
"gitHead": "335bc3d3d05b52c60734dd3b3fb4a07482df6b72"
|
|
60
|
+
"gitHead": "35bf56eed58ac95ea597e8f4eb4e5530746bb8b8"
|
|
61
61
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020-
|
|
2
|
+
* Copyright (c) 2020-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -223,7 +223,7 @@ export class AutoCompleteWidget {
|
|
|
223
223
|
|
|
224
224
|
protected renderSuggestions(item: LabeledAction, value: string): HTMLDivElement {
|
|
225
225
|
const itemElement = document.createElement('div');
|
|
226
|
-
const wordMatcher = this.
|
|
226
|
+
const wordMatcher = this.escapeForRegExp(value).split(' ').join('|');
|
|
227
227
|
const regex = new RegExp(wordMatcher, 'gi');
|
|
228
228
|
if (item.icon) {
|
|
229
229
|
this.renderIcon(itemElement, item.icon);
|
|
@@ -232,7 +232,7 @@ export class AutoCompleteWidget {
|
|
|
232
232
|
return itemElement;
|
|
233
233
|
}
|
|
234
234
|
|
|
235
|
-
protected
|
|
235
|
+
protected escapeForRegExp(value: string): string {
|
|
236
236
|
return value.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
|
|
237
237
|
}
|
|
238
238
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,22 +13,24 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import { CommandStack, IActionDispatcher, SModelRoot } from 'sprotty';
|
|
19
|
-
import { TYPES } from './types';
|
|
16
|
+
import { injectable } from 'inversify';
|
|
17
|
+
import { CommandStack, SModelRoot } from 'sprotty';
|
|
20
18
|
|
|
21
19
|
@injectable()
|
|
22
20
|
export class GLSPCommandStack extends CommandStack {
|
|
23
|
-
@inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
|
|
24
|
-
|
|
25
21
|
override undo(): Promise<SModelRoot> {
|
|
26
|
-
this.
|
|
27
|
-
|
|
22
|
+
this.logger.warn(
|
|
23
|
+
this,
|
|
24
|
+
'GLSPCommandStack.undo() was called. This should never happen as the GLSP server is responsible for handling undo requests'
|
|
25
|
+
);
|
|
26
|
+
return this.currentModel;
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
override redo(): Promise<SModelRoot> {
|
|
31
|
-
this.
|
|
32
|
-
|
|
30
|
+
this.logger.warn(
|
|
31
|
+
this,
|
|
32
|
+
'GLSPCommandStack.redo() was called. This should never happen as the GLSP server is responsible for handling redo requests'
|
|
33
|
+
);
|
|
34
|
+
return this.currentModel;
|
|
33
35
|
}
|
|
34
36
|
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
import { remove } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { asArray, distinctAdd, MaybeArray, remove } from '@eclipse-glsp/protocol';
|
|
18
18
|
import { Container, ContainerModule } from 'inversify';
|
|
19
19
|
import {
|
|
20
20
|
buttonModule,
|
|
@@ -40,7 +40,7 @@ import modelHintsModule from '../features/hints/di.config';
|
|
|
40
40
|
import glspHoverModule from '../features/hover/di.config';
|
|
41
41
|
import layoutModule from '../features/layout/di.config';
|
|
42
42
|
import glspMouseToolModule from '../features/mouse-tool/di.config';
|
|
43
|
-
import
|
|
43
|
+
import navigationModule from '../features/navigation/di.config';
|
|
44
44
|
import glspSelectModule from '../features/select/di.config';
|
|
45
45
|
import sourceModelWatcherModule from '../features/source-model-watcher/di.config';
|
|
46
46
|
import toolFeedbackModule from '../features/tool-feedback/di.config';
|
|
@@ -88,14 +88,19 @@ export const DEFAULT_MODULES = [
|
|
|
88
88
|
|
|
89
89
|
/**
|
|
90
90
|
* Creates a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
|
|
91
|
-
*
|
|
92
|
-
*
|
|
91
|
+
* Additional modules can be passed as direct arguments or as part of a {@link ModuleConfiguration}.
|
|
92
|
+
* ```typescript
|
|
93
|
+
* const container= createDiagramContainer(myModule1, myModule2)
|
|
94
|
+
* // or
|
|
95
|
+
* const container= createDiagramContainer({ add: [myModule1, myModule2]})
|
|
96
|
+
* ```
|
|
97
|
+
* Default modules can be excluded using {@link ModuleConfiguration}s.
|
|
93
98
|
* This means, you can still customize the default modules in two ways.
|
|
94
99
|
*
|
|
95
100
|
* First, you can exclude default modules and add a module with your custom code.
|
|
96
101
|
*
|
|
97
102
|
* ```typescript
|
|
98
|
-
* const container = createDiagramContainer(
|
|
103
|
+
* const container = createDiagramContainer({ add:myModelSourceWatcherModule, remove: modelSourceWatcherModule} );
|
|
99
104
|
* ```
|
|
100
105
|
*
|
|
101
106
|
* Second, you can unbind or rebind implementations that are originally bound in one of the default modules.
|
|
@@ -108,7 +113,7 @@ export const DEFAULT_MODULES = [
|
|
|
108
113
|
* @param options Options to customize the module loading
|
|
109
114
|
* @returns The created container.
|
|
110
115
|
*/
|
|
111
|
-
export function createDiagramContainer(...customModules: Array<ContainerModule |
|
|
116
|
+
export function createDiagramContainer(...customModules: Array<ContainerModule | ModuleConfiguration>): Container {
|
|
112
117
|
const container = new Container();
|
|
113
118
|
|
|
114
119
|
const modules = [...DEFAULT_MODULES];
|
|
@@ -116,7 +121,12 @@ export function createDiagramContainer(...customModules: Array<ContainerModule |
|
|
|
116
121
|
if (customModule instanceof ContainerModule) {
|
|
117
122
|
modules.push(customModule);
|
|
118
123
|
} else {
|
|
119
|
-
|
|
124
|
+
if (customModule.remove) {
|
|
125
|
+
remove(modules, ...asArray(customModule.remove));
|
|
126
|
+
}
|
|
127
|
+
if (customModule.add) {
|
|
128
|
+
distinctAdd(modules, ...asArray(customModule.add));
|
|
129
|
+
}
|
|
120
130
|
}
|
|
121
131
|
});
|
|
122
132
|
container.load(...modules);
|
|
@@ -124,10 +134,12 @@ export function createDiagramContainer(...customModules: Array<ContainerModule |
|
|
|
124
134
|
}
|
|
125
135
|
|
|
126
136
|
/**
|
|
127
|
-
* Can be passed to the {@link createDiagramContainer} utility function to
|
|
137
|
+
* Can be passed to the {@link createDiagramContainer} utility function to configure additional modules or
|
|
138
|
+
* remove (i.e. not load) default modules.
|
|
128
139
|
*/
|
|
129
|
-
export interface
|
|
130
|
-
|
|
140
|
+
export interface ModuleConfiguration {
|
|
141
|
+
add?: MaybeArray<ContainerModule>;
|
|
142
|
+
remove?: MaybeArray<ContainerModule>;
|
|
131
143
|
}
|
|
132
144
|
|
|
133
145
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020-
|
|
2
|
+
* Copyright (c) 2020-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -21,7 +21,7 @@ import { isSourceUriAware } from './source-uri-aware';
|
|
|
21
21
|
import { TYPES } from './types';
|
|
22
22
|
|
|
23
23
|
export interface EditModeListener {
|
|
24
|
-
editModeChanged(newValue: string,
|
|
24
|
+
editModeChanged(newValue: string, oldValue: string): void;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
/**
|
|
@@ -81,11 +81,11 @@ export class EditorContextService implements IActionHandler {
|
|
|
81
81
|
if (SetEditModeAction.is(action)) {
|
|
82
82
|
const oldValue = this._editMode;
|
|
83
83
|
this._editMode = action.editMode;
|
|
84
|
-
this.
|
|
84
|
+
this.notifyEditModeListeners(oldValue);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
protected
|
|
88
|
+
protected notifyEditModeListeners(oldValue: string): void {
|
|
89
89
|
this.editModeListeners.forEach(listener => listener.editModeChanged(oldValue, this.editMode));
|
|
90
90
|
}
|
|
91
91
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2020-2022 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020-
|
|
2
|
+
* Copyright (c) 2020-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,19 +13,14 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { distinctAdd, EditMode } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { AnyObject, distinctAdd, EditMode, hasBooleanProp, hasFunctionProp, hasStringProp } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
|
|
18
18
|
import { Tool, ToolManager } from 'sprotty';
|
|
19
19
|
import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
|
|
20
20
|
import { TYPES } from '../types';
|
|
21
21
|
|
|
22
|
-
export interface IGLSPToolManager extends ToolManager {
|
|
23
|
-
/* Disables all actives tools and activates only default tool with non-edit function*/
|
|
24
|
-
disableEditTools(): void;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
22
|
@injectable()
|
|
28
|
-
export class GLSPToolManager extends ToolManager implements
|
|
23
|
+
export class GLSPToolManager extends ToolManager implements EditModeListener {
|
|
29
24
|
protected editorContext?: EditorContextService;
|
|
30
25
|
|
|
31
26
|
@multiInject(TYPES.ITool) @optional() override tools: Tool[];
|
|
@@ -59,7 +54,7 @@ export class GLSPToolManager extends ToolManager implements IGLSPToolManager, Ed
|
|
|
59
54
|
this.disableActiveTools();
|
|
60
55
|
let tools = toolIds.map(id => this.tool(id));
|
|
61
56
|
if (this.editorContext && this.editorContext.isReadonly) {
|
|
62
|
-
tools = tools.filter(tool => tool && (!
|
|
57
|
+
tools = tools.filter(tool => tool && (!GLSPTool.is(tool) || tool.isEditTool === false));
|
|
63
58
|
}
|
|
64
59
|
tools.forEach(tool => {
|
|
65
60
|
if (tool !== undefined) {
|
|
@@ -71,7 +66,7 @@ export class GLSPToolManager extends ToolManager implements IGLSPToolManager, Ed
|
|
|
71
66
|
|
|
72
67
|
disableEditTools(): void {
|
|
73
68
|
this.disableActiveTools();
|
|
74
|
-
this.enable(this.defaultTools.filter(tool => !
|
|
69
|
+
this.enable(this.defaultTools.filter(tool => !GLSPTool.is(tool) || tool.isEditTool === false).map(tool => tool.id));
|
|
75
70
|
}
|
|
76
71
|
|
|
77
72
|
editModeChanged(oldValue: string, newValue: string): void {
|
|
@@ -90,6 +85,14 @@ export interface GLSPTool extends Tool {
|
|
|
90
85
|
isEditTool: boolean;
|
|
91
86
|
}
|
|
92
87
|
|
|
93
|
-
export
|
|
94
|
-
|
|
88
|
+
export namespace GLSPTool {
|
|
89
|
+
export function is(object: unknown): object is GLSPTool {
|
|
90
|
+
return (
|
|
91
|
+
AnyObject.is(object) &&
|
|
92
|
+
hasStringProp(object, 'id') &&
|
|
93
|
+
hasFunctionProp(object, 'enable') &&
|
|
94
|
+
hasFunctionProp(object, 'disable') &&
|
|
95
|
+
hasBooleanProp(object, 'isEditTool')
|
|
96
|
+
);
|
|
97
|
+
}
|
|
95
98
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2022-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -15,12 +15,21 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { ContainerModule } from 'inversify';
|
|
17
17
|
import {
|
|
18
|
-
configureCommand,
|
|
19
|
-
|
|
18
|
+
configureCommand,
|
|
19
|
+
configureLayout,
|
|
20
|
+
HBoxLayouter,
|
|
21
|
+
HiddenBoundsUpdater,
|
|
22
|
+
Layouter,
|
|
23
|
+
LayoutRegistry,
|
|
24
|
+
RequestBoundsCommand,
|
|
25
|
+
SetBoundsCommand,
|
|
26
|
+
VBoxLayouter
|
|
20
27
|
} from 'sprotty';
|
|
21
|
-
import '../../../css/command-palette.css';
|
|
22
28
|
import { TYPES } from '../../base/types';
|
|
29
|
+
import { FreeFormLayouter } from './freeform-layout';
|
|
23
30
|
import { GLSPHiddenBoundsUpdater } from './glsp-hidden-bounds-updater';
|
|
31
|
+
import { HBoxLayouterExt } from './hbox-layout';
|
|
32
|
+
import { VBoxLayouterExt } from './vbox-layout';
|
|
24
33
|
|
|
25
34
|
const glspBoundsModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
|
|
26
35
|
configureCommand({ bind, isBound }, SetBoundsCommand);
|
|
@@ -31,9 +40,9 @@ const glspBoundsModule = new ContainerModule((bind, _unbind, isBound, _rebind) =
|
|
|
31
40
|
bind(TYPES.Layouter).to(Layouter).inSingletonScope();
|
|
32
41
|
bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
|
|
33
42
|
|
|
34
|
-
configureLayout({ bind, isBound }, VBoxLayouter.KIND,
|
|
35
|
-
configureLayout({ bind, isBound }, HBoxLayouter.KIND,
|
|
36
|
-
configureLayout({ bind, isBound },
|
|
43
|
+
configureLayout({ bind, isBound }, VBoxLayouter.KIND, VBoxLayouterExt);
|
|
44
|
+
configureLayout({ bind, isBound }, HBoxLayouter.KIND, HBoxLayouterExt);
|
|
45
|
+
configureLayout({ bind, isBound }, FreeFormLayouter.KIND, FreeFormLayouter);
|
|
37
46
|
});
|
|
38
47
|
|
|
39
48
|
export default glspBoundsModule;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
2
|
+
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -17,7 +17,7 @@ import { expect } from 'chai';
|
|
|
17
17
|
import 'mocha';
|
|
18
18
|
import 'reflect-metadata';
|
|
19
19
|
import { BoundsData, ConsoleLogger, SModelElement } from 'sprotty';
|
|
20
|
-
import { gModel, layout, sComp, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
|
|
20
|
+
import { gModel, layout, sComp, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
|
|
21
21
|
|
|
22
22
|
describe('FreeFormLayouter', () => {
|
|
23
23
|
const layoutRegistry = setupLayoutRegistry();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2021-
|
|
2
|
+
* Copyright (c) 2021-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -20,7 +20,7 @@ import { AbstractLayout } from 'sprotty/lib/features/bounds/abstract-layout';
|
|
|
20
20
|
import { AbstractLayoutOptions } from 'sprotty/lib/features/bounds/layout-options';
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
|
-
* Layouts children of a container with
|
|
23
|
+
* Layouts children of a container with explicit X/Y positions
|
|
24
24
|
*/
|
|
25
25
|
@injectable()
|
|
26
26
|
export class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2022-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -14,10 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
Action, ComputedBoundsAction, Deferred, ElementAndRoutingPoints, RequestAction,
|
|
19
|
-
ResponseAction
|
|
20
|
-
} from '@eclipse-glsp/protocol';
|
|
17
|
+
import { Action, ComputedBoundsAction, Deferred, ElementAndRoutingPoints, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
|
|
21
18
|
import { inject, injectable, optional } from 'inversify';
|
|
22
19
|
import { VNode } from 'snabbdom';
|
|
23
20
|
import { EdgeRouterRegistry, HiddenBoundsUpdater, IActionDispatcher, SModelElement, SRoutableElement } from 'sprotty';
|
|
@@ -30,7 +27,6 @@ import { calcElementAndRoute, isRoutable } from '../../utils/smodel-util';
|
|
|
30
27
|
*/
|
|
31
28
|
@injectable()
|
|
32
29
|
export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
33
|
-
|
|
34
30
|
@inject(EdgeRouterRegistry) @optional() protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
35
31
|
|
|
36
32
|
protected element2route: ElementAndRoutingPoints[] = [];
|
|
@@ -47,7 +43,8 @@ export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
|
47
43
|
|
|
48
44
|
override postUpdate(cause?: Action): void {
|
|
49
45
|
const actions = this.captureActions(() => super.postUpdate(cause));
|
|
50
|
-
actions
|
|
46
|
+
actions
|
|
47
|
+
.filter(action => ComputedBoundsAction.is(action))
|
|
51
48
|
.forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action as ComputedBoundsAction)));
|
|
52
49
|
this.element2route = [];
|
|
53
50
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 TypeFox, STMicroelectronics and others.
|
|
2
|
+
* Copyright (c) 2022-2023 TypeFox, STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -19,7 +19,7 @@ import { expect } from 'chai';
|
|
|
19
19
|
import 'mocha';
|
|
20
20
|
import 'reflect-metadata';
|
|
21
21
|
import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
|
|
22
|
-
import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
|
|
22
|
+
import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
|
|
23
23
|
|
|
24
24
|
describe('HBoxLayouter', () => {
|
|
25
25
|
const layoutRegistry = setupLayoutRegistry();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2021-
|
|
2
|
+
* Copyright (c) 2021-2023 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|