@eclipse-glsp/client 0.10.0-next.6bee8eb.163 → 0.10.0-next.88e4725.166
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/base/action-dispatcher.d.ts +1 -0
- package/lib/base/action-dispatcher.d.ts.map +1 -1
- package/lib/base/action-dispatcher.js +11 -3
- package/lib/base/action-dispatcher.js.map +1 -1
- package/lib/base/actions/focus-change-action.d.ts +16 -7
- package/lib/base/actions/focus-change-action.d.ts.map +1 -1
- package/lib/base/actions/focus-change-action.js +31 -12
- package/lib/base/actions/focus-change-action.js.map +1 -1
- package/lib/base/actions/sprotty-actions.d.ts +7 -0
- package/lib/base/actions/sprotty-actions.d.ts.map +1 -0
- package/lib/{features/tool-palette/palette-item.js → base/actions/sprotty-actions.js} +4 -20
- package/lib/base/actions/sprotty-actions.js.map +1 -0
- package/lib/base/auto-complete/auto-complete-actions.d.ts +5 -3
- package/lib/base/auto-complete/auto-complete-actions.d.ts.map +1 -1
- package/lib/base/auto-complete/auto-complete-actions.js +24 -5
- package/lib/base/auto-complete/auto-complete-actions.js.map +1 -1
- package/lib/base/auto-complete/auto-complete-widget.d.ts +2 -2
- package/lib/base/auto-complete/auto-complete-widget.d.ts.map +1 -1
- package/lib/base/auto-complete/auto-complete-widget.js +4 -4
- package/lib/base/auto-complete/auto-complete-widget.js.map +1 -1
- package/lib/base/command-stack.d.ts.map +1 -1
- package/lib/base/command-stack.js +4 -3
- package/lib/base/command-stack.js.map +1 -1
- package/lib/base/di.config.d.ts +1 -1
- package/lib/base/di.config.d.ts.map +1 -1
- package/lib/base/di.config.js +9 -10
- package/lib/base/di.config.js.map +1 -1
- package/lib/base/editor-context-service.d.ts +1 -1
- package/lib/base/editor-context-service.d.ts.map +1 -1
- package/lib/base/editor-context-service.js +5 -5
- package/lib/base/editor-context-service.js.map +1 -1
- package/lib/base/focus-tracker.d.ts +1 -1
- package/lib/base/focus-tracker.d.ts.map +1 -1
- package/lib/base/focus-tracker.js +3 -3
- package/lib/base/focus-tracker.js.map +1 -1
- package/lib/base/model/update-model-command.d.ts.map +1 -1
- package/lib/base/model/update-model-command.js +9 -9
- package/lib/base/model/update-model-command.js.map +1 -1
- package/lib/base/model-initialization-constraint.d.ts +2 -3
- package/lib/base/model-initialization-constraint.d.ts.map +1 -1
- package/lib/base/model-initialization-constraint.js +3 -4
- package/lib/base/model-initialization-constraint.js.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.d.ts.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.js +3 -3
- package/lib/base/tool-manager/glsp-tool-manager.js.map +1 -1
- package/lib/base/tool-manager/tool-actions.d.ts +14 -0
- package/lib/base/tool-manager/tool-actions.d.ts.map +1 -0
- package/lib/base/tool-manager/tool-actions.js +25 -0
- package/lib/base/tool-manager/tool-actions.js.map +1 -0
- package/lib/base/types.d.ts +144 -20
- package/lib/base/types.d.ts.map +1 -1
- package/lib/base/types.js +14 -26
- package/lib/base/types.js.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.d.ts +1 -1
- package/lib/features/change-bounds/movement-restrictor.js +2 -2
- package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
- package/lib/features/change-bounds/snap.d.ts +42 -1
- package/lib/features/change-bounds/snap.d.ts.map +1 -1
- package/lib/features/change-bounds/snap.js +77 -1
- package/lib/features/change-bounds/snap.js.map +1 -1
- package/lib/features/change-bounds/snap.spec.d.ts +17 -0
- package/lib/features/change-bounds/snap.spec.d.ts.map +1 -0
- package/lib/features/change-bounds/snap.spec.js +82 -0
- package/lib/features/change-bounds/snap.spec.js.map +1 -0
- package/lib/features/command-palette/di.config.d.ts +2 -2
- package/lib/features/command-palette/di.config.d.ts.map +1 -1
- package/lib/features/command-palette/di.config.js +6 -6
- package/lib/features/command-palette/di.config.js.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.d.ts +1 -1
- package/lib/features/command-palette/server-command-palette-provider.d.ts.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.js +11 -8
- package/lib/features/command-palette/server-command-palette-provider.js.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.d.ts +17 -1
- package/lib/features/context-menu/delete-element-context-menu.d.ts.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.js +3 -3
- package/lib/features/context-menu/delete-element-context-menu.js.map +1 -1
- package/lib/features/context-menu/di.config.d.ts +1 -1
- package/lib/features/context-menu/di.config.d.ts.map +1 -1
- package/lib/features/context-menu/di.config.js +8 -7
- package/lib/features/context-menu/di.config.js.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts +17 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js +4 -19
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.d.ts +1 -1
- package/lib/features/context-menu/server-context-menu-provider.d.ts.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.js +6 -5
- package/lib/features/context-menu/server-context-menu-provider.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.d.ts +12 -15
- package/lib/features/copy-paste/copy-paste-context-menu.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.js +24 -31
- package/lib/features/copy-paste/copy-paste-context-menu.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.d.ts +1 -1
- package/lib/features/copy-paste/copy-paste-handler.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.js +6 -7
- package/lib/features/copy-paste/copy-paste-handler.js.map +1 -1
- package/lib/features/copy-paste/di.config.d.ts +1 -1
- package/lib/features/copy-paste/di.config.d.ts.map +1 -1
- package/lib/features/copy-paste/di.config.js +5 -7
- package/lib/features/copy-paste/di.config.js.map +1 -1
- package/lib/features/decoration/decoration-placer.d.ts.map +1 -1
- package/lib/features/decoration/decoration-placer.js +17 -1
- package/lib/features/decoration/decoration-placer.js.map +1 -1
- package/lib/features/decoration/di.config.d.ts +2 -2
- package/lib/features/decoration/di.config.d.ts.map +1 -1
- package/lib/features/decoration/di.config.js +4 -4
- package/lib/features/decoration/di.config.js.map +1 -1
- package/lib/features/edit-label/di.config.d.ts +1 -1
- package/lib/features/edit-label/di.config.d.ts.map +1 -1
- package/lib/features/edit-label/di.config.js +4 -4
- package/lib/features/edit-label/di.config.js.map +1 -1
- package/lib/features/edit-label/edit-label-tool.d.ts.map +1 -1
- package/lib/features/edit-label/edit-label-tool.js +1 -1
- package/lib/features/edit-label/edit-label-tool.js.map +1 -1
- package/lib/features/edit-label/edit-label-validator.d.ts +4 -6
- package/lib/features/edit-label/edit-label-validator.d.ts.map +1 -1
- package/lib/features/edit-label/edit-label-validator.js +8 -10
- package/lib/features/edit-label/edit-label-validator.js.map +1 -1
- package/lib/features/hints/di.config.js +2 -2
- package/lib/features/hints/di.config.js.map +1 -1
- package/lib/features/hints/type-hints.d.ts +14 -4
- package/lib/features/hints/type-hints.d.ts.map +1 -1
- package/lib/features/hints/type-hints.js +21 -18
- package/lib/features/hints/type-hints.js.map +1 -1
- package/lib/features/hover/di.config.d.ts.map +1 -1
- package/lib/features/hover/di.config.js +2 -0
- package/lib/features/hover/di.config.js.map +1 -1
- package/lib/features/hover/hover.d.ts +4 -2
- package/lib/features/hover/hover.d.ts.map +1 -1
- package/lib/features/hover/hover.js +22 -4
- package/lib/features/hover/hover.js.map +1 -1
- package/lib/features/layout/di.config.d.ts +1 -1
- package/lib/features/layout/di.config.js +1 -1
- package/lib/features/layout/freeform-layout.d.ts +17 -1
- package/lib/features/layout/freeform-layout.d.ts.map +1 -1
- package/lib/features/layout/freeform-layout.js +2 -2
- package/lib/features/layout/freeform-layout.js.map +1 -1
- package/lib/features/layout/layout-commands.d.ts +64 -37
- package/lib/features/layout/layout-commands.d.ts.map +1 -1
- package/lib/features/layout/layout-commands.js +79 -59
- package/lib/features/layout/layout-commands.js.map +1 -1
- package/lib/features/layout/layout-commands.spec.d.ts.map +1 -1
- package/lib/features/layout/layout-commands.spec.js +29 -17
- package/lib/features/layout/layout-commands.spec.js.map +1 -1
- package/lib/features/layout/vbox-layout.d.ts +17 -1
- package/lib/features/layout/vbox-layout.d.ts.map +1 -1
- package/lib/features/layout/vbox-layout.js +4 -3
- package/lib/features/layout/vbox-layout.js.map +1 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts +1 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts.map +1 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.js +7 -7
- package/lib/features/model-source-watcher/model-source-changed-action-handler.js.map +1 -1
- package/lib/features/mouse-tool/di.config.d.ts +1 -1
- package/lib/features/mouse-tool/di.config.d.ts.map +1 -1
- package/lib/features/mouse-tool/di.config.js +2 -2
- package/lib/features/mouse-tool/di.config.js.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.js +4 -10
- package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
- package/lib/features/navigation/navigation-action-handler.d.ts +31 -16
- package/lib/features/navigation/navigation-action-handler.d.ts.map +1 -1
- package/lib/features/navigation/navigation-action-handler.js +50 -66
- package/lib/features/navigation/navigation-action-handler.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.d.ts +3 -3
- package/lib/features/navigation/navigation-target-resolver.d.ts.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.js +7 -8
- package/lib/features/navigation/navigation-target-resolver.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.spec.js +3 -3
- package/lib/features/navigation/navigation-target-resolver.spec.js.map +1 -1
- package/lib/features/save/di.config.d.ts +1 -1
- package/lib/features/save/di.config.d.ts.map +1 -1
- package/lib/features/save/di.config.js +3 -3
- package/lib/features/save/di.config.js.map +1 -1
- package/lib/features/save/save-keylistener.js +1 -1
- package/lib/features/save/save-keylistener.js.map +1 -1
- package/lib/features/select/di.config.d.ts +1 -1
- package/lib/features/select/di.config.d.ts.map +1 -1
- package/lib/features/select/di.config.js +4 -5
- package/lib/features/select/di.config.js.map +1 -1
- package/lib/features/select/select-feedback-action.d.ts +26 -22
- package/lib/features/select/select-feedback-action.d.ts.map +1 -1
- package/lib/features/select/select-feedback-action.js +18 -45
- package/lib/features/select/select-feedback-action.js.map +1 -1
- package/lib/features/select/select-mouse-listener.d.ts +1 -1
- package/lib/features/select/select-mouse-listener.d.ts.map +1 -1
- package/lib/features/select/select-mouse-listener.js +1 -1
- package/lib/features/select/select-mouse-listener.js.map +1 -1
- package/lib/features/select/selection-service.d.ts.map +1 -1
- package/lib/features/select/selection-service.js +16 -13
- package/lib/features/select/selection-service.js.map +1 -1
- package/lib/features/select/selection-service.spec.js +9 -6
- package/lib/features/select/selection-service.spec.js.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts +16 -8
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js +50 -20
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts +22 -10
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.js +46 -21
- package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/css-feedback.d.ts +17 -10
- package/lib/features/tool-feedback/css-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/css-feedback.js +41 -37
- package/lib/features/tool-feedback/css-feedback.js.map +1 -1
- package/lib/features/tool-feedback/di.config.d.ts +1 -1
- package/lib/features/tool-feedback/di.config.d.ts.map +1 -1
- package/lib/features/tool-feedback/di.config.js +4 -4
- package/lib/features/tool-feedback/di.config.js.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts +43 -21
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js +117 -91
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.js +3 -3
- package/lib/features/tool-feedback/feedback-action-dispatcher.js.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.d.ts +20 -9
- package/lib/features/tool-feedback/marquee-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.js +41 -15
- package/lib/features/tool-feedback/marquee-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/view.d.ts +1 -1
- package/lib/features/tool-feedback/view.d.ts.map +1 -1
- package/lib/features/tool-feedback/view.js +18 -1
- package/lib/features/tool-feedback/view.js.map +1 -1
- package/lib/features/tool-palette/di.config.d.ts +1 -1
- package/lib/features/tool-palette/di.config.d.ts.map +1 -1
- package/lib/features/tool-palette/di.config.js +3 -2
- package/lib/features/tool-palette/di.config.js.map +1 -1
- package/lib/features/tool-palette/tool-palette.d.ts +9 -6
- package/lib/features/tool-palette/tool-palette.d.ts.map +1 -1
- package/lib/features/tool-palette/tool-palette.js +25 -20
- package/lib/features/tool-palette/tool-palette.js.map +1 -1
- package/lib/features/tools/base-glsp-tool.d.ts.map +1 -1
- package/lib/features/tools/base-glsp-tool.js +3 -3
- package/lib/features/tools/base-glsp-tool.js.map +1 -1
- package/lib/features/tools/change-bounds-tool.d.ts +6 -8
- package/lib/features/tools/change-bounds-tool.d.ts.map +1 -1
- package/lib/features/tools/change-bounds-tool.js +22 -45
- package/lib/features/tools/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/delete-tool.d.ts.map +1 -1
- package/lib/features/tools/delete-tool.js +5 -5
- package/lib/features/tools/delete-tool.js.map +1 -1
- package/lib/features/tools/di.config.js +9 -9
- package/lib/features/tools/di.config.js.map +1 -1
- package/lib/features/tools/edge-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-creation-tool.js +16 -9
- package/lib/features/tools/edge-creation-tool.js.map +1 -1
- package/lib/features/tools/edge-edit-tool.d.ts +2 -1
- package/lib/features/tools/edge-edit-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-edit-tool.js +20 -15
- package/lib/features/tools/edge-edit-tool.js.map +1 -1
- package/lib/features/tools/marquee-behavior.d.ts +1 -1
- package/lib/features/tools/marquee-behavior.js +2 -2
- package/lib/features/tools/marquee-behavior.js.map +1 -1
- package/lib/features/tools/marquee-mouse-tool.d.ts.map +1 -1
- package/lib/features/tools/marquee-mouse-tool.js +7 -7
- package/lib/features/tools/marquee-mouse-tool.js.map +1 -1
- package/lib/features/tools/marquee-tool.js +1 -1
- package/lib/features/tools/marquee-tool.js.map +1 -1
- package/lib/features/tools/model.d.ts +2 -1
- package/lib/features/tools/model.d.ts.map +1 -1
- package/lib/features/tools/model.js +0 -15
- package/lib/features/tools/model.js.map +1 -1
- package/lib/features/tools/node-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/node-creation-tool.js +5 -5
- package/lib/features/tools/node-creation-tool.js.map +1 -1
- package/lib/features/validation/di.config.d.ts +1 -1
- package/lib/features/validation/di.config.d.ts.map +1 -1
- package/lib/features/validation/di.config.js +3 -3
- package/lib/features/validation/di.config.js.map +1 -1
- package/lib/features/validation/marker-navigator.d.ts +15 -7
- package/lib/features/validation/marker-navigator.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.js +21 -19
- package/lib/features/validation/marker-navigator.js.map +1 -1
- package/lib/features/validation/marker-navigator.spec.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.spec.js +2 -16
- package/lib/features/validation/marker-navigator.spec.js.map +1 -1
- package/lib/features/validation/validate.d.ts +9 -11
- package/lib/features/validation/validate.d.ts.map +1 -1
- package/lib/features/validation/validate.js +27 -26
- package/lib/features/validation/validate.js.map +1 -1
- package/lib/features/viewport/di.config.d.ts +1 -1
- package/lib/features/viewport/di.config.d.ts.map +1 -1
- package/lib/features/viewport/di.config.js +1 -1
- package/lib/features/viewport/di.config.js.map +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.js +2 -2
- package/lib/features/viewport/glsp-scroll-mouse-listener.js.map +1 -1
- package/lib/index.d.ts +4 -5
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +4 -5
- package/lib/index.js.map +1 -1
- package/lib/lib/model.d.ts +2 -1
- package/lib/lib/model.d.ts.map +1 -1
- package/lib/lib/model.js +0 -15
- package/lib/lib/model.js.map +1 -1
- package/lib/model-source/glsp-diagram-server.d.ts +4 -4
- package/lib/model-source/glsp-diagram-server.d.ts.map +1 -1
- package/lib/model-source/glsp-diagram-server.js +5 -5
- package/lib/model-source/glsp-diagram-server.js.map +1 -1
- package/lib/sprotty-reexport.d.ts +174 -0
- package/lib/sprotty-reexport.d.ts.map +1 -0
- package/lib/sprotty-reexport.js +299 -0
- package/lib/sprotty-reexport.js.map +1 -0
- package/lib/utils/layout-utils.d.ts +3 -3
- package/lib/utils/layout-utils.d.ts.map +1 -1
- package/lib/utils/smodel-util.d.ts +27 -18
- package/lib/utils/smodel-util.d.ts.map +1 -1
- package/lib/utils/smodel-util.js +30 -11
- package/lib/utils/smodel-util.js.map +1 -1
- package/lib/utils/viewpoint-util.d.ts +3 -3
- package/lib/utils/viewpoint-util.d.ts.map +1 -1
- package/lib/utils/viewpoint-util.js +17 -1
- package/lib/utils/viewpoint-util.js.map +1 -1
- package/package.json +5 -4
- package/src/base/action-dispatcher.ts +13 -4
- package/src/base/actions/focus-change-action.ts +25 -8
- package/{lib/features/tool-palette/palette-item.d.ts → src/base/actions/sprotty-actions.ts} +11 -11
- package/src/base/auto-complete/auto-complete-actions.ts +7 -5
- package/src/base/auto-complete/auto-complete-widget.ts +8 -13
- package/src/base/command-stack.ts +4 -3
- package/src/base/di.config.ts +4 -5
- package/src/base/editor-context-service.ts +7 -7
- package/src/base/focus-tracker.ts +5 -4
- package/src/base/model/update-model-command.ts +7 -8
- package/src/base/model-initialization-constraint.ts +3 -4
- package/src/base/tool-manager/glsp-tool-manager.ts +4 -4
- package/src/base/tool-manager/tool-actions.ts +37 -0
- package/src/base/types.ts +31 -24
- package/src/features/change-bounds/movement-restrictor.ts +3 -3
- package/src/features/change-bounds/snap.spec.ts +89 -0
- package/src/features/change-bounds/snap.ts +86 -2
- package/src/features/command-palette/di.config.ts +5 -7
- package/src/features/command-palette/server-command-palette-provider.ts +9 -8
- package/src/features/context-menu/delete-element-context-menu.ts +6 -6
- package/src/features/context-menu/di.config.ts +3 -2
- package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts +5 -6
- package/src/features/context-menu/server-context-menu-provider.ts +7 -6
- package/src/features/copy-paste/copy-paste-context-menu.ts +30 -23
- package/src/features/copy-paste/copy-paste-handler.ts +6 -6
- package/src/features/copy-paste/di.config.ts +7 -15
- package/src/features/decoration/decoration-placer.ts +2 -2
- package/src/features/decoration/di.config.ts +3 -5
- package/src/features/edit-label/di.config.ts +4 -5
- package/src/features/edit-label/edit-label-tool.ts +1 -2
- package/src/features/edit-label/edit-label-validator.ts +6 -10
- package/src/features/hints/di.config.ts +3 -3
- package/src/features/hints/type-hints.ts +31 -16
- package/src/features/hover/di.config.ts +4 -0
- package/src/features/hover/hover.ts +29 -11
- package/src/features/layout/di.config.ts +1 -1
- package/src/features/layout/freeform-layout.ts +3 -12
- package/src/features/layout/layout-commands.spec.ts +38 -22
- package/src/features/layout/layout-commands.ts +129 -55
- package/src/features/layout/vbox-layout.ts +4 -8
- package/src/features/model-source-watcher/model-source-changed-action-handler.ts +7 -12
- package/src/features/mouse-tool/di.config.ts +3 -4
- package/src/features/mouse-tool/mouse-tool.ts +4 -9
- package/src/features/navigation/navigation-action-handler.ts +76 -42
- package/src/features/navigation/navigation-target-resolver.spec.ts +3 -3
- package/src/features/navigation/navigation-target-resolver.ts +8 -13
- package/src/features/save/di.config.ts +2 -3
- package/src/features/save/save-keylistener.ts +1 -1
- package/src/features/select/di.config.ts +6 -8
- package/src/features/select/select-feedback-action.ts +18 -46
- package/src/features/select/select-mouse-listener.ts +1 -2
- package/src/features/select/selection-service.spec.ts +11 -8
- package/src/features/select/selection-service.ts +14 -10
- package/src/features/tool-feedback/change-bounds-tool-feedback.ts +42 -13
- package/src/features/tool-feedback/creation-tool-feedback.ts +42 -21
- package/src/features/tool-feedback/css-feedback.ts +40 -37
- package/src/features/tool-feedback/di.config.ts +4 -5
- package/src/features/tool-feedback/edge-edit-tool-feedback.ts +122 -78
- package/src/features/tool-feedback/feedback-action-dispatcher.ts +2 -1
- package/src/features/tool-feedback/marquee-tool-feedback.ts +36 -11
- package/src/features/tool-feedback/view.tsx +3 -3
- package/src/features/tool-palette/di.config.ts +3 -2
- package/src/features/tool-palette/tool-palette.ts +30 -16
- package/src/features/tools/base-glsp-tool.ts +4 -4
- package/src/features/tools/change-bounds-tool.ts +31 -61
- package/src/features/tools/delete-tool.ts +6 -6
- package/src/features/tools/di.config.ts +10 -10
- package/src/features/tools/edge-creation-tool.ts +18 -9
- package/src/features/tools/edge-edit-tool.ts +20 -16
- package/src/features/tools/marquee-behavior.ts +2 -2
- package/src/features/tools/marquee-mouse-tool.ts +8 -9
- package/src/features/tools/marquee-tool.ts +1 -1
- package/src/features/tools/model.ts +2 -1
- package/src/features/tools/node-creation-tool.ts +5 -5
- package/src/features/validation/di.config.ts +4 -5
- package/src/features/validation/marker-navigator.spec.ts +4 -2
- package/src/features/validation/marker-navigator.ts +41 -21
- package/src/features/validation/validate.ts +27 -20
- package/src/features/viewport/di.config.ts +1 -2
- package/src/features/viewport/glsp-scroll-mouse-listener.ts +3 -3
- package/src/index.ts +4 -5
- package/src/lib/model.ts +2 -1
- package/src/model-source/glsp-diagram-server.ts +8 -10
- package/src/sprotty-reexport.ts +283 -0
- package/src/utils/layout-utils.ts +3 -3
- package/src/utils/smodel-util.ts +36 -20
- package/src/utils/viewpoint-util.ts +5 -14
- package/lib/features/tool-palette/palette-item.d.ts.map +0 -1
- package/lib/features/tool-palette/palette-item.js.map +0 -1
- package/lib/protocol-reexport.d.ts +0 -45
- package/lib/protocol-reexport.d.ts.map +0 -1
- package/lib/protocol-reexport.js +0 -80
- package/lib/protocol-reexport.js.map +0 -1
- package/src/features/tool-palette/palette-item.ts +0 -38
- package/src/protocol-reexport.ts +0 -64
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/********************************************************************************
|
|
4
|
-
* Copyright (c) 2019 EclipseSource and others.
|
|
4
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
5
5
|
*
|
|
6
6
|
* This program and the accompanying materials are made available under the
|
|
7
7
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -21,9 +21,9 @@ const types_1 = require("../../base/types");
|
|
|
21
21
|
const edit_label_tool_1 = require("./edit-label-tool");
|
|
22
22
|
const edit_label_validator_1 = require("./edit-label-validator");
|
|
23
23
|
const glspEditLabelModule = new inversify_1.ContainerModule((bind, _unbind, isBound, _rebind) => {
|
|
24
|
-
bind(
|
|
25
|
-
bind(
|
|
26
|
-
bind(types_1.
|
|
24
|
+
bind(types_1.TYPES.IEditLabelValidator).to(edit_label_validator_1.ServerEditLabelValidator);
|
|
25
|
+
bind(types_1.TYPES.IEditLabelValidationDecorator).to(edit_label_validator_1.BalloonLabelValidationDecorator);
|
|
26
|
+
bind(types_1.TYPES.IDefaultTool).to(edit_label_tool_1.DirectLabelEditTool);
|
|
27
27
|
(0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.ApplyLabelEditCommand);
|
|
28
28
|
});
|
|
29
29
|
exports.default = glspEditLabelModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/edit-label/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/edit-label/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAAkE;AAClE,4CAAyC;AACzC,uDAAwD;AACxD,iEAAmG;AAEnG,MAAM,mBAAmB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,aAAK,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,+CAAwB,CAAC,CAAC;IAC7D,IAAI,CAAC,aAAK,CAAC,6BAA6B,CAAC,CAAC,EAAE,CAAC,sDAA+B,CAAC,CAAC;IAC9E,IAAI,CAAC,aAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,qCAAmB,CAAC,CAAC;IACjD,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,+BAAqB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,kBAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-label-tool.d.ts","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAgD,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"edit-label-tool.d.ts","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAgD,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,qBACa,mBAAoB,SAAQ,YAAY;IACjD,MAAM,CAAC,QAAQ,CAAC,EAAE,iCAAiC;IAEnD,SAAS,CAAC,sBAAsB,EAAE,aAAa,CAAC;IAChD,SAAS,CAAC,oBAAoB,EAAE,WAAW,CAAC;IAE5C,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,SAAS,CAAC,4BAA4B,IAAI,aAAa;IAIvD,SAAS,CAAC,0BAA0B,IAAI,WAAW;IAInD,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAIlB"}
|
|
@@ -9,7 +9,7 @@ var DirectLabelEditTool_1;
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.DirectLabelEditTool = void 0;
|
|
11
11
|
/********************************************************************************
|
|
12
|
-
* Copyright (c) 2020 EclipseSource and others.
|
|
12
|
+
* Copyright (c) 2020-2022 EclipseSource and others.
|
|
13
13
|
*
|
|
14
14
|
* This program and the accompanying materials are made available under the
|
|
15
15
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-label-tool.js","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-tool.ts"],"names":[],"mappings":";;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,qCAAmG;
|
|
1
|
+
{"version":3,"file":"edit-label-tool.js","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-tool.ts"],"names":[],"mappings":";;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,qCAAmG;AACnG,4DAAuD;AAGvD,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,6BAAY;IAMjD,IAAI,EAAE;QACF,OAAO,qBAAmB,CAAC,EAAE,CAAC;IAClC,CAAC;IAES,4BAA4B;QAClC,OAAO,IAAI,gCAAsB,EAAE,CAAC;IACxC,CAAC;IAES,0BAA0B;QAChC,OAAO,IAAI,8BAAoB,EAAE,CAAC;IACtC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC9D,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AA5BmB,sBAAE,GAAG,6BAA8B,CAAA;AAD1C,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CA6B/B;AA7BY,kDAAmB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,15 +13,13 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { RequestEditValidationAction, ValidationStatus } from '@eclipse-glsp/protocol';
|
|
17
|
-
import {
|
|
16
|
+
import { Action, RequestEditValidationAction, ValidationStatus } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { EditableLabel, EditLabelValidationResult, IEditLabelValidationDecorator, IEditLabelValidator, SModelElement } from 'sprotty';
|
|
18
18
|
import { GLSPActionDispatcher } from '../../base/action-dispatcher';
|
|
19
19
|
export declare namespace LabelEditValidation {
|
|
20
20
|
const CONTEXT_ID = "label-edit";
|
|
21
21
|
function toEditLabelValidationResult(status: ValidationStatus): EditLabelValidationResult;
|
|
22
|
-
|
|
23
|
-
export declare class ValidateLabelEditAction extends RequestEditValidationAction {
|
|
24
|
-
constructor(value: string, labelId: string);
|
|
22
|
+
function createValidationRequestAction(value: string, labelId: string): RequestEditValidationAction;
|
|
25
23
|
}
|
|
26
24
|
export declare class ServerEditLabelValidator implements IEditLabelValidator {
|
|
27
25
|
protected actionDispatcher: GLSPActionDispatcher;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-label-validator.d.ts","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,
|
|
1
|
+
{"version":3,"file":"edit-label-validator.d.ts","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,2BAA2B,EAAiC,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE9H,OAAO,EACH,aAAa,EACb,yBAAyB,EACzB,6BAA6B,EAC7B,mBAAmB,EAEnB,aAAa,EAEhB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,UAAU,eAAe,CAAC;IAEvC,SAAgB,2BAA2B,CAAC,MAAM,EAAE,gBAAgB,GAAG,yBAAyB,CAS/F;IAED,SAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,2BAA2B,CAEzG;CACJ;AAED,qBACa,wBAAyB,YAAW,mBAAmB;IAC/B,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAElF,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAKjG,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;CAM7E;AAED,qBACa,+BAAgC,YAAW,6BAA6B;IACjF,QAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,yBAAyB,GAAG,IAAI;IAuB1E,OAAO,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;CASzC"}
|
|
@@ -9,9 +9,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.BalloonLabelValidationDecorator = exports.ServerEditLabelValidator = exports.
|
|
12
|
+
exports.BalloonLabelValidationDecorator = exports.ServerEditLabelValidator = exports.LabelEditValidation = void 0;
|
|
13
13
|
/********************************************************************************
|
|
14
|
-
* Copyright (c) 2019-
|
|
14
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
15
15
|
*
|
|
16
16
|
* This program and the accompanying materials are made available under the
|
|
17
17
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -44,20 +44,18 @@ var LabelEditValidation;
|
|
|
44
44
|
return { message, severity };
|
|
45
45
|
}
|
|
46
46
|
LabelEditValidation.toEditLabelValidationResult = toEditLabelValidationResult;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
constructor(value, labelId) {
|
|
50
|
-
super(LabelEditValidation.CONTEXT_ID, labelId, value);
|
|
47
|
+
function createValidationRequestAction(value, labelId) {
|
|
48
|
+
return protocol_1.RequestEditValidationAction.create({ contextId: LabelEditValidation.CONTEXT_ID, modelElementId: labelId, text: value });
|
|
51
49
|
}
|
|
52
|
-
|
|
53
|
-
exports.
|
|
50
|
+
LabelEditValidation.createValidationRequestAction = createValidationRequestAction;
|
|
51
|
+
})(LabelEditValidation = exports.LabelEditValidation || (exports.LabelEditValidation = {}));
|
|
54
52
|
let ServerEditLabelValidator = class ServerEditLabelValidator {
|
|
55
53
|
validate(value, label) {
|
|
56
|
-
const action =
|
|
54
|
+
const action = LabelEditValidation.createValidationRequestAction(value, label.id);
|
|
57
55
|
return this.actionDispatcher.requestUntil(action).then(response => this.getValidationResultFromResponse(response));
|
|
58
56
|
}
|
|
59
57
|
getValidationResultFromResponse(action) {
|
|
60
|
-
if (
|
|
58
|
+
if (protocol_1.SetEditValidationResultAction.is(action)) {
|
|
61
59
|
return LabelEditValidation.toEditLabelValidationResult(action.status);
|
|
62
60
|
}
|
|
63
61
|
return { severity: 'ok' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-label-validator.js","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"edit-label-validator.js","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/********************************************************************************
|
|
4
|
-
* Copyright (c) 2019-
|
|
4
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
5
5
|
*
|
|
6
6
|
* This program and the accompanying materials are made available under the
|
|
7
7
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -22,7 +22,7 @@ const types_1 = require("../../base/types");
|
|
|
22
22
|
const type_hints_1 = require("./type-hints");
|
|
23
23
|
const modelHintsModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
|
|
24
24
|
bind(type_hints_1.TypeHintProvider).toSelf().inSingletonScope();
|
|
25
|
-
bind(types_1.
|
|
25
|
+
bind(types_1.TYPES.ITypeHintProvider).toService(type_hints_1.TypeHintProvider);
|
|
26
26
|
(0, sprotty_1.configureActionHandler)({ bind, isBound }, protocol_1.SetTypeHintsAction.KIND, type_hints_1.TypeHintProvider);
|
|
27
27
|
(0, sprotty_1.configureCommand)({ bind, isBound }, type_hints_1.ApplyTypeHintsCommand);
|
|
28
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4D;AAC5D,yCAA4C;AAC5C,qCAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4D;AAC5D,yCAA4C;AAC5C,qCAAmE;AACnE,4CAAyC;AACzC,6CAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACpE,IAAI,CAAC,6BAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,aAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,6BAAgB,CAAC,CAAC;IAC1D,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,6BAAkB,CAAC,IAAI,EAAE,6BAAgB,CAAC,CAAC;IACrF,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAqB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}
|
|
@@ -17,15 +17,25 @@ import { Action, EdgeTypeHint, ShapeTypeHint } from '@eclipse-glsp/protocol';
|
|
|
17
17
|
import { CommandExecutionContext, CommandReturn, IActionHandler, ICommand, SModelElement } from 'sprotty';
|
|
18
18
|
import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
|
|
19
19
|
import { FeedbackCommand } from '../tool-feedback/model';
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Is dispatched by the {@link TypeHintProvider} to apply the type hints received from the server
|
|
22
|
+
* onto the graphical model. The action is dispatched as persistent feedback to ensure the applied type hints
|
|
23
|
+
* don't get lost after a server-side model update.
|
|
24
|
+
*/
|
|
25
|
+
export interface ApplyTypeHintsAction extends Action {
|
|
26
|
+
kind: typeof ApplyTypeHintsAction.KIND;
|
|
27
|
+
}
|
|
28
|
+
export declare namespace ApplyTypeHintsAction {
|
|
29
|
+
const KIND = "applyTypeHints";
|
|
30
|
+
function is(object: any): object is ApplyTypeHintsAction;
|
|
31
|
+
function create(): ApplyTypeHintsAction;
|
|
22
32
|
}
|
|
23
33
|
export declare class ApplyTypeHintsCommand extends FeedbackCommand {
|
|
24
|
-
protected action:
|
|
34
|
+
protected action: Action;
|
|
25
35
|
static KIND: string;
|
|
26
36
|
readonly priority = 10;
|
|
27
37
|
protected typeHintProvider: ITypeHintProvider;
|
|
28
|
-
constructor(action:
|
|
38
|
+
constructor(action: Action);
|
|
29
39
|
execute(context: CommandExecutionContext): CommandReturn;
|
|
30
40
|
protected applyEdgeTypeHint(element: SModelElement): void;
|
|
31
41
|
protected applyShapeTypeHint(element: SModelElement): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-hints.d.ts","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"type-hints.d.ts","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAsB,aAAa,EAAY,MAAM,wBAAwB,CAAC;AAE3G,OAAO,EACH,uBAAuB,EACvB,aAAa,EAMb,cAAc,EACd,QAAQ,EAGR,aAAa,EAGhB,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,MAAM;IAChD,IAAI,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAC;CAC1C;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,IAAI,mBAAmB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,oBAAoB,CAE9D;IAED,SAAgB,MAAM,IAAI,oBAAoB,CAE7C;CACJ;AAED,qBACa,qBAAsB,SAAQ,eAAe;IAMpB,SAAS,CAAC,MAAM,EAAE,MAAM;IAL1D,OAAc,IAAI,SAA6B;IAC/C,SAAyB,QAAQ,MAAM;IAEN,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;gBAEnC,MAAM,EAAE,MAAM;IAI1D,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAWxD,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IASzD,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAmB7D;AA4BD,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAC3F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACzF,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;CAChH;AAED,qBACa,gBAAiB,YAAW,cAAc,EAAE,iBAAiB;IAEtE,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAC7D,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAE3D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAQhD,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE;IAqB5G,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS;CAG3F"}
|
|
@@ -37,15 +37,18 @@ const model_1 = require("../change-bounds/model");
|
|
|
37
37
|
const model_2 = require("../reconnect/model");
|
|
38
38
|
const model_3 = require("../tool-feedback/model");
|
|
39
39
|
const model_4 = require("./model");
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
var ApplyTypeHintsAction;
|
|
41
|
+
(function (ApplyTypeHintsAction) {
|
|
42
|
+
ApplyTypeHintsAction.KIND = 'applyTypeHints';
|
|
43
|
+
function is(object) {
|
|
44
|
+
return protocol_1.Action.hasKind(object, ApplyTypeHintsAction.KIND);
|
|
43
45
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
46
|
+
ApplyTypeHintsAction.is = is;
|
|
47
|
+
function create() {
|
|
48
|
+
return { kind: ApplyTypeHintsAction.KIND };
|
|
49
|
+
}
|
|
50
|
+
ApplyTypeHintsAction.create = create;
|
|
51
|
+
})(ApplyTypeHintsAction = exports.ApplyTypeHintsAction || (exports.ApplyTypeHintsAction = {}));
|
|
49
52
|
let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.FeedbackCommand {
|
|
50
53
|
constructor(action) {
|
|
51
54
|
super();
|
|
@@ -65,7 +68,7 @@ let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.Feedback
|
|
|
65
68
|
}
|
|
66
69
|
applyEdgeTypeHint(element) {
|
|
67
70
|
const hint = this.typeHintProvider.getEdgeTypeHint(element);
|
|
68
|
-
if (hint &&
|
|
71
|
+
if (hint && isModifiableFeatureSet(element.features)) {
|
|
69
72
|
addOrRemove(element.features, sprotty_1.deletableFeature, hint.deletable);
|
|
70
73
|
addOrRemove(element.features, sprotty_1.editFeature, hint.routable);
|
|
71
74
|
addOrRemove(element.features, model_2.reconnectFeature, hint.repositionable);
|
|
@@ -73,7 +76,7 @@ let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.Feedback
|
|
|
73
76
|
}
|
|
74
77
|
applyShapeTypeHint(element) {
|
|
75
78
|
const hint = this.typeHintProvider.getShapeTypeHint(element);
|
|
76
|
-
if (hint &&
|
|
79
|
+
if (hint && isModifiableFeatureSet(element.features)) {
|
|
77
80
|
addOrRemove(element.features, sprotty_1.deletableFeature, hint.deletable);
|
|
78
81
|
addOrRemove(element.features, sprotty_1.moveFeature, hint.repositionable);
|
|
79
82
|
addOrRemove(element.features, model_1.resizeFeature, hint.resizable);
|
|
@@ -89,15 +92,15 @@ let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.Feedback
|
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
94
|
};
|
|
92
|
-
ApplyTypeHintsCommand.KIND =
|
|
95
|
+
ApplyTypeHintsCommand.KIND = ApplyTypeHintsAction.KIND;
|
|
93
96
|
__decorate([
|
|
94
|
-
(0, inversify_1.inject)(types_1.
|
|
97
|
+
(0, inversify_1.inject)(types_1.TYPES.ITypeHintProvider),
|
|
95
98
|
__metadata("design:type", Object)
|
|
96
99
|
], ApplyTypeHintsCommand.prototype, "typeHintProvider", void 0);
|
|
97
100
|
ApplyTypeHintsCommand = __decorate([
|
|
98
101
|
(0, inversify_1.injectable)(),
|
|
99
|
-
__param(0, (0, inversify_1.inject)(
|
|
100
|
-
__metadata("design:paramtypes", [
|
|
102
|
+
__param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
|
|
103
|
+
__metadata("design:paramtypes", [Object])
|
|
101
104
|
], ApplyTypeHintsCommand);
|
|
102
105
|
exports.ApplyTypeHintsCommand = ApplyTypeHintsCommand;
|
|
103
106
|
function createConnectable(validSourceEdges, validTargetEdges) {
|
|
@@ -118,7 +121,7 @@ function addOrRemove(features, feature, add) {
|
|
|
118
121
|
features.delete(feature);
|
|
119
122
|
}
|
|
120
123
|
}
|
|
121
|
-
function
|
|
124
|
+
function isModifiableFeatureSet(featureSet) {
|
|
122
125
|
return featureSet !== undefined && featureSet instanceof Set;
|
|
123
126
|
}
|
|
124
127
|
let TypeHintProvider = class TypeHintProvider {
|
|
@@ -127,10 +130,10 @@ let TypeHintProvider = class TypeHintProvider {
|
|
|
127
130
|
this.edgeHints = new Map();
|
|
128
131
|
}
|
|
129
132
|
handle(action) {
|
|
130
|
-
if (
|
|
133
|
+
if (protocol_1.SetTypeHintsAction.is(action)) {
|
|
131
134
|
action.shapeHints.forEach(hint => this.shapeHints.set(hint.elementTypeId, hint));
|
|
132
135
|
action.edgeHints.forEach(hint => this.edgeHints.set(hint.elementTypeId, hint));
|
|
133
|
-
this.feedbackActionDispatcher.registerFeedback(this, [
|
|
136
|
+
this.feedbackActionDispatcher.registerFeedback(this, [ApplyTypeHintsAction.create()]);
|
|
134
137
|
}
|
|
135
138
|
}
|
|
136
139
|
getValidEdgeElementTypes(input, role) {
|
|
@@ -154,7 +157,7 @@ let TypeHintProvider = class TypeHintProvider {
|
|
|
154
157
|
}
|
|
155
158
|
};
|
|
156
159
|
__decorate([
|
|
157
|
-
(0, inversify_1.inject)(types_1.
|
|
160
|
+
(0, inversify_1.inject)(types_1.TYPES.IFeedbackActionDispatcher),
|
|
158
161
|
__metadata("design:type", Object)
|
|
159
162
|
], TypeHintProvider.prototype, "feedbackActionDispatcher", void 0);
|
|
160
163
|
TypeHintProvider = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-hints.js","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"type-hints.js","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAsB5C,QAAA,MAAM,eAAe,iBA0BnB,CAAC;AAEH,eAAe,eAAe,CAAC"}
|
|
@@ -42,6 +42,8 @@ const glspHoverModule = new inversify_1.ContainerModule((bind, _unbind, isBound)
|
|
|
42
42
|
(0, sprotty_1.configureActionHandler)(context, sprotty_1.SetViewportCommand.KIND, sprotty_1.ClosePopupActionHandler);
|
|
43
43
|
(0, sprotty_1.configureActionHandler)(context, sprotty_1.MoveCommand.KIND, sprotty_1.ClosePopupActionHandler);
|
|
44
44
|
(0, sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, sprotty_1.ClosePopupActionHandler);
|
|
45
|
+
(0, sprotty_1.configureActionHandler)(context, sprotty_1.EnableToolsAction.KIND, hover_1.GlspHoverMouseListener);
|
|
46
|
+
(0, sprotty_1.configureActionHandler)(context, sprotty_1.EnableDefaultToolsAction.KIND, hover_1.GlspHoverMouseListener);
|
|
45
47
|
(0, sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, hover_1.GlspHoverMouseListener);
|
|
46
48
|
});
|
|
47
49
|
exports.default = glspHoverModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAgBiB;AACjB,8FAAyF;AACzF,gFAAiF;AACjF,mCAAiD;AAEjD,MAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACnE,IAAI,CAAC,eAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChF,IAAI,CAAC,8BAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,8BAAsB,CAAC,CAAC;IAC5D,IAAI,CAAC,eAAK,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,iCAAuB,CAAC,CAAC;IAC3D,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,0BAAgB,CAAC,CAAC;IAC7C,IAAI,CAAa,eAAK,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC;QAC/C,cAAc,EAAE,SAAS;QACzB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,oBAAoB,EAAE,SAAS;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,iCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,IAAA,gCAAsB,EAAC,OAAO,EAAE,8BAAoB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACpF,IAAA,gCAAsB,EAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,IAAA,gCAAsB,EAAC,OAAO,EAAE,uBAAa,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC7E,IAAA,gCAAsB,EAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,IAAA,gCAAsB,EAAC,OAAO,EAAE,qBAAW,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC3E,IAAA,gCAAsB,EAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACvF,IAAA,gCAAsB,EAAC,OAAO,EAAE,2BAAiB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;IAChF,IAAA,gCAAsB,EAAC,OAAO,EAAE,kCAAwB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;IACvF,IAAA,gCAAsB,EAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,kBAAe,eAAe,CAAC"}
|
|
@@ -13,10 +13,11 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action, Bounds } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { HoverMouseListener, IActionHandler, ICommand, SIssueMarker, SIssueSeverity, SModelElement
|
|
16
|
+
import { Action, Bounds, SModelElementSchema, SModelRootSchema } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { HoverMouseListener, IActionHandler, ICommand, SIssueMarker, SIssueSeverity, SModelElement } from 'sprotty';
|
|
18
18
|
import { GIssueMarker } from '../validation/issue-marker';
|
|
19
19
|
export declare class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
|
|
20
|
+
protected enableHover: boolean;
|
|
20
21
|
/**
|
|
21
22
|
* Stops mouse over timer and remove hover feedback, if focus is lost.
|
|
22
23
|
*
|
|
@@ -27,6 +28,7 @@ export declare class GlspHoverMouseListener extends HoverMouseListener implement
|
|
|
27
28
|
* @returns a `HoverFeedbackAction` resetting the state, if the specified action indicates lost focus
|
|
28
29
|
*/
|
|
29
30
|
handle(action: Action): void | Action | ICommand;
|
|
31
|
+
mouseOver(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[];
|
|
30
32
|
protected startMouseOverTimer(target: SModelElement, event: MouseEvent): Promise<Action>;
|
|
31
33
|
protected createPopupModel(marker: GIssueMarker, bounds: Bounds): SModelRootSchema;
|
|
32
34
|
protected createMarkerIssuePopup(marker: GIssueMarker): SModelElementSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,
|
|
1
|
+
{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,aAAa,EAChB,MAAM,SAAS,CAAC;AAIjB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF,SAAS,CAAC,WAAW,UAAQ;IAC7B;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAevC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;cAOvE,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}
|
|
@@ -26,8 +26,14 @@ const protocol_1 = require("@eclipse-glsp/protocol");
|
|
|
26
26
|
const inversify_1 = require("inversify");
|
|
27
27
|
const sprotty_1 = require("sprotty");
|
|
28
28
|
const focus_change_action_1 = require("../../base/actions/focus-change-action");
|
|
29
|
+
const tool_actions_1 = require("../../base/tool-manager/tool-actions");
|
|
30
|
+
const edge_creation_tool_1 = require("../tools/edge-creation-tool");
|
|
29
31
|
const issue_marker_1 = require("../validation/issue-marker");
|
|
30
32
|
let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.HoverMouseListener {
|
|
33
|
+
constructor() {
|
|
34
|
+
super(...arguments);
|
|
35
|
+
this.enableHover = true;
|
|
36
|
+
}
|
|
31
37
|
/**
|
|
32
38
|
* Stops mouse over timer and remove hover feedback, if focus is lost.
|
|
33
39
|
*
|
|
@@ -38,14 +44,26 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
|
|
|
38
44
|
* @returns a `HoverFeedbackAction` resetting the state, if the specified action indicates lost focus
|
|
39
45
|
*/
|
|
40
46
|
handle(action) {
|
|
41
|
-
if (
|
|
47
|
+
if (focus_change_action_1.FocusStateChangedAction.is(action) && !action.hasFocus) {
|
|
42
48
|
this.stopMouseOverTimer();
|
|
43
49
|
if (this.lastHoverFeedbackElementId) {
|
|
44
50
|
const previousTargetId = this.lastHoverFeedbackElementId;
|
|
45
51
|
this.lastHoverFeedbackElementId = undefined;
|
|
46
|
-
return
|
|
52
|
+
return sprotty_1.HoverFeedbackAction.create({ mouseoverElement: previousTargetId, mouseIsOver: false });
|
|
47
53
|
}
|
|
48
54
|
}
|
|
55
|
+
else if (tool_actions_1.EnableToolsAction.is(action)) {
|
|
56
|
+
this.enableHover = !action.toolIds.includes(edge_creation_tool_1.EdgeCreationTool.ID);
|
|
57
|
+
}
|
|
58
|
+
else if (tool_actions_1.EnableDefaultToolsAction.is(action)) {
|
|
59
|
+
this.enableHover = true;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
mouseOver(target, event) {
|
|
63
|
+
if (this.enableHover) {
|
|
64
|
+
return super.mouseOver(target, event);
|
|
65
|
+
}
|
|
66
|
+
return [];
|
|
49
67
|
}
|
|
50
68
|
startMouseOverTimer(target, event) {
|
|
51
69
|
this.stopMouseOverTimer();
|
|
@@ -53,10 +71,10 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
|
|
|
53
71
|
this.state.mouseOverTimer = window.setTimeout(() => {
|
|
54
72
|
const popupBounds = this.computePopupBounds(target, { x: event.pageX, y: event.pageY });
|
|
55
73
|
if (target instanceof issue_marker_1.GIssueMarker) {
|
|
56
|
-
resolve(
|
|
74
|
+
resolve(protocol_1.SetPopupModelAction.create(this.createPopupModel(target, popupBounds)));
|
|
57
75
|
}
|
|
58
76
|
else {
|
|
59
|
-
resolve(
|
|
77
|
+
resolve(protocol_1.RequestPopupModelAction.create({ elementId: target.id, bounds: popupBounds }));
|
|
60
78
|
}
|
|
61
79
|
this.state.popupOpen = true;
|
|
62
80
|
this.state.previousPopupElement = target;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/********************************************************************************
|
|
4
|
-
* Copyright (c) 2019-
|
|
4
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
5
5
|
*
|
|
6
6
|
* This program and the accompanying materials are made available under the
|
|
7
7
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,4 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2021-2022 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 { Bounds, Dimension, Point } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { BoundsData, LayoutContainer, SChildElement, SParentElement, StatefulLayouter } from 'sprotty';
|
|
2
18
|
import { AbstractLayout } from 'sprotty/lib/features/bounds/abstract-layout';
|
|
3
19
|
import { AbstractLayoutOptions } from 'sprotty/lib/features/bounds/layout-options';
|
|
4
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"freeform-layout.d.ts","sourceRoot":"","sources":["../../../src/features/layout/freeform-layout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"freeform-layout.d.ts","sourceRoot":"","sources":["../../../src/features/layout/freeform-layout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAEnF;;GAEG;AACH,qBACa,gBAAiB,SAAQ,cAAc,CAAC,qBAAqB,CAAC;IACvE,MAAM,CAAC,IAAI,SAAc;IAEhB,MAAM,CAAC,SAAS,EAAE,cAAc,GAAG,eAAe,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAoB9F,SAAS,CAAC,eAAe,CACrB,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,gBAAgB,EAAE,qBAAqB,EACvC,QAAQ,EAAE,gBAAgB,GAC3B,SAAS;IAkBZ,SAAS,CAAC,WAAW,CACjB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,qBAAqB,EACnC,gBAAgB,EAAE,qBAAqB,EACvC,aAAa,EAAE,KAAK,EACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAClB,KAAK;cAWW,uBAAuB,CACtC,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAClB,MAAM;IAWT,SAAS,CAAC,uBAAuB,IAAI,qBAAqB;IAa1D,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,qBAAqB,EAAE,CAAC,EAAE,qBAAqB,GAAG,qBAAqB;CAG9F"}
|
|
@@ -22,8 +22,8 @@ exports.FreeFormLayouter = void 0;
|
|
|
22
22
|
*
|
|
23
23
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
24
24
|
********************************************************************************/
|
|
25
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
25
26
|
const inversify_1 = require("inversify");
|
|
26
|
-
const sprotty_1 = require("sprotty");
|
|
27
27
|
const abstract_layout_1 = require("sprotty/lib/features/bounds/abstract-layout");
|
|
28
28
|
/**
|
|
29
29
|
* Layouts children of a container with explit X/Y positions
|
|
@@ -52,7 +52,7 @@ let FreeFormLayouter = class FreeFormLayouter extends abstract_layout_1.Abstract
|
|
|
52
52
|
let maxY = 0;
|
|
53
53
|
container.children.forEach(child => {
|
|
54
54
|
const bounds = layouter.getBoundsData(child).bounds;
|
|
55
|
-
if (bounds !== undefined &&
|
|
55
|
+
if (bounds !== undefined && protocol_1.Dimension.isValid(bounds)) {
|
|
56
56
|
const childMaxX = bounds.x + bounds.width;
|
|
57
57
|
const childMaxY = bounds.y + bounds.height;
|
|
58
58
|
maxX = Math.max(maxX, childMaxX);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"freeform-layout.js","sourceRoot":"","sources":["../../../src/features/layout/freeform-layout.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"freeform-layout.js","sourceRoot":"","sources":["../../../src/features/layout/freeform-layout.ts"],"names":[],"mappings":"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"}
|