@eclipse-glsp/client 0.9.0-next.fd1a8bb6 → 0.10.0-next.4ce46ea.160

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 (497) hide show
  1. package/LICENSE +642 -277
  2. package/README.md +4 -2
  3. package/css/command-palette.css +9 -5
  4. package/css/decoration.css +3 -2
  5. package/css/glsp-sprotty.css +125 -14
  6. package/css/tool-palette.css +44 -27
  7. package/lib/base/action-dispatcher.d.ts +19 -3
  8. package/lib/base/action-dispatcher.d.ts.map +1 -1
  9. package/lib/base/action-dispatcher.js +11 -8
  10. package/lib/base/action-dispatcher.js.map +1 -1
  11. package/lib/base/actions/focus-change-action.d.ts +1 -1
  12. package/lib/base/actions/focus-change-action.d.ts.map +1 -1
  13. package/lib/base/{args.d.ts → argumentable.d.ts} +2 -4
  14. package/lib/base/argumentable.d.ts.map +1 -0
  15. package/lib/base/{args.js → argumentable.js} +1 -1
  16. package/lib/base/argumentable.js.map +1 -0
  17. package/lib/base/auto-complete/auto-complete-actions.d.ts +1 -1
  18. package/lib/base/auto-complete/auto-complete-actions.d.ts.map +1 -1
  19. package/lib/base/auto-complete/auto-complete-widget.d.ts +2 -2
  20. package/lib/base/auto-complete/auto-complete-widget.d.ts.map +1 -1
  21. package/lib/base/auto-complete/auto-complete-widget.js +20 -4
  22. package/lib/base/auto-complete/auto-complete-widget.js.map +1 -1
  23. package/lib/base/auto-complete/validation-decorator.d.ts +3 -18
  24. package/lib/base/auto-complete/validation-decorator.d.ts.map +1 -1
  25. package/lib/base/auto-complete/validation-decorator.js +9 -8
  26. package/lib/base/auto-complete/validation-decorator.js.map +1 -1
  27. package/lib/base/command-stack.d.ts.map +1 -1
  28. package/lib/base/command-stack.js +3 -3
  29. package/lib/base/command-stack.js.map +1 -1
  30. package/lib/base/container-modules.d.ts +40 -0
  31. package/lib/base/container-modules.d.ts.map +1 -0
  32. package/lib/base/container-modules.js +100 -0
  33. package/lib/base/container-modules.js.map +1 -0
  34. package/lib/base/di.config.d.ts +4 -2
  35. package/lib/base/di.config.d.ts.map +1 -1
  36. package/lib/base/di.config.js +10 -8
  37. package/lib/base/di.config.js.map +1 -1
  38. package/lib/base/drag-aware-mouse-listener.d.ts +2 -1
  39. package/lib/base/drag-aware-mouse-listener.d.ts.map +1 -1
  40. package/lib/base/drag-aware-mouse-listener.js +0 -15
  41. package/lib/base/drag-aware-mouse-listener.js.map +1 -1
  42. package/lib/base/{editor-context.d.ts → editor-context-service.d.ts} +18 -22
  43. package/lib/base/editor-context-service.d.ts.map +1 -0
  44. package/lib/base/{editor-context.js → editor-context-service.js} +6 -7
  45. package/lib/base/editor-context-service.js.map +1 -0
  46. package/lib/base/focus-tracker.d.ts +17 -1
  47. package/lib/base/focus-tracker.d.ts.map +1 -1
  48. package/lib/base/focus-tracker.js +0 -15
  49. package/lib/base/focus-tracker.js.map +1 -1
  50. package/lib/base/model/update-model-command.d.ts +19 -5
  51. package/lib/base/model/update-model-command.d.ts.map +1 -1
  52. package/lib/base/model/update-model-command.js +8 -12
  53. package/lib/base/model/update-model-command.js.map +1 -1
  54. package/lib/base/model-initialization-constraint.d.ts +16 -1
  55. package/lib/base/model-initialization-constraint.d.ts.map +1 -1
  56. package/lib/base/model-initialization-constraint.js +3 -2
  57. package/lib/base/model-initialization-constraint.js.map +1 -1
  58. package/lib/base/tool-manager/glsp-tool-manager.d.ts +1 -1
  59. package/lib/base/tool-manager/glsp-tool-manager.d.ts.map +1 -1
  60. package/lib/base/tool-manager/glsp-tool-manager.js +6 -7
  61. package/lib/base/tool-manager/glsp-tool-manager.js.map +1 -1
  62. package/lib/base/types.d.ts +3 -1
  63. package/lib/base/types.d.ts.map +1 -1
  64. package/lib/base/types.js +4 -2
  65. package/lib/base/types.js.map +1 -1
  66. package/lib/features/change-bounds/model.d.ts +2 -0
  67. package/lib/features/change-bounds/model.d.ts.map +1 -1
  68. package/lib/features/change-bounds/model.js +6 -0
  69. package/lib/features/change-bounds/model.js.map +1 -1
  70. package/lib/features/change-bounds/movement-restrictor.d.ts +17 -1
  71. package/lib/features/change-bounds/movement-restrictor.d.ts.map +1 -1
  72. package/lib/features/change-bounds/movement-restrictor.js +0 -15
  73. package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
  74. package/lib/features/change-bounds/snap.d.ts +17 -1
  75. package/lib/features/change-bounds/snap.d.ts.map +1 -1
  76. package/lib/features/change-bounds/snap.js +0 -15
  77. package/lib/features/change-bounds/snap.js.map +1 -1
  78. package/lib/features/command-palette/server-command-palette-provider.d.ts +18 -2
  79. package/lib/features/command-palette/server-command-palette-provider.d.ts.map +1 -1
  80. package/lib/features/command-palette/server-command-palette-provider.js +6 -6
  81. package/lib/features/command-palette/server-command-palette-provider.js.map +1 -1
  82. package/lib/features/context-menu/delete-element-context-menu.d.ts +1 -1
  83. package/lib/features/context-menu/delete-element-context-menu.d.ts.map +1 -1
  84. package/lib/features/context-menu/delete-element-context-menu.js +3 -3
  85. package/lib/features/context-menu/delete-element-context-menu.js.map +1 -1
  86. package/lib/features/context-menu/di.config.d.ts.map +1 -1
  87. package/lib/features/context-menu/di.config.js.map +1 -1
  88. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts +16 -0
  89. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts.map +1 -1
  90. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js +36 -8
  91. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
  92. package/lib/features/context-menu/server-context-menu-provider.d.ts +18 -2
  93. package/lib/features/context-menu/server-context-menu-provider.d.ts.map +1 -1
  94. package/lib/features/context-menu/server-context-menu-provider.js +6 -6
  95. package/lib/features/context-menu/server-context-menu-provider.js.map +1 -1
  96. package/lib/features/copy-paste/copy-paste-context-menu.d.ts +17 -1
  97. package/lib/features/copy-paste/copy-paste-context-menu.d.ts.map +1 -1
  98. package/lib/features/copy-paste/copy-paste-context-menu.js +6 -6
  99. package/lib/features/copy-paste/copy-paste-context-menu.js.map +1 -1
  100. package/lib/features/copy-paste/copy-paste-handler.d.ts +17 -2
  101. package/lib/features/copy-paste/copy-paste-handler.d.ts.map +1 -1
  102. package/lib/features/copy-paste/copy-paste-handler.js +7 -7
  103. package/lib/features/copy-paste/copy-paste-handler.js.map +1 -1
  104. package/lib/features/copy-paste/di.config.d.ts +1 -1
  105. package/lib/features/copy-paste/di.config.d.ts.map +1 -1
  106. package/lib/features/copy-paste/di.config.js +5 -5
  107. package/lib/features/copy-paste/di.config.js.map +1 -1
  108. package/lib/features/decoration/decoration-placer.d.ts +17 -1
  109. package/lib/features/decoration/decoration-placer.d.ts.map +1 -1
  110. package/lib/features/decoration/decoration-placer.js +0 -15
  111. package/lib/features/decoration/decoration-placer.js.map +1 -1
  112. package/lib/features/edit-label/edit-label-validator.d.ts +16 -1
  113. package/lib/features/edit-label/edit-label-validator.d.ts.map +1 -1
  114. package/lib/features/edit-label/edit-label-validator.js +5 -5
  115. package/lib/features/edit-label/edit-label-validator.js.map +1 -1
  116. package/lib/features/hints/di.config.d.ts +0 -15
  117. package/lib/features/hints/di.config.d.ts.map +1 -1
  118. package/lib/features/hints/di.config.js +3 -3
  119. package/lib/features/hints/di.config.js.map +1 -1
  120. package/lib/features/hints/model.d.ts +2 -1
  121. package/lib/features/hints/model.d.ts.map +1 -1
  122. package/lib/features/hints/model.js.map +1 -1
  123. package/lib/features/hints/type-hints.d.ts +17 -45
  124. package/lib/features/hints/type-hints.d.ts.map +1 -1
  125. package/lib/features/hints/type-hints.js +3 -20
  126. package/lib/features/hints/type-hints.js.map +1 -1
  127. package/lib/features/hover/di.config.d.ts +1 -1
  128. package/lib/features/hover/di.config.d.ts.map +1 -1
  129. package/lib/features/hover/di.config.js +4 -2
  130. package/lib/features/hover/di.config.js.map +1 -1
  131. package/lib/features/hover/hover.d.ts +28 -2
  132. package/lib/features/hover/hover.d.ts.map +1 -1
  133. package/lib/features/hover/hover.js +24 -3
  134. package/lib/features/hover/hover.js.map +1 -1
  135. package/lib/features/layout/di.config.d.ts +1 -1
  136. package/lib/features/layout/di.config.d.ts.map +1 -1
  137. package/lib/features/layout/di.config.js +6 -2
  138. package/lib/features/layout/di.config.js.map +1 -1
  139. package/lib/features/layout/freeform-layout.d.ts +16 -0
  140. package/lib/features/layout/freeform-layout.d.ts.map +1 -0
  141. package/lib/features/layout/freeform-layout.js +107 -0
  142. package/lib/features/layout/freeform-layout.js.map +1 -0
  143. package/lib/features/layout/layout-commands.d.ts +17 -1
  144. package/lib/features/layout/layout-commands.d.ts.map +1 -1
  145. package/lib/features/layout/layout-commands.js +3 -3
  146. package/lib/features/layout/layout-commands.js.map +1 -1
  147. package/lib/features/layout/layout-commands.spec.d.ts +0 -15
  148. package/lib/features/layout/layout-commands.spec.d.ts.map +1 -1
  149. package/lib/features/layout/layout-commands.spec.js +4 -4
  150. package/lib/features/layout/layout-commands.spec.js.map +1 -1
  151. package/lib/features/layout/vbox-layout.d.ts +25 -0
  152. package/lib/features/layout/vbox-layout.d.ts.map +1 -0
  153. package/lib/features/layout/vbox-layout.js +188 -0
  154. package/lib/features/layout/vbox-layout.js.map +1 -0
  155. package/lib/features/model-source-watcher/di.config.d.ts +0 -15
  156. package/lib/features/model-source-watcher/di.config.d.ts.map +1 -1
  157. package/lib/features/model-source-watcher/di.config.js +4 -4
  158. package/lib/features/model-source-watcher/di.config.js.map +1 -1
  159. package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts +17 -2
  160. package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts.map +1 -1
  161. package/lib/features/model-source-watcher/model-source-changed-action-handler.js +7 -8
  162. package/lib/features/model-source-watcher/model-source-changed-action-handler.js.map +1 -1
  163. package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
  164. package/lib/features/mouse-tool/mouse-tool.js +2 -1
  165. package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
  166. package/lib/features/navigation/di.config.d.ts +0 -15
  167. package/lib/features/navigation/di.config.d.ts.map +1 -1
  168. package/lib/features/navigation/di.config.js +7 -6
  169. package/lib/features/navigation/di.config.js.map +1 -1
  170. package/lib/features/navigation/navigation-action-handler.d.ts +19 -38
  171. package/lib/features/navigation/navigation-action-handler.d.ts.map +1 -1
  172. package/lib/features/navigation/navigation-action-handler.js +12 -67
  173. package/lib/features/navigation/navigation-action-handler.js.map +1 -1
  174. package/lib/features/navigation/navigation-target-resolver.d.ts +18 -40
  175. package/lib/features/navigation/navigation-target-resolver.d.ts.map +1 -1
  176. package/lib/features/navigation/navigation-target-resolver.js +6 -83
  177. package/lib/features/navigation/navigation-target-resolver.js.map +1 -1
  178. package/lib/features/navigation/navigation-target-resolver.spec.d.ts +0 -15
  179. package/lib/features/navigation/navigation-target-resolver.spec.d.ts.map +1 -1
  180. package/lib/features/navigation/navigation-target-resolver.spec.js +16 -16
  181. package/lib/features/navigation/navigation-target-resolver.spec.js.map +1 -1
  182. package/lib/features/save/di.config.js +2 -2
  183. package/lib/features/save/di.config.js.map +1 -1
  184. package/lib/features/save/{save.d.ts → save-keylistener.d.ts} +3 -9
  185. package/lib/features/save/save-keylistener.d.ts.map +1 -0
  186. package/lib/features/save/{save.js → save-keylistener.js} +4 -15
  187. package/lib/features/save/save-keylistener.js.map +1 -0
  188. package/lib/features/select/selection-service.d.ts +17 -1
  189. package/lib/features/select/selection-service.d.ts.map +1 -1
  190. package/lib/features/select/selection-service.js +5 -5
  191. package/lib/features/select/selection-service.js.map +1 -1
  192. package/lib/features/select/selection-service.spec.js +0 -16
  193. package/lib/features/select/selection-service.spec.js.map +1 -1
  194. package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts +18 -1
  195. package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts.map +1 -1
  196. package/lib/features/tool-feedback/change-bounds-tool-feedback.js +16 -18
  197. package/lib/features/tool-feedback/change-bounds-tool-feedback.js.map +1 -1
  198. package/lib/features/tool-feedback/creation-tool-feedback.d.ts +18 -2
  199. package/lib/features/tool-feedback/creation-tool-feedback.d.ts.map +1 -1
  200. package/lib/features/tool-feedback/creation-tool-feedback.js +30 -19
  201. package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
  202. package/lib/features/tool-feedback/css-feedback.d.ts +20 -2
  203. package/lib/features/tool-feedback/css-feedback.d.ts.map +1 -1
  204. package/lib/features/tool-feedback/css-feedback.js +5 -3
  205. package/lib/features/tool-feedback/css-feedback.js.map +1 -1
  206. package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts +17 -1
  207. package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts.map +1 -1
  208. package/lib/features/tool-feedback/edge-edit-tool-feedback.js +0 -15
  209. package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
  210. package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts +18 -2
  211. package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts.map +1 -1
  212. package/lib/features/tool-feedback/feedback-action-dispatcher.js +0 -15
  213. package/lib/features/tool-feedback/feedback-action-dispatcher.js.map +1 -1
  214. package/lib/features/tool-feedback/marquee-tool-feedback.d.ts +17 -1
  215. package/lib/features/tool-feedback/marquee-tool-feedback.d.ts.map +1 -1
  216. package/lib/features/tool-feedback/marquee-tool-feedback.js +0 -15
  217. package/lib/features/tool-feedback/marquee-tool-feedback.js.map +1 -1
  218. package/lib/features/tool-feedback/view.d.ts +17 -1
  219. package/lib/features/tool-feedback/view.d.ts.map +1 -1
  220. package/lib/features/tool-feedback/view.js +0 -15
  221. package/lib/features/tool-feedback/view.js.map +1 -1
  222. package/lib/features/tool-palette/di.config.d.ts +1 -1
  223. package/lib/features/tool-palette/di.config.d.ts.map +1 -1
  224. package/lib/features/tool-palette/di.config.js +1 -1
  225. package/lib/features/tool-palette/di.config.js.map +1 -1
  226. package/lib/features/tool-palette/palette-item.d.ts +1 -2
  227. package/lib/features/tool-palette/palette-item.d.ts.map +1 -1
  228. package/lib/features/tool-palette/palette-item.js +3 -4
  229. package/lib/features/tool-palette/palette-item.js.map +1 -1
  230. package/lib/features/tool-palette/tool-palette.d.ts +19 -3
  231. package/lib/features/tool-palette/tool-palette.d.ts.map +1 -1
  232. package/lib/features/tool-palette/tool-palette.js +38 -31
  233. package/lib/features/tool-palette/tool-palette.js.map +1 -1
  234. package/lib/features/tools/base-glsp-tool.d.ts +20 -4
  235. package/lib/features/tools/base-glsp-tool.d.ts.map +1 -1
  236. package/lib/features/tools/base-glsp-tool.js +8 -23
  237. package/lib/features/tools/base-glsp-tool.js.map +1 -1
  238. package/lib/features/tools/change-bounds-tool.d.ts +20 -3
  239. package/lib/features/tools/change-bounds-tool.d.ts.map +1 -1
  240. package/lib/features/tools/change-bounds-tool.js +28 -13
  241. package/lib/features/tools/change-bounds-tool.js.map +1 -1
  242. package/lib/features/tools/delete-tool.d.ts +17 -1
  243. package/lib/features/tools/delete-tool.d.ts.map +1 -1
  244. package/lib/features/tools/delete-tool.js +3 -3
  245. package/lib/features/tools/delete-tool.js.map +1 -1
  246. package/lib/features/tools/di.config.d.ts +0 -15
  247. package/lib/features/tools/di.config.d.ts.map +1 -1
  248. package/lib/features/tools/di.config.js +4 -4
  249. package/lib/features/tools/di.config.js.map +1 -1
  250. package/lib/features/tools/edge-creation-tool.d.ts +17 -2
  251. package/lib/features/tools/edge-creation-tool.d.ts.map +1 -1
  252. package/lib/features/tools/edge-creation-tool.js +4 -4
  253. package/lib/features/tools/edge-creation-tool.js.map +1 -1
  254. package/lib/features/tools/edge-edit-tool.d.ts +17 -1
  255. package/lib/features/tools/edge-edit-tool.d.ts.map +1 -1
  256. package/lib/features/tools/edge-edit-tool.js +5 -4
  257. package/lib/features/tools/edge-edit-tool.js.map +1 -1
  258. package/lib/features/tools/marquee-behavior.d.ts +42 -0
  259. package/lib/features/tools/marquee-behavior.d.ts.map +1 -0
  260. package/lib/features/tools/marquee-behavior.js +128 -0
  261. package/lib/features/tools/marquee-behavior.js.map +1 -0
  262. package/{src/features/undo-redo/model.ts → lib/features/tools/marquee-behavior.spec.d.ts} +3 -12
  263. package/lib/features/tools/marquee-behavior.spec.d.ts.map +1 -0
  264. package/lib/features/tools/marquee-behavior.spec.js +165 -0
  265. package/lib/features/tools/marquee-behavior.spec.js.map +1 -0
  266. package/lib/features/tools/marquee-mouse-tool.d.ts +24 -13
  267. package/lib/features/tools/marquee-mouse-tool.d.ts.map +1 -1
  268. package/lib/features/tools/marquee-mouse-tool.js +33 -121
  269. package/lib/features/tools/marquee-mouse-tool.js.map +1 -1
  270. package/lib/features/tools/marquee-tool.d.ts +17 -1
  271. package/lib/features/tools/marquee-tool.d.ts.map +1 -1
  272. package/lib/features/tools/marquee-tool.js +0 -15
  273. package/lib/features/tools/marquee-tool.js.map +1 -1
  274. package/lib/features/tools/node-creation-tool.d.ts +17 -2
  275. package/lib/features/tools/node-creation-tool.d.ts.map +1 -1
  276. package/lib/features/tools/node-creation-tool.js +4 -4
  277. package/lib/features/tools/node-creation-tool.js.map +1 -1
  278. package/lib/features/validation/issue-marker.d.ts +2 -2
  279. package/lib/features/validation/issue-marker.d.ts.map +1 -1
  280. package/lib/features/validation/issue-marker.js +5 -5
  281. package/lib/features/validation/issue-marker.js.map +1 -1
  282. package/lib/features/validation/marker-navigator.d.ts +17 -1
  283. package/lib/features/validation/marker-navigator.d.ts.map +1 -1
  284. package/lib/features/validation/marker-navigator.js +2 -1
  285. package/lib/features/validation/marker-navigator.js.map +1 -1
  286. package/lib/features/validation/marker-navigator.spec.d.ts +0 -15
  287. package/lib/features/validation/marker-navigator.spec.d.ts.map +1 -1
  288. package/lib/features/validation/marker-navigator.spec.js +9 -9
  289. package/lib/features/validation/marker-navigator.spec.js.map +1 -1
  290. package/lib/features/validation/validate.d.ts +18 -29
  291. package/lib/features/validation/validate.d.ts.map +1 -1
  292. package/lib/features/validation/validate.js +11 -49
  293. package/lib/features/validation/validate.js.map +1 -1
  294. package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts +18 -2
  295. package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts.map +1 -1
  296. package/lib/features/viewport/glsp-scroll-mouse-listener.js +0 -15
  297. package/lib/features/viewport/glsp-scroll-mouse-listener.js.map +1 -1
  298. package/lib/index.d.ts +6 -12
  299. package/lib/index.d.ts.map +1 -1
  300. package/lib/index.js +6 -12
  301. package/lib/index.js.map +1 -1
  302. package/lib/model-source/glsp-diagram-server.d.ts +2 -4
  303. package/lib/model-source/glsp-diagram-server.d.ts.map +1 -1
  304. package/lib/model-source/glsp-diagram-server.js +21 -6
  305. package/lib/model-source/glsp-diagram-server.js.map +1 -1
  306. package/lib/protocol-reexport.d.ts +45 -0
  307. package/lib/protocol-reexport.d.ts.map +1 -0
  308. package/lib/protocol-reexport.js +75 -0
  309. package/lib/protocol-reexport.js.map +1 -0
  310. package/lib/utils/argument-utils.d.ts.map +1 -1
  311. package/lib/utils/argument-utils.js +6 -6
  312. package/lib/utils/argument-utils.js.map +1 -1
  313. package/lib/utils/layout-utils.d.ts +2 -1
  314. package/lib/utils/layout-utils.d.ts.map +1 -1
  315. package/lib/utils/marker.d.ts +0 -38
  316. package/lib/utils/marker.d.ts.map +1 -1
  317. package/lib/utils/marker.js +6 -11
  318. package/lib/utils/marker.js.map +1 -1
  319. package/lib/utils/smodel-util.d.ts +1 -1
  320. package/lib/utils/smodel-util.d.ts.map +1 -1
  321. package/lib/utils/smodel-util.js +0 -15
  322. package/lib/utils/smodel-util.js.map +1 -1
  323. package/lib/utils/viewpoint-util.d.ts +2 -1
  324. package/lib/utils/viewpoint-util.d.ts.map +1 -1
  325. package/lib/utils/viewpoint-util.js +0 -15
  326. package/lib/utils/viewpoint-util.js.map +1 -1
  327. package/lib/views/base-view-module.d.ts +0 -15
  328. package/lib/views/base-view-module.d.ts.map +1 -1
  329. package/lib/views/base-view-module.js +20 -20
  330. package/lib/views/base-view-module.js.map +1 -1
  331. package/lib/views/compartments.d.ts +6 -0
  332. package/lib/views/compartments.d.ts.map +1 -0
  333. package/lib/{base/actions/edit-mode-action.js → views/compartments.js} +18 -26
  334. package/lib/views/compartments.js.map +1 -0
  335. package/lib/views/glsp-edge-view.d.ts +17 -1
  336. package/lib/views/glsp-edge-view.d.ts.map +1 -1
  337. package/lib/views/glsp-edge-view.js +0 -15
  338. package/lib/views/glsp-edge-view.js.map +1 -1
  339. package/lib/views/index.d.ts +1 -1
  340. package/lib/views/index.d.ts.map +1 -1
  341. package/lib/views/index.js +1 -1
  342. package/lib/views/index.js.map +1 -1
  343. package/lib/views/issue-marker-view.d.ts +1 -0
  344. package/lib/views/issue-marker-view.d.ts.map +1 -1
  345. package/lib/views/issue-marker-view.js +17 -8
  346. package/lib/views/issue-marker-view.js.map +1 -1
  347. package/lib/views/rounded-corner.d.ts +2 -1
  348. package/lib/views/rounded-corner.d.ts.map +1 -1
  349. package/package.json +8 -5
  350. package/src/base/action-dispatcher.ts +11 -10
  351. package/src/base/actions/focus-change-action.ts +1 -1
  352. package/src/base/{args.ts → argumentable.ts} +1 -4
  353. package/src/base/auto-complete/auto-complete-actions.ts +1 -1
  354. package/src/base/auto-complete/auto-complete-widget.ts +3 -4
  355. package/src/base/auto-complete/validation-decorator.ts +7 -6
  356. package/src/base/command-stack.ts +1 -2
  357. package/src/base/container-modules.ts +112 -0
  358. package/src/base/di.config.ts +6 -7
  359. package/src/base/drag-aware-mouse-listener.ts +2 -1
  360. package/src/base/{editor-context.ts → editor-context-service.ts} +2 -27
  361. package/src/base/focus-tracker.ts +2 -2
  362. package/src/base/model/update-model-command.ts +5 -12
  363. package/src/base/model-initialization-constraint.ts +3 -2
  364. package/src/base/tool-manager/glsp-tool-manager.ts +3 -5
  365. package/src/base/types.ts +4 -2
  366. package/src/features/change-bounds/model.ts +9 -1
  367. package/src/features/change-bounds/movement-restrictor.ts +2 -2
  368. package/src/features/change-bounds/snap.ts +3 -2
  369. package/src/features/command-palette/server-command-palette-provider.ts +3 -4
  370. package/src/features/context-menu/delete-element-context-menu.ts +3 -4
  371. package/src/features/context-menu/di.config.ts +0 -1
  372. package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts +40 -11
  373. package/src/features/context-menu/server-context-menu-provider.ts +3 -4
  374. package/src/features/copy-paste/copy-paste-context-menu.ts +2 -13
  375. package/src/features/copy-paste/copy-paste-handler.ts +3 -4
  376. package/src/features/copy-paste/di.config.ts +2 -3
  377. package/src/features/decoration/decoration-placer.ts +2 -1
  378. package/src/features/edit-label/edit-label-validator.ts +1 -1
  379. package/src/features/hints/di.config.ts +2 -3
  380. package/src/features/hints/model.ts +2 -1
  381. package/src/features/hints/type-hints.ts +1 -64
  382. package/src/features/hover/di.config.ts +4 -3
  383. package/src/features/hover/hover.ts +27 -7
  384. package/src/features/layout/di.config.ts +8 -4
  385. package/src/features/layout/freeform-layout.ts +133 -0
  386. package/src/features/layout/layout-commands.spec.ts +3 -8
  387. package/src/features/layout/layout-commands.ts +1 -3
  388. package/src/features/layout/vbox-layout.ts +256 -0
  389. package/src/features/model-source-watcher/di.config.ts +3 -4
  390. package/src/features/model-source-watcher/model-source-changed-action-handler.ts +8 -4
  391. package/src/features/mouse-tool/mouse-tool.ts +2 -1
  392. package/src/features/navigation/di.config.ts +4 -10
  393. package/src/features/navigation/navigation-action-handler.ts +16 -62
  394. package/src/features/navigation/navigation-target-resolver.spec.ts +2 -4
  395. package/src/features/navigation/navigation-target-resolver.ts +8 -88
  396. package/src/features/save/di.config.ts +1 -1
  397. package/src/features/save/{save.ts → save-keylistener.ts} +2 -10
  398. package/src/features/select/selection-service.spec.ts +2 -2
  399. package/src/features/select/selection-service.ts +1 -5
  400. package/src/features/tool-feedback/change-bounds-tool-feedback.ts +19 -6
  401. package/src/features/tool-feedback/creation-tool-feedback.ts +34 -8
  402. package/src/features/tool-feedback/css-feedback.ts +5 -3
  403. package/src/features/tool-feedback/edge-edit-tool-feedback.ts +1 -3
  404. package/src/features/tool-feedback/feedback-action-dispatcher.ts +4 -3
  405. package/src/features/tool-feedback/marquee-tool-feedback.ts +1 -3
  406. package/src/features/tool-feedback/view.tsx +2 -2
  407. package/src/features/tool-palette/di.config.ts +1 -3
  408. package/src/features/tool-palette/palette-item.ts +1 -3
  409. package/src/features/tool-palette/tool-palette.ts +32 -26
  410. package/src/features/tools/base-glsp-tool.ts +10 -10
  411. package/src/features/tools/change-bounds-tool.ts +36 -18
  412. package/src/features/tools/delete-tool.ts +1 -3
  413. package/src/features/tools/di.config.ts +2 -3
  414. package/src/features/tools/edge-creation-tool.ts +1 -3
  415. package/src/features/tools/edge-edit-tool.ts +3 -4
  416. package/src/features/tools/marquee-behavior.spec.ts +175 -0
  417. package/src/features/tools/marquee-behavior.ts +158 -0
  418. package/src/features/tools/marquee-mouse-tool.ts +35 -146
  419. package/src/features/tools/marquee-tool.ts +2 -2
  420. package/src/features/tools/node-creation-tool.ts +1 -3
  421. package/src/features/validation/issue-marker.ts +2 -3
  422. package/src/features/validation/marker-navigator.spec.ts +3 -5
  423. package/src/features/validation/marker-navigator.ts +1 -4
  424. package/src/features/validation/validate.ts +4 -33
  425. package/src/features/viewport/glsp-scroll-mouse-listener.ts +3 -3
  426. package/src/index.ts +6 -12
  427. package/src/model-source/glsp-diagram-server.ts +12 -14
  428. package/src/protocol-reexport.ts +64 -0
  429. package/src/utils/argument-utils.ts +1 -2
  430. package/src/utils/layout-utils.ts +2 -2
  431. package/src/utils/marker.ts +2 -26
  432. package/src/utils/smodel-util.ts +1 -1
  433. package/src/utils/viewpoint-util.ts +1 -2
  434. package/src/views/base-view-module.ts +1 -2
  435. package/src/{base/actions/edit-mode-action.ts → views/compartments.tsx} +18 -13
  436. package/src/views/glsp-edge-view.tsx +2 -2
  437. package/src/views/index.ts +1 -1
  438. package/src/views/issue-marker-view.tsx +18 -8
  439. package/src/views/rounded-corner.ts +2 -2
  440. package/lib/base/actions/context-actions.d.ts +0 -36
  441. package/lib/base/actions/context-actions.d.ts.map +0 -1
  442. package/lib/base/actions/context-actions.js +0 -44
  443. package/lib/base/actions/context-actions.js.map +0 -1
  444. package/lib/base/actions/edit-mode-action.d.ts +0 -13
  445. package/lib/base/actions/edit-mode-action.d.ts.map +0 -1
  446. package/lib/base/actions/edit-mode-action.js.map +0 -1
  447. package/lib/base/actions/edit-validation-actions.d.ts +0 -78
  448. package/lib/base/actions/edit-validation-actions.d.ts.map +0 -1
  449. package/lib/base/actions/edit-validation-actions.js +0 -80
  450. package/lib/base/actions/edit-validation-actions.js.map +0 -1
  451. package/lib/base/args.d.ts.map +0 -1
  452. package/lib/base/args.js.map +0 -1
  453. package/lib/base/editor-context.d.ts.map +0 -1
  454. package/lib/base/editor-context.js.map +0 -1
  455. package/lib/base/operations/operation.d.ts +0 -135
  456. package/lib/base/operations/operation.d.ts.map +0 -1
  457. package/lib/base/operations/operation.js +0 -191
  458. package/lib/base/operations/operation.js.map +0 -1
  459. package/lib/features/copy-paste/copy-paste-actions.d.ts +0 -50
  460. package/lib/features/copy-paste/copy-paste-actions.d.ts.map +0 -1
  461. package/lib/features/copy-paste/copy-paste-actions.js +0 -58
  462. package/lib/features/copy-paste/copy-paste-actions.js.map +0 -1
  463. package/lib/features/hints/request-type-hints-action.d.ts +0 -32
  464. package/lib/features/hints/request-type-hints-action.d.ts.map +0 -1
  465. package/lib/features/hints/request-type-hints-action.js +0 -28
  466. package/lib/features/hints/request-type-hints-action.js.map +0 -1
  467. package/lib/features/model-source-watcher/model-source-changed-action.d.ts +0 -24
  468. package/lib/features/model-source-watcher/model-source-changed-action.d.ts.map +0 -1
  469. package/lib/features/model-source-watcher/model-source-changed-action.js +0 -16
  470. package/lib/features/model-source-watcher/model-source-changed-action.js.map +0 -1
  471. package/lib/features/save/save.d.ts.map +0 -1
  472. package/lib/features/save/save.js.map +0 -1
  473. package/lib/features/undo-redo/model.d.ts +0 -27
  474. package/lib/features/undo-redo/model.d.ts.map +0 -1
  475. package/lib/features/undo-redo/model.js +0 -18
  476. package/lib/features/undo-redo/model.js.map +0 -1
  477. package/lib/model-source/glsp-server-status.d.ts +0 -30
  478. package/lib/model-source/glsp-server-status.d.ts.map +0 -1
  479. package/lib/model-source/glsp-server-status.js +0 -44
  480. package/lib/model-source/glsp-server-status.js.map +0 -1
  481. package/lib/utils/array-utils.d.ts +0 -28
  482. package/lib/utils/array-utils.d.ts.map +0 -1
  483. package/lib/utils/array-utils.js +0 -56
  484. package/lib/utils/array-utils.js.map +0 -1
  485. package/lib/views/default-types.d.ts +0 -37
  486. package/lib/views/default-types.d.ts.map +0 -1
  487. package/lib/views/default-types.js +0 -47
  488. package/lib/views/default-types.js.map +0 -1
  489. package/src/base/actions/context-actions.ts +0 -43
  490. package/src/base/actions/edit-validation-actions.ts +0 -115
  491. package/src/base/operations/operation.ts +0 -205
  492. package/src/features/copy-paste/copy-paste-actions.ts +0 -63
  493. package/src/features/hints/request-type-hints-action.ts +0 -41
  494. package/src/features/model-source-watcher/model-source-changed-action.ts +0 -26
  495. package/src/model-source/glsp-server-status.ts +0 -38
  496. package/src/utils/array-utils.ts +0 -57
  497. package/src/views/default-types.ts +0 -48
