@eclipse-glsp/client 2.2.0-next.329 → 2.2.0-next.330

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 (174) hide show
  1. package/css/change-bounds.css +15 -0
  2. package/css/glsp-sprotty.css +17 -0
  3. package/lib/base/drag-aware-mouse-listener.d.ts +5 -2
  4. package/lib/base/drag-aware-mouse-listener.d.ts.map +1 -1
  5. package/lib/base/drag-aware-mouse-listener.js +11 -0
  6. package/lib/base/drag-aware-mouse-listener.js.map +1 -1
  7. package/lib/base/feedback/css-feedback.d.ts +4 -0
  8. package/lib/base/feedback/css-feedback.d.ts.map +1 -1
  9. package/lib/base/feedback/css-feedback.js +4 -0
  10. package/lib/base/feedback/css-feedback.js.map +1 -1
  11. package/lib/base/feedback/feeback-emitter.d.ts +67 -0
  12. package/lib/base/feedback/feeback-emitter.d.ts.map +1 -0
  13. package/lib/base/feedback/feeback-emitter.js +109 -0
  14. package/lib/base/feedback/feeback-emitter.js.map +1 -0
  15. package/lib/base/feedback/feedback-action-dispatcher.d.ts +17 -5
  16. package/lib/base/feedback/feedback-action-dispatcher.d.ts.map +1 -1
  17. package/lib/base/feedback/feedback-action-dispatcher.js +23 -3
  18. package/lib/base/feedback/feedback-action-dispatcher.js.map +1 -1
  19. package/lib/base/feedback/index.d.ts +1 -0
  20. package/lib/base/feedback/index.d.ts.map +1 -1
  21. package/lib/base/feedback/index.js +1 -0
  22. package/lib/base/feedback/index.js.map +1 -1
  23. package/lib/base/selection-service.d.ts +3 -2
  24. package/lib/base/selection-service.d.ts.map +1 -1
  25. package/lib/base/selection-service.js.map +1 -1
  26. package/lib/features/accessibility/element-navigation/local-element-navigator.d.ts +3 -3
  27. package/lib/features/accessibility/element-navigation/local-element-navigator.d.ts.map +1 -1
  28. package/lib/features/accessibility/element-navigation/local-element-navigator.js.map +1 -1
  29. package/lib/features/accessibility/move-zoom/move-handler.d.ts +4 -2
  30. package/lib/features/accessibility/move-zoom/move-handler.d.ts.map +1 -1
  31. package/lib/features/accessibility/move-zoom/move-handler.js +10 -4
  32. package/lib/features/accessibility/move-zoom/move-handler.js.map +1 -1
  33. package/lib/features/accessibility/resize-key-tool/resize-key-handler.d.ts +4 -2
  34. package/lib/features/accessibility/resize-key-tool/resize-key-handler.d.ts.map +1 -1
  35. package/lib/features/accessibility/resize-key-tool/resize-key-handler.js +11 -3
  36. package/lib/features/accessibility/resize-key-tool/resize-key-handler.js.map +1 -1
  37. package/lib/features/change-bounds/model.d.ts +8 -8
  38. package/lib/features/change-bounds/model.d.ts.map +1 -1
  39. package/lib/features/change-bounds/model.js +17 -5
  40. package/lib/features/change-bounds/model.js.map +1 -1
  41. package/lib/features/change-bounds/movement-restrictor.d.ts +3 -2
  42. package/lib/features/change-bounds/movement-restrictor.d.ts.map +1 -1
  43. package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
  44. package/lib/features/element-template/mouse-tracking-element-position-listener.d.ts +15 -5
  45. package/lib/features/element-template/mouse-tracking-element-position-listener.d.ts.map +1 -1
  46. package/lib/features/element-template/mouse-tracking-element-position-listener.js +27 -38
  47. package/lib/features/element-template/mouse-tracking-element-position-listener.js.map +1 -1
  48. package/lib/features/helper-lines/helper-line-manager-default.d.ts +4 -2
  49. package/lib/features/helper-lines/helper-line-manager-default.d.ts.map +1 -1
  50. package/lib/features/helper-lines/helper-line-manager-default.js +8 -12
  51. package/lib/features/helper-lines/helper-line-manager-default.js.map +1 -1
  52. package/lib/features/hints/type-hint-provider.d.ts +3 -0
  53. package/lib/features/hints/type-hint-provider.d.ts.map +1 -1
  54. package/lib/features/hints/type-hint-provider.js +10 -1
  55. package/lib/features/hints/type-hint-provider.js.map +1 -1
  56. package/lib/features/select/select-mouse-listener.d.ts +4 -3
  57. package/lib/features/select/select-mouse-listener.d.ts.map +1 -1
  58. package/lib/features/select/select-mouse-listener.js.map +1 -1
  59. package/lib/features/tools/base-tools.d.ts +23 -4
  60. package/lib/features/tools/base-tools.d.ts.map +1 -1
  61. package/lib/features/tools/base-tools.js +11 -6
  62. package/lib/features/tools/base-tools.js.map +1 -1
  63. package/lib/features/tools/change-bounds/change-bounds-tool-feedback.d.ts +1 -35
  64. package/lib/features/tools/change-bounds/change-bounds-tool-feedback.d.ts.map +1 -1
  65. package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js +5 -206
  66. package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js.map +1 -1
  67. package/lib/features/tools/change-bounds/change-bounds-tool-module.d.ts +1 -0
  68. package/lib/features/tools/change-bounds/change-bounds-tool-module.d.ts.map +1 -1
  69. package/lib/features/tools/change-bounds/change-bounds-tool-module.js +1 -0
  70. package/lib/features/tools/change-bounds/change-bounds-tool-module.js.map +1 -1
  71. package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.d.ts +67 -0
  72. package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.d.ts.map +1 -0
  73. package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.js +227 -0
  74. package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.js.map +1 -0
  75. package/lib/features/tools/change-bounds/change-bounds-tool.d.ts +34 -24
  76. package/lib/features/tools/change-bounds/change-bounds-tool.d.ts.map +1 -1
  77. package/lib/features/tools/change-bounds/change-bounds-tool.js +172 -180
  78. package/lib/features/tools/change-bounds/change-bounds-tool.js.map +1 -1
  79. package/lib/features/tools/change-bounds/index.d.ts +1 -0
  80. package/lib/features/tools/change-bounds/index.d.ts.map +1 -1
  81. package/lib/features/tools/change-bounds/index.js +1 -0
  82. package/lib/features/tools/change-bounds/index.js.map +1 -1
  83. package/lib/features/tools/change-bounds/view.d.ts +1 -1
  84. package/lib/features/tools/change-bounds/view.d.ts.map +1 -1
  85. package/lib/features/tools/change-bounds/view.js +3 -0
  86. package/lib/features/tools/change-bounds/view.js.map +1 -1
  87. package/lib/features/tools/deletion/delete-tool.d.ts +16 -1
  88. package/lib/features/tools/deletion/delete-tool.d.ts.map +1 -1
  89. package/lib/features/tools/deletion/delete-tool.js +5 -2
  90. package/lib/features/tools/deletion/delete-tool.js.map +1 -1
  91. package/lib/features/tools/edge-creation/dangling-edge-feedback.d.ts +17 -1
  92. package/lib/features/tools/edge-creation/dangling-edge-feedback.d.ts.map +1 -1
  93. package/lib/features/tools/edge-creation/dangling-edge-feedback.js +3 -1
  94. package/lib/features/tools/edge-creation/dangling-edge-feedback.js.map +1 -1
  95. package/lib/features/tools/edge-creation/edge-creation-tool-feedback.d.ts +3 -1
  96. package/lib/features/tools/edge-creation/edge-creation-tool-feedback.d.ts.map +1 -1
  97. package/lib/features/tools/edge-creation/edge-creation-tool-feedback.js +4 -7
  98. package/lib/features/tools/edge-creation/edge-creation-tool-feedback.js.map +1 -1
  99. package/lib/features/tools/edge-creation/edge-creation-tool.d.ts +20 -2
  100. package/lib/features/tools/edge-creation/edge-creation-tool.d.ts.map +1 -1
  101. package/lib/features/tools/edge-creation/edge-creation-tool.js +23 -18
  102. package/lib/features/tools/edge-creation/edge-creation-tool.js.map +1 -1
  103. package/lib/features/tools/edge-edit/edge-edit-tool-feedback.d.ts +3 -1
  104. package/lib/features/tools/edge-edit/edge-edit-tool-feedback.d.ts.map +1 -1
  105. package/lib/features/tools/edge-edit/edge-edit-tool-feedback.js +5 -8
  106. package/lib/features/tools/edge-edit/edge-edit-tool-feedback.js.map +1 -1
  107. package/lib/features/tools/edge-edit/edge-edit-tool.d.ts +4 -4
  108. package/lib/features/tools/edge-edit/edge-edit-tool.d.ts.map +1 -1
  109. package/lib/features/tools/edge-edit/edge-edit-tool.js +27 -44
  110. package/lib/features/tools/edge-edit/edge-edit-tool.js.map +1 -1
  111. package/lib/features/tools/marquee-selection/marquee-mouse-tool.d.ts +3 -2
  112. package/lib/features/tools/marquee-selection/marquee-mouse-tool.d.ts.map +1 -1
  113. package/lib/features/tools/marquee-selection/marquee-mouse-tool.js +4 -2
  114. package/lib/features/tools/marquee-selection/marquee-mouse-tool.js.map +1 -1
  115. package/lib/features/tools/node-creation/node-creation-tool.d.ts +14 -5
  116. package/lib/features/tools/node-creation/node-creation-tool.d.ts.map +1 -1
  117. package/lib/features/tools/node-creation/node-creation-tool.js +58 -24
  118. package/lib/features/tools/node-creation/node-creation-tool.js.map +1 -1
  119. package/lib/features/validation/marker-navigator.d.ts +7 -6
  120. package/lib/features/validation/marker-navigator.d.ts.map +1 -1
  121. package/lib/features/validation/marker-navigator.js.map +1 -1
  122. package/lib/features/validation/validate.d.ts +2 -5
  123. package/lib/features/validation/validate.d.ts.map +1 -1
  124. package/lib/features/validation/validate.js +4 -16
  125. package/lib/features/validation/validate.js.map +1 -1
  126. package/lib/utils/gmodel-util.d.ts +27 -2
  127. package/lib/utils/gmodel-util.d.ts.map +1 -1
  128. package/lib/utils/gmodel-util.js +30 -1
  129. package/lib/utils/gmodel-util.js.map +1 -1
  130. package/lib/utils/layout-utils.d.ts +8 -7
  131. package/lib/utils/layout-utils.d.ts.map +1 -1
  132. package/lib/utils/layout-utils.js +2 -4
  133. package/lib/utils/layout-utils.js.map +1 -1
  134. package/lib/utils/viewpoint-util.d.ts +4 -4
  135. package/lib/utils/viewpoint-util.d.ts.map +1 -1
  136. package/lib/utils/viewpoint-util.js.map +1 -1
  137. package/package.json +3 -3
  138. package/src/base/drag-aware-mouse-listener.ts +16 -2
  139. package/src/base/feedback/css-feedback.ts +4 -0
  140. package/src/base/feedback/feeback-emitter.ts +112 -0
  141. package/src/base/feedback/feedback-action-dispatcher.ts +41 -6
  142. package/src/base/feedback/index.ts +1 -0
  143. package/src/base/selection-service.spec.ts +5 -0
  144. package/src/base/selection-service.ts +2 -3
  145. package/src/features/accessibility/element-navigation/local-element-navigator.ts +4 -4
  146. package/src/features/accessibility/move-zoom/move-handler.ts +10 -5
  147. package/src/features/accessibility/resize-key-tool/resize-key-handler.ts +11 -7
  148. package/src/features/change-bounds/model.ts +25 -13
  149. package/src/features/change-bounds/movement-restrictor.ts +5 -4
  150. package/src/features/element-template/mouse-tracking-element-position-listener.ts +44 -44
  151. package/src/features/helper-lines/helper-line-manager-default.ts +12 -21
  152. package/src/features/hints/type-hint-provider.spec.ts +4 -1
  153. package/src/features/hints/type-hint-provider.ts +9 -2
  154. package/src/features/select/select-mouse-listener.ts +4 -3
  155. package/src/features/tools/base-tools.ts +15 -8
  156. package/src/features/tools/change-bounds/change-bounds-tool-feedback.ts +6 -232
  157. package/src/features/tools/change-bounds/change-bounds-tool-module.ts +1 -0
  158. package/src/features/tools/change-bounds/change-bounds-tool-move-feedback.ts +254 -0
  159. package/src/features/tools/change-bounds/change-bounds-tool.ts +217 -226
  160. package/src/features/tools/change-bounds/index.ts +1 -0
  161. package/src/features/tools/change-bounds/view.tsx +4 -1
  162. package/src/features/tools/deletion/delete-tool.ts +6 -6
  163. package/src/features/tools/edge-creation/dangling-edge-feedback.ts +7 -4
  164. package/src/features/tools/edge-creation/edge-creation-tool-feedback.ts +9 -9
  165. package/src/features/tools/edge-creation/edge-creation-tool.ts +33 -23
  166. package/src/features/tools/edge-edit/edge-edit-tool-feedback.ts +8 -8
  167. package/src/features/tools/edge-edit/edge-edit-tool.ts +42 -49
  168. package/src/features/tools/marquee-selection/marquee-mouse-tool.ts +7 -6
  169. package/src/features/tools/node-creation/node-creation-tool.ts +69 -25
  170. package/src/features/validation/marker-navigator.ts +6 -8
  171. package/src/features/validation/validate.ts +5 -20
  172. package/src/utils/gmodel-util.ts +44 -1
  173. package/src/utils/layout-utils.ts +9 -20
  174. package/src/utils/viewpoint-util.ts +3 -4
