@eclipse-glsp/client 0.10.0-next.e5fcffe.169 → 1.1.0-next.282a632.186

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.glspViewportModule = exports.modelSourceWatcherModule = exports.glspDecorationModule = exports.markerNavigatorModule = exports.navigationModule = exports.toolsModule = exports.glspHoverModule = exports.glspEditLabelModule = exports.layoutCommandsModule = exports.glspMouseToolModule = exports.glspSelectModule = exports.copyPasteContextMenuModule = exports.glspServerCopyPasteModule = exports.glspContextMenuModule = exports.glspCommandPaletteModule = exports.modelHintsModule = exports.defaultGLSPModule = exports.toolFeedbackModule = exports.paletteModule = exports.saveModule = exports.validationModule = exports.configureServerActions = void 0;
+exports.glspViewportModule = exports.modelSourceWatcherModule = exports.glspDecorationModule = exports.markerNavigatorModule = exports.navigationModule = exports.enableDefaultToolsOnFocusLossModule = exports.toolsModule = exports.glspHoverModule = exports.glspEditLabelModule = exports.layoutModule = exports.glspMouseToolModule = exports.glspSelectModule = exports.copyPasteContextMenuModule = exports.glspServerCopyPasteModule = exports.glspContextMenuModule = exports.glspCommandPaletteModule = exports.modelHintsModule = exports.defaultGLSPModule = exports.toolFeedbackModule = exports.paletteModule = exports.saveModule = exports.validationModule = exports.configureServerActions = void 0;
 /********************************************************************************
  * Copyright (c) 2019-2022 EclipseSource and others.
  *
@@ -48,23 +48,24 @@ exports.modelHintsModule = di_config_7.default;
 const di_config_8 = require("./features/hover/di.config");
 exports.glspHoverModule = di_config_8.default;
 const di_config_9 = require("./features/layout/di.config");
-exports.layoutCommandsModule = di_config_9.default;
-const di_config_10 = require("./features/model-source-watcher/di.config");
-exports.modelSourceWatcherModule = di_config_10.default;
-const di_config_11 = require("./features/mouse-tool/di.config");
-exports.glspMouseToolModule = di_config_11.default;
-const di_config_12 = require("./features/navigation/di.config");
-Object.defineProperty(exports, "navigationModule", { enumerable: true, get: function () { return di_config_12.navigationModule; } });
-const di_config_13 = require("./features/save/di.config");
-exports.saveModule = di_config_13.default;
-const di_config_14 = require("./features/select/di.config");
-exports.glspSelectModule = di_config_14.default;
+exports.layoutModule = di_config_9.default;
+const di_config_10 = require("./features/mouse-tool/di.config");
+exports.glspMouseToolModule = di_config_10.default;
+const di_config_11 = require("./features/navigation/di.config");
+Object.defineProperty(exports, "navigationModule", { enumerable: true, get: function () { return di_config_11.navigationModule; } });
+const di_config_12 = require("./features/save/di.config");
+exports.saveModule = di_config_12.default;
+const di_config_13 = require("./features/select/di.config");
+exports.glspSelectModule = di_config_13.default;
+const di_config_14 = require("./features/source-model-watcher/di.config");
+exports.modelSourceWatcherModule = di_config_14.default;
 const di_config_15 = require("./features/tool-feedback/di.config");
 exports.toolFeedbackModule = di_config_15.default;
 const di_config_16 = require("./features/tool-palette/di.config");
 exports.paletteModule = di_config_16.default;
 const di_config_17 = require("./features/tools/di.config");
-exports.toolsModule = di_config_17.default;
+Object.defineProperty(exports, "enableDefaultToolsOnFocusLossModule", { enumerable: true, get: function () { return di_config_17.enableDefaultToolsOnFocusLossModule; } });
+Object.defineProperty(exports, "toolsModule", { enumerable: true, get: function () { return di_config_17.toolsModule; } });
 const di_config_18 = require("./features/validation/di.config");
 Object.defineProperty(exports, "markerNavigatorModule", { enumerable: true, get: function () { return di_config_18.markerNavigatorModule; } });
 Object.defineProperty(exports, "validationModule", { enumerable: true, get: function () { return di_config_18.validationModule; } });
@@ -103,8 +104,7 @@ __exportStar(require("./features/edit-label/edit-label-validator"), exports);
 __exportStar(require("./features/hints/model"), exports);
 __exportStar(require("./features/hints/type-hints"), exports);
 __exportStar(require("./features/hover/hover"), exports);
-__exportStar(require("./features/layout/layout-commands"), exports);
-__exportStar(require("./features/model-source-watcher/model-source-changed-action-handler"), exports);
+__exportStar(require("./features/layout/layout-elements-action"), exports);
 __exportStar(require("./features/mouse-tool/mouse-tool"), exports);
 __exportStar(require("./features/navigation/navigation-action-handler"), exports);
 __exportStar(require("./features/navigation/navigation-target-resolver"), exports);
@@ -112,6 +112,7 @@ __exportStar(require("./features/rank/model"), exports);
 __exportStar(require("./features/reconnect/model"), exports);
 __exportStar(require("./features/save/model"), exports);
 __exportStar(require("./features/save/save-keylistener"), exports);
+__exportStar(require("./features/source-model-watcher/source-model-changed-action-handler"), exports);
 __exportStar(require("./features/tool-feedback/change-bounds-tool-feedback"), exports);
 __exportStar(require("./features/tool-feedback/creation-tool-feedback"), exports);
 __exportStar(require("./features/tool-feedback/css-feedback"), exports);

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gDAAiD;AA4F7C,4BA5FG,mBAAiB,CA4FH;AA3FrB,oEAA4E;AA6FxE,mCA7FG,mBAAwB,CA6FH;AA5F5B,iEAAsE;AA6FlE,gCA7FG,mBAAqB,CA6FH;AA5FzB,+DAAwG;AA8FpG,2GA9FK,sCAA0B,OA8FL;AAD1B,0GA7FiC,qCAAyB,OA6FjC;AA5F7B,+DAAmE;AAsG/D,+BAtGG,mBAAoB,CAsGH;AArGxB,+DAAkE;AAgG9D,8BAhGG,mBAAmB,CAgGH;AA/FvB,0DAA0D;AAuFtD,2BAvFG,mBAAgB,CAuFH;AAtFpB,0DAAyD;AA+FrD,0BA/FG,mBAAe,CA+FH;AA9FnB,2DAA+D;AA4F3D,+BA5FG,mBAAoB,CA4FH;AA3FxB,0EAAiF;AAkG7E,mCAlGG,oBAAwB,CAkGH;AAjG5B,gEAAkE;AAyF9D,8BAzFG,oBAAmB,CAyFH;AAxFvB,gEAAmE;AA6F/D,iGA7FK,6BAAgB,OA6FL;AA5FpB,0DAAmD;AA6E/C,qBA7EG,oBAAU,CA6EH;AA5Ed,4DAA2D;AAqFvD,2BArFG,oBAAgB,CAqFH;AApFpB,mEAAoE;AA6EhE,6BA7EG,oBAAkB,CA6EH;AA5EtB,kEAA8D;AA2E1D,wBA3EG,oBAAa,CA2EH;AA1EjB,2DAAqD;AAuFjD,sBAvFG,oBAAW,CAuFH;AAtFf,gEAA0F;AAwFtF,sGAxFK,kCAAqB,OAwFL;AAjBrB,iGAvE4B,6BAAgB,OAuE5B;AAtEpB,8DAA+D;AA0F3D,6BA1FG,oBAAkB,CA0FH;AAxFtB,2DAAyC;AACzC,qEAAmD;AACnD,sDAAoC;AACpC,6EAA2D;AAC3D,4EAA0D;AAC1D,4EAA0D;AAC1D,uDAAqC;AACrC,2DAAyC;AACzC,+CAA0D;AAAjD,oHAAA,sBAAsB,OAAA;AAC/B,mEAAiD;AACjD,gEAA8C;AAC9C,uDAAqC;AACrC,yEAAuD;AACvD,8DAA4C;AAC5C,oEAAkD;AAClD,2EAAyD;AACzD,0DAAwC;AACxC,mEAAiD;AACjD,+CAA6B;AAC7B,4DAA0C;AAC1C,iEAA+C;AAC/C,+EAA6D;AAC7D,gEAA8C;AAC9C,6FAA2E;AAC3E,sFAAoE;AACpE,2EAAyD;AACzD,0EAAwD;AACxD,wEAAsD;AACtD,6EAA2D;AAC3D,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,oEAAkD;AAClD,sGAAoF;AACpF,mEAAiD;AACjD,kFAAgE;AAChE,mFAAiE;AACjE,wDAAsC;AACtC,6DAA2C;AAC3C,wDAAsC;AACtC,mEAAiD;AACjD,uFAAqE;AACrE,kFAAgE;AAChE,wEAAsD;AACtD,mFAAiE;AACjE,sFAAoE;AACpE,iEAA+C;AAC/C,uEAAqD;AACrD,kEAAgD;AAChD,sEAAoD;AACpD,+DAA6C;AAC7C,sEAAoD;AACpD,kEAAgD;AAChD,oEAAkD;AAClD,sEAAoD;AACpD,qEAAmD;AACnD,yEAAuD;AACvD,iEAA+C;AAC/C,iFAA+D;AAC/D,8CAA4B;AAC5B,qEAAmD;AACnD,qDAAmC;AACnC,yDAAuC;AACvC,iDAA+B;AAC/B,sDAAoC;AACpC,yDAAuC;AACvC,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gDAAiD;AA4F7C,4BA5FG,mBAAiB,CA4FH;AA3FrB,oEAA4E;AA6FxE,mCA7FG,mBAAwB,CA6FH;AA5F5B,iEAAsE;AA6FlE,gCA7FG,mBAAqB,CA6FH;AA5FzB,+DAAwG;AA8FpG,2GA9FK,sCAA0B,OA8FL;AAD1B,0GA7FiC,qCAAyB,OA6FjC;AA5F7B,+DAAmE;AAuG/D,+BAvGG,mBAAoB,CAuGH;AAtGxB,+DAAkE;AAgG9D,8BAhGG,mBAAmB,CAgGH;AA/FvB,0DAA0D;AAuFtD,2BAvFG,mBAAgB,CAuFH;AAtFpB,0DAAyD;AA+FrD,0BA/FG,mBAAe,CA+FH;AA9FnB,2DAAuD;AA4FnD,uBA5FG,mBAAY,CA4FH;AA3FhB,gEAAkE;AA0F9D,8BA1FG,oBAAmB,CA0FH;AAzFvB,gEAAmE;AA+F/D,iGA/FK,6BAAgB,OA+FL;AA9FpB,0DAAmD;AA8E/C,qBA9EG,oBAAU,CA8EH;AA7Ed,4DAA2D;AAsFvD,2BAtFG,oBAAgB,CAsFH;AArFpB,0EAAiF;AA+FjD,mCA/FzB,oBAAwB,CA+FyB;AA9FxD,mEAAoE;AA6EhE,6BA7EG,oBAAkB,CA6EH;AA5EtB,kEAA8D;AA2E1D,wBA3EG,oBAAa,CA2EH;AA1EjB,2DAA8F;AAwF1F,oHAxFK,gDAAmC,OAwFL;AADnC,4FAvF0C,wBAAW,OAuF1C;AAtFf,gEAA0F;AAyFtF,sGAzFK,kCAAqB,OAyFL;AAlBrB,iGAvE4B,6BAAgB,OAuE5B;AAtEpB,8DAA+D;AA2F3D,6BA3FG,oBAAkB,CA2FH;AAzFtB,2DAAyC;AACzC,qEAAmD;AACnD,sDAAoC;AACpC,6EAA2D;AAC3D,4EAA0D;AAC1D,4EAA0D;AAC1D,uDAAqC;AACrC,2DAAyC;AACzC,+CAA0D;AAAjD,oHAAA,sBAAsB,OAAA;AAC/B,mEAAiD;AACjD,gEAA8C;AAC9C,uDAAqC;AACrC,yEAAuD;AACvD,8DAA4C;AAC5C,oEAAkD;AAClD,2EAAyD;AACzD,0DAAwC;AACxC,mEAAiD;AACjD,+CAA6B;AAC7B,4DAA0C;AAC1C,iEAA+C;AAC/C,+EAA6D;AAC7D,gEAA8C;AAC9C,6FAA2E;AAC3E,sFAAoE;AACpE,2EAAyD;AACzD,0EAAwD;AACxD,wEAAsD;AACtD,6EAA2D;AAC3D,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,2EAAyD;AACzD,mEAAiD;AACjD,kFAAgE;AAChE,mFAAiE;AACjE,wDAAsC;AACtC,6DAA2C;AAC3C,wDAAsC;AACtC,mEAAiD;AACjD,sGAAoF;AACpF,uFAAqE;AACrE,kFAAgE;AAChE,wEAAsD;AACtD,mFAAiE;AACjE,sFAAoE;AACpE,iEAA+C;AAC/C,uEAAqD;AACrD,kEAAgD;AAChD,sEAAoD;AACpD,+DAA6C;AAC7C,sEAAoD;AACpD,kEAAgD;AAChD,oEAAkD;AAClD,sEAAoD;AACpD,qEAAmD;AACnD,yEAAuD;AACvD,iEAA+C;AAC/C,iFAA+D;AAC/D,8CAA4B;AAC5B,qEAAmD;AACnD,qDAAmC;AACnC,yDAAuC;AACvC,iDAA+B;AAC/B,sDAAoC;AACpC,yDAAuC;AACvC,0CAAwB"}

package/lib/lib/model.d.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { SGraph, SModelElement } from 'sprotty/lib';
+import { SGraph, SModelElement } from 'sprotty';
 import { Containable } from '../features/hints/model';
 import { Saveable } from '../features/save/model';
 export declare class GLSPGraph extends SGraph implements Saveable, Containable {

package/lib/lib/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAiB,MAAM,EAAE,aAAa,EAAmB,MAAM,aAAa,CAAC;AACpF,OAAO,EAAE,WAAW,EAAoB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAE/D,qBAAa,SAAU,SAAQ,MAAO,YAAW,QAAQ,EAAE,WAAW;IAClE,gBAAyB,gBAAgB,WAAmE;IAC5G,KAAK,UAAS;IACd,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,mBAAmB,GAAG,OAAO;CAGrF"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAiB,MAAM,EAAE,aAAa,EAAmB,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,WAAW,EAAoB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAE/D,qBAAa,SAAU,SAAQ,MAAO,YAAW,QAAQ,EAAE,WAAW;IAClE,gBAAyB,gBAAgB,WAAmE;IAC5G,KAAK,UAAS;IACd,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,mBAAmB,GAAG,OAAO;CAGrF"}

package/lib/lib/model.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPGraph = void 0;
-const lib_1 = require("sprotty/lib");
+const sprotty_1 = require("sprotty");
 const model_1 = require("../features/hints/model");
 const model_2 = require("../features/save/model");
-class GLSPGraph extends lib_1.SGraph {
+class GLSPGraph extends sprotty_1.SGraph {
     constructor() {
         super(...arguments);
         this.dirty = false;
@@ -14,5 +14,5 @@ class GLSPGraph extends lib_1.SGraph {
     }
 }
 exports.GLSPGraph = GLSPGraph;
-GLSPGraph.DEFAULT_FEATURES = [lib_1.viewportFeature, lib_1.exportFeature, model_2.saveFeature, model_1.containerFeature];
+GLSPGraph.DEFAULT_FEATURES = [sprotty_1.viewportFeature, sprotty_1.exportFeature, model_2.saveFeature, model_1.containerFeature];
 //# sourceMappingURL=model.js.map

package/lib/lib/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":";;;AAgBA,qCAAoF;AACpF,mDAAwE;AACxE,kDAA+D;AAE/D,MAAa,SAAU,SAAQ,YAAM;IAArC;;QAEI,UAAK,GAAG,KAAK,CAAC;IAIlB,CAAC;IAHG,oBAAoB,CAAC,KAAmD;QACpE,OAAO,IAAI,CAAC;IAChB,CAAC;;AALL,8BAMC;AAL4B,0BAAgB,GAAG,CAAC,qBAAe,EAAE,mBAAa,EAAE,mBAAW,EAAE,wBAAgB,CAAC,CAAC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":";;;AAgBA,qCAAgF;AAChF,mDAAwE;AACxE,kDAA+D;AAE/D,MAAa,SAAU,SAAQ,gBAAM;IAArC;;QAEI,UAAK,GAAG,KAAK,CAAC;IAIlB,CAAC;IAHG,oBAAoB,CAAC,KAAmD;QACpE,OAAO,IAAI,CAAC;IAChB,CAAC;;AALL,8BAMC;AAL4B,0BAAgB,GAAG,CAAC,yBAAe,EAAE,uBAAa,EAAE,mBAAW,EAAE,wBAAgB,CAAC,CAAC"}

package/lib/model-source/glsp-diagram-server.d.ts

@@ -29,7 +29,7 @@ export declare class GLSPDiagramServer extends DiagramServerProxy implements Sou
     protected handleServerMessageAction(action: ServerMessageAction): boolean;
     protected handleComputedBounds(_action: ComputedBoundsAction): boolean;
     protected handleSetEditModeAction(action: SetEditModeAction): boolean;
-    getSourceURI(): string;
+    get sourceURI(): string;
 }
 export declare function isReceivedFromServer(action: Action): boolean;
 export declare function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServerProxy): void;

package/lib/model-source/glsp-diagram-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-diagram-server.d.ts","sourceRoot":"","sources":["../../src/model-source/glsp-diagram-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,aAAa,EACb,oBAAoB,EACpB,UAAU,EAEV,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAmB,QAAQ,EAA6C,MAAM,SAAS,CAAC;AAC1I,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,qBACa,iBAAkB,SAAQ,kBAAmB,YAAW,cAAc;IAC/E,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IACnC,SAAS,CAAC,KAAK,UAAS;IAElB,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAOtD,IAAW,UAAU,IAAI,UAAU,GAAG,SAAS,CAE9C;IAED,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAQ1C,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAOjD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM;IAOhD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAU/C,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO;cAKtD,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO;IAI/E,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO;IAI9D,YAAY,IAAI,MAAM;CAGhC;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAQzH"}
+{"version":3,"file":"glsp-diagram-server.d.ts","sourceRoot":"","sources":["../../src/model-source/glsp-diagram-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,aAAa,EACb,oBAAoB,EACpB,UAAU,EAEV,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAmB,QAAQ,EAA6C,MAAM,SAAS,CAAC;AAC1I,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,qBACa,iBAAkB,SAAQ,kBAAmB,YAAW,cAAc;IAC/E,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IACnC,SAAS,CAAC,KAAK,UAAS;IAElB,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAOtD,IAAW,UAAU,IAAI,UAAU,GAAG,SAAS,CAE9C;IAED,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAQ1C,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAOjD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM;IAOhD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAU/C,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO;cAKtD,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO;IAI/E,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO;IAIrE,IAAW,SAAS,IAAI,MAAM,CAE7B;CACJ;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAQzH"}

package/lib/model-source/glsp-diagram-server.js

@@ -79,7 +79,7 @@ let GLSPDiagramServer = class GLSPDiagramServer extends sprotty_1.DiagramServerP
     handleSetEditModeAction(action) {
         return !isReceivedFromServer(action);
     }
-    getSourceURI() {
+    get sourceURI() {
         return this._sourceUri;
     }
 };

package/lib/model-source/glsp-diagram-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-diagram-server.js","sourceRoot":"","sources":["../../src/model-source/glsp-diagram-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-diagram-server.js","sourceRoot":"","sources":["../../src/model-source/glsp-diagram-server.ts"],"names":[],"mappings":"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"}

package/lib/utils/layout-utils.d.ts

@@ -13,30 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Dimension, ElementAndBounds, Point } from '@eclipse-glsp/protocol';
+import { Dimension, ElementAndBounds, Point, Writable } from '@eclipse-glsp/protocol';
 import { BoundsAware, ElementMove, ModelLayoutOptions, SModelElement } from 'sprotty';
 import { IMovementRestrictor } from '../features/change-bounds/movement-restrictor';
 export declare function minWidth(element: SModelElement & BoundsAware): number;
 export declare function minHeight(element: SModelElement & BoundsAware): number;
 export declare function getLayoutOptions(element: SModelElement): ModelLayoutOptions | undefined;
 export declare function isValidSize(element: SModelElement & BoundsAware, size: Dimension): boolean;
-export declare function isValidMove(element: SModelElement & BoundsAware, newPosition: Point, movementRestrictor?: IMovementRestrictor): boolean;
-export declare function toValidElementMove(element: SModelElement & BoundsAware, move: WriteableElementMove, movementRestrictor?: IMovementRestrictor): WriteableElementMove | undefined;
-export declare function toValidElementAndBounds(element: SModelElement & BoundsAware, bounds: WriteableElementAndBounds, movementRestrictor?: IMovementRestrictor): WriteableElementAndBounds | undefined;
-export interface WriteablePoint extends Point {
-    x: number;
-    y: number;
-}
-export interface WriteableElementMove extends ElementMove {
-    fromPosition?: WriteablePoint;
-    toPosition: WriteablePoint;
-}
-export interface WriteableDimension extends Dimension {
-    width: number;
-    height: number;
-}
-export interface WriteableElementAndBounds extends ElementAndBounds {
-    newPosition: WriteablePoint;
-    newSize: WriteableDimension;
-}
+export declare function isValidMove(element: SModelElement & BoundsAware, newPosition?: Point, movementRestrictor?: IMovementRestrictor): boolean;
+export declare function toValidElementMove(element: SModelElement & BoundsAware, move: ElementMove, movementRestrictor?: IMovementRestrictor): ElementMove | undefined;
+export declare function toValidElementAndBounds(element: SModelElement & BoundsAware, bounds: Writable<ElementAndBounds>, movementRestrictor?: IMovementRestrictor): ElementAndBounds | undefined;
 //# sourceMappingURL=layout-utils.d.ts.map

package/lib/utils/layout-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-utils.d.ts","sourceRoot":"","sources":["../../src/utils/layout-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,MAAM,CAMrE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,MAAM,CAMtE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,kBAAkB,GAAG,SAAS,CAMvF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAE1F;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAKvI;AAED,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,aAAa,GAAG,WAAW,EACpC,IAAI,EAAE,oBAAoB,EAC1B,kBAAkB,CAAC,EAAE,mBAAmB,GACzC,oBAAoB,GAAG,SAAS,CAKlC;AAED,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,aAAa,GAAG,WAAW,EACpC,MAAM,EAAE,yBAAyB,EACjC,kBAAkB,CAAC,EAAE,mBAAmB,GACzC,yBAAyB,GAAG,SAAS,CAavC;AAED,MAAM,WAAW,cAAe,SAAQ,KAAK;IACzC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACrD,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,UAAU,EAAE,cAAc,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAmB,SAAQ,SAAS;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D,WAAW,EAAE,cAAc,CAAC;IAC5B,OAAO,EAAE,kBAAkB,CAAC;CAC/B"}
+{"version":3,"file":"layout-utils.d.ts","sourceRoot":"","sources":["../../src/utils/layout-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,MAAM,CAMrE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,MAAM,CAMtE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,kBAAkB,GAAG,SAAS,CAMvF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAE1F;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,WAAW,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAKxI;AAED,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,aAAa,GAAG,WAAW,EACpC,IAAI,EAAE,WAAW,EACjB,kBAAkB,CAAC,EAAE,mBAAmB,GACzC,WAAW,GAAG,SAAS,CAKzB;AAED,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,aAAa,GAAG,WAAW,EACpC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAClC,kBAAkB,CAAC,EAAE,mBAAmB,GACzC,gBAAgB,GAAG,SAAS,CAa9B"}

package/lib/utils/layout-utils.js

@@ -31,7 +31,7 @@ function isValidSize(element, size) {
 exports.isValidSize = isValidSize;
 function isValidMove(element, newPosition, movementRestrictor) {
     if (movementRestrictor) {
-        return movementRestrictor.validate(newPosition, element);
+        return movementRestrictor.validate(element, newPosition);
     }
     return true;
 }

package/lib/utils/layout-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout-utils.js","sourceRoot":"","sources":["../../src/utils/layout-utils.ts"],"names":[],"mappings":";;;AAmBA,SAAgB,QAAQ,CAAC,OAAoC;IACzD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,aAAa,KAAK,SAAS,IAAI,OAAO,aAAa,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC3E,OAAO,aAAa,CAAC,QAAQ,CAAC;KACjC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAND,4BAMC;AAED,SAAgB,SAAS,CAAC,OAAoC;IAC1D,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,aAAa,KAAK,SAAS,IAAI,OAAO,aAAa,CAAC,SAAS,KAAK,QAAQ,EAAE;QAC5E,OAAO,aAAa,CAAC,SAAS,CAAC;KAClC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAND,8BAMC;AAED,SAAgB,gBAAgB,CAAC,OAAsB;IACnD,MAAM,aAAa,GAAI,OAAe,CAAC,aAAa,CAAC;IACrD,IAAI,aAAa,KAAK,SAAS,EAAE;QAC7B,OAAO,aAAmC,CAAC;KAC9C;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAND,4CAMC;AAED,SAAgB,WAAW,CAAC,OAAoC,EAAE,IAAe;IAC7E,OAAO,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AAChF,CAAC;AAFD,kCAEC;AAED,SAAgB,WAAW,CAAC,OAAoC,EAAE,WAAkB,EAAE,kBAAwC;IAC1H,IAAI,kBAAkB,EAAE;QACpB,OAAO,kBAAkB,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AALD,kCAKC;AAED,SAAgB,kBAAkB,CAC9B,OAAoC,EACpC,IAA0B,EAC1B,kBAAwC;IAExC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;QAC5D,OAAO;KACV;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AATD,gDASC;AAED,SAAgB,uBAAuB,CACnC,OAAoC,EACpC,MAAiC,EACjC,kBAAwC;IAExC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAAE;QAC/D,OAAO;KACV;IACD,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,eAAe,EAAE;QACxC,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,eAAe,CAAC;KAC1C;IACD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,gBAAgB,EAAE;QAC1C,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,gBAAgB,CAAC;KAC5C;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAjBD,0DAiBC"}
+{"version":3,"file":"layout-utils.js","sourceRoot":"","sources":["../../src/utils/layout-utils.ts"],"names":[],"mappings":";;;AAmBA,SAAgB,QAAQ,CAAC,OAAoC;IACzD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,aAAa,KAAK,SAAS,IAAI,OAAO,aAAa,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC3E,OAAO,aAAa,CAAC,QAAQ,CAAC;KACjC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAND,4BAMC;AAED,SAAgB,SAAS,CAAC,OAAoC;IAC1D,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,aAAa,KAAK,SAAS,IAAI,OAAO,aAAa,CAAC,SAAS,KAAK,QAAQ,EAAE;QAC5E,OAAO,aAAa,CAAC,SAAS,CAAC;KAClC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAND,8BAMC;AAED,SAAgB,gBAAgB,CAAC,OAAsB;IACnD,MAAM,aAAa,GAAI,OAAe,CAAC,aAAa,CAAC;IACrD,IAAI,aAAa,KAAK,SAAS,EAAE;QAC7B,OAAO,aAAmC,CAAC;KAC9C;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAND,4CAMC;AAED,SAAgB,WAAW,CAAC,OAAoC,EAAE,IAAe;IAC7E,OAAO,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AAChF,CAAC;AAFD,kCAEC;AAED,SAAgB,WAAW,CAAC,OAAoC,EAAE,WAAmB,EAAE,kBAAwC;IAC3H,IAAI,kBAAkB,EAAE;QACpB,OAAO,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KAC5D;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AALD,kCAKC;AAED,SAAgB,kBAAkB,CAC9B,OAAoC,EACpC,IAAiB,EACjB,kBAAwC;IAExC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE;QAC5D,OAAO;KACV;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AATD,gDASC;AAED,SAAgB,uBAAuB,CACnC,OAAoC,EACpC,MAAkC,EAClC,kBAAwC;IAExC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAAE;QAC/D,OAAO;KACV;IACD,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,eAAe,EAAE;QACxC,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,eAAe,CAAC;KAC1C;IACD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,gBAAgB,EAAE;QAC1C,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,gBAAgB,CAAC;KAC5C;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAjBD,0DAiBC"}

package/lib/views/base-view-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-view-module.d.ts","sourceRoot":"","sources":["../../src/views/base-view-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAqCxD,UAAU,gBAAgB;IACtB,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;CAC/B;AAED,QAAA,MAAM,cAAc,iBAGlB,CAAC;AAEH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CA+B7E;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"base-view-module.d.ts","sourceRoot":"","sources":["../../src/views/base-view-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAuCxD,UAAU,gBAAgB;IACtB,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;CAC/B;AAED,QAAA,MAAM,cAAc,iBAGlB,CAAC;AAEH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAiC7E;AAED,eAAe,cAAc,CAAC"}

package/lib/views/base-view-module.js

@@ -31,7 +31,9 @@ function configureDefaultModelElements(context) {
     // HTML elements
     (0, sprotty_1.configureModelElement)(context, protocol_1.DefaultTypes.HTML, sprotty_1.HtmlRoot, sprotty_1.HtmlRootView);
     // generic elements
-    (0, sprotty_1.configureModelElement)(context, protocol_1.DefaultTypes.FOREIGN_OBJECT, sprotty_1.ForeignObjectElement, sprotty_1.ForeignObjectView);
+    (0, sprotty_1.configureModelElement)(context, protocol_1.DefaultTypes.FOREIGN_OBJECT, sprotty_1.ForeignObjectElement, sprotty_1.ForeignObjectView, {
+        disable: [sprotty_1.selectFeature, sprotty_1.moveFeature]
+    });
     (0, sprotty_1.configureModelElement)(context, protocol_1.DefaultTypes.PRE_RENDERED, sprotty_1.PreRenderedElement, sprotty_1.PreRenderedView);
     (0, sprotty_1.configureModelElement)(context, protocol_1.DefaultTypes.SHAPE_PRE_RENDERED, sprotty_1.ShapedPreRenderedElement, sprotty_1.PreRenderedView);
     // SVG elements

package/lib/views/base-view-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-view-module.js","sourceRoot":"","sources":["../../src/views/base-view-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-view-module.js","sourceRoot":"","sources":["../../src/views/base-view-module.ts"],"names":[],"mappings":"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"}

package/lib/views/glsp-projection-view.d.ts

@@ -0,0 +1,30 @@
+/********************************************************************************
+ * Copyright (c) 2017-2018 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+/** @jsx html */
+import { Bounds } from '@eclipse-glsp/protocol';
+import { VNode } from 'snabbdom';
+import { IViewArgs, ProjectedViewportView, ProjectionParams, RenderingContext, ViewportRootElement, ViewProjection } from 'sprotty';
+/**
+ * Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
+ */
+export declare class GLSPProjectionView extends ProjectedViewportView {
+    render(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode;
+    protected renderSvg(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode;
+    protected renderProjectionBar(projections: ViewProjection[], model: Readonly<ViewportRootElement>, modelBounds: Bounds, orientation: 'horizontal' | 'vertical'): VNode;
+    protected renderViewport(model: Readonly<ViewportRootElement>, params: ProjectionParams): VNode;
+    protected renderProjection(projection: ViewProjection, model: Readonly<ViewportRootElement>, params: ProjectionParams): VNode;
+}
+//# sourceMappingURL=glsp-projection-view.d.ts.map

package/lib/views/glsp-projection-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-projection-view.d.ts","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,gBAAgB;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAK,KAAK,EAAc,MAAM,UAAU,CAAC;AAChD,OAAO,EAGH,SAAS,EACT,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EAEhB,mBAAmB,EACnB,cAAc,EACjB,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,qBACa,kBAAmB,SAAQ,qBAAqB;IAChD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK;cAStF,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK;cAOnG,mBAAmB,CAClC,WAAW,EAAE,cAAc,EAAE,EAC7B,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EACpC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,YAAY,GAAG,UAAU,GACvC,KAAK;cAoBW,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,gBAAgB,GAAG,KAAK;cAwCrF,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,gBAAgB,GAAG,KAAK;CA+CzI"}

package/lib/views/glsp-projection-view.js

@@ -0,0 +1,142 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2017-2018 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLSPProjectionView = void 0;
+const inversify_1 = require("inversify");
+const snabbdom_1 = require("snabbdom");
+const sprotty_1 = require("sprotty");
+/**
+ * Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
+ */
+let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedViewportView {
+    render(model, context, args) {
+        return ((0, sprotty_1.html)("div", { "class-sprotty-graph": true, style: { width: '100%' } },
+            this.renderSvg(model, context, args),
+            this.renderProjections(model, context, args)));
+    }
+    renderSvg(model, context, args) {
+        const transform = `scale(${model.zoom}) translate(${-model.scroll.x},${-model.scroll.y})`;
+        const ns = 'http://www.w3.org/2000/svg';
+        const svg = (0, snabbdom_1.h)('svg', { ns, style: { height: '100%' } }, (0, snabbdom_1.h)('g', { ns, attrs: { transform } }, context.renderChildren(model)));
+        return svg;
+    }
+    renderProjectionBar(projections, model, modelBounds, orientation) {
+        const params = { modelBounds, orientation };
+        // NOTE: Here we assume that the projection bars have the same size as the diagram canvas,
+        // i.e. they are drawn as overlay above the canvas.
+        params.factor =
+            orientation === 'horizontal' ? model.canvasBounds.width / modelBounds.width : model.canvasBounds.height / modelBounds.height;
+        params.zoomedFactor = params.factor / model.zoom;
+        return ((0, sprotty_1.html)("div", { "class-sprotty-projection-bar": true, "class-horizontal": orientation === 'horizontal', "class-vertical": orientation === 'vertical', "class-bordered-projection-bar": true },
+            this.renderViewport(model, params),
+            projections.map(p => this.renderProjection(p, model, params))));
+    }
+    renderViewport(model, params) {
+        let canvasSize;
+        let viewportPos;
+        if (params.orientation === 'horizontal') {
+            canvasSize = model.canvasBounds.width;
+            viewportPos = (model.scroll.x - params.modelBounds.x) * params.factor;
+        }
+        else {
+            canvasSize = model.canvasBounds.height;
+            viewportPos = (model.scroll.y - params.modelBounds.y) * params.factor;
+        }
+        let viewportSize = canvasSize * params.zoomedFactor;
+        if (viewportPos < 0) {
+            viewportSize += viewportPos;
+            viewportPos = 0;
+        }
+        else if (viewportPos > canvasSize) {
+            viewportPos = canvasSize;
+        }
+        if (viewportSize < 0) {
+            viewportSize = 0;
+        }
+        else if (viewportPos + viewportSize > canvasSize) {
+            viewportSize = canvasSize - viewportPos;
+        }
+        if (Math.abs(viewportSize - canvasSize) < 1) {
+            viewportSize = 0;
+        }
+        const style = params.orientation === 'horizontal'
+            ? {
+                left: `${viewportPos}px`,
+                width: `${viewportSize}px`,
+                border: 'none'
+            }
+            : {
+                top: `${viewportPos}px`,
+                height: `${viewportSize}px`,
+                border: 'none'
+            };
+        return (0, sprotty_1.html)("div", { "class-sprotty-viewport": viewportSize !== 0, "class-projection-scroll-bar": true, style: style });
+    }
+    renderProjection(projection, model, params) {
+        let canvasSize;
+        let projPos;
+        let projSize;
+        if (params.orientation === 'horizontal') {
+            canvasSize = model.canvasBounds.width;
+            projPos = (projection.projectedBounds.x - params.modelBounds.x) * params.factor;
+            projSize = projection.projectedBounds.width * params.factor;
+        }
+        else {
+            canvasSize = model.canvasBounds.height;
+            projPos = (projection.projectedBounds.y - params.modelBounds.y) * params.factor;
+            projSize = projection.projectedBounds.height * params.factor;
+        }
+        if (projPos < 0) {
+            projSize += projPos;
+            projPos = 0;
+        }
+        else if (projPos > canvasSize) {
+            projPos = canvasSize;
+        }
+        if (projSize < 0) {
+            projSize = 0;
+        }
+        else if (projPos + projSize > canvasSize) {
+            projSize = canvasSize - projPos;
+        }
+        const style = params.orientation === 'horizontal'
+            ? {
+                left: `${projPos}px`,
+                width: `${projSize}px`,
+                height: '60%'
+            }
+            : {
+                top: `${projPos}px`,
+                height: `${projSize}px`,
+                width: '60%'
+            };
+        const result = ((0, sprotty_1.html)("div", { id: `${params.orientation}-projection:${projection.elementId}`, "class-sprotty-projection": true, "class-glsp-projection": true, style: style }));
+        projection.cssClasses.forEach(cl => (0, sprotty_1.setClass)(result, cl, true));
+        return result;
+    }
+};
+GLSPProjectionView = __decorate([
+    (0, inversify_1.injectable)()
+], GLSPProjectionView);
+exports.GLSPProjectionView = GLSPProjectionView;
+//# sourceMappingURL=glsp-projection-view.js.map

package/lib/views/glsp-projection-view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-projection-view.js","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":"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"}

package/lib/views/index.d.ts

@@ -16,6 +16,7 @@
 export * from './base-view-module';
 export * from './compartments';
 export * from './glsp-edge-view';
+export * from './glsp-projection-view';
 export * from './issue-marker-view';
 export * from './rounded-corner';
 export * from './rounded-corner-view';

package/lib/views/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}

package/lib/views/index.js

@@ -32,6 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base-view-module"), exports);
 __exportStar(require("./compartments"), exports);
 __exportStar(require("./glsp-edge-view"), exports);
+__exportStar(require("./glsp-projection-view"), exports);
 __exportStar(require("./issue-marker-view"), exports);
 __exportStar(require("./rounded-corner"), exports);
 __exportStar(require("./rounded-corner-view"), exports);

package/lib/views/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmC;AACnC,iDAA+B;AAC/B,mDAAiC;AACjC,sDAAoC;AACpC,mDAAiC;AACjC,wDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmC;AACnC,iDAA+B;AAC/B,mDAAiC;AACjC,yDAAuC;AACvC,sDAAoC;AACpC,mDAAiC;AACjC,wDAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "0.10.0-next.e5fcffe.169+e5fcffe",
+  "version": "1.1.0-next.282a632.186+282a632",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -34,9 +34,9 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.10.0-next.e5fcffe.169+e5fcffe",
+    "@eclipse-glsp/protocol": "1.1.0-next.282a632.186+282a632",
     "autocompleter": "5.1.0",
-    "sprotty": "next"
+    "sprotty": "0.12.0"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",
@@ -57,5 +57,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "e5fcffe323165bf82385707b49dcc02903ac9a2b"
+  "gitHead": "282a632212f02eeaaae3b64e8b58ab9ba9d03f16"
 }