@@ -0,0 +1,128 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (c) 2021 EclipseSource and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the Eclipse Public License v. 2.0 which is available at
7
+ * http://www.eclipse.org/legal/epl-2.0.
8
+ *
9
+ * This Source Code may also be made available under the following Secondary
10
+ * Licenses when the conditions for such availability set forth in the Eclipse
11
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ * with the GNU Classpath Exception which is available at
13
+ * https://www.gnu.org/software/classpath/license.html.
14
+ *
15
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
+ ********************************************************************************/
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.MarqueeUtil = void 0;
19
+ const sprotty_1 = require("sprotty");
20
+ const marquee_tool_feedback_1 = require("../tool-feedback/marquee-tool-feedback");
21
+ class MarqueeUtil {
22
+ constructor(marqueeBehavior) {
23
+ if (marqueeBehavior) {
24
+ this.marqueeBehavior = marqueeBehavior;
25
+ }
26
+ else {
27
+ this.marqueeBehavior = { entireElement: false, entireEdge: false };
28
+ }
29
+ }
30
+ updateStartPoint(position) {
31
+ this.startPoint = position;
32
+ }
33
+ updateCurrentPoint(position) {
34
+ this.currentPoint = position;
35
+ }
36
+ drawMarqueeAction() {
37
+ return new marquee_tool_feedback_1.DrawMarqueeAction(this.startPoint, this.currentPoint);
38
+ }
39
+ isEdgePathMarked(path) {
40
+ if (!path) {
41
+ return false;
42
+ }
43
+ const points = path
44
+ .split(/M|L/)
45
+ .filter(p => p)
46
+ .map(p => {
47
+ const coord = p.split(',');
48
+ return { x: parseInt(coord[0], 10), y: parseInt(coord[1], 10) };
49
+ });
50
+ return this.isEdgeMarked(points);
51
+ }
52
+ isEdgeMarked(points) {
53
+ return this.marqueeBehavior.entireEdge ? this.isEntireEdgeMarked(points) : this.isPartOfEdgeMarked(points);
54
+ }
55
+ isNodeMarked(elementBounds) {
56
+ const horizontallyIn = this.startPoint.x < this.currentPoint.x
57
+ ? this.isElementBetweenXAxis(elementBounds, this.startPoint.x, this.currentPoint.x)
58
+ : this.isElementBetweenXAxis(elementBounds, this.currentPoint.x, this.startPoint.x);
59
+ const verticallyIn = this.startPoint.y < this.currentPoint.y
60
+ ? this.isElementBetweenYAxis(elementBounds, this.startPoint.y, this.currentPoint.y)
61
+ : this.isElementBetweenYAxis(elementBounds, this.currentPoint.y, this.startPoint.y);
62
+ return horizontallyIn && verticallyIn;
63
+ }
64
+ isEntireEdgeMarked(points) {
65
+ for (let i = 0; i < points.length; i++) {
66
+ if (!this.pointInRect(points[i])) {
67
+ return false;
68
+ }
69
+ }
70
+ return true;
71
+ }
72
+ isPartOfEdgeMarked(points) {
73
+ for (let i = 0; i < points.length - 1; i++) {
74
+ if (this.isLineMarked(points[i], points[i + 1])) {
75
+ return true;
76
+ }
77
+ }
78
+ return false;
79
+ }
80
+ isLineMarked(point1, point2) {
81
+ const line = new sprotty_1.PointToPointLine(point1, point2);
82
+ return (this.pointInRect(point1) ||
83
+ this.pointInRect(point2) ||
84
+ this.lineIntersect(line, this.startPoint, { x: this.startPoint.x, y: this.currentPoint.y }) ||
85
+ this.lineIntersect(line, this.startPoint, { x: this.currentPoint.x, y: this.startPoint.y }) ||
86
+ this.lineIntersect(line, { x: this.currentPoint.x, y: this.startPoint.y }, this.currentPoint) ||
87
+ this.lineIntersect(line, { x: this.startPoint.x, y: this.currentPoint.y }, this.currentPoint));
88
+ }
89
+ lineIntersect(line, p1, p2) {
90
+ return line.intersection(new sprotty_1.PointToPointLine(p1, p2)) !== undefined;
91
+ }
92
+ pointInRect(point) {
93
+ const boolX = this.startPoint.x <= this.currentPoint.x
94
+ ? this.isBetween(point.x, this.startPoint.x, this.currentPoint.x)
95
+ : this.isBetween(point.x, this.currentPoint.x, this.startPoint.x);
96
+ const boolY = this.startPoint.y <= this.currentPoint.y
97
+ ? this.isBetween(point.y, this.startPoint.y, this.currentPoint.y)
98
+ : this.isBetween(point.y, this.currentPoint.y, this.startPoint.y);
99
+ return boolX && boolY;
100
+ }
101
+ isElementBetweenXAxis(elementBounds, marqueeLeft, marqueeRight) {
102
+ const leftEdge = this.isBetween(elementBounds.x, marqueeLeft, marqueeRight);
103
+ const rightEdge = this.isBetween(elementBounds.x + elementBounds.width, marqueeLeft, marqueeRight);
104
+ if (this.marqueeBehavior.entireElement) {
105
+ return leftEdge && rightEdge;
106
+ }
107
+ return (leftEdge ||
108
+ rightEdge ||
109
+ this.isBetween(marqueeLeft, elementBounds.x, elementBounds.x + elementBounds.width) ||
110
+ this.isBetween(marqueeRight, elementBounds.x, elementBounds.x + elementBounds.width));
111
+ }
112
+ isElementBetweenYAxis(elementBounds, marqueeTop, marqueeBottom) {
113
+ const topEdge = this.isBetween(elementBounds.y, marqueeTop, marqueeBottom);
114
+ const bottomEdge = this.isBetween(elementBounds.y + elementBounds.height, marqueeTop, marqueeBottom);
115
+ if (this.marqueeBehavior.entireElement) {
116
+ return topEdge && bottomEdge;
117
+ }
118
+ return (topEdge ||
119
+ bottomEdge ||
120
+ this.isBetween(marqueeTop, elementBounds.y, elementBounds.y + elementBounds.height) ||
121
+ this.isBetween(marqueeBottom, elementBounds.y, elementBounds.y + elementBounds.height));
122
+ }
123
+ isBetween(x, lower, upper) {
124
+ return lower <= x && x <= upper;
125
+ }
126
+ }
127
+ exports.MarqueeUtil = MarqueeUtil;
128
+ //# sourceMappingURL=marquee-behavior.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"marquee-behavior.js","sourceRoot":"","sources":["../../../src/features/tools/marquee-behavior.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2021 EclipseSource and others.
2
+ * Copyright (c) 2021 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,14 +13,5 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Operation } from '../../base/operations/operation';
17
-
18
- export class UndoOperation implements Operation {
19
- static readonly KIND = 'glspUndo';
20
- constructor(public readonly kind = UndoOperation.KIND) {}
21
- }
22
-
23
- export class RedoOperation implements Operation {
24
- static readonly KIND = 'glspRedo';
25
- constructor(public readonly kind = RedoOperation.KIND) {}
26
- }
16
+ export {};
17
+ //# sourceMappingURL=marquee-behavior.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"marquee-behavior.spec.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-behavior.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}
@@ -0,0 +1,165 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (c) 2021 EclipseSource and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the Eclipse Public License v. 2.0 which is available at
7
+ * http://www.eclipse.org/legal/epl-2.0.
8
+ *
9
+ * This Source Code may also be made available under the following Secondary
10
+ * Licenses when the conditions for such availability set forth in the Eclipse
11
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ * with the GNU Classpath Exception which is available at
13
+ * https://www.gnu.org/software/classpath/license.html.
14
+ *
15
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
+ ********************************************************************************/
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ const chai_1 = require("chai");
19
+ const marquee_behavior_1 = require("./marquee-behavior");
20
+ describe('MarqueeUtil', () => {
21
+ function initUtil(marqueeBehavior) {
22
+ const util = new marquee_behavior_1.MarqueeUtil(marqueeBehavior);
23
+ util.updateStartPoint({ x: 0, y: 0 });
24
+ util.updateCurrentPoint({ x: 0, y: 0 });
25
+ return util;
26
+ }
27
+ describe('Node marquee', () => {
28
+ const node = { x: 20, y: 20, width: 200, height: 50 };
29
+ it('touch element', () => {
30
+ const util = initUtil();
31
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
32
+ util.updateCurrentPoint({ x: 30, y: 50 });
33
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
34
+ util.updateCurrentPoint({ x: 250, y: 85 });
35
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
36
+ util.updateStartPoint({ x: 30, y: 25 });
37
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
38
+ });
39
+ it('touch element (reverse)', () => {
40
+ const util = initUtil();
41
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
42
+ util.updateStartPoint({ x: 30, y: 50 });
43
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
44
+ util.updateStartPoint({ x: 250, y: 85 });
45
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
46
+ util.updateCurrentPoint({ x: 30, y: 25 });
47
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
48
+ });
49
+ it('mark entire element', () => {
50
+ const util = initUtil({ entireElement: true, entireEdge: false });
51
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
52
+ util.updateCurrentPoint({ x: 30, y: 50 });
53
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
54
+ util.updateCurrentPoint({ x: 250, y: 85 });
55
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
56
+ util.updateStartPoint({ x: 30, y: 85 });
57
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
58
+ });
59
+ it('mark entire element (reverse)', () => {
60
+ const util = initUtil({ entireElement: true, entireEdge: false });
61
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
62
+ util.updateStartPoint({ x: 30, y: 50 });
63
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
64
+ util.updateStartPoint({ x: 250, y: 85 });
65
+ chai_1.expect(util.isNodeMarked(node)).is.equals(true);
66
+ util.updateCurrentPoint({ x: 30, y: 85 });
67
+ chai_1.expect(util.isNodeMarked(node)).is.equals(false);
68
+ });
69
+ });
70
+ describe('Edge marquee', () => {
71
+ const edge = [
72
+ { x: 20, y: 40 },
73
+ { x: 40, y: 20 }
74
+ ];
75
+ const edge2 = [
76
+ { x: 20, y: 20 },
77
+ { x: 40, y: 40 },
78
+ { x: 50, y: 10 }
79
+ ];
80
+ it('touch edge', () => {
81
+ const util = initUtil();
82
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
83
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
84
+ util.updateCurrentPoint({ x: 20, y: 20 });
85
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
86
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
87
+ util.updateCurrentPoint({ x: 30, y: 30 });
88
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
89
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
90
+ util.updateCurrentPoint({ x: 50, y: 50 });
91
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
92
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
93
+ util.updateStartPoint({ x: 25, y: 25 });
94
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
95
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
96
+ });
97
+ it('touch edge (reverse)', () => {
98
+ const util = initUtil();
99
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
100
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
101
+ util.updateStartPoint({ x: 20, y: 20 });
102
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
103
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
104
+ util.updateStartPoint({ x: 30, y: 30 });
105
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
106
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
107
+ util.updateStartPoint({ x: 50, y: 50 });
108
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
109
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
110
+ util.updateCurrentPoint({ x: 25, y: 25 });
111
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
112
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
113
+ });
114
+ it('mark entire edge', () => {
115
+ const util = initUtil({ entireElement: false, entireEdge: true });
116
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
117
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
118
+ util.updateCurrentPoint({ x: 20, y: 20 });
119
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
120
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
121
+ util.updateCurrentPoint({ x: 30, y: 30 });
122
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
123
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
124
+ util.updateCurrentPoint({ x: 45, y: 50 });
125
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
126
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
127
+ util.updateCurrentPoint({ x: 55, y: 50 });
128
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
129
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
130
+ util.updateStartPoint({ x: 25, y: 25 });
131
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
132
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
133
+ });
134
+ it('mark entire edge (reverse)', () => {
135
+ const util = initUtil({ entireElement: false, entireEdge: true });
136
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
137
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
138
+ util.updateStartPoint({ x: 20, y: 20 });
139
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
140
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
141
+ util.updateStartPoint({ x: 30, y: 30 });
142
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
143
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
144
+ util.updateStartPoint({ x: 45, y: 50 });
145
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
146
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
147
+ util.updateStartPoint({ x: 55, y: 50 });
148
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
149
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
150
+ util.updateCurrentPoint({ x: 25, y: 25 });
151
+ chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
152
+ chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
153
+ });
154
+ it('edge path should be marked', () => {
155
+ const path = 'M 599.968775008469,272.3972942960205 L 677.0904664855072,232';
156
+ const util = initUtil({ entireElement: false, entireEdge: true });
157
+ chai_1.expect(util.isEdgePathMarked(path)).is.equals(false);
158
+ util.updateCurrentPoint({ x: 600, y: 300 });
159
+ chai_1.expect(util.isEdgePathMarked(path)).is.equals(false);
160
+ util.updateCurrentPoint({ x: 700, y: 300 });
161
+ chai_1.expect(util.isEdgePathMarked(path)).is.equals(true);
162
+ });
163
+ });
164
+ });
165
+ //# sourceMappingURL=marquee-behavior.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"marquee-behavior.spec.js","sourceRoot":"","sources":["../../../src/features/tools/marquee-behavior.spec.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,28 @@
1
- import { Action, BoundsAware, KeyListener, Point, SModelElement } from 'sprotty';
1
+ /********************************************************************************
2
+ * Copyright (c) 2021 EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import { Action } from '@eclipse-glsp/protocol';
17
+ import { BoundsAware, KeyListener, SModelElement, SModelRoot } from 'sprotty';
2
18
  import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
3
19
  import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
4
- import { BaseGLSPTool } from '../tools/base-glsp-tool';
20
+ import { BaseGLSPTool } from './base-glsp-tool';
21
+ import { IMarqueeBehavior, MarqueeUtil } from './marquee-behavior';
5
22
  export declare class MarqueeMouseTool extends BaseGLSPTool {
6
23
  static ID: string;
7
24
  protected domHelper: DOMHelper;
25
+ protected marqueeBehavior: IMarqueeBehavior;
8
26
  protected marqueeMouseListener: MarqueeMouseListener;
9
27
  protected shiftKeyListener: ShiftKeyListener;
10
28
  get id(): string;
@@ -12,24 +30,17 @@ export declare class MarqueeMouseTool extends BaseGLSPTool {
12
30
  disable(): void;
13
31
  }
14
32
  export declare class MarqueeMouseListener extends DragAwareMouseListener {
15
- protected startPoint: Point;
16
- protected currentPoint: Point;
17
33
  protected domHelper: DOMHelper;
34
+ protected marqueeUtil: MarqueeUtil;
35
+ protected nodes: (SModelElement & BoundsAware)[];
36
+ protected edges: SVGGElement[];
18
37
  protected previouslySelected: string[];
19
38
  protected isActive: boolean;
20
- constructor(domHelper: DOMHelper);
39
+ constructor(domHelper: DOMHelper, root: SModelRoot, marqueeBehavior: IMarqueeBehavior | undefined);
21
40
  mouseDown(target: SModelElement, event: MouseEvent): Action[];
22
41
  mouseMove(target: SModelElement, event: MouseEvent): Action[];
23
42
  mouseUp(target: SModelElement, event: MouseEvent): Action[];
24
- getMarkedEdges(root: SModelElement): string[];
25
43
  isEdgeMarked(element: SVGElement): boolean;
26
- isLineMarked(point1: Point, point2: Point): boolean;
27
- linesIntersect(p1: Point, p2: Point, p3: Point, p4: Point): boolean;
28
- pointInRect(point: Point): boolean;
29
- isNodeMarked(element: SModelElement & BoundsAware): boolean;
30
- isElementBetweenXAxis(element: SModelElement & BoundsAware, marqueeLeft: number, marqueeRight: number): boolean;
31
- isElementBetweenYAxis(element: SModelElement & BoundsAware, marqueeTop: number, marqueeBottom: number): boolean;
32
- isBetween(x: number, lower: number, upper: number): boolean;
33
44
  }
34
45
  export declare class ShiftKeyListener extends KeyListener {
35
46
  keyUp(element: SModelElement, event: KeyboardEvent): Action[];
@@ -1 +1 @@
1
- {"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,WAAW,EAIX,WAAW,EACX,KAAK,EAGL,aAAa,EAGhB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAExD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBACa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC;IAE5B,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC;IAE9B,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAE/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAEvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS;IAKhC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAuB7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQ3D,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE;IAe7C,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;IAqB1C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,OAAO;IAmBnD,cAAc,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,GAAG,OAAO;IAanE,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAYlC,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,OAAO;IAe3D,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAY/G,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO;IAY/G,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;CAM9D;AAED,qBACa,gBAAiB,SAAQ,WAAW;IAC7C,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMhE"}
1
+ {"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EACH,WAAW,EAIX,WAAW,EAEX,aAAa,EACb,UAAU,EAGb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnE,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IACP,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAE7F,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACjD,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,GAAG,SAAS;IAqBjG,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQ3D,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;CAS7C;AAED,qBACa,gBAAiB,SAAQ,WAAW;IAC7C,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMhE"}
@@ -26,14 +26,17 @@ exports.ShiftKeyListener = exports.MarqueeMouseListener = exports.MarqueeMouseTo
26
26
  *
27
27
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
28
28
  ********************************************************************************/