@@ -13,9 +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 { BoundsAware, EdgeRouterRegistry, GModelElement, GModelRoot } from '@eclipse-glsp/sprotty';
16
+ import { EdgeRouterRegistry, GModelElement, GModelRoot } from '@eclipse-glsp/sprotty';
17
17
  import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
18
- import { SelectableBoundsAware } from '../../../utils/gmodel-util';
18
+ import { BoundsAwareModelElement, SelectableBoundsAware } from '../../../utils/gmodel-util';
19
19
  import { ElementNavigator } from './element-navigator';
20
20
  export declare class LocalElementNavigator implements ElementNavigator {
21
21
  navigableElementCSS: string;
@@ -27,7 +27,7 @@ export declare class LocalElementNavigator implements ElementNavigator {
27
27
  down(root: Readonly<GModelRoot>, current: SelectableBoundsAware, previousCurrent?: SelectableBoundsAware, predicate?: (element: GModelElement) => boolean): GModelElement | undefined;
28
28
  process(root: Readonly<GModelRoot>, current: SelectableBoundsAware, target: SelectableBoundsAware, previousCurrent?: SelectableBoundsAware, predicate?: (element: GModelElement) => boolean): void;
29
29
  clean(root: Readonly<GModelRoot>, current?: SelectableBoundsAware, previousCurrent?: SelectableBoundsAware): void;
30
- protected getIterables(current: SelectableBoundsAware, previousCurrent?: GModelElement & BoundsAware, predicate?: (element: GModelElement) => boolean): GModelElement[];
30
+ protected getIterables(current: SelectableBoundsAware, previousCurrent?: BoundsAwareModelElement, predicate?: (element: GModelElement) => boolean): GModelElement[];
31
31
  protected getIterable(current: SelectableBoundsAware, previousCurrent?: SelectableBoundsAware, predicate?: (element: GModelElement) => boolean): GModelElement | undefined;
32
32
  protected getNextElement(current: SelectableBoundsAware, predicate?: (element: GModelElement) => boolean): GModelElement | undefined;
33
33
  protected getPreviousElement(current: SelectableBoundsAware, predicate?: (element: GModelElement) => boolean): GModelElement | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"local-element-navigator.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/local-element-navigator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAuB,aAAa,EAAE,UAAU,EAAS,MAAM,uBAAuB,CAAC;AAE/H,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,qBACa,qBAAsB,YAAW,gBAAgB;IAC1D,mBAAmB,SAAuB;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAE3F,QAAQ,CACJ,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,IAAI,CACA,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,EAAE,CACE,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,IAAI,CACA,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,OAAO,CACH,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,qBAAqB,EAC7B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,IAAI;IAgBP,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,EAAE,qBAAqB,EAAE,eAAe,CAAC,EAAE,qBAAqB,GAAG,IAAI;IAIjH,SAAS,CAAC,YAAY,CAClB,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,aAAa,GAAG,WAAW,EAC7C,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,EAAE;IAclB,SAAS,CAAC,WAAW,CACjB,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,GAAG,SAAS;IAG5B,SAAS,CAAC,cAAc,CACpB,OAAO,EAAE,qBAAqB,EAC9B,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,GAAG,SAAS;IAa5B,SAAS,CAAC,kBAAkB,CACxB,OAAO,EAAE,qBAAqB,EAC9B,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,GAAG,SAAS;CAY/B"}
1
+ {"version":3,"file":"local-element-navigator.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/local-element-navigator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,kBAAkB,EAAuB,aAAa,EAAE,UAAU,EAAS,MAAM,uBAAuB,CAAC;AAElH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,qBACa,qBAAsB,YAAW,gBAAgB;IAC1D,mBAAmB,SAAuB;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAE3F,QAAQ,CACJ,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,IAAI,CACA,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,EAAE,CACE,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,IAAI,CACA,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,aAAa,GAAG,SAAS;IAI5B,OAAO,CACH,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC1B,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,qBAAqB,EAC7B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAChD,IAAI;IAgBP,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,EAAE,qBAAqB,EAAE,eAAe,CAAC,EAAE,qBAAqB,GAAG,IAAI;IAIjH,SAAS,CAAC,YAAY,CAClB,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,uBAAuB,EACzC,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,EAAE;IAclB,SAAS,CAAC,WAAW,CACjB,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,qBAAqB,EACvC,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,GAAG,SAAS;IAG5B,SAAS,CAAC,cAAc,CACpB,OAAO,EAAE,qBAAqB,EAC9B,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,GAAG,SAAS;IAa5B,SAAS,CAAC,kBAAkB,CACxB,OAAO,EAAE,qBAAqB,EAC9B,SAAS,GAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAoB,GAC5D,aAAa,GAAG,SAAS;CAY/B"}
@@ -1 +1 @@
1
- {"version":3,"file":"local-element-navigator.js","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/local-element-navigator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"local-element-navigator.js","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/local-element-navigator.ts"],"names":[],"mappings":"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"}
@@ -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, DisposableCollection, ElementAndBounds, ElementMove, GModelRoot, IActionDispatcher, IActionHandler, ICommand, ISnapper, Point, SetViewportAction, Viewport } from '@eclipse-glsp/sprotty';
16
+ import { Action, ElementAndBounds, ElementMove, GModelRoot, IActionDispatcher, IActionHandler, ICommand, ISnapper, Point, SetViewportAction, Viewport } from '@eclipse-glsp/sprotty';
17
17
  import { DebouncedFunc } from 'lodash';
18
+ import { FeedbackEmitter } from '../../../base';
18
19
  import { EditorContextService } from '../../../base/editor-context-service';
19
20
  import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
20
21
  import { SelectableBoundsAware } from '../../../utils/gmodel-util';
@@ -85,7 +86,8 @@ export declare class MoveElementHandler implements IActionHandler {
85
86
  readonly snapper?: ISnapper;
86
87
  readonly movementRestrictor?: IMovementRestrictor;
87
88
  protected debouncedChangeBounds?: DebouncedFunc<() => void>;
88
- protected disposableFeedback: DisposableCollection;
89
+ protected moveFeedback: FeedbackEmitter;
90
+ protected init(): void;
89
91
  handle(action: Action): void | Action | ICommand;
90
92
  handleMoveElement(action: MoveElementAction): void;
91
93
  protected getTargetBounds(element: SelectableBoundsAware, action: MoveElementAction): Point;
@@ -1 +1 @@
1
- {"version":3,"file":"move-handler.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/move-zoom/move-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"move-handler.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/move-zoom/move-handler.ts"],"names":[],"mappings":"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"}
@@ -99,8 +99,8 @@ exports.MoveViewportHandler = MoveViewportHandler = __decorate([
99
99
  * Action handler for moving elements.
100
100
  */
101
101
  let MoveElementHandler = class MoveElementHandler {
102
- constructor() {
103
- this.disposableFeedback = new sprotty_1.DisposableCollection();
102
+ init() {
103
+ this.moveFeedback = this.feedbackDispatcher.createEmitter();
104
104
  }
105
105
  handle(action) {
106
106
  if (MoveElementAction.is(action)) {
@@ -132,7 +132,7 @@ let MoveElementHandler = class MoveElementHandler {
132
132
  }
133
133
  this.dispatcher.dispatchAll(viewportActions);
134
134
  const moveAction = sprotty_1.MoveAction.create(elementMoves, { animate: false });
135
- this.disposableFeedback.push(this.feedbackDispatcher.registerFeedback(this, [moveAction]));
135
+ this.moveFeedback.add(moveAction).submit();
136
136
  this.scheduleChangeBounds(this.toElementAndBounds(elementMoves));
137
137
  }
138
138
  getTargetBounds(element, action) {
@@ -150,7 +150,7 @@ let MoveElementHandler = class MoveElementHandler {
150
150
  var _a;
151
151
  (_a = this.debouncedChangeBounds) === null || _a === void 0 ? void 0 : _a.cancel();
152
152
  this.debouncedChangeBounds = (0, lodash_1.debounce)(() => {
153
- this.disposableFeedback.dispose();
153
+ this.moveFeedback.dispose();
154
154
  this.dispatcher.dispatchAll([sprotty_1.ChangeBoundsOperation.create(elementAndBounds)]);
155
155
  this.debouncedChangeBounds = undefined;
156
156
  }, 300);
@@ -200,6 +200,12 @@ __decorate([
200
200
  (0, inversify_1.optional)(),
201
201
  __metadata("design:type", Object)
202
202
  ], MoveElementHandler.prototype, "movementRestrictor", void 0);
203
+ __decorate([
204
+ (0, inversify_1.postConstruct)(),
205
+ __metadata("design:type", Function),
206
+ __metadata("design:paramtypes", []),
207
+ __metadata("design:returntype", void 0)
208
+ ], MoveElementHandler.prototype, "init", null);
203
209
  exports.MoveElementHandler = MoveElementHandler = __decorate([
204
210
  (0, inversify_1.injectable)()
205
211
  ], MoveElementHandler);
@@ -1 +1 @@
1
- {"version":3,"file":"move-handler.js","sourceRoot":"","sources":["../../../../src/features/accessibility/move-zoom/move-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"move-handler.js","sourceRoot":"","sources":["../../../../src/features/accessibility/move-zoom/move-handler.ts"],"names":[],"mappings":"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"}
@@ -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, Dimension, DisposableCollection, ElementAndBounds, IActionDispatcher, IActionHandler, ICommand, ISnapper, Point } from '@eclipse-glsp/sprotty';
16
+ import { Action, Dimension, ElementAndBounds, IActionDispatcher, IActionHandler, ICommand, ISnapper, Point } from '@eclipse-glsp/sprotty';
17
17
  import { DebouncedFunc } from 'lodash';
18
+ import { FeedbackEmitter } from '../../../base';
18
19
  import { EditorContextService } from '../../../base/editor-context-service';
19
20
  import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
20
21
  import { SelectableBoundsAware } from '../../../utils/gmodel-util';
@@ -42,7 +43,7 @@ export declare class ResizeElementHandler implements IActionHandler {
42
43
  protected dispatcher: IActionDispatcher;
43
44
  protected feedbackDispatcher: IFeedbackActionDispatcher;
44
45
  protected debouncedChangeBounds?: DebouncedFunc<() => void>;
45
- protected disposableFeedback: DisposableCollection;
46
+ protected resizeFeedback: FeedbackEmitter;
46
47
  static readonly defaultResizeX = 20;
47
48
  static readonly defaultResizeY = 20;
48
49
  protected grid: {
@@ -51,6 +52,7 @@ export declare class ResizeElementHandler implements IActionHandler {
51
52
  };
52
53
  protected isEditMode: boolean;
53
54
  constructor(snapper?: ISnapper | undefined);
55
+ protected init(): void;
54
56
  handle(action: Action): void | Action | ICommand;
55
57
  handleResizeElement(action: ResizeElementAction): void;
56
58
  protected computeElementAndBounds(elements: SelectableBoundsAware[], action: ResizeElementAction): ElementAndBounds[];
@@ -1 +1 @@
1
- {"version":3,"file":"resize-key-handler.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/resize-key-tool/resize-key-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,SAAS,EACT,oBAAoB,EACpB,gBAAgB,EAGhB,iBAAiB,EACjB,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,KAAK,EAGR,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAY,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAA+D,MAAM,4BAA4B,CAAC;AAKhI,oBAAY,UAAU;IAClB,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,OAAO,IAAA;CACV;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,MAAM;IAC/C,IAAI,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;CAC1B;AACD,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,IAAI,wBAAwB,CAAC;IAE1C,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,mBAAmB,CAE7D;IAED,SAAgB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,mBAAmB,CAExF;CACJ;AAID,qBACa,oBAAqB,YAAW,cAAc;IAsBP,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;IApB3E,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGxC,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAExD,SAAS,CAAC,qBAAqB,CAAC,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC;IAC5D,SAAS,CAAC,kBAAkB,uBAA8B;IAG1D,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM;IAGpC,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM;IACpC,SAAS,CAAC,IAAI;;;MAAsF;IAEpG,SAAS,CAAC,UAAU,UAAS;gBAEsC,OAAO,CAAC,sBAAU;IAMrF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAMhD,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAetD,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,EAAE,MAAM,EAAE,mBAAmB,GAAG,gBAAgB,EAAE;IA4BrH,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO;CAGhH"}
1
+ {"version":3,"file":"resize-key-handler.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/resize-key-tool/resize-key-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,SAAS,EACT,gBAAgB,EAGhB,iBAAiB,EACjB,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,KAAK,EAGR,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAY,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAa,qBAAqB,EAA+D,MAAM,4BAA4B,CAAC;AAI3I,oBAAY,UAAU;IAClB,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,OAAO,IAAA;CACV;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,MAAM;IAC/C,IAAI,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;CAC1B;AACD,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,IAAI,wBAAwB,CAAC;IAE1C,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,mBAAmB,CAE7D;IAED,SAAgB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,mBAAmB,CAExF;CACJ;AAID,qBACa,oBAAqB,YAAW,cAAc;IAsBP,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;IApB3E,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGxC,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAExD,SAAS,CAAC,qBAAqB,CAAC,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC;IAC5D,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAG1C,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM;IAGpC,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM;IACpC,SAAS,CAAC,IAAI;;;MAAsF;IAEpG,SAAS,CAAC,UAAU,UAAS;gBAEsC,OAAO,CAAC,sBAAU;IAOrF,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAMhD,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAetD,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,EAAE,MAAM,EAAE,mBAAmB,GAAG,gBAAgB,EAAE;IA4BrH,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO;CAGhH"}
@@ -59,13 +59,15 @@ resizing of elements. */
59
59
  let ResizeElementHandler = ResizeElementHandler_1 = class ResizeElementHandler {
60
60
  constructor(snapper) {
61
61
  this.snapper = snapper;
62
- this.disposableFeedback = new sprotty_1.DisposableCollection();
63
62
  this.grid = { x: ResizeElementHandler_1.defaultResizeX, y: ResizeElementHandler_1.defaultResizeY };
64
63
  this.isEditMode = false;
65
64
  if (snapper instanceof snap_1.GridSnapper) {
66
65
  this.grid = snapper.grid;
67
66
  }
68
67
  }
68
+ init() {
69
+ this.resizeFeedback = this.feedbackDispatcher.createEmitter();
70
+ }
69
71
  handle(action) {
70
72
  if (ResizeElementAction.is(action)) {
71
73
  this.handleResizeElement(action);
@@ -75,10 +77,10 @@ let ResizeElementHandler = ResizeElementHandler_1 = class ResizeElementHandler {
75
77
  var _a;
76
78
  const elements = (0, gmodel_util_1.getElements)(this.editorContextService.modelRoot.index, action.elementIds, gmodel_util_1.isSelectableAndBoundsAware);
77
79
  const elementAndBounds = this.computeElementAndBounds(elements, action);
78
- this.disposableFeedback.push(this.feedbackDispatcher.registerFeedback(this, [sprotty_1.SetBoundsAction.create(elementAndBounds)]));
80
+ this.resizeFeedback.add(sprotty_1.SetBoundsAction.create(elementAndBounds)).submit();
79
81
  (_a = this.debouncedChangeBounds) === null || _a === void 0 ? void 0 : _a.cancel();
80
82
  this.debouncedChangeBounds = (0, lodash_1.debounce)(() => {
81
- this.disposableFeedback.dispose();
83
+ this.resizeFeedback.dispose();
82
84
  this.dispatcher.dispatchAll([sprotty_1.ChangeBoundsOperation.create(elementAndBounds)]);
83
85
  this.debouncedChangeBounds = undefined;
84
86
  }, 300);
@@ -130,6 +132,12 @@ __decorate([
130
132
  (0, inversify_1.inject)(sprotty_1.TYPES.IFeedbackActionDispatcher),
131
133
  __metadata("design:type", Object)
132
134
  ], ResizeElementHandler.prototype, "feedbackDispatcher", void 0);
135
+ __decorate([
136
+ (0, inversify_1.postConstruct)(),
137
+ __metadata("design:type", Function),
138
+ __metadata("design:paramtypes", []),
139
+ __metadata("design:returntype", void 0)
140
+ ], ResizeElementHandler.prototype, "init", null);
133
141
  exports.ResizeElementHandler = ResizeElementHandler = ResizeElementHandler_1 = __decorate([
134
142
  (0, inversify_1.injectable)(),
135
143
  __param(0, (0, inversify_1.inject)(sprotty_1.TYPES.ISnapper)),
@@ -1 +1 @@
1
- {"version":3,"file":"resize-key-handler.js","sourceRoot":"","sources":["../../../../src/features/accessibility/resize-key-tool/resize-key-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resize-key-handler.js","sourceRoot":"","sources":["../../../../src/features/accessibility/resize-key-tool/resize-key-handler.ts"],"names":[],"mappings":"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"}
@@ -13,24 +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 { BoundsAware, GChildElement, GModelElement, GParentElement, Hoverable, Locateable, Selectable } from '@eclipse-glsp/sprotty';
16
+ import { GChildElement, GModelElement, GParentElement, Hoverable } from '@eclipse-glsp/sprotty';
17
+ import { BoundsAwareModelElement, MoveableElement, ResizableModelElement } from '../../utils';
17
18
  export declare const resizeFeature: unique symbol;
18
- export interface Resizable extends BoundsAware, Selectable {
19
- }
20
- export declare function isResizable(element: GModelElement): element is GParentElement & Resizable;
19
+ export declare function isResizable(element: GModelElement): element is ResizableModelElement;
21
20
  export declare enum ResizeHandleLocation {
22
21
  TopLeft = "top-left",
23
22
  TopRight = "top-right",
24
23
  BottomLeft = "bottom-left",
25
24
  BottomRight = "bottom-right"
26
25
  }
27
- export declare function isBoundsAwareMoveable(element: GModelElement): element is GModelElement & Locateable & BoundsAware;
26
+ export declare function isBoundsAwareMoveable(element: GModelElement): element is BoundsAwareModelElement & MoveableElement;
28
27
  export declare class SResizeHandle extends GChildElement implements Hoverable {
29
- readonly location?: ResizeHandleLocation | undefined;
28
+ readonly location: ResizeHandleLocation;
30
29
  readonly type: string;
31
30
  readonly hoverFeedback: boolean;
32
31
  static readonly TYPE = "resize-handle";
33
- constructor(location?: ResizeHandleLocation | undefined, type?: string, hoverFeedback?: boolean);
32
+ readonly parent: ResizableModelElement;
33
+ constructor(location: ResizeHandleLocation, type?: string, hoverFeedback?: boolean);
34
34
  hasFeature(feature: symbol): boolean;
35
35
  isNwResize(): boolean;
36
36
  isSeResize(): boolean;
@@ -39,6 +39,6 @@ export declare class SResizeHandle extends GChildElement implements Hoverable {
39
39
  isNwSeResize(): boolean;
40
40
  isNeSwResize(): boolean;
41
41
  }
42
- export declare function addResizeHandles(element: GParentElement): void;
42
+ export declare function addResizeHandles(element: ResizableModelElement, locations?: ResizeHandleLocation[]): void;
43
43
  export declare function removeResizeHandles(element: GParentElement): void;
44
44
  //# sourceMappingURL=model.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,WAAW,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACd,SAAS,EACT,UAAU,EACV,UAAU,EAKb,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,WAAW,SAAU,SAAQ,WAAW,EAAE,UAAU;CAAG;AAE7D,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,cAAc,GAAG,SAAS,CAEzF;AAGD,oBAAY,oBAAoB;IAC5B,OAAO,aAAa;IACpB,QAAQ,cAAc;IACtB,UAAU,gBAAgB;IAC1B,WAAW,iBAAiB;CAC/B;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,UAAU,GAAG,WAAW,CAEjH;AAED,qBAAa,aAAc,SAAQ,aAAc,YAAW,SAAS;IAI7D,QAAQ,CAAC,QAAQ,CAAC;aACA,IAAI,EAAE,MAAM;IAC9B,QAAQ,CAAC,aAAa,EAAE,OAAO;IALnC,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAAmB;gBAG1B,QAAQ,CAAC,kCAAsB,EACtB,IAAI,GAAE,MAA2B,EAC1C,aAAa,GAAE,OAAe;IAKlC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI7C,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,YAAY,IAAI,OAAO;IAIvB,YAAY,IAAI,OAAO;CAG1B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAK9D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAEjE"}
1
+ {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,aAAa,EACb,cAAc,EACd,SAAS,EAKZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE9F,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,qBAAqB,CAEpF;AAGD,oBAAY,oBAAoB;IAC5B,OAAO,aAAa;IACpB,QAAQ,cAAc;IACtB,UAAU,gBAAgB;IAC1B,WAAW,iBAAiB;CAC/B;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,uBAAuB,GAAG,eAAe,CAElH;AAED,qBAAa,aAAc,SAAQ,aAAc,YAAW,SAAS;IAM7D,QAAQ,CAAC,QAAQ,EAAE,oBAAoB;aACrB,IAAI,EAAE,MAAM;IAC9B,QAAQ,CAAC,aAAa,EAAE,OAAO;IAPnC,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAAmB;IAEvC,SAAkB,MAAM,EAAE,qBAAqB,CAAC;gBAGnC,QAAQ,EAAE,oBAAoB,EACrB,IAAI,GAAE,MAA2B,EAC1C,aAAa,GAAE,OAAe;IAKlC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI7C,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,YAAY,IAAI,OAAO;IAIvB,YAAY,IAAI,OAAO;CAG1B;AAED,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,qBAAqB,EAC9B,SAAS,GAAE,oBAAoB,EAK9B,GACF,IAAI,CAWN;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAEjE"}
@@ -65,11 +65,23 @@ class SResizeHandle extends sprotty_1.GChildElement {
65
65
  }
66
66
  exports.SResizeHandle = SResizeHandle;
67
67
  SResizeHandle.TYPE = 'resize-handle';
68
- function addResizeHandles(element) {
69
- element.add(new SResizeHandle(ResizeHandleLocation.TopLeft));
70
- element.add(new SResizeHandle(ResizeHandleLocation.TopRight));
71
- element.add(new SResizeHandle(ResizeHandleLocation.BottomLeft));
72
- element.add(new SResizeHandle(ResizeHandleLocation.BottomRight));
68
+ function addResizeHandles(element, locations = [
69
+ ResizeHandleLocation.TopLeft,
70
+ ResizeHandleLocation.TopRight,
71
+ ResizeHandleLocation.BottomLeft,
72
+ ResizeHandleLocation.BottomRight
73
+ ]) {
74
+ for (const location of Object.values(ResizeHandleLocation)) {
75
+ const existing = element.children.find(child => child instanceof SResizeHandle && child.location === location);
76
+ if (locations.includes(location) && !existing) {
77
+ // add missing handle
78
+ element.add(new SResizeHandle(location));
79
+ }
80
+ else if (!locations.includes(location) && existing) {
81
+ // remove existing handle
82
+ element.remove(existing);
83
+ }
84
+ }
73
85
  }
74
86
  exports.addResizeHandles = addResizeHandles;
75
87
  function removeResizeHandles(element) {
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/change-bounds/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAY+B;AAElB,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAIrD,SAAgB,WAAW,CAAC,OAAsB;IAC9C,OAAO,IAAA,uBAAa,EAAC,OAAO,CAAC,IAAI,IAAA,sBAAY,EAAC,OAAO,CAAC,IAAI,OAAO,YAAY,wBAAc,IAAI,OAAO,CAAC,UAAU,CAAC,qBAAa,CAAC,CAAC;AACrI,CAAC;AAFD,kCAEC;AAED,qCAAqC;AACrC,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC5B,4CAAoB,CAAA;IACpB,8CAAsB,CAAA;IACtB,kDAA0B,CAAA;IAC1B,oDAA4B,CAAA;AAChC,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,SAAgB,qBAAqB,CAAC,OAAsB;IACxD,OAAO,IAAA,oBAAU,EAAC,OAAO,CAAC,IAAI,IAAA,uBAAa,EAAC,OAAO,CAAC,CAAC;AACzD,CAAC;AAFD,sDAEC;AAED,MAAa,aAAc,SAAQ,uBAAa;IAG5C,YACa,QAA+B,EACtB,OAAe,aAAa,CAAC,IAAI,EAC1C,gBAAyB,KAAK;QAEvC,KAAK,EAAE,CAAC;QAJC,aAAQ,GAAR,QAAQ,CAAuB;QACtB,SAAI,GAAJ,IAAI,CAA6B;QAC1C,kBAAa,GAAb,aAAa,CAAiB;IAG3C,CAAC;IAEQ,UAAU,CAAC,OAAe;QAC/B,OAAO,OAAO,KAAK,8BAAoB,CAAC;IAC5C,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,QAAQ,KAAK,oBAAoB,CAAC,OAAO,CAAC;IAC1D,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,QAAQ,KAAK,oBAAoB,CAAC,WAAW,CAAC;IAC9D,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,QAAQ,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAC3D,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,QAAQ,KAAK,oBAAoB,CAAC,UAAU,CAAC;IAC7D,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC;;AArCL,sCAsCC;AArCmB,kBAAI,GAAG,eAAe,CAAC;AAuC3C,SAAgB,gBAAgB,CAAC,OAAuB;IACpD,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC;AACrE,CAAC;AALD,4CAKC;AAED,SAAgB,mBAAmB,CAAC,OAAuB;IACvD,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,aAAa,CAAC,CAAC;AAC/D,CAAC;AAFD,kDAEC"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/change-bounds/model.ts"],"names":[],"mappings":"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"}
@@ -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 { BoundsAware, GModelElement, Point } from '@eclipse-glsp/sprotty';
16
+ import { GModelElement, Point } from '@eclipse-glsp/sprotty';
17
17
  import { ModifyCSSFeedbackAction } from '../../base/feedback/css-feedback';
18
+ import { BoundsAwareModelElement } from '../../utils';
18
19
  /**
19
20
  * A `MovementRestrictor` is an optional service that can be used by tools to validate
20
21
  * whether a certain move operation (e.g. `ChangeBoundsOperation`) in the diagram is valid.
@@ -40,7 +41,7 @@ export interface IMovementRestrictor {
40
41
  export declare class NoOverlapMovementRestrictor implements IMovementRestrictor {
41
42
  cssClasses: string[];
42
43
  validate(element: GModelElement, newLocation?: Point): boolean;
43
- protected areOverlapping(element1: GModelElement & BoundsAware, element2: GModelElement & BoundsAware): boolean;
44
+ protected areOverlapping(element1: BoundsAwareModelElement, element2: BoundsAwareModelElement): boolean;
44
45
  }
45
46
  /**
46
47
  * Utility function to create an action that applies the given {@link IMovementRestrictor.cssClasses} to the given element.
@@ -1 +1 @@
1
- {"version":3,"file":"movement-restrictor.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/movement-restrictor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAU,WAAW,EAAE,aAAa,EAAyB,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAI3E;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;IAC/D;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED;;;GAGG;AACH,qBACa,2BAA4B,YAAW,mBAAmB;IACnE,UAAU,WAA4B;IAEtC,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO;IAsB9D,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,WAAW,EAAE,QAAQ,EAAE,aAAa,GAAG,WAAW,GAAG,OAAO;CAGlH;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC7C,OAAO,EAAE,aAAa,EACtB,kBAAkB,EAAE,mBAAmB,GACxC,uBAAuB,CAMzB;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC7C,OAAO,EAAE,aAAa,EACtB,kBAAkB,EAAE,mBAAmB,GACxC,uBAAuB,CAOzB"}
1
+ {"version":3,"file":"movement-restrictor.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/movement-restrictor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAU,aAAa,EAAyB,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAItD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;IAC/D;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED;;;GAGG;AACH,qBACa,2BAA4B,YAAW,mBAAmB;IACnE,UAAU,WAA4B;IAEtC,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO;IAsB9D,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,uBAAuB,EAAE,QAAQ,EAAE,uBAAuB,GAAG,OAAO;CAG1G;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC7C,OAAO,EAAE,aAAa,EACtB,kBAAkB,EAAE,mBAAmB,GACxC,uBAAuB,CAMzB;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC7C,OAAO,EAAE,aAAa,EACtB,kBAAkB,EAAE,mBAAmB,GACxC,uBAAuB,CAOzB"}
@@ -1 +1 @@
1
- {"version":3,"file":"movement-restrictor.js","sourceRoot":"","sources":["../../../src/features/change-bounds/movement-restrictor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"movement-restrictor.js","sourceRoot":"","sources":["../../../src/features/change-bounds/movement-restrictor.ts"],"names":[],"mappings":"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"}
@@ -13,29 +13,39 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Action, Disposable, GModelElement, Locateable, Point } from '@eclipse-glsp/sprotty';
16
+ import { Action, Disposable, ElementMove, GModelElement, Point } from '@eclipse-glsp/sprotty';
17
17
  import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
18
+ import { FeedbackEmitter } from '../../base/feedback/feeback-emitter';
18
19
  import { IFeedbackEmitter } from '../../base/feedback/feedback-action-dispatcher';
19
20
  import { Tool } from '../../base/tool-manager/tool';
21
+ import { MoveableElement } from '../../utils';
20
22
  import { IMovementRestrictor } from '../change-bounds/movement-restrictor';
21
23
  import { PointPositionUpdater } from '../change-bounds/point-position-updater';
22
24
  import { PositionSnapper } from '../change-bounds/position-snapper';
23
25
  export interface PositioningTool extends Tool {
24
26
  readonly positionSnapper: PositionSnapper;
25
27
  readonly movementRestrictor?: IMovementRestrictor;
28
+ createFeedbackEmitter(): FeedbackEmitter;
29
+ /**
30
+ * @deprecated It is recommended to create a {@link createFeedbackEmitter dedicated emitter} per feedback instead of using the tool.
31
+ */
26
32
  registerFeedback(feedbackActions: Action[], feedbackEmitter?: IFeedbackEmitter, cleanupActions?: Action[]): Disposable;
33
+ /**
34
+ * @deprecated It is recommended to create a {@link createFeedbackEmitter dedicated emitter} per feedback and dispose it like that.
35
+ */
27
36
  deregisterFeedback(feedbackEmitter?: IFeedbackEmitter, cleanupActions?: Action[]): void;
28
37
  }
29
38
  export declare class MouseTrackingElementPositionListener extends DragAwareMouseListener {
30
39
  protected elementId: string;
31
40
  protected tool: PositioningTool;
32
41
  protected cursorPosition: 'top-left' | 'middle';
33
- currentPosition?: Point;
34
42
  protected positionUpdater: PointPositionUpdater;
43
+ protected moveGhostFeedback: FeedbackEmitter;
44
+ protected currentPosition?: Point;
35
45
  constructor(elementId: string, tool: PositioningTool, cursorPosition?: 'top-left' | 'middle');
36
46
  mouseMove(target: GModelElement, event: MouseEvent): Action[];
37
- protected getTargetPosition(target: GModelElement, event: MouseEvent, element: GModelElement & Locateable): Point;
38
- protected snap(position: Point, element: GModelElement, isSnap?: boolean): Point;
39
- protected validateMove(startPosition: Point, toPosition: Point, element: GModelElement, isFinished: boolean): Point;
47
+ protected getElementTargetPosition(mousePosition: Point, element: MoveableElement, event: MouseEvent): Point;
48
+ protected addMoveFeeback(element: MoveableElement, elementMove: ElementMove): void;
49
+ dispose(): void;
40
50
  }
41
51
  //# sourceMappingURL=mouse-tracking-element-position-listener.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mouse-tracking-element-position-listener.d.ts","sourceRoot":"","sources":["../../../src/features/element-template/mouse-tracking-element-position-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,UAAU,EACV,aAAa,EACb,UAAU,EAEV,KAAK,EAGR,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAEpD,OAAO,EACH,mBAAmB,EAGtB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGpE,MAAM,WAAW,eAAgB,SAAQ,IAAI;IACzC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;IAElD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IACvH,kBAAkB,CAAC,eAAe,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC3F;AAED,qBACa,oCAAqC,SAAQ,sBAAsB;IAMxE,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,IAAI,EAAE,eAAe;IAC/B,SAAS,CAAC,cAAc,EAAE,UAAU,GAAG,QAAQ;IAPnD,eAAe,CAAC,EAAE,KAAK,CAAC;IAExB,SAAS,CAAC,eAAe,EAAE,oBAAoB,CAAC;gBAGlC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,eAAe,EACrB,cAAc,GAAE,UAAU,GAAG,QAAqB;IAMvD,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAgCtE,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,GAAG,UAAU,GAAG,KAAK;IAQjH,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAO,GAAG,KAAK;IAI7E,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,GAAG,KAAK;CAiBtH"}
1
+ {"version":3,"file":"mouse-tracking-element-position-listener.d.ts","sourceRoot":"","sources":["../../../src/features/element-template/mouse-tracking-element-position-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,UAAU,EACV,WAAW,EACX,aAAa,EAEb,KAAK,EAGR,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EACH,mBAAmB,EAGtB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAIpE,MAAM,WAAW,eAAgB,SAAQ,IAAI;IACzC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,mBAAmB,CAAC;IAElD,qBAAqB,IAAI,eAAe,CAAC;IACzC;;OAEG;IACH,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IACvH;;OAEG;IACH,kBAAkB,CAAC,eAAe,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC3F;AAED,qBACa,oCAAqC,SAAQ,sBAAsB;IAMxE,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,IAAI,EAAE,eAAe;IAC/B,SAAS,CAAC,cAAc,EAAE,UAAU,GAAG,QAAQ;IAPnD,SAAS,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAChD,SAAS,CAAC,iBAAiB,EAAE,eAAe,CAAC;IAC7C,SAAS,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC;gBAGpB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,eAAe,EACrB,cAAc,GAAE,UAAU,GAAG,QAAqB;IAOvD,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAwBtE,SAAS,CAAC,wBAAwB,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,GAAG,KAAK;IAQ5G,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAczE,OAAO,IAAI,IAAI;CAI3B"}
@@ -33,6 +33,7 @@ const viewpoint_util_1 = require("../../utils/viewpoint-util");
33
33
  const movement_restrictor_1 = require("../change-bounds/movement-restrictor");
34
34
  const point_position_updater_1 = require("../change-bounds/point-position-updater");
35
35
  const snap_1 = require("../change-bounds/snap");
36
+ const tools_1 = require("../tools");
36
37
  let MouseTrackingElementPositionListener = class MouseTrackingElementPositionListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
37
38
  constructor(elementId, tool, cursorPosition = 'top-left') {
38
39
  super();
@@ -40,63 +41,51 @@ let MouseTrackingElementPositionListener = class MouseTrackingElementPositionLis
40
41
  this.tool = tool;
41
42
  this.cursorPosition = cursorPosition;
42
43
  this.positionUpdater = new point_position_updater_1.PointPositionUpdater(this.tool.positionSnapper);
44
+ this.moveGhostFeedback = this.tool.createFeedbackEmitter();
43
45
  }
44
46
  mouseMove(target, event) {
45
- var _a, _b;
46
47
  super.mouseMove(target, event);
47
48
  const element = target.root.index.getById(this.elementId);
48
49
  if (!element || !(0, sprotty_1.isMoveable)(element)) {
49
50
  return [];
50
51
  }
51
- let targetPosition = this.getTargetPosition(target, event, element);
52
52
  if (this.positionUpdater.isLastDragPositionUndefined()) {
53
- this.positionUpdater.updateLastDragPosition(targetPosition);
53
+ this.positionUpdater.updateLastDragPosition(element.position);
54
54
  }
55
- const delta = this.positionUpdater.updatePosition(element, targetPosition, (0, snap_1.useSnap)(event));
55
+ const mousePosition = (0, viewpoint_util_1.getAbsolutePosition)(target, event);
56
+ const delta = this.positionUpdater.updatePosition(element, mousePosition, (0, snap_1.useSnap)(event));
56
57
  if (!delta) {
57
58
  return [];
58
59
  }
59
- targetPosition = this.validateMove((_a = this.currentPosition) !== null && _a !== void 0 ? _a : targetPosition, targetPosition, element, false);
60
- const moveGhostElement = sprotty_1.MoveAction.create([
61
- {
62
- elementId: element.id,
63
- fromPosition: this.currentPosition,
64
- toPosition: targetPosition
65
- }
66
- ], { animate: false, finished: false });
67
- this.currentPosition = targetPosition;
68
- this.tool.registerFeedback([moveGhostElement], this);
69
- return ((_b = element.cssClasses) === null || _b === void 0 ? void 0 : _b.includes(css_feedback_1.CSS_HIDDEN))
70
- ? [css_feedback_1.ModifyCSSFeedbackAction.create({ elements: [element.id], remove: [css_feedback_1.CSS_HIDDEN] })]
71
- : [];
72
- }
73
- getTargetPosition(target, event, element) {
74
- let targetPosition = (0, viewpoint_util_1.getAbsolutePosition)(target, event);
75
- if (this.cursorPosition === 'middle' && (0, sprotty_1.isBoundsAware)(element)) {
76
- targetPosition = sprotty_1.Point.subtract(targetPosition, sprotty_1.Dimension.center(element.bounds));
77
- }
78
- return targetPosition;
60
+ const toPosition = this.getElementTargetPosition(mousePosition, element, event);
61
+ const elementMove = { elementId: element.id, toPosition: toPosition };
62
+ this.addMoveFeeback(element, elementMove);
63
+ this.currentPosition = toPosition;
64
+ // since we are moving a ghost element that is feedback-only and will be removed anyway,
65
+ // we just send a MoveFinishedEventAction instead of reseting the position with a MoveAction and the finished flag set to true.
66
+ this.moveGhostFeedback.add(sprotty_1.MoveAction.create([elementMove], { animate: false }), tools_1.MoveFinishedEventAction.create()).submit();
67
+ return [];
79
68
  }
80
- snap(position, element, isSnap = true) {
81
- return this.tool.positionSnapper.snapPosition(position, element, isSnap);
69
+ getElementTargetPosition(mousePosition, element, event) {
70
+ const unsnappedPosition = this.cursorPosition === 'middle' && (0, sprotty_1.isBoundsAware)(element)
71
+ ? sprotty_1.Point.subtract(mousePosition, sprotty_1.Dimension.center(element.bounds))
72
+ : mousePosition;
73
+ return this.tool.positionSnapper.snapPosition(unsnappedPosition, element, (0, snap_1.useSnap)(event));
82
74
  }
83
- validateMove(startPosition, toPosition, element, isFinished) {
84
- let newPosition = toPosition;
75
+ addMoveFeeback(element, elementMove) {
85
76
  if (this.tool.movementRestrictor) {
86
- const valid = this.tool.movementRestrictor.validate(element, toPosition);
87
- let action;
88
- if (!valid) {
89
- action = (0, movement_restrictor_1.createMovementRestrictionFeedback)(element, this.tool.movementRestrictor);
90
- if (isFinished) {
91
- newPosition = startPosition;
92
- }
77
+ if (!this.tool.movementRestrictor.validate(element, elementMove.toPosition)) {
78
+ this.moveGhostFeedback.add((0, movement_restrictor_1.createMovementRestrictionFeedback)(element, this.tool.movementRestrictor), (0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
93
79
  }
94
80
  else {
95
- action = (0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor);
81
+ this.moveGhostFeedback.add((0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
96
82
  }
97
- this.tool.registerFeedback([action], this, [(0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor)]);
98
83
  }
99
- return newPosition;
84
+ this.moveGhostFeedback.add(css_feedback_1.ModifyCSSFeedbackAction.create({ elements: [element.id], remove: [css_feedback_1.CSS_HIDDEN] }));
85
+ }
86
+ dispose() {
87
+ this.moveGhostFeedback.dispose();
88
+ super.dispose();
100
89
  }
101
90
  };
102
91
  exports.MouseTrackingElementPositionListener = MouseTrackingElementPositionListener;
@@ -1 +1 @@
1
- {"version":3,"file":"mouse-tracking-element-position-listener.js","sourceRoot":"","sources":["../../../src/features/element-template/mouse-tracking-element-position-listener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mouse-tracking-element-position-listener.js","sourceRoot":"","sources":["../../../src/features/element-template/mouse-tracking-element-position-listener.ts"],"names":[],"mappings":"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"}