@eclipse-glsp/client 2.2.0-next.332 → 2.2.0-next.333

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.
Files changed (10) hide show
  1. package/lib/base/model/diagram-loader.d.ts.map +1 -1
  2. package/lib/base/model/diagram-loader.js +6 -1
  3. package/lib/base/model/diagram-loader.js.map +1 -1
  4. package/lib/features/viewport/viewport-handler.d.ts +6 -4
  5. package/lib/features/viewport/viewport-handler.d.ts.map +1 -1
  6. package/lib/features/viewport/viewport-handler.js +13 -8
  7. package/lib/features/viewport/viewport-handler.js.map +1 -1
  8. package/package.json +3 -3
  9. package/src/base/model/diagram-loader.ts +5 -1
  10. package/src/features/viewport/viewport-handler.ts +13 -7
package/lib/base/model/diagram-loader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAGH,IAAI,EAEJ,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,YAAY,EAMf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,kBAAkB,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9C;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,OAAO,CAAC,MAAM,CAAC;IACpD;;;OAGG;IACH,cAAc,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC;;OAEG;IACH,aAAa,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC;;;OAGG;IACH,eAAe,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACvC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAIxC,uBAAuB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,eAAe,CAU7D;CACJ;AAED,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,IAAI,CAAC;IAE3B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAErD;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC1C,mBAAmB,EAAE,IAAI,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,mBAAmB,EAAE,OAAO,CAAC;CAChC;AAED;;;;;GAKG;AACH,qBACa,aAAa;IAEtB,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;IAGnC,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAGjD,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,6BAA6B,EAAE,6BAA6B,CAAC;IAGvE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC,IAAI,eAAe,IAAI,eAAe,EAAE,CAEvC;IAEK,IAAI,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;cA0B9C,iBAAiB,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cAM3E,YAAY,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cAOnE,UAAU,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBpF"}
1
+ {"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAGH,IAAI,EAEJ,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,YAAY,EAMf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,kBAAkB,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9C;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,OAAO,CAAC,MAAM,CAAC;IACpD;;;OAGG;IACH,cAAc,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC;;OAEG;IACH,aAAa,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC;;;OAGG;IACH,eAAe,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACvC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAIxC,uBAAuB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,eAAe,CAU7D;CACJ;AAED,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,IAAI,CAAC;IAE3B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAErD;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC1C,mBAAmB,EAAE,IAAI,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,mBAAmB,EAAE,OAAO,CAAC;CAChC;AAED;;;;;GAKG;AACH,qBACa,aAAa;IAEtB,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;IAGnC,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAGjD,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,6BAA6B,EAAE,6BAA6B,CAAC;IAGvE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC,IAAI,eAAe,IAAI,eAAe,EAAE,CAEvC;IAEK,IAAI,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;cA0B9C,iBAAiB,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cAU3E,YAAY,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cAOnE,UAAU,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBpF"}
package/lib/base/model/diagram-loader.js CHANGED
@@ -75,7 +75,12 @@ let DiagramLoader = class DiagramLoader {
75
75
  async invokeStartupHook(hook) {
76
76
  var _a;
77
77
  for (const startup of this.diagramStartups) {
78
- await ((_a = startup[hook]) === null || _a === void 0 ? void 0 : _a.call(startup));
78
+ try {
79
+ await ((_a = startup[hook]) === null || _a === void 0 ? void 0 : _a.call(startup));
80
+ }
81
+ catch (err) {
82
+ console.error(`Error invoking diagram startup hook '${hook}':`, '\n', err);
83
+ }
79
84
  }
80
85
  }
81
86
  async requestModel(options) {
package/lib/base/model/diagram-loader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"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"}
package/lib/features/viewport/viewport-handler.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
2
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,17 +13,19 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Action, IActionHandler, ViewerOptions } from '@eclipse-glsp/sprotty';
16
+ import { Action, DOMHelper, IActionHandler } from '@eclipse-glsp/sprotty';
17
+ import { EditorContextService } from '../../base';
17
18
  import { FocusTracker } from '../../base/focus/focus-tracker';