29
+ const protocol_1 = require("@eclipse-glsp/protocol");
29
30
  const inversify_1 = require("inversify");
30
31
  const sprotty_1 = require("sprotty");
31
32
  const dom_helper_1 = require("sprotty/lib/base/views/dom-helper");
33
+ const types_1 = require("../../base/types");
32
34
  const drag_aware_mouse_listener_1 = require("../../base/drag-aware-mouse-listener");
33
35
  const viewpoint_util_1 = require("../../utils/viewpoint-util");
34
36
  const css_feedback_1 = require("../tool-feedback/css-feedback");
35
37
  const marquee_tool_feedback_1 = require("../tool-feedback/marquee-tool-feedback");
36
- const base_glsp_tool_1 = require("../tools/base-glsp-tool");
38
+ const base_glsp_tool_1 = require("./base-glsp-tool");
39
+ const marquee_behavior_1 = require("./marquee-behavior");
37
40
  let MarqueeMouseTool = MarqueeMouseTool_1 = class MarqueeMouseTool extends base_glsp_tool_1.BaseGLSPTool {
38
41
  constructor() {
39
42
  super(...arguments);
@@ -43,7 +46,7 @@ let MarqueeMouseTool = MarqueeMouseTool_1 = class MarqueeMouseTool extends base_
43
46
  return MarqueeMouseTool_1.ID;
44
47
  }
45
48
  enable() {
46
- this.marqueeMouseListener = new MarqueeMouseListener(this.domHelper);
49
+ this.marqueeMouseListener = new MarqueeMouseListener(this.domHelper, this.editorContext.modelRoot, this.marqueeBehavior);
47
50
  this.mouseTool.register(this.marqueeMouseListener);
48
51
  this.keyTool.register(this.shiftKeyListener);
49
52
  this.dispatchFeedback([css_feedback_1.cursorFeedbackAction(css_feedback_1.CursorCSS.MARQUEE)]);
@@ -59,19 +62,36 @@ __decorate([
59
62
  inversify_1.inject(sprotty_1.TYPES.DOMHelper),
60
63
  __metadata("design:type", dom_helper_1.DOMHelper)
61
64
  ], MarqueeMouseTool.prototype, "domHelper", void 0);
65
+ __decorate([
66
+ inversify_1.inject(types_1.GLSP_TYPES.IMarqueeBehavior),
67
+ inversify_1.optional(),
68
+ __metadata("design:type", Object)
69
+ ], MarqueeMouseTool.prototype, "marqueeBehavior", void 0);
62
70
  MarqueeMouseTool = MarqueeMouseTool_1 = __decorate([
63
71
  inversify_1.injectable()
64
72
  ], MarqueeMouseTool);
65
73
  exports.MarqueeMouseTool = MarqueeMouseTool;
66
- let MarqueeMouseListener = class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
67
- constructor(domHelper) {
74
+ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
75
+ constructor(domHelper, root, marqueeBehavior) {
68
76
  super();
69
77
  this.isActive = false;
70
78
  this.domHelper = domHelper;
79
+ this.marqueeUtil = new marquee_behavior_1.MarqueeUtil(marqueeBehavior);
80
+ this.nodes = Array.from(root.index
81
+ .all()
82
+ .map(e => e)
83
+ .filter(e => sprotty_1.isSelectable(e))
84
+ .filter(e => e instanceof sprotty_1.SNode));
85
+ const sEdges = Array.from(root.index
86
+ .all()
87
+ .filter(e => e instanceof sprotty_1.SEdge)
88
+ .filter(e => sprotty_1.isSelectable(e))
89
+ .map(e => e.id));
90
+ this.edges = Array.from(document.querySelectorAll('g')).filter(e => sEdges.includes(this.domHelper.findSModelIdByDOMElement(e)));
71
91
  }
72
92
  mouseDown(target, event) {
73
93
  this.isActive = true;
74
- this.startPoint = { x: viewpoint_util_1.getAbsolutePosition(target, event).x, y: viewpoint_util_1.getAbsolutePosition(target, event).y };
94
+ this.marqueeUtil.updateStartPoint(viewpoint_util_1.getAbsolutePosition(target, event));
75
95
  if (event.ctrlKey) {
76
96
  this.previouslySelected = Array.from(target.root.index
77
97
  .all()
@@ -82,21 +102,15 @@ let MarqueeMouseListener = class MarqueeMouseListener extends drag_aware_mouse_l
82
102
  return [];
83
103
  }
84
104
  mouseMove(target, event) {
85
- this.currentPoint = { x: viewpoint_util_1.getAbsolutePosition(target, event).x, y: viewpoint_util_1.getAbsolutePosition(target, event).y };
105
+ this.marqueeUtil.updateCurrentPoint(viewpoint_util_1.getAbsolutePosition(target, event));
86
106
  if (this.isActive) {
87
- const nodeIdsSelected = Array.from(target.root.index
88
- .all()
89
- .map(e => e)
90
- .filter(e => sprotty_1.isSelectable(e))
91
- .filter(e => e instanceof sprotty_1.SNode)
92
- .filter(e => this.isNodeMarked(e))
93
- .map(e => e.id));
94
- const edgeIdsSelected = this.getMarkedEdges(target.root);
107
+ const nodeIdsSelected = this.nodes.filter(e => this.marqueeUtil.isNodeMarked(viewpoint_util_1.toAbsoluteBounds(e))).map(e => e.id);
108
+ const edgeIdsSelected = this.edges.filter(e => this.isEdgeMarked(e)).map(e => this.domHelper.findSModelIdByDOMElement(e));
95
109
  const selected = nodeIdsSelected.concat(edgeIdsSelected);
96
110
  return [
97
- new sprotty_1.SelectAction([], Array.from(target.root.index.all().map(e => e.id))),
98
- new sprotty_1.SelectAction(selected.concat(this.previouslySelected), []),
99
- new marquee_tool_feedback_1.DrawMarqueeAction(this.startPoint, { x: viewpoint_util_1.getAbsolutePosition(target, event).x, y: viewpoint_util_1.getAbsolutePosition(target, event).y })
111
+ new protocol_1.SelectAction([], Array.from(target.root.index.all().map(e => e.id))),
112
+ new protocol_1.SelectAction(selected.concat(this.previouslySelected), []),
113
+ this.marqueeUtil.drawMarqueeAction()
100
114
  ];
101
115
  }
102
116
  return [];
@@ -108,118 +122,16 @@ let MarqueeMouseListener = class MarqueeMouseListener extends drag_aware_mouse_l
108
122
  }
109
123
  return [new marquee_tool_feedback_1.RemoveMarqueeAction(), new sprotty_1.EnableDefaultToolsAction()];
110
124
  }
111
- getMarkedEdges(root) {
112
- const elements = Array.from(document.querySelectorAll('g'));
113
- const edges = Array.from(root.index
114
- .all()
115
- .filter(e => e instanceof sprotty_1.SEdge)
116
- .filter(e => sprotty_1.isSelectable(e))
117
- .map(e => e.id));
118
- return elements
119
- .filter(e => edges.includes(this.domHelper.findSModelIdByDOMElement(e)))
120
- .filter(e => this.isEdgeMarked(e))
121
- .map(e => this.domHelper.findSModelIdByDOMElement(e));
122
- }
123
125
  isEdgeMarked(element) {
124
126
  if (!element.getAttribute('transform')) {
125
127
  if (element.children[0]) {
126
128
  const path = element.children[0].getAttribute('d');
127
- if (path) {
128
- const points = path.split(/M|L/);
129
- for (let i = 0; i < points.length - 1; i++) {
130
- const coord1 = points[i].split(',');
131
- const coord2 = points[i + 1].split(',');
132
- const point1 = { x: parseInt(coord1[0], 10), y: parseInt(coord1[1], 10) };
133
- const point2 = { x: parseInt(coord2[0], 10), y: parseInt(coord2[1], 10) };
134
- if (this.isLineMarked(point1, point2)) {
135
- return true;
136
- }
137
- }
138
- }
129
+ return this.marqueeUtil.isEdgePathMarked(path);
139
130
  }
140
131
  }
141
132
  return false;
142
133
  }
143
- isLineMarked(point1, point2) {
144
- if (this.pointInRect(point1) || this.pointInRect(point2)) {
145
- return true;
146
- }
147
- if (this.linesIntersect(point1, point2, this.startPoint, { x: this.startPoint.x, y: this.currentPoint.y })) {
148
- return true;
149
- }
150
- if (this.linesIntersect(point1, point2, this.startPoint, { x: this.currentPoint.x, y: this.startPoint.y })) {
151
- return true;
152
- }
153
- if (this.linesIntersect(point1, point2, { x: this.currentPoint.x, y: this.startPoint.y }, this.currentPoint)) {
154
- return true;
155
- }
156
- if (this.linesIntersect(point1, point2, { x: this.startPoint.x, y: this.currentPoint.y }, this.currentPoint)) {
157
- return true;
158
- }
159
- return false;
160
- }
161
- linesIntersect(p1, p2, p3, p4) {
162
- const tCount = (p1.x - p3.x) * (p3.y - p4.y) - (p1.y - p3.y) * (p3.x - p4.x);
163
- const tDenom = (p1.x - p2.x) * (p3.y - p4.y) - (p1.y - p2.y) * (p3.x - p4.x);
164
- const t = tCount / tDenom;
165
- const uCount = (p2.x - p1.x) * (p1.y - p3.y) - (p2.y - p1.y) * (p1.x - p3.x);
166
- const uDenom = (p1.x - p2.x) * (p3.y - p4.y) - (p1.y - p2.y) * (p3.x - p4.x);
167
- const u = uCount / uDenom;
168
- if (t >= 0.0 && t <= 1.0 && u >= 0.0 && u <= 1.0) {
169
- return true;
170
- }
171
- return false;
172
- }
173
- pointInRect(point) {
174
- const boolX = this.startPoint.x <= this.currentPoint.x
175
- ? this.isBetween(point.x, this.startPoint.x, this.currentPoint.x)
176
- : this.isBetween(point.x, this.currentPoint.x, this.startPoint.x);
177
- const boolY = this.startPoint.y <= this.currentPoint.y
178
- ? this.isBetween(point.y, this.startPoint.y, this.currentPoint.y)
179
- : this.isBetween(point.y, this.currentPoint.y, this.startPoint.y);
180
- return boolX && boolY;
181
- }
182
- isNodeMarked(element) {
183
- const horizontallyIn = this.startPoint.x < this.currentPoint.x
184
- ? this.isElementBetweenXAxis(element, this.startPoint.x, this.currentPoint.x)
185
- : this.isElementBetweenXAxis(element, this.currentPoint.x, this.startPoint.x);
186
- const verticallyIn = this.startPoint.y < this.currentPoint.y
187
- ? this.isElementBetweenYAxis(element, this.startPoint.y, this.currentPoint.y)
188
- : this.isElementBetweenYAxis(element, this.currentPoint.y, this.startPoint.y);
189
- if (horizontallyIn && verticallyIn) {
190
- return true;
191
- }
192
- return false;
193
- }
194
- isElementBetweenXAxis(element, marqueeLeft, marqueeRight) {
195
- if (this.isBetween(marqueeLeft, viewpoint_util_1.toAbsoluteBounds(element).x, viewpoint_util_1.toAbsoluteBounds(element).x + viewpoint_util_1.toAbsoluteBounds(element).width) ||
196
- this.isBetween(marqueeRight, viewpoint_util_1.toAbsoluteBounds(element).x, viewpoint_util_1.toAbsoluteBounds(element).x + viewpoint_util_1.toAbsoluteBounds(element).width)) {
197
- return true;
198
- }
199
- const leftEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).x, marqueeLeft, marqueeRight);
200
- const rightEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).x + viewpoint_util_1.toAbsoluteBounds(element).width, marqueeLeft, marqueeRight);
201
- return leftEdge || rightEdge;
202
- }
203
- isElementBetweenYAxis(element, marqueeTop, marqueeBottom) {
204
- if (this.isBetween(marqueeTop, viewpoint_util_1.toAbsoluteBounds(element).y, viewpoint_util_1.toAbsoluteBounds(element).y + viewpoint_util_1.toAbsoluteBounds(element).height) ||
205
- this.isBetween(marqueeBottom, viewpoint_util_1.toAbsoluteBounds(element).y, viewpoint_util_1.toAbsoluteBounds(element).y + viewpoint_util_1.toAbsoluteBounds(element).height)) {
206
- return true;
207
- }
208
- const topEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).y, marqueeTop, marqueeBottom);
209
- const bottomEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).y + viewpoint_util_1.toAbsoluteBounds(element).height, marqueeTop, marqueeBottom);
210
- return topEdge || bottomEdge;
211
- }
212
- isBetween(x, lower, upper) {
213
- if (lower <= x && x <= upper) {
214
- return true;
215
- }
216
- return false;
217
- }
218
- };
219
- MarqueeMouseListener = __decorate([
220
- inversify_1.injectable(),
221
- __metadata("design:paramtypes", [dom_helper_1.DOMHelper])
222
- ], MarqueeMouseListener);
134
+ }
223
135
  exports.MarqueeMouseListener = MarqueeMouseListener;
224
136
  let ShiftKeyListener = class ShiftKeyListener extends sprotty_1.KeyListener {
225
137
  keyUp(element, event) {