@eclipse-glsp/client 2.3.0-next.317 → 2.3.0-next.318

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 (27) hide show
  1. package/css/ghost-element.css +3 -1
  2. package/css/glsp-sprotty.css +0 -5
  3. package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts +5 -3
  4. package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts.map +1 -1
  5. package/lib/features/bounds/glsp-hidden-bounds-updater.js +19 -2
  6. package/lib/features/bounds/glsp-hidden-bounds-updater.js.map +1 -1
  7. package/lib/features/bounds/local-bounds.d.ts +7 -3
  8. package/lib/features/bounds/local-bounds.d.ts.map +1 -1
  9. package/lib/features/bounds/local-bounds.js +8 -4
  10. package/lib/features/bounds/local-bounds.js.map +1 -1
  11. package/lib/features/bounds/set-bounds-feedback-command.d.ts.map +1 -1
  12. package/lib/features/bounds/set-bounds-feedback-command.js +2 -1
  13. package/lib/features/bounds/set-bounds-feedback-command.js.map +1 -1
  14. package/lib/features/element-template/add-template-element.d.ts.map +1 -1
  15. package/lib/features/element-template/add-template-element.js +5 -4
  16. package/lib/features/element-template/add-template-element.js.map +1 -1
  17. package/lib/tsconfig.tsbuildinfo +1 -1
  18. package/lib/utils/gmodel-util.d.ts +1 -0
  19. package/lib/utils/gmodel-util.d.ts.map +1 -1
  20. package/lib/utils/gmodel-util.js +14 -4
  21. package/lib/utils/gmodel-util.js.map +1 -1
  22. package/package.json +3 -3
  23. package/src/features/bounds/glsp-hidden-bounds-updater.ts +26 -4
  24. package/src/features/bounds/local-bounds.ts +23 -6
  25. package/src/features/bounds/set-bounds-feedback-command.ts +2 -1
  26. package/src/features/element-template/add-template-element.ts +5 -4
  27. package/src/utils/gmodel-util.ts +15 -4
@@ -21,5 +21,7 @@
21
21
  }
22
22
 
23
23
  .ghost-element.hidden {
24
- display: none;
24
+ width: 0;
25
+ height: 0;
26
+ visibility: hidden;
25
27
  }
@@ -73,11 +73,6 @@
73
73
  fill: #1d80d1;
74
74
  }
75
75
 
76
- .sprotty-hidden .sprotty-resize-handle {
77
- /** resize handles should not be considered as part of the elements bounds */
78
- display: none;
79
- }
80
-
81
76
  .sprotty-edge {
82
77
  fill: none;
83
78
  stroke-width: 1.5px;
@@ -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, ComputedBoundsAction, EdgeRouterRegistry, ElementAndRoutingPoints, GModelElement, GRoutableElement, HiddenBoundsUpdater } from '@eclipse-glsp/sprotty';
16
+ import { Action, BoundsData, ComputedBoundsAction, EdgeRouterRegistry, ElementAndRoutingPoints, GModelElement, HiddenBoundsUpdater, ModelIndexImpl } from '@eclipse-glsp/sprotty';
17
17
  import { VNode } from 'snabbdom';