package/src/base/container-modules.ts

@@ -37,14 +37,14 @@ import glspDecorationModule from '../features/decoration/di.config';
 import glspEditLabelModule from '../features/edit-label/di.config';
 import modelHintsModule from '../features/hints/di.config';
 import glspHoverModule from '../features/hover/di.config';
-import layoutCommandsModule from '../features/layout/di.config';
-import modelSourceWatcherModule from '../features/model-source-watcher/di.config';
+import layoutModule from '../features/layout/di.config';
 import glspMouseToolModule from '../features/mouse-tool/di.config';
 import { navigationModule } from '../features/navigation/di.config';
 import glspSelectModule from '../features/select/di.config';
+import sourceModelWatcherModule from '../features/source-model-watcher/di.config';
 import toolFeedbackModule from '../features/tool-feedback/di.config';
 import toolPaletteModule from '../features/tool-palette/di.config';
-import toolsModule from '../features/tools/di.config';
+import { enableDefaultToolsOnFocusLossModule, toolsModule } from '../features/tools/di.config';
 import { markerNavigatorModule, validationModule } from '../features/validation/di.config';
 import glspViewportModule from '../features/viewport/di.config';
 import defaultGLSPModule from './di.config';
@@ -69,17 +69,18 @@ export const DEFAULT_MODULES = [
     glspServerCopyPasteModule,
     glspViewportModule,
     labelEditUiModule,
-    layoutCommandsModule,
+    layoutModule,
     markerNavigatorModule,
     modelHintsModule,
     modelSourceModule,
-    modelSourceWatcherModule,
+    sourceModelWatcherModule,
     navigationModule,
     openModule,
     toolPaletteModule,
     routingModule,
     toolFeedbackModule,
     toolsModule,
+    enableDefaultToolsOnFocusLossModule,
     validationModule,
     zorderModule
 ];