18
19
  import { IDiagramStartup } from '../../base/model/diagram-loader';
19
20
  /**
20
21
  * Focuses the graph on different actions.
21
22
  */
22
23
  export declare class RestoreViewportHandler implements IActionHandler, IDiagramStartup {
23
- protected readonly graphSelector = "[data-svg-metadata-type=\"graph\"]";
24
- protected options: ViewerOptions;
24
+ protected domHelper: DOMHelper;
25
25
  protected focusTracker: FocusTracker;
26
+ protected editorContext: EditorContextService;
26
27
  handle(action: Action): void | Action;
28
+ get graphSelector(): string;
27
29
  postRequestModel(): Promise<void>;
28
30
  protected focusGraph(): void;
29
31
  protected waitForElement(selector: string): Promise<Element | null>;
package/lib/features/viewport/viewport-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"viewport-handler.d.ts","sourceRoot":"","sources":["../../../src/features/viewport/viewport-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,cAAc,EAAS,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAErF,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE;;GAEG;AACH,qBACa,sBAAuB,YAAW,cAAc,EAAE,eAAe;IAC1E,SAAS,CAAC,QAAQ,CAAC,aAAa,wCAAsC;IAGtE,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM;IAM/B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC,SAAS,CAAC,UAAU,IAAI,IAAI;IAQ5B,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;CAmBtE"}
1
+ {"version":3,"file":"viewport-handler.d.ts","sourceRoot":"","sources":["../../../src/features/viewport/viewport-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAS,MAAM,uBAAuB,CAAC;AAEjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE;;GAEG;AACH,qBACa,sBAAuB,YAAW,cAAc,EAAE,eAAe;IAE1E,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAG/B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE9C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM;IAMrC,IAAI,aAAa,IAAI,MAAM,CAG1B;IAEK,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC,SAAS,CAAC,UAAU,IAAI,IAAI;IAO5B,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;CAmBtE"}
package/lib/features/viewport/viewport-handler.js CHANGED
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.RestoreViewportHandler = void 0;
13
13
  /********************************************************************************
14
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
14
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
15
15
  *
16
16
  * This program and the accompanying materials are made available under the
17
17
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@ exports.RestoreViewportHandler = void 0;
27
27
  ********************************************************************************/
28
28
  const sprotty_1 = require("@eclipse-glsp/sprotty");
29
29
  const inversify_1 = require("inversify");
30
+ const base_1 = require("../../base");
30
31
  const focus_tracker_1 = require("../../base/focus/focus-tracker");
31
32
  const tool_1 = require("../../base/tool-manager/tool");
32
33
  const actions_1 = require("../accessibility/actions");
@@ -34,14 +35,15 @@ const actions_1 = require("../accessibility/actions");
34
35
  * Focuses the graph on different actions.
35
36
  */
36
37
  let RestoreViewportHandler = class RestoreViewportHandler {
37
- constructor() {
38
- this.graphSelector = '[data-svg-metadata-type="graph"]';
39
- }
40
38
  handle(action) {
41
39
  if (tool_1.EnableDefaultToolsAction.is(action) || (actions_1.FocusDomAction.is(action) && action.id === 'graph')) {
42
40
  this.focusGraph();
43
41
  }
44
42
  }
43
+ get graphSelector() {
44
+ const rootId = this.domHelper.createUniqueDOMElementId(this.editorContext.modelRoot);
45
+ return `#${rootId}`;
46
+ }
45
47
  async postRequestModel() {
46
48
  await this.waitForElement(this.graphSelector);
47
49
  this.focusGraph();
@@ -53,7 +55,6 @@ let RestoreViewportHandler = class RestoreViewportHandler {
53
55
  container === null || container === void 0 ? void 0 : container.focus();
54
56
  }
55
57
  }
56
- // https://stackoverflow.com/questions/5525071/how-to-wait-until-an-element-exists
57
58
  waitForElement(selector) {
58
59
  return new Promise(resolve => {
59
60
  if (document.querySelector(selector)) {
@@ -74,13 +75,17 @@ let RestoreViewportHandler = class RestoreViewportHandler {
74
75
  };
75
76
  exports.RestoreViewportHandler = RestoreViewportHandler;
76
77
  __decorate([
77
- (0, inversify_1.inject)(sprotty_1.TYPES.ViewerOptions),
78
- __metadata("design:type", Object)
79
- ], RestoreViewportHandler.prototype, "options", void 0);
78
+ (0, inversify_1.inject)(sprotty_1.TYPES.DOMHelper),
79
+ __metadata("design:type", sprotty_1.DOMHelper)
80
+ ], RestoreViewportHandler.prototype, "domHelper", void 0);
80
81
  __decorate([
81
82
  (0, inversify_1.inject)(focus_tracker_1.FocusTracker),
82
83
  __metadata("design:type", focus_tracker_1.FocusTracker)
83
84
  ], RestoreViewportHandler.prototype, "focusTracker", void 0);
85
+ __decorate([
86
+ (0, inversify_1.inject)(base_1.EditorContextService),
87
+ __metadata("design:type", base_1.EditorContextService)
88
+ ], RestoreViewportHandler.prototype, "editorContext", void 0);
84
89
  exports.RestoreViewportHandler = RestoreViewportHandler = __decorate([
85
90
  (0, inversify_1.injectable)()
86
91
  ], RestoreViewportHandler);
package/lib/features/viewport/viewport-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"viewport-handler.js","sourceRoot":"","sources":["../../../src/features/viewport/viewport-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAqF;AACrF,yCAA+C;AAC/C,kEAA8D;AAE9D,uDAAwE;AACxE,sDAA0D;AAE1D;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QACgB,kBAAa,GAAG,kCAAkC,CAAC;IA8C1E,CAAC;IAtCG,MAAM,CAAC,MAAc;QACjB,IAAI,+BAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;YAC9F,IAAI,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;;QAChB,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,YAAY,CAAC,cAAc,0CAAE,aAAa,CAAc,IAAI,CAAC,aAAa,CAAC,CAAC;YACnG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,EAAE,CAAC;QACvB,CAAC;IACL,CAAC;IAED,kFAAkF;IACxE,cAAc,CAAC,QAAgB;QACrC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,IAAI,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrD,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE;gBAC9C,IAAI,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACnC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9C,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC5B,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,IAAI;aAChB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA/CY,wDAAsB;AAIrB;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,aAAa,CAAC;;uDACK;AAGvB;IADT,IAAA,kBAAM,EAAC,4BAAY,CAAC;8BACG,4BAAY;4DAAC;iCAP5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA+ClC"}
1
+ {"version":3,"file":"viewport-handler.js","sourceRoot":"","sources":["../../../src/features/viewport/viewport-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAiF;AACjF,yCAA+C;AAC/C,qCAAkD;AAClD,kEAA8D;AAE9D,uDAAwE;AACxE,sDAA0D;AAE1D;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAU/B,MAAM,CAAC,MAAc;QACjB,IAAI,+BAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC;YAC9F,IAAI,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;IAED,IAAI,aAAa;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACrF,OAAO,IAAI,MAAM,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU;;QAChB,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,YAAY,CAAC,cAAc,0CAAE,aAAa,CAAc,IAAI,CAAC,aAAa,CAAC,CAAC;YACnG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,EAAE,CAAC;QACvB,CAAC;IACL,CAAC;IAES,cAAc,CAAC,QAAgB;QACrC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,IAAI,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrD,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE;gBAC9C,IAAI,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACnC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9C,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC5B,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,IAAI;aAChB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AApDY,wDAAsB;AAErB;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,SAAS,CAAC;8BACH,mBAAS;yDAAC;AAGrB;IADT,IAAA,kBAAM,EAAC,4BAAY,CAAC;8BACG,4BAAY;4DAAC;AAG3B;IADT,IAAA,kBAAM,EAAC,2BAAoB,CAAC;8BACJ,2BAAoB;6DAAC;iCARrC,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAoDlC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp/client",
3
- "version": "2.2.0-next.332+ca7c9ae",
3
+ "version": "2.2.0-next.333+50b1e85",
4
4
  "description": "A sprotty-based client for GLSP",
5
5
  "keywords": [
6
6
  "eclipse",
@@ -46,7 +46,7 @@
46
46
  "watch": "tsc -w"
47
47
  },
48
48
  "dependencies": {
49
- "@eclipse-glsp/sprotty": "2.2.0-next.332+ca7c9ae",
49
+ "@eclipse-glsp/sprotty": "2.2.0-next.333+50b1e85",
50
50
  "autocompleter": "^9.1.0",
51
51
  "file-saver": "^2.0.5",
52
52
  "lodash": "4.17.21"
@@ -61,5 +61,5 @@
61
61
  "publishConfig": {
62
62
  "access": "public"
63
63
  },
64
- "gitHead": "ca7c9aecfaa198b8ceed3bf488abfc3d3d552e07"
64
+ "gitHead": "50b1e85e8d2acf2fc73a2280dcb0151d617e0286"
65
65
  }
package/src/base/model/diagram-loader.ts CHANGED
@@ -192,7 +192,11 @@ export class DiagramLoader {
192
192
 
193
193
  protected async invokeStartupHook(hook: keyof Omit<IDiagramStartup, 'rank'>): Promise<void> {
194
194
  for (const startup of this.diagramStartups) {
195
- await startup[hook]?.();
195
+ try {
196
+ await startup[hook]?.();
197
+ } catch (err) {
198
+ console.error(`Error invoking diagram startup hook '${hook}':`, '\n', err);
199
+ }
196
200
  }
197
201
  }
198
202
 
package/src/features/viewport/viewport-handler.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
2
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,8 +13,9 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Action, IActionHandler, TYPES, ViewerOptions } from '@eclipse-glsp/sprotty';
16
+ import { Action, DOMHelper, IActionHandler, TYPES } from '@eclipse-glsp/sprotty';
17
17
  import { inject, injectable } from 'inversify';
18
+ import { EditorContextService } from '../../base';
18
19
  import { FocusTracker } from '../../base/focus/focus-tracker';
19
20
  import { IDiagramStartup } from '../../base/model/diagram-loader';
20
21
  import { EnableDefaultToolsAction } from '../../base/tool-manager/tool';
@@ -25,20 +26,26 @@ import { FocusDomAction } from '../accessibility/actions';
25
26
  */
26
27
  @injectable()
27
28
  export class RestoreViewportHandler implements IActionHandler, IDiagramStartup {
28
- protected readonly graphSelector = '[data-svg-metadata-type="graph"]';
29
-
30
- @inject(TYPES.ViewerOptions)
31
- protected options: ViewerOptions;
29
+ @inject(TYPES.DOMHelper)
30
+ protected domHelper: DOMHelper;
32
31
 
33
32
  @inject(FocusTracker)
34
33
  protected focusTracker: FocusTracker;
35
34
 
35
+ @inject(EditorContextService)
36
+ protected editorContext: EditorContextService;
37
+
36
38
  handle(action: Action): void | Action {
37
39
  if (EnableDefaultToolsAction.is(action) || (FocusDomAction.is(action) && action.id === 'graph')) {
38
40
  this.focusGraph();
39
41
  }
40
42
  }
41
43
 
44
+ get graphSelector(): string {
45
+ const rootId = this.domHelper.createUniqueDOMElementId(this.editorContext.modelRoot);
46
+ return `#${rootId}`;
47
+ }
48
+
42
49
  async postRequestModel(): Promise<void> {
43
50
  await this.waitForElement(this.graphSelector);
44
51
  this.focusGraph();
@@ -51,7 +58,6 @@ export class RestoreViewportHandler implements IActionHandler, IDiagramStartup {
51
58
  }
52
59
  }
53
60
 
54
- // https://stackoverflow.com/questions/5525071/how-to-wait-until-an-element-exists
55
61
  protected waitForElement(selector: string): Promise<Element | null> {
56
62
  return new Promise(resolve => {
57
63
  if (document.querySelector(selector)) {