18
+ import { BoundsAwareModelElement } from '../../utils/gmodel-util';
18
19
  /**
19
20
  * Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
20
21
  *
@@ -23,10 +24,11 @@ import { VNode } from 'snabbdom';
23
24
  export declare class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
24
25
  protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
25
26
  protected element2route: ElementAndRoutingPoints[];
26
- protected edges: GRoutableElement[];
27
- protected nodes: VNode[];
27
+ protected getElement2BoundsData(): Map<BoundsAwareModelElement, BoundsData>;
28
28
  decorate(vnode: VNode, element: GModelElement): VNode;
29
29
  postUpdate(cause?: Action): void;
30
+ protected focusOnElements(elementIDs: string[]): void;
31
+ protected expandElementId(id: string, index: ModelIndexImpl, elementIDs: string[]): string[];
30
32
  protected captureActions(call: () => void): Action[];
31
33
  protected enhanceAction(action: ComputedBoundsAction, cause?: Action): ComputedBoundsAction;
32
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,oBAAoB,EAEpB,kBAAkB,EAClB,uBAAuB,EACvB,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EAItB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAIjC;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAEnG,SAAS,CAAC,aAAa,EAAE,uBAAuB,EAAE,CAAM;IACxD,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;IACzC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAM;IAErB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAQrD,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAQzC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,MAAM,EAAE;IAYpD,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,oBAAoB;CAO9F"}
1
+ {"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,UAAU,EACV,oBAAoB,EAEpB,kBAAkB,EAClB,uBAAuB,EACvB,aAAa,EACb,mBAAmB,EAEnB,cAAc,EAGjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,uBAAuB,EAAqD,MAAM,yBAAyB,CAAC;AAGrH;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAEnG,SAAS,CAAC,aAAa,EAAE,uBAAuB,EAAE,CAAM;IAExD,SAAS,CAAC,qBAAqB,IAAI,GAAG,CAAC,uBAAuB,EAAE,UAAU,CAAC;IAIlE,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAQrD,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAWzC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IAYrD,SAAS,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAI5F,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,MAAM,EAAE;IAYpD,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,oBAAoB;CAO9F"}
@@ -38,8 +38,9 @@ let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.Hi
38
38
  constructor() {
39
39
  super(...arguments);
40
40
  this.element2route = [];
41
- this.edges = [];
42
- this.nodes = [];
41
+ }
42
+ getElement2BoundsData() {
43
+ return this['element2boundsData'];
43
44
  }
44
45
  decorate(vnode, element) {
45
46
  super.decorate(vnode, element);
@@ -49,12 +50,28 @@ let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.Hi
49
50
  return vnode;
50
51
  }
51
52
  postUpdate(cause) {
53
+ if (local_bounds_1.LocalRequestBoundsAction.is(cause) && cause.elementIDs) {
54
+ this.focusOnElements(cause.elementIDs);
55
+ }
52
56
  const actions = this.captureActions(() => super.postUpdate(cause));
53
57
  actions
54
58
  .filter(action => sprotty_1.ComputedBoundsAction.is(action))
55
59
  .forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action, cause)));
56
60
  this.element2route = [];
57
61
  }
62
+ focusOnElements(elementIDs) {
63
+ const data = this.getElement2BoundsData();
64
+ if (data.size > 0) {
65
+ // expand given IDs to their descendent element IDs as we need their bounding boxes as well
66
+ const index = [...data.keys()][0].index;
67
+ const relevantIds = new Set(elementIDs.flatMap(elementId => this.expandElementId(elementId, index, elementIDs)));
68
+ // ensure we only keep the bounds of the elements we are interested in
69
+ data.forEach((_bounds, element) => !relevantIds.has(element.id) && data.delete(element));
70
+ }
71
+ }
72
+ expandElementId(id, index, elementIDs) {
73
+ return (0, gmodel_util_1.getDescendantIds)(index.getById(id));
74
+ }
58
75
  captureActions(call) {
59
76
  const capturingActionDispatcher = new CapturingActionDispatcher();
60
77
  const actualActionDispatcher = this.actionDispatcher;
@@ -1 +1 @@
1
- {"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,mDAY+B;AAC/B,yCAAyD;AAEzD,yDAA0E;AAC1E,iDAAqF;AAErF;;;;GAIG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAmB;IAAzD;;QAGO,kBAAa,GAA8B,EAAE,CAAC;QAC9C,UAAK,GAAuB,EAAE,CAAC;QAC/B,UAAK,GAAY,EAAE,CAAC;IAqClC,CAAC;IAnCY,QAAQ,CAAC,KAAY,EAAE,OAAsB;QAClD,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,IAAA,wBAAU,EAAC,OAAO,CAAC,EAAE;YACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,iCAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAc;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,OAAO;aACF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,8BAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aACjD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,MAA8B,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAES,cAAc,CAAC,IAAgB;QACrC,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAClE,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,yBAAyB,CAAC;QAClD,IAAI;YACA,IAAI,EAAE,CAAC;YACP,OAAO,yBAAyB,CAAC,OAAO,CAAC;SAC5C;gBAAS;YACN,IAAI,CAAC,gBAAgB,GAAG,sBAAsB,CAAC;SAClD;IACL,CAAC;IAES,aAAa,CAAC,MAA4B,EAAE,KAAc;QAChE,IAAI,uCAAwB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;YACpC,wCAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1C;QACD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;QACjF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA1CY,0DAAuB;AAC2B;IAA1D,IAAA,kBAAM,EAAC,4BAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyC,4BAAkB;mEAAC;kCAD1F,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA0CnC;AAED,MAAM,yBAAyB;IAA/B;QACa,YAAO,GAAa,EAAE,CAAC;IAcpC,CAAC;IAZG,KAAK,CAAC,QAAQ,CAAC,MAAc;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAA6B,MAA0B;QAChE,sCAAsC;QACtC,OAAO,IAAI,kBAAQ,EAAO,CAAC,OAAO,CAAC;IACvC,CAAC;CACJ"}
1
+ {"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,mDAa+B;AAC/B,yCAAyD;AAEzD,yDAAqH;AACrH,iDAAqF;AAErF;;;;GAIG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAmB;IAAzD;;QAGO,kBAAa,GAA8B,EAAE,CAAC;IA4D5D,CAAC;IA1Da,qBAAqB;QAC3B,OAAO,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IAEQ,QAAQ,CAAC,KAAY,EAAE,OAAsB;QAClD,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,IAAA,wBAAU,EAAC,OAAO,CAAC,EAAE;YACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,iCAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAc;QAC9B,IAAI,uCAAwB,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,EAAE;YACxD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;SAC1C;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,OAAO;aACF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,8BAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aACjD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,MAA8B,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAES,eAAe,CAAC,UAAoB;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE;YACf,2FAA2F;YAC3F,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACxC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YAEjH,sEAAsE;YACtE,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;SAC5F;IACL,CAAC;IAES,eAAe,CAAC,EAAU,EAAE,KAAqB,EAAE,UAAoB;QAC7E,OAAO,IAAA,8BAAgB,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAES,cAAc,CAAC,IAAgB;QACrC,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAClE,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,yBAAyB,CAAC;QAClD,IAAI;YACA,IAAI,EAAE,CAAC;YACP,OAAO,yBAAyB,CAAC,OAAO,CAAC;SAC5C;gBAAS;YACN,IAAI,CAAC,gBAAgB,GAAG,sBAAsB,CAAC;SAClD;IACL,CAAC;IAES,aAAa,CAAC,MAA4B,EAAE,KAAc;QAChE,IAAI,uCAAwB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;YACpC,wCAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1C;QACD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;QACjF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA/DY,0DAAuB;AAC2B;IAA1D,IAAA,kBAAM,EAAC,4BAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyC,4BAAkB;mEAAC;kCAD1F,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA+DnC;AAED,MAAM,yBAAyB;IAA/B;QACa,YAAO,GAAa,EAAE,CAAC;IAcpC,CAAC;IAZG,KAAK,CAAC,QAAQ,CAAC,MAAc;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAA6B,MAA0B;QAChE,sCAAsC;QACtC,OAAO,IAAI,kBAAQ,EAAO,CAAC,OAAO,CAAC;IACvC,CAAC;CACJ"}
@@ -13,10 +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 { Action, ActionDispatcher, Command, CommandExecutionContext, CommandResult, CommandReturn, ComputedBoundsAction, ComputedBoundsApplicator, GModelRoot, RequestBoundsAction, ViewerOptions } from '@eclipse-glsp/sprotty';
16
+ import { Action, ActionDispatcher, Command, CommandExecutionContext, CommandResult, CommandReturn, ComputedBoundsAction, ComputedBoundsApplicator, GModelRoot, GModelRootSchema, RequestBoundsAction, ViewerOptions } from '@eclipse-glsp/sprotty';
17
+ export interface LocalRequestBoundsAction extends RequestBoundsAction {
18
+ elementIDs?: string[];
19
+ }
17
20
  export declare namespace LocalRequestBoundsAction {
18
- function is(object: unknown): object is RequestBoundsAction;
19
- function fromCommand(context: CommandExecutionContext, actionDispatcher: ActionDispatcher, cause?: Action): CommandResult;
21
+ function is(object: unknown): object is LocalRequestBoundsAction;
22
+ function create(newRoot: GModelRootSchema, elementIDs?: string[]): LocalRequestBoundsAction;
23
+ function fromCommand({ root }: CommandExecutionContext, actionDispatcher: ActionDispatcher, cause?: Action, elementIDs?: string[]): CommandResult;
20
24
  }
21
25
  export declare namespace LocalComputedBoundsAction {
22
26
  function is(object: unknown): object is RequestBoundsAction;
@@ -1 +1 @@
1
- {"version":3,"file":"local-bounds.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/local-bounds.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,OAAO,EACP,uBAAuB,EACvB,aAAa,EACb,aAAa,EACb,oBAAoB,EACpB,wBAAwB,EACxB,UAAU,EAEV,mBAAmB,EAEnB,aAAa,EAChB,MAAM,uBAAuB,CAAC;AAI/B,yBAAiB,wBAAwB,CAAC;IACtC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,mBAAmB,CAEjE;IAED,SAAgB,WAAW,CAAC,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAQ/H;CACJ;AAED,yBAAiB,yBAAyB,CAAC;IACvC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,mBAAmB,CAEjE;IAED,SAAgB,IAAI,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB,CAIvE;CACJ;AAED,qBACa,0BAA2B,SAAQ,OAAO;IAMjB,QAAQ,CAAC,MAAM,EAAE,oBAAoB;IALvE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAA6B;IAEvB,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAC3E,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;gBAElC,MAAM,EAAE,oBAAoB;IAI9D,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU,GAAG,aAAa;IAiBrE,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAIrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAGjE"}
1
+ {"version":3,"file":"local-bounds.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/local-bounds.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,OAAO,EACP,uBAAuB,EACvB,aAAa,EACb,aAAa,EACb,oBAAoB,EACpB,wBAAwB,EACxB,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EAEnB,aAAa,EAEhB,MAAM,uBAAuB,CAAC;AAI/B,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACjE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,yBAAiB,wBAAwB,CAAC;IACtC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,wBAAwB,CAEtE;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAKjG;IAED,SAAgB,WAAW,CACvB,EAAE,IAAI,EAAE,EAAE,uBAAuB,EACjC,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EAAE,GACtB,aAAa,CAQf;CACJ;AAED,yBAAiB,yBAAyB,CAAC;IACvC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,mBAAmB,CAEjE;IAED,SAAgB,IAAI,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB,CAIvE;CACJ;AAED,qBACa,0BAA2B,SAAQ,OAAO;IAMjB,QAAQ,CAAC,MAAM,EAAE,oBAAoB;IALvE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAA6B;IAEvB,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAC3E,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;gBAElC,MAAM,EAAE,oBAAoB;IAI9D,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU,GAAG,aAAa;IAiBrE,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAIrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAGjE"}
@@ -34,14 +34,18 @@ const glsp_model_source_1 = require("../../base/model/glsp-model-source");
34
34
  var LocalRequestBoundsAction;
35
35
  (function (LocalRequestBoundsAction) {
36
36
  function is(object) {
37
- return sprotty_1.RequestBoundsAction.is(object) && !glsp_model_source_1.ServerAction.is(object);
37
+ return sprotty_1.RequestBoundsAction.is(object) && !glsp_model_source_1.ServerAction.is(object) && (0, sprotty_1.hasArrayProp)(object, 'elementIDs', true);
38
38
  }
39
39
  LocalRequestBoundsAction.is = is;
40
- function fromCommand(context, actionDispatcher, cause) {
40
+ function create(newRoot, elementIDs) {
41
+ return Object.assign(Object.assign({}, sprotty_1.RequestBoundsAction.create(newRoot)), { elementIDs });
42
+ }
43
+ LocalRequestBoundsAction.create = create;
44
+ function fromCommand({ root }, actionDispatcher, cause, elementIDs) {
41
45
  // do not modify the main model (modelChanged = false) but request local bounds calculation on hidden model
42
- actionDispatcher.dispatch(sprotty_1.RequestBoundsAction.create(context.root));
46
+ actionDispatcher.dispatch(LocalRequestBoundsAction.create(root, elementIDs));
43
47
  return {
44
- model: context.root,
48
+ model: root,
45
49
  modelChanged: false,
46
50
  cause
47
51
  };
@@ -1 +1 @@
1
- {"version":3,"file":"local-bounds.js","sourceRoot":"","sources":["../../../src/features/bounds/local-bounds.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAc+B;AAC/B,yCAA+C;AAC/C,0EAAkE;AAElE,IAAiB,wBAAwB,CAcxC;AAdD,WAAiB,wBAAwB;IACrC,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,6BAAmB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IAFe,2BAAE,KAEjB,CAAA;IAED,SAAgB,WAAW,CAAC,OAAgC,EAAE,gBAAkC,EAAE,KAAc;QAC5G,2GAA2G;QAC3G,gBAAgB,CAAC,QAAQ,CAAC,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,IAAmC,CAAC,CAAC,CAAC;QACnG,OAAO;YACH,KAAK,EAAE,OAAO,CAAC,IAAI;YACnB,YAAY,EAAE,KAAK;YACnB,KAAK;SACR,CAAC;IACN,CAAC;IARe,oCAAW,cAQ1B,CAAA;AACL,CAAC,EAdgB,wBAAwB,wCAAxB,wBAAwB,QAcxC;AAED,IAAiB,yBAAyB,CAUzC;AAVD,WAAiB,yBAAyB;IACtC,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,8BAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,gCAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IAFe,4BAAE,KAEjB,CAAA;IAED,SAAgB,IAAI,CAAC,MAA4B;QAC7C,0HAA0H;QAC1H,gCAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,OAAO,MAAM,CAAC;IAClB,CAAC;IAJe,8BAAI,OAInB,CAAA;AACL,CAAC,EAVgB,yBAAyB,yCAAzB,yBAAyB,QAUzC;AAGM,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,iBAAO;IAMnD,YAA2C,MAA4B;QACnE,KAAK,EAAE,CAAC;QAD+B,WAAM,GAAN,MAAM,CAAsB;IAEvE,CAAC;IAEQ,OAAO,CAAC,OAAgC;QAC7C,IAAI,yBAAyB,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE;gBACvC,OAAO,OAAO,CAAC,IAAI,CAAC;aACvB;YACD,gGAAgG;YAChG,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAmC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9F,OAAO,OAAO,CAAC,IAAI,CAAC;SACvB;QAED,uGAAuG;QACvG,OAAO;YACH,KAAK,EAAE,OAAO,CAAC,IAAI;YACnB,YAAY,EAAE,KAAK;SACtB,CAAC;IACN,CAAC;IAEQ,IAAI,CAAC,OAAgC;QAC1C,OAAO,OAAO,CAAC,IAAI,CAAC;IACxB,CAAC;IAEQ,IAAI,CAAC,OAAgC;QAC1C,OAAO,OAAO,CAAC,IAAI,CAAC;IACxB,CAAC;;AAjCQ,gEAA0B;AACnB,+BAAI,GAAW,8BAAoB,CAAC,IAAI,AAApC,CAAqC;AAEJ;IAApD,IAAA,kBAAM,EAAC,kCAAwB,CAAC;8BAA8C,kCAAwB;4EAAC;AACxD;IAA/C,IAAA,kBAAM,EAAC,eAAK,CAAC,aAAa,CAAC;;iEAAiD;qCAJpE,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAOI,WAAA,IAAA,kBAAM,EAAC,eAAK,CAAC,MAAM,CAAC,CAAA;;GANxB,0BAA0B,CAkCtC"}
1
+ {"version":3,"file":"local-bounds.js","sourceRoot":"","sources":["../../../src/features/bounds/local-bounds.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"set-bounds-feedback-command.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/set-bounds-feedback-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,uBAAuB,EACvB,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAGnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAGvE,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;IAC1E,IAAI,EAAE,OAAO,uBAAuB,CAAC,IAAI,CAAC;CAC7C;AAED,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,sBAAsB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,uBAAuB,CAEjE;IAED,SAAgB,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,uBAAuB,CAE1E;CACJ;AAED,qBACa,wBAAyB,SAAQ,gBAAiB,YAAW,eAAe;IACrF,gBAAyB,IAAI,EAAE,MAAM,CAAgC;IAErE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAK;IAEG,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAEzE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAepE"}
1
+ {"version":3,"file":"set-bounds-feedback-command.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/set-bounds-feedback-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,uBAAuB,EACvB,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAGnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAGvE,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;IAC1E,IAAI,EAAE,OAAO,uBAAuB,CAAC,IAAI,CAAC;CAC7C;AAED,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,sBAAsB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,uBAAuB,CAEjE;IAED,SAAgB,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,uBAAuB,CAE1E;CACJ;AAED,qBACa,wBAAyB,SAAQ,gBAAiB,YAAW,eAAe;IACrF,gBAAyB,IAAI,EAAE,MAAM,CAAgC;IAErE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAK;IAEG,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAEzE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAgBpE"}
@@ -59,7 +59,8 @@ let SetBoundsFeedbackCommand = class SetBoundsFeedbackCommand extends sprotty_1.
59
59
  element.layoutOptions = options;
60
60
  }
61
61
  });
62
- return local_bounds_1.LocalRequestBoundsAction.fromCommand(context, this.actionDispatcher, this.action);
62
+ const elementIDs = this.action.bounds.map(bounds => bounds.elementId);
63
+ return local_bounds_1.LocalRequestBoundsAction.fromCommand(context, this.actionDispatcher, this.action, elementIDs);
63
64
  }
64
65
  };
65
66
  exports.SetBoundsFeedbackCommand = SetBoundsFeedbackCommand;
@@ -1 +1 @@
1
- {"version":3,"file":"set-bounds-feedback-command.js","sourceRoot":"","sources":["../../../src/features/bounds/set-bounds-feedback-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAS+B;AAC/B,yCAA+C;AAC/C,oEAAoE;AAEpE,iDAA0D;AAM1D,IAAiB,uBAAuB,CAUvC;AAVD,WAAiB,uBAAuB;IACvB,4BAAI,GAAG,mBAAmB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAW;QAC1B,OAAO,gBAAM,CAAC,OAAO,CAAC,MAAM,EAAE,wBAAA,IAAI,CAAC,CAAC;IACxC,CAAC;IAFe,0BAAE,KAEjB,CAAA;IAED,SAAgB,MAAM,CAAC,MAA0B;QAC7C,OAAO,EAAE,IAAI,EAAE,wBAAA,IAAI,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAFe,8BAAM,SAErB,CAAA;AACL,CAAC,EAVgB,uBAAuB,uCAAvB,uBAAuB,QAUvC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,0BAAgB;IAAvD;;QAGM,aAAQ,GAAW,CAAC,CAAC;IAmBlC,CAAC;IAfY,OAAO,CAAC,OAAgC;QAC7C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvB,8GAA8G;QAC9G,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;;YAChC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7D,IAAI,OAAO,IAAI,IAAA,2BAAiB,EAAC,OAAO,CAAC,EAAE;gBACvC,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,aAAa,mCAAI,EAAE,CAAC;gBAC5C,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC3C,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;gBACzC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;aACnC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,uCAAwB,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7F,CAAC;;AArBQ,4DAAwB;AACR,6BAAI,GAAW,uBAAuB,CAAC,IAAI,AAAvC,CAAwC;AAI1B;IAA1C,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;8BAA6B,wCAAoB;kEAAC;mCALzE,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAsBpC"}
1
+ {"version":3,"file":"set-bounds-feedback-command.js","sourceRoot":"","sources":["../../../src/features/bounds/set-bounds-feedback-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAS+B;AAC/B,yCAA+C;AAC/C,oEAAoE;AAEpE,iDAA0D;AAM1D,IAAiB,uBAAuB,CAUvC;AAVD,WAAiB,uBAAuB;IACvB,4BAAI,GAAG,mBAAmB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAW;QAC1B,OAAO,gBAAM,CAAC,OAAO,CAAC,MAAM,EAAE,wBAAA,IAAI,CAAC,CAAC;IACxC,CAAC;IAFe,0BAAE,KAEjB,CAAA;IAED,SAAgB,MAAM,CAAC,MAA0B;QAC7C,OAAO,EAAE,IAAI,EAAE,wBAAA,IAAI,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAFe,8BAAM,SAErB,CAAA;AACL,CAAC,EAVgB,uBAAuB,uCAAvB,uBAAuB,QAUvC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,0BAAgB;IAAvD;;QAGM,aAAQ,GAAW,CAAC,CAAC;IAoBlC,CAAC;IAhBY,OAAO,CAAC,OAAgC;QAC7C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvB,8GAA8G;QAC9G,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;;YAChC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7D,IAAI,OAAO,IAAI,IAAA,2BAAiB,EAAC,OAAO,CAAC,EAAE;gBACvC,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,aAAa,mCAAI,EAAE,CAAC;gBAC5C,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC3C,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;gBACzC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;aACnC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtE,OAAO,uCAAwB,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzG,CAAC;;AAtBQ,4DAAwB;AACR,6BAAI,GAAW,uBAAuB,CAAC,IAAI,AAAvC,CAAwC;AAI1B;IAA1C,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;8BAA6B,wCAAoB;kEAAC;mCALzE,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAuBpC"}
@@ -1 +1 @@
1
- {"version":3,"file":"add-template-element.d.ts","sourceRoot":"","sources":["../../../src/features/element-template/add-template-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,uBAAuB,EACvB,aAAa,EACb,eAAe,EACf,aAAa,EACb,mBAAmB,EAItB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAIvE,MAAM,WAAW,yBAA0B,SAAQ,MAAM;IACrD,IAAI,EAAE,OAAO,yBAAyB,CAAC,IAAI,CAAC;IAC5C,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,yBAAiB,yBAAyB,CAAC;IAChC,MAAM,IAAI,wBAAwB,CAAC;IAE1C,SAAgB,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,GAAG,yBAAyB,CAKlG;CACJ;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,CAEtE;AAED,qBACa,kCAAmC,SAAQ,eAAe;IAKjC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAJ5E,MAAM,CAAC,QAAQ,CAAC,IAAI,yBAAkC;IAErB,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;gBAEvC,MAAM,EAAE,yBAAyB;IAInE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAUjE,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,aAAa;CAIxH;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,uBAAuB,GAAG,mBAAmB,GAAG,SAAS,CAU7H"}
1
+ {"version":3,"file":"add-template-element.d.ts","sourceRoot":"","sources":["../../../src/features/element-template/add-template-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,uBAAuB,EACvB,aAAa,EACb,eAAe,EACf,aAAa,EACb,mBAAmB,EAItB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAIvE,MAAM,WAAW,yBAA0B,SAAQ,MAAM;IACrD,IAAI,EAAE,OAAO,yBAAyB,CAAC,IAAI,CAAC;IAC5C,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,yBAAiB,yBAAyB,CAAC;IAChC,MAAM,IAAI,wBAAwB,CAAC;IAE1C,SAAgB,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,GAAG,yBAAyB,CAKlG;CACJ;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,CAEtE;AAED,qBACa,kCAAmC,SAAQ,eAAe;IAKjC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAJ5E,MAAM,CAAC,QAAQ,CAAC,IAAI,yBAAkC;IAErB,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;gBAEvC,MAAM,EAAE,yBAAyB;IAInE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAWjE,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,aAAa;CAIxH;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,uBAAuB,GAAG,mBAAmB,GAAG,SAAS,CAU7H"}
@@ -52,13 +52,14 @@ let AddTemplateElementsFeedbackCommand = class AddTemplateElementsFeedbackComman
52
52
  this.action = action;
53
53
  }
54
54
  execute(context) {
55
- this.action.templates
55
+ const templateElements = this.action.templates
56
56
  .map(template => templateToSchema(template, context))
57
57
  .filter(gmodel_util_1.isNotUndefined)
58
58
  .map(schema => context.modelFactory.createElement(schema))
59
- .map(element => this.applyRootCssClasses(element, this.action.addClasses, this.action.removeClasses))
60
- .forEach(templateElement => context.root.add(templateElement));
61
- return local_bounds_1.LocalRequestBoundsAction.fromCommand(context, this.actionDispatcher, this.action);
59
+ .map(element => this.applyRootCssClasses(element, this.action.addClasses, this.action.removeClasses));
60
+ templateElements.forEach(templateElement => context.root.add(templateElement));
61
+ const templateElementIDs = templateElements.map(element => element.id);
62
+ return local_bounds_1.LocalRequestBoundsAction.fromCommand(context, this.actionDispatcher, this.action, templateElementIDs);
62
63
  }
63
64
  applyRootCssClasses(element, addClasses, removeClasses) {
64
65
  element.cssClasses = modifyCssClasses(element.cssClasses, addClasses, removeClasses);
@@ -1 +1 @@
1
- {"version":3,"file":"add-template-element.js","sourceRoot":"","sources":["../../../src/features/element-template/add-template-element.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-template-element.js","sourceRoot":"","sources":["../../../src/features/element-template/add-template-element.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;AAElF,mDAU+B;AAC/B,yCAA+C;AAC/C,oEAAoE;AACpE,2EAAuE;AACvE,yDAAyD;AACzD,yDAAkE;AASlE,IAAiB,yBAAyB,CASzC;AATD,WAAiB,yBAAyB;IACzB,8BAAI,GAAG,qBAAqB,CAAC;IAE1C,SAAgB,MAAM,CAAC,OAAgD;QACnE,uBACI,IAAI,EAAE,0BAAA,IAAI,IACP,OAAO,EACZ;IACN,CAAC;IALe,gCAAM,SAKrB,CAAA;AACL,CAAC,EATgB,yBAAyB,yCAAzB,yBAAyB,QASzC;AAED,SAAgB,oBAAoB,CAAC,QAAyB;IAC1D,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC/E,CAAC;AAFD,oDAEC;AAGM,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,kCAAe;IAKnE,YAA2C,MAAiC;QACxE,KAAK,EAAE,CAAC;QAD+B,WAAM,GAAN,MAAM,CAA2B;IAE5E,CAAC;IAEQ,OAAO,CAAC,OAAgC;QAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS;aACzC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;aACpD,MAAM,CAAC,4BAAc,CAAC;aACtB,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aACzD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC1G,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;QAC/E,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,uCAAwB,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACjH,CAAC;IAES,mBAAmB,CAAC,OAAsB,EAAE,UAAqB,EAAE,aAAwB;QACjG,OAAO,CAAC,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QACrF,OAAO,OAAO,CAAC;IACnB,CAAC;;AAvBQ,gFAAkC;AAC3B,uCAAI,GAAG,yBAAyB,CAAC,IAAI,AAAjC,CAAkC;AAEX;IAA1C,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;8BAA6B,wCAAoB;4EAAC;6CAHzE,kCAAkC;IAD9C,IAAA,sBAAU,GAAE;IAMI,WAAA,IAAA,kBAAM,EAAC,eAAK,CAAC,MAAM,CAAC,CAAA;;GALxB,kCAAkC,CAwB9C;AAED,SAAgB,gBAAgB,CAAC,QAAyB,EAAE,OAAgC;IACxF,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAC9B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,IAAI,MAAM,EAAE;YACR,cAAc,CAAC,MAAM,CAAC,CAAC;SAC1B;QACD,OAAO,MAAM,CAAC;KACjB;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAVD,4CAUC;AAED,SAAS,cAAc,CAAC,MAA2B;;IAC/C,MAAM,CAAC,EAAE,GAAG,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAA,MAAM,CAAC,QAAQ,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAiB,EAAE,KAAgB,EAAE,QAAmB;IAC9E,MAAM,OAAO,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAC7B,IAAI,KAAK,EAAE;QACP,IAAA,qBAAW,EAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;KAClC;IACD,IAAI,QAAQ,EAAE;QACV,IAAA,gBAAM,EAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC;KAChC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC"}