package/src/base/editor-context-service.ts

@@ -38,12 +38,20 @@ export interface EditModeListener {
  */
 @injectable()
 export class EditorContextService implements IActionHandler {
-    @inject(TYPES.SelectionService) protected selectionService: SelectionService;
-    @inject(MousePositionTracker) protected mousePositionTracker: MousePositionTracker;
-    @inject(TYPES.ModelSourceProvider) protected modelSource: () => Promise<ModelSource>;
-    protected _editMode: string;
+    @inject(TYPES.SelectionService)
+    protected selectionService: SelectionService;
+
+    @inject(MousePositionTracker)
+    protected mousePositionTracker: MousePositionTracker;
+
+    @multiInject(TYPES.IEditModeListener)
+    @optional()
+    protected editModeListeners: EditModeListener[] = [];
 
-    constructor(@multiInject(TYPES.IEditModeListener) @optional() protected editModeListeners: EditModeListener[] = []) {}
+    @inject(TYPES.ModelSourceProvider)
+    protected modelSourceProvider: () => Promise<ModelSource>;
+
+    protected _editMode: string;
 
     register(editModeListener: EditModeListener): void {
         distinctAdd(this.editModeListeners, editModeListener);
@@ -82,9 +90,9 @@ export class EditorContextService implements IActionHandler {
     }
 
     async getSourceUri(): Promise<string | undefined> {
-        const modelSource = await this.modelSource();
+        const modelSource = await this.modelSourceProvider();
         if (isSourceUriAware(modelSource)) {
-            return modelSource.getSourceURI();
+            return modelSource.sourceURI;
         }
         return undefined;
     }