Merge 'origin/develop' into feature/map-actions

bitbucket-pipelines.yml

@@ -7,8 +7,8 @@
 image: cypress/included:8.4.1
 
 pipelines:
-  default:
-    - parallel:
+  branches:
+    '{master,develop}':
       - step:
           name: Build and test
           caches:

packages/mindplot/.eslintrc.json

@@ -37,7 +37,6 @@
         // no-unused-vars already used
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/ban-ts-comment": "warn",
-        "@typescript-eslint/no-empty-function": "warn",
         "import/no-extraneous-dependencies": ["warn", {"packageDir": "./", "devDependencies": false, "optionalDependencies": false, "peerDependencies": false}]
     },
     "settings": {

packages/mindplot/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wisemapping/mindplot",
-    "version": "0.4.15",
+    "version": "5.0.1",
     "description": "WiseMapping - Mindplot Canvas Library",
     "homepage": "http://www.wisemapping.org/",
     "main": "dist/mindplot.js",

packages/mindplot/src/components/ActionDispatcher.js

@@ -1,111 +0,0 @@
-/* eslint-disable no-unused-vars */
-/*
- *    Copyright [2021] [wisemapping]
- *
- *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
- *   It is basically the Apache License, Version 2.0 (the "License") plus the
- *   "powered by wisemapping" text requirement on every single page;
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the license at
- *
- *       http://www.wisemapping.org/license
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-import { $assert } from '@wisemapping/core-js';
-import Events from './Events';
-
-class ActionDispatcher extends Events {
-  constructor(commandContext) {
-    $assert(commandContext, 'commandContext can not be null');
-    super();
-  }
-
-  addRelationship(model, mindmap) {
-    throw new Error('method must be implemented.');
-  }
-
-  addTopics(models, parentTopicId) {
-    throw new Error('method must be implemented.');
-  }
-
-  deleteEntities(topicsIds, relIds) {
-    throw new Error('method must be implemented.');
-  }
-
-  dragTopic(topicId, position, order, parentTopic) {
-    throw new Error('method must be implemented.');
-  }
-
-  moveTopic(topicId, position) {
-    throw new Error('method must be implemented.');
-  }
-
-  moveControlPoint(ctrlPoint, point) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeFontFamilyToTopic(topicIds, fontFamily) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeFontStyleToTopic(topicsIds) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeFontColorToTopic(topicsIds, color) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeFontSizeToTopic(topicsIds, size) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeBackgroundColorToTopic(topicsIds, color) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeBorderColorToTopic(topicsIds, color) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeShapeTypeToTopic(topicsIds, shapeType) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeFontWeightToTopic(topicsIds) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeTextToTopic(topicsIds, text) {
-    throw new Error('method must be implemented.');
-  }
-
-  shrinkBranch(topicsIds, collapse) {
-    throw new Error('method must be implemented.');
-  }
-
-  addFeatureToTopic(topicId, type, attributes) {
-    throw new Error('method must be implemented.');
-  }
-
-  changeFeatureToTopic(topicId, featureId, attributes) {
-    throw new Error('method must be implemented.');
-  }
-
-  removeFeatureFromTopic(topicId, featureId) {
-    throw new Error('method must be implemented.');
-  }
-}
-
-ActionDispatcher.setInstance = (dispatcher) => {
-  ActionDispatcher._instance = dispatcher;
-};
-
-ActionDispatcher.getInstance = () => ActionDispatcher._instance;
-
-export default ActionDispatcher;

packages/mindplot/src/components/ActionDispatcher.ts

@@ -0,0 +1,82 @@
+/* eslint-disable  import/no-cycle */
+/* eslint-disable  no-use-before-define */
+/*
+ *    Copyright [2021] [wisemapping]
+ *
+ *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+ *   It is basically the Apache License, Version 2.0 (the "License") plus the
+ *   "powered by wisemapping" text requirement on every single page;
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the license at
+ *
+ *       http://www.wisemapping.org/license
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+import { $assert } from '@wisemapping/core-js';
+import Point from '@wisemapping/web2d';
+import { Mindmap } from '..';
+import CommandContext from './CommandContext';
+import Events from './Events';
+import NodeModel from './model/NodeModel';
+import RelationshipModel from './model/RelationshipModel';
+import Topic from './Topic';
+
+abstract class ActionDispatcher extends Events {
+  static _instance: ActionDispatcher;
+
+  constructor(commandContext: CommandContext) {
+    $assert(commandContext, 'commandContext can not be null');
+    super();
+  }
+
+  abstract addRelationship(model: RelationshipModel, mindmap: Mindmap);
+
+  abstract addTopics(models: NodeModel[], parentTopicId: any[]);
+
+  abstract deleteEntities(topicsIds: number[], relIds: number[]);
+
+  abstract dragTopic(topicId: number, position: Point, order: number, parentTopic: Topic);
+
+  abstract moveTopic(topicId: number, position: any);
+
+  abstract moveControlPoint(ctrlPoint: this, point: any);
+
+  abstract changeFontFamilyToTopic(topicIds: number[], fontFamily: string);
+
+  abstract changeFontStyleToTopic(topicsIds: number[]);
+
+  abstract changeFontColorToTopic(topicsIds: number[], color: string);
+
+  abstract changeFontSizeToTopic(topicsIds: number[], size: number);
+
+  abstract changeBackgroundColorToTopic(topicsIds: number[], color: string);
+
+  abstract changeBorderColorToTopic(topicsIds: number[], color: string);
+
+  abstract changeShapeTypeToTopic(topicsIds: number[], shapeType: string);
+
+  abstract changeFontWeightToTopic(topicsIds: number[]);
+
+  abstract changeTextToTopic(topicsIds: number[], text: string);
+
+  abstract shrinkBranch(topicsIds: number[], collapse: boolean);
+
+  abstract addFeatureToTopic(topicId: number, type: string, attributes: object);
+
+  abstract changeFeatureToTopic(topicId: number, featureId: any, attributes: object);
+
+  abstract removeFeatureFromTopic(topicId: number, featureId: number);
+
+  static setInstance = (dispatcher: ActionDispatcher) => {
+    this._instance = dispatcher;
+  };
+
+  static getInstance = (): ActionDispatcher => ActionDispatcher._instance;
+}
+
+export default ActionDispatcher;

packages/mindplot/src/components/CentralTopic.js

@@ -42,7 +42,9 @@ class CentralTopic extends Topic {
   }
 
   /** */
-  updateTopicShape() { }
+  updateTopicShape() {
+    // Overwite behaviour ...
+  }
 
   _updatePositionOnChangeSize() {
     // Center main topic ...

packages/mindplot/src/components/Command.ts

@@ -16,42 +16,32 @@
 *   limitations under the License.
 */
 import { $defined } from '@wisemapping/core-js';
+import CommandContext from './CommandContext';
+
+abstract class Command {
+  private _id: number;
+
+  static _uuid: number;
 
-class Command {
-  /**
-     * @classdesc The command base class for handling do/undo mindmap operations
-     * @constructs
-     */
   constructor() {
     this._id = Command._nextUUID();
   }
 
-  // eslint-disable-next-line no-unused-vars
-  execute(commandContext) {
-    throw new Error('execute must be implemented.');
-  }
+  abstract execute(commandContext:CommandContext):void;
 
-  // eslint-disable-next-line no-unused-vars
-  undoExecute(commandContext) {
-    throw new Error('undo must be implemented.');
-  }
+  abstract undoExecute(commandContext:CommandContext):void;
 
-  /**
-     * Returns the unique id of this command
-     * @returns {Number} command id
-     */
-  getId() {
+  getId():number {
     return this._id;
   }
-}
 
-Command._nextUUID = function _nextUUID() {
-  if (!$defined(Command._uuid)) {
-    Command._uuid = 1;
+  static _nextUUID() {
+    if (!$defined(this._uuid)) {
+      this._uuid = 1;
+    }
+    this._uuid += 1;
+    return this._uuid;
+  }
 }
-
-  Command._uuid += 1;
-  return Command._uuid;
-};
 
 export default Command;

packages/mindplot/src/components/CommandContext.ts

@@ -16,16 +16,32 @@
  *   limitations under the License.
  */
 import { $assert, $defined } from '@wisemapping/core-js';
+import Point from '@wisemapping/web2d';
+import { Designer } from '..';
 import EventBus from './layout/EventBus';
+import NodeModel from './model/NodeModel';
+import RelationshipModel from './model/RelationshipModel';
+import Relationship from './Relationship';
+import Topic from './Topic';
 
 class CommandContext {
-  constructor(designer) {
+  private _designer: Designer;
+
+  constructor(designer: Designer) {
     $assert(designer, 'designer can not be null');
     this._designer = designer;
   }
 
+  public get designer(): Designer {
+    return this._designer;
+  }
+
+  public set designer(value: Designer) {
+    this._designer = value;
+  }
+
   /** */
-  findTopics(topicIds) {
+  findTopics(topicIds: number[]): Topic[] {
     $assert($defined(topicIds), 'topicsIds can not be null');
     const topicsIds = Array.isArray(topicIds) ? topicIds : [topicIds];
     const designerTopics = this._designer.getModel().getTopics();
@@ -45,51 +61,51 @@ class CommandContext {
   }
 
   /** */
-  deleteTopic(topic) {
+  deleteTopic(topic: Topic) {
     this._designer.removeTopic(topic);
   }
 
   /** */
-  createTopic(model) {
+  createTopic(model: NodeModel) {
     $assert(model, 'model can not be null');
     return this._designer.nodeModelToTopic(model);
   }
 
-  /** */
-  createModel() {
-    const mindmap = this._designer.getMindmap();
-    return mindmap.createNode('MainTopic');
-  }
+  // /** */
+  // createModel() {
+  //   const mindmap = this._designer.getMindmap();
+  //   return mindmap.createNode('MainTopic');
+  // }
 
   /** */
-  addTopic(topic) {
+  addTopic(topic: Topic) {
     const mindmap = this._designer.getMindmap();
     return mindmap.addBranch(topic.getModel());
   }
 
   /** */
-  connect(childTopic, parentTopic) {
-    childTopic.connectTo(parentTopic, this._designer._workspace);
+  connect(childTopic: Topic, parentTopic: Topic) {
+    childTopic.connectTo(parentTopic, this._designer.getWorkSpace());
   }
 
   /** */
-  disconnect(topic) {
-    topic.disconnect(this._designer._workspace);
+  disconnect(topic: Topic) {
+    topic.disconnect(this._designer.getWorkSpace());
   }
 
   /** */
-  addRelationship(model) {
+  addRelationship(model: RelationshipModel) {
     $assert(model, 'model cannot be null');
     return this._designer.addRelationship(model);
   }
 
   /** */
-  deleteRelationship(relationship) {
+  deleteRelationship(relationship: Relationship) {
     this._designer.deleteRelationship(relationship);
   }
 
   /** */
-  findRelationships(relationshipIds) {
+  findRelationships(relationshipIds: number[]) {
     $assert($defined(relationshipIds), 'relId can not be null');
     const relIds = Array.isArray(relationshipIds) ? relationshipIds : [relationshipIds];
 
@@ -98,7 +114,7 @@ class CommandContext {
   }
 
   /** */
-  moveTopic(topic, position) {
+  moveTopic(topic: Topic, position: Point) {
     $assert(topic, 'topic cannot be null');
     $assert(position, 'position cannot be null');
     EventBus.instance.fireEvent(EventBus.events.NodeMoveEvent, {
@@ -107,5 +123,4 @@ class CommandContext {
     });
   }
 }
-// eslint-disable-next-line import/prefer-default-export
 export default CommandContext;

packages/mindplot/src/components/ControlPoint.js

@@ -112,7 +112,9 @@ class ControlPoint {
     );
   }
 
-  _removeLine() { }
+  _removeLine() {
+    // Overwrite default behaviour ...
+  }
 
   _mouseDown(event, point, me) {
     if (!this._isBinded) {

packages/mindplot/src/components/Designer.ts

@@ -77,9 +77,9 @@ class Designer extends Events {
 
   private _relPivot: RelationshipPivot;
 
-  private _clipboard: any[];
+  private _clipboard: NodeModel[];
 
-  private _cleanScreen: any;
+  private _cleanScreen: () => void;
 
   constructor(options: DesignerOptions, divElement: JQuery) {
     super();
@@ -148,9 +148,12 @@ class Designer extends Events {
     }, { passive: false });
   }
 
+  getActionDispatcher(): StandaloneActionDispatcher {
+    return this._actionDispatcher;
+  }
+
   // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  addEvent(type: string, listener: Function): void {
+  addEvent(type: string, listener: any): void {
     if (type === TopicEvent.EDIT || type === TopicEvent.CLICK) {
       const editor = TopicEventDispatcher.getInstance();
       editor.addEvent(type, listener);
@@ -626,11 +629,11 @@ class Designer extends Events {
   }
 
   undo(): void {
-    this._actionDispatcher._actionRunner.undo();
+    this._actionDispatcher.actionRunner.undo();
   }
 
   redo(): void {
-    this._actionDispatcher._actionRunner.redo();
+    this._actionDispatcher.actionRunner.redo();
   }
 
   /** */
@@ -840,18 +843,19 @@ class Designer extends Events {
   }
 
   /** */
-  changeFontColor(color) {
+  changeFontColor(color: string) {
     $assert(color, 'color can not be null');
 
     const topicsIds = this.getModel()
       .filterTopicsIds();
+
     if (topicsIds.length > 0) {
       this._actionDispatcher.changeFontColorToTopic(topicsIds, color);
     }
   }
 
   /** */
-  changeBackgroundColor(color) {
+  changeBackgroundColor(color: string) {
     const validateFunc = (topic) => topic.getShapeType() !== TopicShape.LINE;
     const validateError = 'Color can not be set to line topics.';
 

packages/mindplot/src/components/DesignerModel.ts

@@ -106,7 +106,7 @@ class DesignerModel extends Events {
     this._relationships.push(rel);
   }
 
-  filterTopicsIds(validate: (topic: Topic) => boolean = null, errorMsg = null): Topic[] {
+  filterTopicsIds(validate: (topic: Topic) => boolean = null, errorMsg = null): number[] {
     const result = [];
     const topics = this.filterSelectedTopics();
 

packages/mindplot/src/components/DragManager.js

@@ -92,8 +92,8 @@ class DragManager {
 
       event.preventDefault();
     };
+
     // allowed param reassign to avoid risks of existing code relying in this side-effect
-    // eslint-disable-next-line no-param-reassign
     dragManager._mouseMoveListener = result;
     return result;
   }
@@ -110,10 +110,8 @@ class DragManager {
 
       // Help GC
       // allowed param reassign to avoid risks of existing code relying in this side-effect
-      /* eslint-disable no-param-reassign */
       dragManager._mouseMoveListener = null;
       dragManager._mouseUpListener = null;
-      /* eslint-enable no-param-reassign */
 
       workspace.enableWorkspaceEvents(true);
       // Change the cursor to the default.
@@ -130,7 +128,6 @@ class DragManager {
         me._isDragInProcess = false;
       }
     };
-    // eslint-disable-next-line no-param-reassign
     dragManager._mouseUpListener = result;
     return result;
   }

packages/mindplot/src/components/Relationship.ts

@@ -15,16 +15,34 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import { Arrow, Point } from '@wisemapping/web2d';
 import { $assert, $defined } from '@wisemapping/core-js';
-
+import { Arrow, Point, ElementClass } from '@wisemapping/web2d';
 import ConnectionLine from './ConnectionLine';
 import ControlPoint from './ControlPoint';
-
+import RelationshipModel from './model/RelationshipModel';
+import NodeGraph from './NodeGraph';
 import Shape from './util/Shape';
 
 class Relationship extends ConnectionLine {
-  constructor(sourceNode, targetNode, model) {
+  private _focusShape: ElementClass;
+
+  private _onFocus: boolean;
+
+  private _isInWorkspace: boolean;
+
+  private _controlPointsController: ControlPoint;
+
+  private _startArrow: Arrow;
+
+  private _showEndArrow: Arrow;
+
+  private _endArrow: Arrow;
+
+  private _controlPointControllerListener: any;
+
+  private _showStartArrow: Arrow;
+
+  constructor(sourceNode: NodeGraph, targetNode: NodeGraph, model: RelationshipModel) {
     $assert(sourceNode, 'sourceNode can not be null');
     $assert(targetNode, 'targetNode can not be null');
 
@@ -72,12 +90,12 @@ class Relationship extends ConnectionLine {
     }
   }
 
-  setStroke(color, style, opacity) {
+  setStroke(color: string, style: string, opacity: number): void {
     super.setStroke(color, style, opacity);
     this._startArrow.setStrokeColor(color);
   }
 
-  redraw() {
+  redraw(): void {
     const line2d = this._line2d;
     const sourceTopic = this._sourceTopic;
     const sourcePosition = sourceTopic.getPosition();
@@ -131,7 +149,7 @@ class Relationship extends ConnectionLine {
     this._controlPointsController.redraw();
   }
 
-  _positionArrows() {
+  private _positionArrows(): void {
     const tpos = this._line2d.getTo();
     const spos = this._line2d.getFrom();
 
@@ -167,7 +185,7 @@ class Relationship extends ConnectionLine {
     workspace.append(this._controlPointsController);
 
     this._controlPointControllerListener = this._initializeControlPointController.bind(this);
-    if (workspace.isReadOnly) {
+    if (workspace.isReadOnly()) {
       this._line2d.setCursor('default');
     } else {
       this._line2d.addEvent('click', this._controlPointControllerListener);
@@ -182,7 +200,7 @@ class Relationship extends ConnectionLine {
     this.redraw();
   }
 
-  _initializeControlPointController() {
+  _initializeControlPointController(): void {
     this.setOnFocus(true);
   }
 
@@ -199,12 +217,11 @@ class Relationship extends ConnectionLine {
     super.removeFromWorkspace(workspace);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   getType() {
-    return Relationship.type;
+    return 'Relationship';
   }
 
-  setOnFocus(focus) {
+  setOnFocus(focus: boolean): void {
     // Change focus shape
     if (this.isOnFocus() !== focus) {
       if (focus) {
@@ -219,7 +236,7 @@ class Relationship extends ConnectionLine {
     }
   }
 
-  _refreshShape() {
+  private _refreshShape() {
     const sPos = this._line2d.getFrom();
     const tPos = this._line2d.getTo();
     const ctrlPoints = this._line2d.getControlPoints();
@@ -233,7 +250,8 @@ class Relationship extends ConnectionLine {
     this._focusShape.updateLine();
   }
 
-  addEvent(eventType, listener) {
+  // @typescript-eslint/ban-types
+  addEvent(eventType: string, listener: any) {
     let type = eventType;
     // Translate to web 2d events ...
     if (type === 'onfocus') {
@@ -244,37 +262,37 @@ class Relationship extends ConnectionLine {
     line.addEvent(type, listener);
   }
 
-  isOnFocus() {
+  isOnFocus(): boolean {
     return this._onFocus;
   }
 
-  isInWorkspace() {
+  isInWorkspace(): boolean {
     return this._isInWorkspace;
   }
 
-  setVisibility(value) {
+  setVisibility(value: boolean) {
     super.setVisibility(value);
     if (this._showEndArrow) this._endArrow.setVisibility(this._showEndArrow);
     this._startArrow.setVisibility(this._showStartArrow && value);
   }
 
-  setOpacity(opacity) {
+  setOpacity(opacity: number) {
     super.setOpacity(opacity);
     if (this._showEndArrow) this._endArrow.setOpacity(opacity);
     if (this._showStartArrow) this._startArrow.setOpacity(opacity);
   }
 
-  setShowEndArrow(visible) {
+  setShowEndArrow(visible: boolean) {
     this._showEndArrow = visible;
     if (this._isInWorkspace) this.redraw();
   }
 
-  setShowStartArrow(visible) {
+  setShowStartArrow(visible: boolean) {
     this._showStartArrow = visible;
     if (this._isInWorkspace) this.redraw();
   }
 
-  setFrom(x, y) {
+  setFrom(x: number, y: number) {
     $assert($defined(x), 'x must be defined');
     $assert($defined(y), 'y must be defined');
 
@@ -282,7 +300,7 @@ class Relationship extends ConnectionLine {
     this._startArrow.setFrom(x, y);
   }
 
-  setTo(x, y) {
+  setTo(x: number, y: number) {
     $assert($defined(x), 'x must be defined');
     $assert($defined(y), 'y must be defined');
 
@@ -312,11 +330,11 @@ class Relationship extends ConnectionLine {
     return this._line2d.isDestControlPointCustom();
   }
 
-  setIsSrcControlPointCustom(isCustom) {
+  setIsSrcControlPointCustom(isCustom: boolean) {
     this._line2d.setIsSrcControlPointCustom(isCustom);
   }
 
-  setIsDestControlPointCustom(isCustom) {
+  setIsDestControlPointCustom(isCustom: boolean) {
     this._line2d.setIsDestControlPointCustom(isCustom);
   }
 
@@ -324,16 +342,14 @@ class Relationship extends ConnectionLine {
     return this._model.getId();
   }
 
-  fireEvent(type, event) {
+  fireEvent(type: string, event: any): void {
     const elem = this._line2d;
     elem.trigger(type, event);
   }
+
+  static getStrokeColor() {
+    return '#9b74e6';
+  }
 }
 
-Relationship.getStrokeColor = function getStrokeColor() {
-  return '#9b74e6';
-};
-
-Relationship.type = 'Relationship';
-
 export default Relationship;

packages/mindplot/src/components/RelationshipPivot.ts

@@ -19,21 +19,39 @@ import { CurvedLine, Arrow, Point } from '@wisemapping/web2d';
 import { $assert } from '@wisemapping/core-js';
 import Relationship from './Relationship';
 import Shape from './util/Shape';
+import Workspace from './Workspace';
+import { Designer } from '..';
+import Topic from './Topic';
 
 class RelationshipPivot {
-  constructor(workspace, designer) {
+  private _workspace: Workspace;
+
+  private _designer: Designer;
+
+  private _mouseMoveEvent: MouseEvent;
+
+  private _onClickEvent: (event: MouseEvent) => void;
+
+  private _onTopicClick: (event: MouseEvent) => void;;
+
+  private _sourceTopic: Topic;
+
+  private _pivot: any;
+
+  private _startArrow: Arrow;
+
+  constructor(workspace: Workspace, designer: Designer) {
     $assert(workspace, 'workspace can not be null');
     $assert(designer, 'designer can not be null');
     this._workspace = workspace;
     this._designer = designer;
 
-    // FIXME: the aim of the migration is remove .bind mootools method, please remove these!
     this._mouseMoveEvent = this._mouseMove.bind(this);
     this._onClickEvent = this._cleanOnMouseClick.bind(this);
     this._onTopicClick = this._connectOnFocus.bind(this);
   }
 
-  start(sourceTopic, targetPos) {
+  start(sourceTopic: Topic, targetPos: Point) {
     $assert(sourceTopic, 'sourceTopic can not be null');
     $assert(targetPos, 'targetPos can not be null');
 
@@ -75,7 +93,7 @@ class RelationshipPivot {
     }
   }
 
-  dispose() {
+  dispose(): void {
     const workspace = this._workspace;
 
     if (this._isActive()) {
@@ -99,7 +117,7 @@ class RelationshipPivot {
     }
   }
 
-  _mouseMove(event) {
+  _mouseMove(event: MouseEvent): boolean {
     const screen = this._workspace.getScreenManager();
     const pos = screen.getWorkspaceMousePosition(event);
 
@@ -121,13 +139,13 @@ class RelationshipPivot {
     return false;
   }
 
-  _cleanOnMouseClick(event) {
+  _cleanOnMouseClick(event: MouseEvent): void {
     // The user clicks on a desktop on in other element that is not a node.
     this.dispose();
     event.stopPropagation();
   }
 
-  _calculateFromPosition(toPosition) {
+  private _calculateFromPosition(toPosition: Point): Point {
     // Calculate origin position ...
     let sourcePosition = this._sourceTopic.getPosition();
     if (this._sourceTopic.getType() === 'CentralTopic') {
@@ -141,19 +159,21 @@ class RelationshipPivot {
     return Shape.calculateRelationShipPointCoordinates(this._sourceTopic, spoint);
   }
 
-  _connectOnFocus(event, targetTopic) {
+  private _connectOnFocus(event: string, targetTopic: Topic): void {
     const sourceTopic = this._sourceTopic;
     const mindmap = this._designer.getMindmap();
 
     // Avoid circular connections ...
     if (targetTopic.getId() !== sourceTopic.getId()) {
       const relModel = mindmap.createRelationship(targetTopic.getId(), sourceTopic.getId());
-      this._designer._actionDispatcher.addRelationship(relModel);
+      this._designer
+        .getActionDispatcher()
+        .addRelationship(relModel);
     }
     this.dispose();
   }
 
-  _isActive() {
+  private _isActive() {
     return this._pivot != null;
   }
 }

packages/mindplot/src/components/ScreenManager.ts

@@ -17,6 +17,7 @@
  */
 import { $assert } from '@wisemapping/core-js';
 import { Point } from '@wisemapping/web2d';
+import Topic from './Topic';
 
 class ScreenManager {
   private _divContainer: JQuery;
@@ -83,7 +84,7 @@ class ScreenManager {
     }
   }
 
-  _getElementPosition(elem: { getPosition: () => any; }) {
+  private _getElementPosition(elem: Topic) {
     // Retrieve current element position.
     const elementPosition = elem.getPosition();
     let { x } = elementPosition;

packages/mindplot/src/components/StandaloneActionDispatcher.ts

@@ -16,6 +16,7 @@
  *   limitations under the License.
  */
 import { $defined, $assert } from '@wisemapping/core-js';
+import { Point } from '@wisemapping/web2d';
 import ActionDispatcher from './ActionDispatcher';
 import DesignerActionRunner from './DesignerActionRunner';
 import AddTopicCommand from './commands/AddTopicCommand';
@@ -28,39 +29,52 @@ import GenericFunctionCommand from './commands/GenericFunctionCommand';
 import MoveControlPointCommand from './commands/MoveControlPointCommand';
 import ChangeFeatureToTopicCommand from './commands/ChangeFeatureToTopicCommand';
 import EventBus from './layout/EventBus';
+import CommandContext from './CommandContext';
+import NodeModel from './model/NodeModel';
+import RelationshipModel from './model/RelationshipModel';
+import Topic from './Topic';
+import Command from './Command';
 
 class StandaloneActionDispatcher extends ActionDispatcher {
-  constructor(commandContext) {
+  private _actionRunner: DesignerActionRunner;
+
+  public get actionRunner(): DesignerActionRunner {
+    return this._actionRunner;
+  }
+
+  public set actionRunner(value: DesignerActionRunner) {
+    this._actionRunner = value;
+  }
+
+  constructor(commandContext: CommandContext) {
     super(commandContext);
     this._actionRunner = new DesignerActionRunner(commandContext, this);
   }
 
-  /** */
-  addTopics(models, parentTopicsId) {
+  addTopics(models: NodeModel[], parentTopicsId: number[] = undefined) {
     const command = new AddTopicCommand(models, parentTopicsId);
     this.execute(command);
   }
 
-  /** */
-  addRelationship(model) {
+  addRelationship(model: RelationshipModel) {
     const command = new AddRelationshipCommand(model);
     this.execute(command);
   }
 
   /** */
-  deleteEntities(topicsIds, relIds) {
+  deleteEntities(topicsIds: number[], relIds: number[]) {
     const command = new DeleteCommand(topicsIds, relIds);
     this.execute(command);
   }
 
   /** */
-  dragTopic(topicId, position, order, parentTopic) {
+  dragTopic(topicId: number, position: Point, order: number, parentTopic: Topic) {
     const command = new DragTopicCommand(topicId, position, order, parentTopic);
     this.execute(command);
   }
 
   /** */
-  moveTopic(topicId, position) {
+  moveTopic(topicId: number, position: Point) {
     $assert($defined(topicId), 'topicsId can not be null');
     $assert($defined(position), 'position can not be null');
 
@@ -73,19 +87,19 @@ class StandaloneActionDispatcher extends ActionDispatcher {
       return result;
     };
 
-    const command = new GenericFunctionCommand(commandFunc, topicId, position);
+    const command = new GenericFunctionCommand(commandFunc, [topicId], position);
     this.execute(command);
   }
 
   /** */
-  moveControlPoint(ctrlPoint, point) {
+  moveControlPoint(ctrlPoint: Point, point: Point) {
     const command = new MoveControlPointCommand(ctrlPoint, point);
     this.execute(command);
   }
 
   /** */
-  changeFontStyleToTopic(topicsIds) {
-    const commandFunc = (topic) => {
+  changeFontStyleToTopic(topicsIds: number[]) {
+    const commandFunc = (topic: Topic) => {
       const result = topic.getFontStyle();
       const style = result === 'italic' ? 'normal' : 'italic';
       topic.setFontStyle(style, true);
@@ -96,10 +110,10 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeTextToTopic(topicsIds, text) {
+  changeTextToTopic(topicsIds: number[], text: string) {
     $assert($defined(topicsIds), 'topicsIds can not be null');
 
-    const commandFunc = (topic, value) => {
+    const commandFunc = (topic: Topic, value: object) => {
       const result = topic.getText();
       topic.setText(value);
       return result;
@@ -111,11 +125,11 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeFontFamilyToTopic(topicIds, fontFamily) {
+  changeFontFamilyToTopic(topicIds: number[], fontFamily: string) {
     $assert(topicIds, 'topicIds can not be null');
     $assert(fontFamily, 'fontFamily can not be null');
 
-    const commandFunc = (topic, commandFontFamily) => {
+    const commandFunc = (topic: Topic, commandFontFamily: string) => {
       const result = topic.getFontFamily();
       topic.setFontFamily(commandFontFamily, true);
 
@@ -128,7 +142,7 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeFontColorToTopic(topicsIds, color) {
+  changeFontColorToTopic(topicsIds: number[], color: string) {
     $assert(topicsIds, 'topicIds can not be null');
     $assert(color, 'color can not be null');
 
@@ -144,7 +158,7 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeBackgroundColorToTopic(topicsIds, color) {
+  changeBackgroundColorToTopic(topicsIds: number[], color: string) {
     $assert(topicsIds, 'topicIds can not be null');
     $assert(color, 'color can not be null');
 
@@ -160,7 +174,7 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeBorderColorToTopic(topicsIds, color) {
+  changeBorderColorToTopic(topicsIds: number[], color: string): void {
     $assert(topicsIds, 'topicIds can not be null');
     $assert(color, 'topicIds can not be null');
 
@@ -176,7 +190,7 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeFontSizeToTopic(topicsIds, size) {
+  changeFontSizeToTopic(topicsIds: number[], size: number) {
     $assert(topicsIds, 'topicIds can not be null');
     $assert(size, 'size can not be null');
 
@@ -193,7 +207,7 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeShapeTypeToTopic(topicsIds, shapeType) {
+  changeShapeTypeToTopic(topicsIds: number[], shapeType: string) {
     $assert(topicsIds, 'topicsIds can not be null');
     $assert(shapeType, 'shapeType can not be null');
 
@@ -208,7 +222,7 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  changeFontWeightToTopic(topicsIds) {
+  changeFontWeightToTopic(topicsIds: number[]) {
     $assert(topicsIds, 'topicsIds can not be null');
 
     const commandFunc = (topic) => {
@@ -225,38 +239,38 @@ class StandaloneActionDispatcher extends ActionDispatcher {
   }
 
   /** */
-  shrinkBranch(topicsIds, collapse) {
+  shrinkBranch(topicsIds: number[], collapse: boolean) {
     $assert(topicsIds, 'topicsIds can not be null');
 
-    const commandFunc = (topic, isShrink) => {
+    const commandFunc = (topic: Topic, isShrink: boolean) => {
       topic.setChildrenShrunken(isShrink);
       return !isShrink;
     };
 
     const command = new GenericFunctionCommand(commandFunc, topicsIds, collapse);
-    this.execute(command, false);
+    this.execute(command);
   }
 
   /** */
-  addFeatureToTopic(topicId, featureType, attributes) {
+  addFeatureToTopic(topicId: number, featureType: string, attributes) {
     const command = new AddFeatureToTopicCommand(topicId, featureType, attributes);
     this.execute(command);
   }
 
   /** */
-  changeFeatureToTopic(topicId, featureId, attributes) {
+  changeFeatureToTopic(topicId: number, featureId: number, attributes) {
     const command = new ChangeFeatureToTopicCommand(topicId, featureId, attributes);
     this.execute(command);
   }
 
   /** */
-  removeFeatureFromTopic(topicId, featureId) {
+  removeFeatureFromTopic(topicId: number, featureId: number) {
     const command = new RemoveFeatureFromTopicCommand(topicId, featureId);
     this.execute(command);
   }
 
   /** */
-  execute(command) {
+  execute(command: Command) {
     this._actionRunner.execute(command);
   }
 }

packages/mindplot/src/components/Topic.js

@@ -212,7 +212,9 @@ class Topic extends NodeGraph {
         return model.getImageSize();
       };
 
-      result.setPosition = function setPosition() {};
+      result.setPosition = function setPosition() {
+        // Ignore ...
+      };
     } else if (shapeType === TopicShape.ELLIPSE) {
       result = new Rect(0.9, attributes);
     } else if (shapeType === TopicShape.ROUNDED_RECT) {
@@ -235,13 +237,19 @@ class Topic extends NodeGraph {
         result.setStroke(1, 'solid', stokeColor);
       };
 
-      result.getSize = function getSize() {
-        return this.size;
+      result.getSize = () => this.size;
+
+      result.setPosition = () => {
+        // Overwrite behaviour ...
       };
 
-      result.setPosition = function setPosition() {};
-      result.setFill = function setFill() {};
-      result.setStroke = function setStroke() {};
+      result.setFill = () => {
+        // Overwrite behaviour ...
+      };
+
+      result.setStroke = () => {
+        // Overwrite behaviour ...
+      };
     } else {
       $assert(false, `Unsupported figure shapeType:${shapeType}`);
     }

packages/mindplot/src/components/commands/AddFeatureToTopicCommand.ts

@@ -17,8 +17,17 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
 
 class AddFeatureToTopicCommand extends Command {
+  private _topicId: number;
+
+  private _featureType: string;
+
+  private _attributes: object;
+
+  private _featureModel: any;
+
   /*
     * @classdesc This command class handles do/undo of adding features to topics, e.g. an
     * icon or a note. For a reference of existing features, refer to {@link mindplot.TopicFeature}
@@ -29,7 +38,7 @@ class AddFeatureToTopicCommand extends Command {
     * @extends mindplot.Command
     * @see mindplot.model.FeatureModel and subclasses
     */
-  constructor(topicId, featureType, attributes) {
+  constructor(topicId: number, featureType: string, attributes: object) {
     $assert($defined(topicId), 'topicId can not be null');
     $assert(featureType, 'featureType can not be null');
     $assert(attributes, 'attributes can not be null');
@@ -44,8 +53,8 @@ class AddFeatureToTopicCommand extends Command {
   /**
          * Overrides abstract parent method
          */
-  execute(commandContext) {
-    const topic = commandContext.findTopics(this._topicId)[0];
+  execute(commandContext: CommandContext) {
+    const topic = commandContext.findTopics([this._topicId])[0];
 
     // Feature must be created only one time.
     if (!this._featureModel) {
@@ -59,8 +68,8 @@ class AddFeatureToTopicCommand extends Command {
          * Overrides abstract parent method
          * @see {@link mindplot.Command.undoExecute}
          */
-  undoExecute(commandContext) {
-    const topic = commandContext.findTopics(this._topicId)[0];
+  undoExecute(commandContext: CommandContext) {
+    const topic = commandContext.findTopics([this._topicId])[0];
     topic.removeFeature(this._featureModel);
   }
 }

packages/mindplot/src/components/commands/AddRelationshipCommand.ts

@@ -17,15 +17,15 @@
  */
 import { $assert } from '@wisemapping/core-js';
 import Command from '../Command';
+import RelationshipModel from '../model/RelationshipModel';
 
 class AddRelationshipCommand extends Command {
+  private _model: RelationshipModel;
+
   /**
      * @classdesc This command class handles do/undo of adding a relationship to a topic.
-     * @constructs
-     * @param {XMLDOM} model
-     * @extends mindplot.Command
      */
-  constructor(model) {
+  constructor(model:RelationshipModel) {
     $assert(model, 'Relationship model can not be null');
 
     super();

packages/mindplot/src/components/commands/AddTopicCommand.ts

@@ -17,18 +17,19 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
+import NodeModel from '../model/NodeModel';
 
 class AddTopicCommand extends Command {
+  private _models: NodeModel[];
+
+  private _parentsIds: number[];
+
   /**
    * @classdesc This command class handles do/undo of adding one or multiple topics to
    * the mindmap.
-   * @constructs
-   * @param {Array<mindplot.model.NodeModel>} models one or multiple models
-   * @param {Array<String>} parentTopicsId ids of the parent topics to add the children to, or null
-   * when attaching a dragged node or a node/branch from clipboard
-   * @extends mindplot.Command
    */
-  constructor(models, parentTopicsId) {
+  constructor(models: NodeModel[], parentTopicsId: number[]) {
     $assert(models, 'models can not be null');
     $assert(parentTopicsId == null || parentTopicsId.length === models.length, 'parents and models must have the same size');
 
@@ -40,7 +41,7 @@ class AddTopicCommand extends Command {
   /**
        * Overrides abstract parent method
        */
-  execute(commandContext) {
+  execute(commandContext: CommandContext) {
     const me = this;
     this._models.forEach((model, index) => {
       // Add a new topic ...
@@ -50,7 +51,7 @@ class AddTopicCommand extends Command {
       if (me._parentsIds) {
         const parentId = me._parentsIds[index];
         if ($defined(parentId)) {
-          const parentTopic = commandContext.findTopics(parentId)[0];
+          const parentTopic = commandContext.findTopics([parentId])[0];
           commandContext.connect(topic, parentTopic);
         }
       } else {
@@ -58,7 +59,7 @@ class AddTopicCommand extends Command {
       }
 
       // Select just created node ...
-      const designer = commandContext._designer;
+      const { designer } = commandContext;
       designer.onObjectFocusEvent(topic);
       topic.setOnFocus(true);
 
@@ -71,7 +72,7 @@ class AddTopicCommand extends Command {
        * Overrides abstract parent method
        * @see {@link mindplot.Command.undoExecute}
        */
-  undoExecute(commandContext) {
+  undoExecute(commandContext: CommandContext) {
     // Delete disconnected the nodes. Create a copy of the topics ...
     const clonedModel = [];
     this._models.forEach((model) => {
@@ -79,9 +80,9 @@ class AddTopicCommand extends Command {
     });
 
     // Finally, remove the nodes ...
-    this._models.forEach((model) => {
+    this._models.forEach((model: NodeModel) => {
       const topicId = model.getId();
-      const topic = commandContext.findTopics(topicId)[0];
+      const topic = commandContext.findTopics([topicId])[0];
       commandContext.deleteTopic(topic);
     });
 

packages/mindplot/src/components/commands/ChangeFeatureToTopicCommand.ts

@@ -17,19 +17,16 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
 
 class ChangeFeatureToTopicCommand extends Command {
-  /**
-     * @extends mindplot.Command
-     * @constructs
-     * @param topicId
-     * @param featureId
-     * @param attributes
-     * @throws will throw an error if topicId is null or undefined
-     * @throws will throw an error if featureId is null or undefined
-     * @throws will throw an error if attributes is null or undefined
-     */
-  constructor(topicId, featureId, attributes) {
+  private _featureId: number;
+
+  private _topicId: number;
+
+  private _attributes: any;
+
+  constructor(topicId: number, featureId: number, attributes: any) {
     $assert($defined(topicId), 'topicId can not be null');
     $assert($defined(featureId), 'featureId can not be null');
     $assert($defined(attributes), 'attributes can not be null');
@@ -43,8 +40,8 @@ class ChangeFeatureToTopicCommand extends Command {
   /**
      * Overrides abstract parent method
      */
-  execute(commandContext) {
-    const topic = commandContext.findTopics(this._topicId)[0];
+  execute(commandContext: CommandContext) {
+    const topic = commandContext.findTopics([this._topicId])[0];
     const feature = topic.findFeatureById(this._featureId);
 
     const oldAttributes = feature.getAttributes();
@@ -56,7 +53,7 @@ class ChangeFeatureToTopicCommand extends Command {
      * Overrides abstract parent method
      * @see {@link mindplot.Command.undoExecute}
      */
-  undoExecute(commandContext) {
+  undoExecute(commandContext: any) {
     this.execute(commandContext);
   }
 }

packages/mindplot/src/components/commands/DeleteCommand.ts

@@ -17,16 +17,20 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
 
 class DeleteCommand extends Command {
-  /**
-     * @classdesc This command class handles do/undo of deleting a topic.
-     * @constructs
-     * @param {Array<String>} topicIds ids of the topics to delete
-     * @param {Array<String>} relIds ids of the relationships connected to the topics
-     * @extends mindplot.Command
-     */
-  constructor(topicIds, relIds) {
+  private _relIds: number[];
+
+  private _topicIds: number[];
+
+  private _deletedTopicModels: any[];
+
+  private _deletedRelModel: any[];
+
+  private _parentTopicIds: any[];
+
+  constructor(topicIds: number[], relIds: number[]) {
     $assert($defined(relIds), 'topicIds can not be null');
 
     super();
@@ -40,7 +44,7 @@ class DeleteCommand extends Command {
   /**
      * Overrides abstract parent method
      */
-  execute(commandContext) {
+  execute(commandContext: CommandContext) {
     // If a parent has been selected for deletion, the children must be excluded from the delete ...
     const topics = this._filterChildren(this._topicIds, commandContext);
 
@@ -89,7 +93,7 @@ class DeleteCommand extends Command {
      * Overrides abstract parent method
      * @see {@link mindplot.Command.undoExecute}
      */
-  undoExecute(commandContext) {
+  undoExecute(commandContext: CommandContext) {
     // Add all the topics ...
     this._deletedTopicModels.forEach((model) => {
       commandContext.createTopic(model);

packages/mindplot/src/components/commands/DragTopicCommand.ts

@@ -16,19 +16,25 @@
  *   limitations under the License.
  */
 import { $assert, $defined } from '@wisemapping/core-js';
+import Point from '@wisemapping/web2d';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
+import Topic from '../Topic';
 
 class DragTopicCommand extends Command {
+  private _topicsId: number;
+
+  private _parentId: any;
+
+  private _position: Point;
+
+  private _order: number;
+
   /**
      * @classdesc This command class handles do/undo of dragging a topic to a new position.
      * @constructs
-     * @param {String} topicId id of the topic to drag
-     * @param {Object} position
-     * @param {Number} order the order property (children are displayed in order from 0 to n)
-     * @param {mindplot.Topic} parentTopic the topic to be made the dragged topic's new parent
-     * @extends mindplot.Command
      */
-  constructor(topicId, position, order, parentTopic) {
+  constructor(topicId: number, position: Point, order: number, parentTopic: Topic) {
     $assert(topicId, 'topicId must be defined');
     super();
 
@@ -44,8 +50,8 @@ class DragTopicCommand extends Command {
   /**
      * Overrides abstract parent method
      */
-  execute(commandContext) {
-    const topic = commandContext.findTopics(this._topicsId)[0];
+  execute(commandContext: CommandContext): void {
+    const topic = commandContext.findTopics([this._topicsId])[0];
     topic.setVisibility(false);
 
     // Save old position ...
@@ -89,11 +95,7 @@ class DragTopicCommand extends Command {
     this._position = origPosition;
   }
 
-  /**
-     * Overrides abstract parent method
-     * @see {@link mindplot.Command.undoExecute}
-     */
-  undoExecute(commandContext) {
+  undoExecute(commandContext: CommandContext): void {
     this.execute(commandContext);
   }
 }

packages/mindplot/src/components/commands/GenericFunctionCommand.ts

@@ -17,20 +17,23 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
+import Topic from '../Topic';
 
 class GenericFunctionCommand extends Command {
-  /**
-     * @classdesc This command handles do/undo of different actions, e.g. moving topics to
-     * a different position, changing text or font,... (for full reference check the
-     * StandaloneActionDispatcher i.e. the ActionDispatcher subclass in use)
-     * @constructs
-     * @param {Function} commandFunc the function the command shall execute
-     * @param {String|Array<String>} topicsIds the ids of the topics affected
-     * @param {Object} [value] value arbitrary value necessary for the execution of the function,
-     * e.g. color, font family or text
-     * @extends mindplot.Command
-     */
-  constructor(commandFunc, topicsIds, value) {
+  private _discardDuplicated: string;
+
+  private _value: string | object | boolean | number;
+
+  private _topicsId: number[];
+
+  private _commandFunc: (topic: Topic, value: string | object | boolean | number) => string | object | boolean;
+
+  private _oldValues: any[];
+
+  private _applied: boolean;
+
+  constructor(commandFunc: (topic: Topic, value: string | object | boolean) => string | object | boolean, topicsIds: number[], value: string | object | boolean | number = undefined) {
     $assert(commandFunc, 'commandFunc must be defined');
     $assert($defined(topicsIds), 'topicsIds must be defined');
 
@@ -39,58 +42,51 @@ class GenericFunctionCommand extends Command {
     this._topicsId = topicsIds;
     this._commandFunc = commandFunc;
     this._oldValues = [];
+    this.discardDuplicated = undefined;
   }
 
   /**
      * Overrides abstract parent method
      */
-  execute(commandContext) {
-    if (!this.applied) {
-      let topics = null;
-      try {
-        topics = commandContext.findTopics(this._topicsId);
-      } catch (e) {
-        if (this._commandFunc.commandType !== 'changeTextToTopic') {
-          // Workaround: For some reason, there is a combination of events that involves
-          // making some modification and firing out of focus event. This is causing
-          // that a remove node try to be removed.
-          // In some other life, I will come with the solution. Almost aways occurs with IE9.
-          // I could be related with some change of order in sets o something similar.
-          throw e;
-        }
-      }
+  execute(commandContext: CommandContext) {
+    if (!this._applied) {
+      const topics = commandContext.findTopics(this._topicsId);
 
       if (topics != null) {
         const me = this;
-        topics.forEach((topic) => {
+        topics.forEach((topic: Topic) => {
           const oldValue = me._commandFunc(topic, me._value);
           me._oldValues.push(oldValue);
         });
       }
-      this.applied = true;
+      this._applied = true;
     } else {
       throw new Error('Command can not be applied two times in a row.');
     }
   }
 
-  /**
-     * Overrides abstract parent method
-     * @see {@link mindplot.Command.undoExecute}
-     */
-  undoExecute(commandContext) {
-    if (this.applied) {
+  undoExecute(commandContext: CommandContext): void {
+    if (this._applied) {
       const topics = commandContext.findTopics(this._topicsId);
 
-      topics.forEach(((topic, index) => {
+      topics.forEach(((topic: Topic, index: number) => {
         this._commandFunc(topic, this._oldValues[index]);
       }));
 
-      this.applied = false;
+      this._applied = false;
       this._oldValues = [];
     } else {
       throw new Error('undo can not be applied.');
     }
   }
+
+  public get disardDuplicated(): string {
+    return this._discardDuplicated;
+  }
+
+  public set discardDuplicated(value: string) {
+    this._discardDuplicated = value;
+  }
 }
 
 export default GenericFunctionCommand;

packages/mindplot/src/components/commands/MoveControlPointCommand.ts

@@ -17,20 +17,32 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import ControlPoint from '../ControlPoint';
 
 class MoveControlPointCommand extends Command {
+  private _ctrlPointControler: ControlPoint;
+
+  private _line: any;
+
+  private _controlPoint: any;
+
+  private _oldControlPoint: any;
+
+  private _originalEndPoint: any;
+
+  private _wasCustom: any;
+
+  private _endPoint: any;
+
+  private _point: number;
+
   /**
    * @classdesc This command handles do/undo of changing the control points of a relationship
    * arrow. These are the two points that appear when the relationship is on focus. They
    * influence how the arrow is drawn (not the source or the destination topic nor the arrow
      * direction)
-         * @constructs
-         * @param {ControlPoint} ctrlPointController
-         * @param {Number} point 0 for the destination control point, 1 for the source control point
-         * @param ctrlPointController {ControlPoint}
-         * @param point {Number} 0 for the destination control point, 1 for the source control point
      */
-  constructor(ctrlPointController, point) {
+  constructor(ctrlPointController: ControlPoint, point: number) {
     $assert(ctrlPointController, 'line can not be null');
     $assert($defined(point), 'point can not be null');
 

packages/mindplot/src/components/commands/RemoveFeatureFromTopicCommand.ts

@@ -17,17 +17,20 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import Command from '../Command';
+import CommandContext from '../CommandContext';
 
 class RemoveFeatureFromTopicCommand extends Command {
+  private _topicId: number;
+
+  private _featureId: number;
+
+  private _oldFeature: any;
+
   /**
      * @classdesc This command handles do/undo of removing a feature from a topic, e.g. an icon or
      * a note. For a reference of existing features, refer to {@link mindplot.TopicFeature}.
-     * @constructs
-     * @param {String} topicId id of the topic to remove the feature from
-     * @param {String} featureId id of the feature to remove
-     * @extends mindplot.Command
      */
-  constructor(topicId, featureId) {
+  constructor(topicId: number, featureId: number) {
     $assert($defined(topicId), 'topicId can not be null');
     $assert(featureId, 'iconModel can not be null');
 
@@ -40,8 +43,8 @@ class RemoveFeatureFromTopicCommand extends Command {
   /**
      * Overrides abstract parent method
      */
-  execute(commandContext) {
-    const topic = commandContext.findTopics(this._topicId)[0];
+  execute(commandContext:CommandContext):void {
+    const topic = commandContext.findTopics([this._topicId])[0];
     const feature = topic.findFeatureById(this._featureId);
     topic.removeFeature(feature);
     this._oldFeature = feature;
@@ -51,8 +54,8 @@ class RemoveFeatureFromTopicCommand extends Command {
      * Overrides abstract parent method
      * @see {@link mindplot.Command.undoExecute}
      */
-  undoExecute(commandContext) {
-    const topic = commandContext.findTopics(this._topicId)[0];
+  undoExecute(commandContext:CommandContext) {
+    const topic = commandContext.findTopics([this._topicId])[0];
     topic.addFeature(this._oldFeature);
     this._oldFeature = null;
   }

packages/mindplot/src/components/lang/Bundle.js

@@ -30,7 +30,7 @@ const Bundle = {
   es: ES,
   en: EN,
   de: DE,
-  fe: FR,
+  fr: FR,
   pt_BR: PT_BR,
   zh_CN: ZH_CN,
   zh_TW: ZH_TW,

packages/mindplot/src/components/libraries/bootstrap/BootstrapDialog.js

@@ -100,7 +100,9 @@ class BootstrapDialog extends Options {
     throw new Error('Unsupported operation');
   }
 
-  onDialogShown() {}
+  onDialogShown() {
+    // Overwrite default behaviour ...
+  }
 
   onRemoveClick(event) {
     throw new Error('Unsupported operation');

packages/mindplot/src/components/model/IMindmap.ts

@@ -19,7 +19,6 @@
  */
 import { $assert } from '@wisemapping/core-js';
 import INodeModel, { NodeModelType as NodeType } from './INodeModel';
-import NodeModel from './NodeModel';
 import RelationshipModel from './RelationshipModel';
 
 abstract class IMindmap {
@@ -76,14 +75,13 @@ abstract class IMindmap {
 
   abstract createNode(type: NodeType, id: number): INodeModel
 
-  abstract createRelationship(fromNode: NodeModel, toNode: NodeModel): void;
+  abstract createRelationship(fromNodeId: number, toNodeId: number): void;
 
   abstract addRelationship(rel: RelationshipModel): void;
 
   abstract deleteRelationship(relationship: RelationshipModel): void;
 
-  /** */
-  inspect() {
+  inspect():string {
     let result = '';
     result = '{ ';
 
@@ -104,19 +102,15 @@ abstract class IMindmap {
     return result;
   }
 
-  /**
-     * @param target
-     */
-  copyTo(target) {
-    const source = this;
-    const version = source.getVersion();
+  copyTo(target:IMindmap) {
+    const version = this.getVersion();
     target.setVersion(version);
 
     const desc = this.getDescription();
     target.setDescription(desc);
 
     // Then the rest of the branches ...
-    const sbranchs = source.getBranches();
+    const sbranchs = this.getBranches();
     sbranchs.forEach((snode) => {
       const tnode = target.createNode(snode.getType(), snode.getId());
       snode.copyTo(tnode);

packages/mindplot/src/components/model/INodeModel.ts

@@ -18,7 +18,6 @@
  */
 import { $assert, $defined } from '@wisemapping/core-js';
 import FeatureModel from './FeatureModel';
-import IMindmap from './IMindmap';
 import Mindmap from './Mindmap';
 
 export type NodeModelType = 'CentralTopic' | 'MainTopic';
@@ -39,7 +38,7 @@ abstract class INodeModel {
   }
 
   getId(): number {
-    return this.getProperty('id');
+    return this.getProperty('id') as number;
   }
 
   abstract getFeatures(): FeatureModel[];
@@ -71,7 +70,7 @@ abstract class INodeModel {
   }
 
   getText(): string {
-    return this.getProperty('text');
+    return this.getProperty('text') as string;
   }
 
   setPosition(x: number, y: number): void {
@@ -79,7 +78,7 @@ abstract class INodeModel {
   }
 
   getPosition(): { x: number, y: number } {
-    const value = this.getProperty('position');
+    const value = this.getProperty('position') as string;
     let result = null;
     if (value != null) {
       result = parseJsObject(value);
@@ -92,7 +91,7 @@ abstract class INodeModel {
   }
 
   getImageSize(): {width: number, height: number} {
-    const value = this.getProperty('imageSize');
+    const value = this.getProperty('imageSize') as string;
     let result = null;
     if (value != null) {
       result = parseJsObject(value);
@@ -105,7 +104,7 @@ abstract class INodeModel {
   }
 
   getMetadata(): string {
-    return this.getProperty('metadata');
+    return this.getProperty('metadata') as string;
   }
 
   setMetadata(json: string): void {
@@ -113,10 +112,10 @@ abstract class INodeModel {
   }
 
   getImageUrl(): string {
-    return this.getProperty('imageUrl');
+    return this.getProperty('imageUrl') as string;
   }
 
-  getMindmap(): IMindmap {
+  getMindmap(): Mindmap {
     return this._mindmap;
   }
 
@@ -131,7 +130,7 @@ abstract class INodeModel {
 
   /** */
   getShapeType(): string {
-    return this.getProperty('shapeType');
+    return this.getProperty('shapeType') as string;
   }
 
   /** */
@@ -148,7 +147,7 @@ abstract class INodeModel {
   }
 
   getOrder(): number {
-    return this.getProperty('order');
+    return this.getProperty('order') as number;
   }
 
   setFontFamily(fontFamily: string): void {
@@ -156,7 +155,7 @@ abstract class INodeModel {
   }
 
   getFontFamily(): string {
-    return this.getProperty('fontFamily');
+    return this.getProperty('fontFamily') as string;
   }
 
   /** */
@@ -165,7 +164,7 @@ abstract class INodeModel {
   }
 
   getFontStyle(): string {
-    return this.getProperty('fontStyle');
+    return this.getProperty('fontStyle') as string;
   }
 
   setFontWeight(weight) {
@@ -181,7 +180,7 @@ abstract class INodeModel {
   }
 
   getFontColor(): string {
-    return this.getProperty('fontColor');
+    return this.getProperty('fontColor') as string;
   }
 
   setFontSize(size: number) {
@@ -189,11 +188,11 @@ abstract class INodeModel {
   }
 
   getFontSize(): number {
-    return this.getProperty('fontSize');
+    return this.getProperty('fontSize') as number;
   }
 
   getBorderColor(): string {
-    return this.getProperty('borderColor');
+    return this.getProperty('borderColor') as string;
   }
 
   setBorderColor(color: string): void {
@@ -201,7 +200,7 @@ abstract class INodeModel {
   }
 
   getBackgroundColor(): string {
-    return this.getProperty('backgroundColor');
+    return this.getProperty('backgroundColor') as string;
   }
 
   setBackgroundColor(color: string) {
@@ -209,7 +208,7 @@ abstract class INodeModel {
   }
 
   areChildrenShrunken(): boolean {
-    const result = this.getProperty('shrunken');
+    const result = this.getProperty('shrunken') as boolean;
     return $defined(result) ? result : false;
   }
 
@@ -291,9 +290,9 @@ abstract class INodeModel {
 
   abstract getPropertiesKeys(): string[];
 
-  abstract getProperty(key: string): any;
+  abstract getProperty(key: string): number | string | boolean;
 
-  abstract putProperty(key: string, value: any): void;
+  abstract putProperty(key: string, value: number | string| boolean): void;
 
   abstract setParent(parent: INodeModel): void;
 

packages/mindplot/src/components/model/Mindmap.ts

@@ -126,14 +126,7 @@ class Mindmap extends IMindmap {
     return new NodeModel(type, this, id);
   }
 
-  /**
-   * @param sourceNodeId
-   * @param targetNodeId
-   * @throws will throw an error if source node is null or undefined
-   * @throws will throw an error if target node is null or undefined
-   * @return the relationship model created
-   */
-  createRelationship(sourceNodeId: any, targetNodeId: any) {
+  createRelationship(sourceNodeId: number, targetNodeId: number):RelationshipModel {
     $assert($defined(sourceNodeId), 'from node cannot be null');
     $assert($defined(targetNodeId), 'to node cannot be null');
 
@@ -154,7 +147,7 @@ class Mindmap extends IMindmap {
     this._relationships = this._relationships.filter((r) => r !== relationship);
   }
 
-  findNodeById(id: any) {
+  findNodeById(id: number) {
     let result = null;
     for (let i = 0; i < this._branches.length; i++) {
       const branch = this._branches[i];

packages/mindplot/src/components/model/NodeModel.ts

@@ -37,6 +37,7 @@ class NodeModel extends INodeModel {
     $assert(type, 'Node type can not be null');
     $assert(mindmap, 'mindmap can not be null');
     super(mindmap);
+
     this._properties = {};
     this.setId(id);
     this.setType(type);

packages/mindplot/src/components/persistence/Pela2TangoMigrator.ts

@@ -83,7 +83,7 @@ class Pela2TangoMigrator implements XMLMindmapSerializer {
     }
   }
 
-  _fixNodePosition(node: { getPosition: () => any; setPosition: (arg0: any, arg1: any) => void; getChildren: () => any; }, parentPosition: { x: number; y: any; }) {
+  _fixNodePosition(node: NodeModel, parentPosition: {x:number, y:number}) {
     // Position was not required in previous versions. Try to synthesize one .
     let position = node.getPosition();
     if (!position) {

packages/mindplot/src/components/persistence/XMLSerializerFactory.ts

@@ -30,6 +30,7 @@ const codeToSerializer = [
     codeName: ModelCodeName.BETA,
     serializer: XMLSerializerBeta,
     migrator() {
+      // Ignore ..
     },
   },
   {

packages/mindplot/src/components/widget/AccountSettingsPanel.js

@@ -22,6 +22,7 @@ class AccountSettingsPanel extends ListToolbarPanel {
   constructor(elemId) {
     const model = {
       getValue() {
+        // Overwite default behaviour ...
       },
       setValue() {
         window.location = '/c/logout';

packages/mindplot/src/index.js

@@ -15,7 +15,6 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-/* eslint-disable import/no-unresolved */
 import jquery from 'jquery';
 import * as DesignerBuilder from './components/DesignerBuilder';
 import Mindmap from './components/model/Mindmap';

packages/mindplot/test/playground/layout/lib/raphael-min.js

@@ -217,7 +217,7 @@
       const e = 'hasOwnProperty'; const r = String; const i = parseFloat; const n = Math; const a = n.round; const s = n.max; const o = n.min; const l = n.abs; const h = /[, ]+/; const u = t.eve; const c = ' '; const f = ''; const p = {
         M: 'm', L: 'l', C: 'c', Z: 'x', m: 't', l: 'r', c: 'v', z: 'x',
       }; const d = /([clmz]),?([^clmz]*)/gi; const g = / progid:\S+Blur\([^\)]+\)/g; const x = /-?[^,\s-]+/g; const v = 'position:absolute;left:0;top:0;width:1px;height:1px;behavior:url(#default#VML)'; const y = 21600; const m = { path: 1, rect: 1, image: 1 }; const b = { circle: 1, ellipse: 1 }; const _ = function (e, r, i) { const n = t.matrix(); return n.rotate(-e, 0.5, 0.5), { dx: n.x(r, i), dy: n.y(r, i) }; }; const w = function (t, e, r, i, n, a) { const s = t._; const o = t.matrix; const h = s.fillpos; const u = t.node; const f = u.style; let p = 1; let d = ''; const g = y / e; const x = y / r; if (f.visibility = 'hidden', e && r) { if (u.coordsize = l(g) + c + l(x), f.rotation = a * (e * r < 0 ? -1 : 1), a) { var v = _(a, i, n); i = v.dx, n = v.dy; } if (e < 0 && (d += 'x'), r < 0 && (d += ' y') && (p = -1), f.flip = d, u.coordorigin = i * -g + c + n * -x, h || s.fillsize) { let m = u.getElementsByTagName('fill'); m = m && m[0], u.removeChild(m), h && (v = _(a, o.x(h[0], h[1]), o.y(h[0], h[1])), m.position = v.dx * p + c + v.dy * p), s.fillsize && (m.size = s.fillsize[0] * l(e) + c + s.fillsize[1] * l(r)), u.appendChild(m); }f.visibility = 'visible'; } }; t.toString = function () { return `Your browser doesn’t support SVG. Falling down to VML.\nYou are running Raphaël ${this.version}`; }; let k; const B = function (t, e, i) { for (var n = r(e).toLowerCase().split('-'), a = i ? 'end' : 'start', s = n.length, o = 'classic', l = 'medium', h = 'medium'; s--;) switch (n[s]) { case 'block': case 'classic': case 'oval': case 'diamond': case 'open': case 'none': o = n[s]; break; case 'wide': case 'narrow': h = n[s]; break; case 'long': case 'short': l = n[s]; } const u = t.node.getElementsByTagName('stroke')[0]; u[`${a}arrow`] = o, u[`${a}arrowlength`] = l, u[`${a}arrowwidth`] = h; }; const C = function (n, l) {
-        n.attrs = n.attrs || {}; const u = n.node; const g = n.attrs; let v = u.style; const _ = m[n.type] && (l.x != g.x || l.y != g.y || l.width != g.width || l.height != g.height || l.cx != g.cx || l.cy != g.cy || l.rx != g.rx || l.ry != g.ry || l.r != g.r); const C = b[n.type] && (g.cx != l.cx || g.cy != l.cy || g.r != l.r || g.rx != l.rx || g.ry != l.ry); const T = n; for (const A in l)l[e](A) && (g[A] = l[A]); if (_ && (g.path = t._getPath[n.type](n), n._.dirty = 1), l.href && (u.href = l.href), l.title && (u.title = l.title), l.target && (u.target = l.target), l.cursor && (v.cursor = l.cursor), 'blur' in l && n.blur(l.blur), (l.path && n.type == 'path' || _) && (u.path = (function (e) { let i = /[ahqstv]/gi; let n = t._pathToAbsolute; if (r(e).match(i) && (n = t._path2curve), i = /[clmz]/g, n == t._pathToAbsolute && !r(e).match(i)) { var s = r(e).replace(d, (t, e, r) => { let i = []; const n = 'm' == e.toLowerCase(); let s = p[e]; return r.replace(x, (t) => { n && i.length == 2 && (s += i + p[e == 'm' ? 'l' : 'L'], i = []), i.push(a(t * y)); }), s + i; }); return s; } let o; let l; const h = n(e); s = []; for (let u = 0, g = h.length; u < g; u++) { o = h[u], (l = h[u][0].toLowerCase()) == 'z' && (l = 'x'); for (let v = 1, m = o.length; v < m; v++)l += a(o[v] * y) + (v != m - 1 ? ',' : f); s.push(l); } return s.join(c); }(~r(g.path).toLowerCase().indexOf('r') ? t._pathToAbsolute(g.path) : g.path)), n._.dirty = 1, n.type == 'image' && (n._.fillpos = [g.x, g.y], n._.fillsize = [g.width, g.height], w(n, 1, 1, 0, 0, 0))), 'transform' in l && n.transform(l.transform), C) { const M = +g.cx; const E = +g.cy; const N = +g.rx || +g.r || 0; const L = +g.ry || +g.r || 0; u.path = t.format('ar{0},{1},{2},{3},{4},{1},{4},{1}x', a((M - N) * y), a((E - L) * y), a((M + N) * y), a((E + L) * y), a(M * y)), n._.dirty = 1; } if ('clip-rect' in l) { const P = r(l['clip-rect']).split(h); if (P.length == 4) { P[2] = +P[2] + +P[0], P[3] = +P[3] + +P[1]; const z = u.clipRect || t._g.doc.createElement('div'); const F = z.style; F.clip = t.format('rect({1}px {2}px {3}px {0}px)', P), u.clipRect || (F.position = 'absolute', F.top = 0, F.left = 0, F.width = `${n.paper.width}px`, F.height = `${n.paper.height}px`, u.parentNode.insertBefore(z, u), z.appendChild(u), u.clipRect = z); }l['clip-rect'] || u.clipRect && (u.clipRect.style.clip = 'auto'); } if (n.textpath) { const R = n.textpath.style; l.font && (R.font = l.font), l['font-family'] && (R.fontFamily = `"${l['font-family'].split(',')[0].replace(/^['"]+|['"]+$/g, f)}"`), l['font-size'] && (R.fontSize = l['font-size']), l['font-weight'] && (R.fontWeight = l['font-weight']), l['font-style'] && (R.fontStyle = l['font-style']); } if ('arrow-start' in l && B(T, l['arrow-start']), 'arrow-end' in l && B(T, l['arrow-end'], 1), l.opacity != null || l.fill != null || l.src != null || l.stroke != null || l['stroke-width'] != null || l['stroke-opacity'] != null || l['fill-opacity'] != null || l['stroke-dasharray'] != null || l['stroke-miterlimit'] != null || l['stroke-linejoin'] != null || l['stroke-linecap'] != null) {
+        n.attrs = n.attrs || {}; const u = n.node; const g = n.attrs; let v = u.style; const _ = m[n.type] && (l.x != g.x || l.y != g.y || l.width != g.width || l.height != g.height || l.cx != g.cx || l.cy != g.cy || l.rx != g.rx || l.ry != g.ry || l.r != g.r); const C = b[n.type] && (g.cx != l.cx || g.cy != l.cy || g.r != l.r || g.rx != l.rx || g.ry != l.ry); const T = n; for (const A in l)l[e](A) && (g[A] = l[A]); if (_ && (g.path = t._getPath[n.type](n), n._.dirty = 1), l.href && (u.href = l.href), l.title && (u.title = l.title), l.target && (u.target = l.target), l.cursor && (v.cursor = l.cursor), 'blur' in l && n.blur(l.blur), (l.path && n.type == 'path' || _) && (u.path = (function (e) { let i = /[ahqstv]/gi; let n = t._pathToAbsolute; if (r(e).match(i) && (n = t._path2curve), i = /[clmz]/g, n == t._pathToAbsolute && !r(e).match(i)) { var s = r(e).replace(d, (t, e, r) => { let i = []; const n = e.toLowerCase() == 'm'; let s = p[e]; return r.replace(x, (t) => { n && i.length == 2 && (s += i + p[e == 'm' ? 'l' : 'L'], i = []), i.push(a(t * y)); }), s + i; }); return s; } let o; let l; const h = n(e); s = []; for (let u = 0, g = h.length; u < g; u++) { o = h[u], (l = h[u][0].toLowerCase()) == 'z' && (l = 'x'); for (let v = 1, m = o.length; v < m; v++)l += a(o[v] * y) + (v != m - 1 ? ',' : f); s.push(l); } return s.join(c); }(~r(g.path).toLowerCase().indexOf('r') ? t._pathToAbsolute(g.path) : g.path)), n._.dirty = 1, n.type == 'image' && (n._.fillpos = [g.x, g.y], n._.fillsize = [g.width, g.height], w(n, 1, 1, 0, 0, 0))), 'transform' in l && n.transform(l.transform), C) { const M = +g.cx; const E = +g.cy; const N = +g.rx || +g.r || 0; const L = +g.ry || +g.r || 0; u.path = t.format('ar{0},{1},{2},{3},{4},{1},{4},{1}x', a((M - N) * y), a((E - L) * y), a((M + N) * y), a((E + L) * y), a(M * y)), n._.dirty = 1; } if ('clip-rect' in l) { const P = r(l['clip-rect']).split(h); if (P.length == 4) { P[2] = +P[2] + +P[0], P[3] = +P[3] + +P[1]; const z = u.clipRect || t._g.doc.createElement('div'); const F = z.style; F.clip = t.format('rect({1}px {2}px {3}px {0}px)', P), u.clipRect || (F.position = 'absolute', F.top = 0, F.left = 0, F.width = `${n.paper.width}px`, F.height = `${n.paper.height}px`, u.parentNode.insertBefore(z, u), z.appendChild(u), u.clipRect = z); }l['clip-rect'] || u.clipRect && (u.clipRect.style.clip = 'auto'); } if (n.textpath) { const R = n.textpath.style; l.font && (R.font = l.font), l['font-family'] && (R.fontFamily = `"${l['font-family'].split(',')[0].replace(/^['"]+|['"]+$/g, f)}"`), l['font-size'] && (R.fontSize = l['font-size']), l['font-weight'] && (R.fontWeight = l['font-weight']), l['font-style'] && (R.fontStyle = l['font-style']); } if ('arrow-start' in l && B(T, l['arrow-start']), 'arrow-end' in l && B(T, l['arrow-end'], 1), l.opacity != null || l.fill != null || l.src != null || l.stroke != null || l['stroke-width'] != null || l['stroke-opacity'] != null || l['fill-opacity'] != null || l['stroke-dasharray'] != null || l['stroke-miterlimit'] != null || l['stroke-linejoin'] != null || l['stroke-linecap'] != null) {
           let j = u.getElementsByTagName('fill'); if (!(j = j && j[0]) && (j = k('fill')), n.type == 'image' && l.src && (j.src = l.src), l.fill && (j.on = !0), j.on != null && l.fill != 'none' && l.fill !== null || (j.on = !1), j.on && l.fill) { const I = r(l.fill).match(t._ISURL); if (I) { j.parentNode == u && u.removeChild(j), j.rotate = !0, j.src = I[1], j.type = 'tile'; const D = n.getBBox(1); j.position = D.x + c + D.y, n._.fillpos = [D.x, D.y], t._preload(I[1], function () { n._.fillsize = [this.offsetWidth, this.offsetHeight]; }); } else j.color = t.getRGB(l.fill).hex, j.src = f, j.type = 'solid', t.getRGB(l.fill).error && (T.type in { circle: 1, ellipse: 1 } || r(l.fill).charAt() != 'r') && S(T, l.fill, j) && (g.fill = 'none', g.gradient = l.fill, j.rotate = !1); } if ('fill-opacity' in l || 'opacity' in l) { var q = ((+g['fill-opacity'] + 1 || 2) - 1) * ((+g.opacity + 1 || 2) - 1) * ((+t.getRGB(l.fill).o + 1 || 2) - 1); q = o(s(q, 0), 1), j.opacity = q, j.src && (j.color = 'none'); }u.appendChild(j); let O = u.getElementsByTagName('stroke') && u.getElementsByTagName('stroke')[0]; let V = !1; !O && (V = O = k('stroke')), (l.stroke && l.stroke != 'none' || l['stroke-width'] || l['stroke-opacity'] != null || l['stroke-dasharray'] || l['stroke-miterlimit'] || l['stroke-linejoin'] || l['stroke-linecap']) && (O.on = !0), (l.stroke == 'none' || l.stroke === null || O.on == null || l.stroke == 0 || l['stroke-width'] == 0) && (O.on = !1); const W = t.getRGB(l.stroke); O.on && l.stroke && (O.color = W.hex), q = ((+g['stroke-opacity'] + 1 || 2) - 1) * ((+g.opacity + 1 || 2) - 1) * ((+W.o + 1 || 2) - 1); let Y = 0.75 * (i(l['stroke-width']) || 1); if (q = o(s(q, 0), 1), l['stroke-width'] == null && (Y = g['stroke-width']), l['stroke-width'] && (O.weight = Y), Y && Y < 1 && (q *= Y) && (O.weight = 1), O.opacity = q, l['stroke-linejoin'] && (O.joinstyle = l['stroke-linejoin'] || 'miter'), O.miterlimit = l['stroke-miterlimit'] || 8, l['stroke-linecap'] && (O.endcap = l['stroke-linecap'] == 'butt' ? 'flat' : l['stroke-linecap'] == 'square' ? 'square' : 'round'), 'stroke-dasharray' in l) {
             const G = {
               '-': 'shortdash', '.': 'shortdot', '-.': 'shortdashdot', '-..': 'shortdashdotdot', '. ': 'dot', '- ': 'dash', '--': 'longdash', '- .': 'dashdot', '--.': 'longdashdot', '--..': 'longdashdotdot',

packages/mindplot/test/unit/export/Helper.ts

@@ -16,11 +16,11 @@
  *   limitations under the License.
  */
 import { Blob } from 'blob-polyfill';
-import Exporter from '../../../src/components/export/Exporter';
 import path from 'path';
 import fs from 'fs';
 import { diff } from 'jest-diff';
 import { expect } from '@jest/globals';
+import Exporter from '../../../src/components/export/Exporter';
 
 const saveOutputRecord = false;
 
@@ -40,26 +40,26 @@ export const parseXMLFile = (filePath: fs.PathOrFileDescriptor, mimeType: DOMPar
 
   let content = stream.toString();
   // Hack for SVG exported from the browser ...
-  if(mimeType=="image/svg+xml"){
-    content = content.replace('<svg ', '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ')
+  if (mimeType == 'image/svg+xml') {
+    content = content.replace('<svg ', '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ');
   }
 
   return parseXMLString(content, mimeType);
-}
+};
 
 export const parseXMLString = (xmlStr: string, mimeType: DOMParserSupportedType) => {
   const parser = new DOMParser();
   const xmlDoc = parser.parseFromString(xmlStr, mimeType);
 
   // Is there any parsing error ?.
-  if (xmlDoc.getElementsByTagName("parsererror").length > 0) {
+  if (xmlDoc.getElementsByTagName('parsererror').length > 0) {
     const xmmStr = new XMLSerializer().serializeToString(xmlDoc);
     console.log(xmmStr);
     throw new Error(`Unexpected error parsing: ${xmlStr}. Error: ${xmmStr}`);
   }
 
   return xmlDoc;
-}
+};
 
 export const exporterAssert = async (testName: string, exporter: Exporter) => {
   const actualStr = await exporter.export();
@@ -77,4 +77,4 @@ export const exporterAssert = async (testName: string, exporter: Exporter) => {
     console.log(diffResult);
     expect(actualStr).toEqual(expectedStr);
   }
-}
+};

packages/mindplot/test/unit/export/SVGExporterTestSuite.test.ts

@@ -1,7 +1,7 @@
-import Mindmap from '../../../src/components/model/Mindmap';
 import path from 'path';
 import fs from 'fs';
 import { expect, test } from '@jest/globals'; // Workaround for cypress conflict
+import Mindmap from '../../../src/components/model/Mindmap';
 import XMLSerializerFactory from '../../../src/components/persistence/XMLSerializerFactory';
 import SVGExporter from '../../../src/components/export/SVGExporter';
 import { parseXMLFile, setupBlob, exporterAssert } from './Helper';
@@ -11,8 +11,7 @@ setupBlob();
 describe('SVG export test execution', () => {
   test.each(fs.readdirSync(path.resolve(__dirname, './input/'))
     .filter((f) => f.endsWith('.wxml'))
-    .map((filename: string) => filename.split('.')[0]))
-    (`Exporting %p suite`, async (testName: string) => {
+    .map((filename: string) => filename.split('.')[0]))('Exporting %p suite', async (testName: string) => {
     // Load mindmap DOM ...
     const mindmapPath = path.resolve(__dirname, `./input/${testName}.wxml`);
     const mapDocument = parseXMLFile(mindmapPath, 'text/xml');

packages/mindplot/test/unit/export/TextExporterTestSuite.test.ts

@@ -1,10 +1,10 @@
-import Mindmap from '../../../src/components/model/Mindmap';
 import path from 'path';
+import fs from 'fs';
+import { test } from '@jest/globals'; // Workaround for cypress conflict
+import Mindmap from '../../../src/components/model/Mindmap';
 import XMLSerializerFactory from '../../../src/components/persistence/XMLSerializerFactory';
 import TextExporterFactory from '../../../src/components/export/TextExporterFactory';
 import { parseXMLFile, setupBlob, exporterAssert } from './Helper';
-import fs from 'fs';
-import { test } from '@jest/globals'; // Workaround for cypress conflict
 
 setupBlob();
 
@@ -13,8 +13,7 @@ const testNames = fs.readdirSync(path.resolve(__dirname, './input/'))
   .map((filename: string) => filename.split('.')[0]);
 
 describe('WXML export test execution', () => {
-  test.each(testNames)
-    (`Exporting %p suite`, async (testName: string) => {
+  test.each(testNames)('Exporting %p suite', async (testName: string) => {
     // Load mindmap DOM ...
     const mindmapPath = path.resolve(__dirname, `./input/${testName}.wxml`);
     const mapDocument = parseXMLFile(mindmapPath, 'text/xml');
@@ -29,8 +28,7 @@ describe('WXML export test execution', () => {
 });
 
 describe('Txt export test execution', () => {
-    test.each(testNames)
-      (`Exporting %p suite`, async (testName: string) => {
+  test.each(testNames)('Exporting %p suite', async (testName: string) => {
     // Load mindmap DOM ...
     const mindmapPath = path.resolve(__dirname, `./input/${testName}.wxml`);
     const mapDocument = parseXMLFile(mindmapPath, 'text/xml');
@@ -45,8 +43,7 @@ describe('WXML export test execution', () => {
 });
 
 describe('MD export test execution', () => {
-      test.each(testNames)
-        (`Exporting %p suite`, async (testName: string) => {
+  test.each(testNames)('Exporting %p suite', async (testName: string) => {
     // Load mindmap DOM ...
     const mindmapPath = path.resolve(__dirname, `./input/${testName}.wxml`);
     const mapDocument = parseXMLFile(mindmapPath, 'text/xml');

packages/mindplot/test/unit/layout/Constants.ts

@@ -1,5 +1,5 @@
 const Constants = {
   NODE_SIZE: { width: 80, height: 30 },
-    ROOT_NODE_SIZE: { width: 120, height: 40 }
-}
+  ROOT_NODE_SIZE: { width: 120, height: 40 },
+};
 export default Constants;

packages/mindplot/webpack.playground.js

@@ -2,8 +2,8 @@ const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
-const common = require('./webpack.common');
 const { merge } = require('webpack-merge');
+const common = require('./webpack.common');
 
 const playgroundConfig = {
   mode: 'development',

packages/webapp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wisemapping/webapp",
-    "version": "0.4.9",
+    "version": "5.0.1",
     "main": "app.jsx",
     "scripts": {
         "start": "webpack serve --config webpack.dev.js ",