basicprimitives - npm Package Compare versions

Comparing version 6.4.1 to 6.5.0

.vscode/launch.json

@@ -8,3 +8,3 @@ {
     {
-      "command": "yarn test getFamilyLoops ",
+      "command": "yarn test VisualTreeBuilder.test",
       "name": "Run npm start",
@@ -32,3 +32,3 @@ "request": "launch",
             "name": "Launch Chrome against localhost",
-            "url": "http://localhost:8080/samples/javascript.controls/CasePERTChart.html",
+            "url": "http://localhost:8080/samples/javascript.controls/CaseSelectionPathMode.html",
             "webRoot": "${workspaceFolder}"
@@ -35,0 +35,0 @@ }

changelog.md

@@ -0,1 +1,7 @@
+#### Version 6.5.0
+**Warning**: Non-backward compatible API changes!
+* Added `alignBranches` option to `OrgConfig`.
+* Removed children formation for items having `levelOffset`.
+* Fixed highlight path annotation tracing over partner connection.
+* Fixed `placeAssistantsAboveChildren` property for multiple assistants rows
 #### Version 6.4.1
@@ -2,0 +8,0 @@ * Added `onGroupTitleRender`, `onLevelTitleRender` and `onLevelBackgroundRender` options to `OrgConfig` and `FamConfig`

package.json

@@ -5,3 +5,3 @@ {
   "homepage": "https://www.basicprimitives.com/",
-  "version": "6.4.1",
+  "version": "6.5.0",
   "author": "Basic Primitives Inc. <[e-mail]> (https://www.basicprimitives.com)",
@@ -8,0 +8,0 @@ "description": "Basic Primitives Diagrams for JavaScript - data visualization components library that implements organizational chart and multi-parent dependency diagrams, contains implementations of JavaScript Controls and PDF rendering plugins.",

src/algorithms/Tree.js

@@ -196,5 +196,6 @@ import { isObject, cloneObject, isEmptyObject } from '../common'
      * @param {Object} thisArg The callback function invocation context
-     * @param {onTreeItemWithParentCallback} onItem A callback function to call for every node 
+     * @param {string} arg0 The node id to start traversing
+     * @param {onTreeItemWithParentCallback} arg1 A callback function to call for every node 
      */
-    function loopPreOrder(thisArg, onItem) {
+    function loopPreOrder(thisArg, arg0, arg1) {
       var stack = [], nodeid,
@@ -205,10 +206,26 @@ key,
         prevParent,
-        children;
+        children,
+        startNodeId,
+        onItem;
   
+      switch (arguments.length) {
+        case 2:
+          onItem = arg0;
+          break;
+        case 3:
+          startNodeId = arg0;
+          onItem = arg1;
+          break;
+      }
+
       if (onItem != null) {
   
-        for (key in _rootChildren) {
-          if (_rootChildren.hasOwnProperty(key)) {
-            stack = stack.concat(_rootChildren[key]);
+        if(!node(startNodeId)) {
+          for (key in _rootChildren) {
+            if (_rootChildren.hasOwnProperty(key)) {
+              stack = stack.concat(_rootChildren[key]);
+            }
           }
+        } else {
+          stack.push(startNodeId);
         }
@@ -215,0 +232,0 @@

src/algorithms/Tree.test.js

@@ -58,2 +58,12 @@ import Tree from './Tree';
 
+test('Pre order with start node sequence test', () => {
+    const tree = getTree(items);
+    const preOrderSequence = [];
+    tree.loopPreOrder(this, 1, function (nodeid, node) {
+        preOrderSequence.push(nodeid);
+    });
+    const expectedChildren = [1, 2, 3, 9, 10];
+    expect(preOrderSequence).toEqual(expectedChildren);
+});
+
 test('loopEulerWalk - returns tree nodes in Euler Walk sequence', () => {
@@ -60,0 +70,0 @@ const tree = getTree(items);

src/BaseControl.js

@@ -504,3 +504,3 @@ import Point from './graphics/structs/Point';
       var eventArgs = getEventArgs(null, selectedId);
-      var position = selectedItems.findIndex(function(itemid) { return selectedId === itemid});
+      var position = selectedItems.findIndex(function(itemid) { return selectedId == itemid});
       trigger("onSelectionChanging", event, eventArgs);
@@ -550,3 +550,3 @@ if (!eventArgs.cancel) {
       }
-      else if (target.getAttribute("name") === "checkbox" || target.getAttribute("name") === "selectiontext") { //ignore jslint
+      else if (target.getAttribute("name") === "checkbox" || target.getAttribute("name") === "selectiontext") { 
 
@@ -656,3 +656,3 @@ }
     _scrollFrom = new Point(scrollPanel.scrollLeft, scrollPanel.scrollTop);
-    _dragImage = _dragImage || new Image(); //ignore jslint
+    _dragImage = _dragImage || new Image(); 
     event.dataTransfer.setDragImage(_dragImage, 0, 0);
@@ -659,0 +659,0 @@ }

src/configs/OrgConfig.js

@@ -692,2 +692,11 @@ import {NavigationMode, PageFitMode, Visibility, OrientationType, VerticalAlignmentType,
   /**
+   * Enables cross branch nodes alignment. Places the same type of nodes across all branches of the diagram at the same level.
+   * 
+   * @group Auto Layout
+   * @type {boolean}
+   */
+   this.alignBranches = false;
+
+
+  /**
    * Sets default formation of child nodes. By default all children that belong to a parent node are always aligned 
@@ -694,0 +703,0 @@ * below and placed in a horizontal line. On a large scale this may result in the end user having to scroll screens

src/connectors/VerticalConnectorBundle.js

@@ -106,3 +106,3 @@ import BaseConnectorBundle from './BaseConnectorBundle';
     topCenterPoint = new this.ConnectorDestination({
-      id: (children.length == 0 ? this.dotId : this.getId(data)),
+      id: (children.length == 0 && this.dotId ? this.dotId : this.getId(data)),
       x: parentHorizontalCenter,
@@ -117,3 +117,3 @@ y: parentsConnectorOffset
     bottomCenterPoint = new this.ConnectorDestination({
-      id: (parents.length == 0 ? this.dotId : this.getId(data)),
+      id: (parents.length == 0 && this.dotId ?  this.dotId : this.getId(data)),
       x: parentHorizontalCenter,
@@ -120,0 +120,0 @@ y: childrenConnectorOffset

src/FamPdfkitTaskManagerFactory.js

@@ -127,4 +127,2 @@ import FamConfig from './configs/FamConfig';
 
-  tasks.addDependency('isFamilyChartMode', true);/* in regular org diagram we hide branch if it contains only invisible nodes, 
-  in the family chart we use invisible items to draw connectors across multiple levels */
   tasks.addDependency('showElbowDots', true);/* in regular org chart we don;t have situations when connector lines cross, but we have such situations in 
@@ -224,3 +222,3 @@ family tree so we need extra visual attribute to distinguish intersections between connectors */
 
-  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'null', 'ItemsPositionsTask', 'isFamilyChartMode'], AlignDiagramTask, Colors.Red);
+  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'null', 'ItemsPositionsTask'], AlignDiagramTask, Colors.Red);
   tasks.addTask('CreateTransformTask', ['OrientationOptionTask', 'ScaleOptionTask', 'AlignDiagramTask'], CreateTransformTask, Colors.Cyan);
@@ -227,0 +225,0 @@

src/FamTaskManagerFactory.js

@@ -146,4 +146,2 @@ import FamConfig from './configs/FamConfig';
 
-  tasks.addDependency('isFamilyChartMode', true);/* in regular org diagram we hide branch if it contains only invisible nodes, 
-    in the family chart we use invisible items to draw connectors across multiple levels */
   tasks.addDependency('showElbowDots', true);/* in regular org chart we don;t have situations when connector lines cross, but we have such situations in 
@@ -275,3 +273,3 @@ family tree so we need extra visual attribute to distinguish intersections betwen connectors */
 
-  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'ActiveItemsTask', 'ItemsPositionsTask', 'isFamilyChartMode'], AlignDiagramTask, Colors.Red);
+  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'ActiveItemsTask', 'ItemsPositionsTask'], AlignDiagramTask, Colors.Red);
   tasks.addTask('CreateTransformTask', ['OrientationOptionTask', 'ScaleOptionTask', 'AlignDiagramTask'], CreateTransformTask, Colors.Cyan);
@@ -278,0 +276,0 @@

src/models/OrgItem.js

@@ -12,3 +12,2 @@ import { ItemType, AdviserPlacementType, ChildrenPlacementType, Enabled } from '../enums';
   this.isActive = true; // If it is true then item is clickable in hierarchy. 
-  this.hasVisibleChildren = false; // If it is true then item is Visible or one of its children in hierarchy. 
 
@@ -15,0 +14,0 @@ this.itemType = ItemType.Regular; // This property defines how item should be placed in chart.

src/models/TreeItem.js

@@ -10,3 +10,2 @@ import { Visibility } from '../enums';
   this.visualAggregatorId = null;
-  this.visualDepth = 1; // private 
 
@@ -13,0 +12,0 @@ this.partners = []; /* nodes connected with bottom line together into one family, family is group of items having common set of children */

src/OrgPdfkitTaskManagerFactory.js

@@ -105,3 +105,2 @@ import OrgConfig from './configs/OrgConfig';
 
-  tasks.addDependency('isFamilyChartMode', false);
   tasks.addDependency('showElbowDots', false);
@@ -157,3 +156,3 @@ tasks.addDependency('null', null);
   
-  tasks.addTask('VisualTreeTask', ['OrgTreeTask', 'null', 'VisualTreeOptionTask', 'isFamilyChartMode'], VisualTreeTask, Colors.Red);
+  tasks.addTask('VisualTreeTask', ['OrgTreeTask', 'null', 'VisualTreeOptionTask'], VisualTreeTask, Colors.Red);
   tasks.addTask('VisualTreeLevelsTask', ['VisualTreeTask', 'ItemTemplateParamsTask'], VisualTreeLevelsTask, Colors.Red);
@@ -180,3 +179,3 @@ tasks.addTask('ExtractNestedLayoutsTask', ['OptionsTask'], ExtractNestedLayoutsTask, Colors.Red);
 
-  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'null', 'ItemsPositionsTask', 'isFamilyChartMode'], AlignDiagramTask, Colors.Red);
+  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'null', 'ItemsPositionsTask'], AlignDiagramTask, Colors.Red);
   tasks.addTask('CreateTransformTask', ['OrientationOptionTask', 'ScaleOptionTask', 'AlignDiagramTask'], CreateTransformTask, Colors.Cyan);
@@ -183,0 +182,0 @@

src/OrgTaskManagerFactory.js

@@ -128,3 +128,2 @@ import TaskManager from './managers/TaskManager';
 
-  tasks.addDependency('isFamilyChartMode', false);
   tasks.addDependency('showElbowDots', false);
@@ -185,3 +184,3 @@ tasks.addDependency('null', null);
 
-  tasks.addTask('VisualTreeTask', ['OrgTreeTask', 'ActiveItemsTask', 'VisualTreeOptionTask', 'isFamilyChartMode'], VisualTreeTask, Colors.Red);
+  tasks.addTask('VisualTreeTask', ['OrgTreeTask', 'ActiveItemsTask', 'VisualTreeOptionTask'], VisualTreeTask, Colors.Red);
   tasks.addTask('VisualTreeLevelsTask', ['VisualTreeTask', 'ItemTemplateParamsTask'], VisualTreeLevelsTask, Colors.Red);
@@ -238,3 +237,3 @@ tasks.addTask('ExtractNestedLayoutsTask', ['OptionsTask'], ExtractNestedLayoutsTask, Colors.Red);
 
-  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'ActiveItemsTask', 'ItemsPositionsTask', 'isFamilyChartMode'], AlignDiagramTask, Colors.Red);
+  tasks.addTask('AlignDiagramTask', ['OrientationOptionTask', 'ItemsSizesOptionTask', 'VisualTreeOptionTask', 'ScaleOptionTask', 'CurrentControlSizeTask', 'ActiveItemsTask', 'ItemsPositionsTask'], AlignDiagramTask, Colors.Red);
   tasks.addTask('CreateTransformTask', ['OrientationOptionTask', 'ScaleOptionTask', 'AlignDiagramTask'], CreateTransformTask, Colors.Cyan);
@@ -241,0 +240,0 @@

src/tasks/layout/AlignDiagramTask.js

@@ -10,3 +10,3 @@ import Size from '../../graphics/structs/Size';
 export default function AlignDiagramTask(orientationOptionTask, itemsSizesOptionTask, visualTreeOptionTask, scaleOptionTask,
-  currentControlSizeTask, activeItemsTask, itemsPositionsTask, isFamilyChartMode) {
+  currentControlSizeTask, activeItemsTask, itemsPositionsTask) {
   var _data = {
@@ -78,16 +78,12 @@ treeItemsPositions: {}, // TreeItemPosition();
     var offset;
-    if (isFamilyChartMode) {
-      offset = (panelWidth - treeWidth) / 2.0;
-    } else {
-      switch (horizontalAlignment) {
-        case HorizontalAlignmentType.Left:
-          offset = 0;
-          break;
-        case HorizontalAlignmentType.Right:
-          offset = panelWidth - treeWidth;
-          break;
-        case HorizontalAlignmentType.Center:
-          offset = (panelWidth - treeWidth) / 2.0;
-          break;
-      }
+    switch (horizontalAlignment) {
+      case HorizontalAlignmentType.Left:
+        offset = 0;
+        break;
+      case HorizontalAlignmentType.Right:
+        offset = panelWidth - treeWidth;
+        break;
+      case HorizontalAlignmentType.Center:
+        offset = (panelWidth - treeWidth) / 2.0;
+        break;
     }
@@ -94,0 +90,0 @@ translateItemPositions(treeItemsPositions, offset, 0);

src/tasks/options/OrgVisualTreeOptionTask.js

@@ -11,2 +11,3 @@ import ValueReader from '../../readers/ValueReader';
   var _dataTemplate = new ObjectReader({
+    alignBranches: new ValueReader(["boolean"], false, defaultConfig.alignBranches),
     leavesPlacementType: new EnumerationReader(ChildrenPlacementType, false, defaultConfig.leavesPlacementType),
@@ -13,0 +14,0 @@ childrenPlacementType: new EnumerationReader(ChildrenPlacementType, false, defaultConfig.childrenPlacementType),

src/tasks/renders/DrawMinimizedItemsTask.js

@@ -113,3 +113,3 @@ import Rect from '../../graphics/structs/Rect';
                   polyline = markers.getPolyline(paletteItems[itemTitleColor]);
-                  polyline.addSegment(new DotSegment(x - 2, y - 2, 4, 4, 2));
+                  polyline.addSegment(new DotSegment(x - 4, y - 4, 8, 8, 4));
                 }
@@ -132,2 +132,2 @@ break;
   };
-};
+};

src/tasks/transformations/layouts/OrgLayout.js

@@ -195,5 +195,2 @@ import Rect from '../../../graphics/structs/Rect';
 
-    if(treeItemId == 0) {
-      var i = 2;
-    }
     childLayoutsPositions[treeItemId] = new ChildLayoutPosition(0,  leftPadding, treeItemPadding);
@@ -200,0 +197,0 @@ var childLayoutPosition = childLayoutsPositions[treeItemId];

src/tasks/transformations/selection/OrgCursorNeighboursTask.js

@@ -21,3 +21,3 @@ import { Visibility } from '../../../enums';
       navigationFamily.loopNeighbours(this, cursorTreeItemId, function (treeItemId, treeItem, distance) {
-        if (treeItem.visibility === Visibility.Auto) {
+        if (treeItem.isVisible) {
           result.push(treeItemId);
@@ -24,0 +24,0 @@ }

src/tasks/transformations/VisualTreeLevelsTask.js

@@ -45,3 +45,3 @@ import TreeLevelConnectorStackSize from '../../models/TreeLevelConnectorStackSize';
       itemPosition,
-      bundle, bundlesToStack, bundlesByItemmId = {},
+      bundle, bundlesToStack, bundlesByItemId = {},
       startIndex, endIndex, stackSegments;
@@ -58,3 +58,3 @@
         var parents = [];
-        if (!bundlesByItemmId.hasOwnProperty(itemid)) {
+        if (!bundlesByItemId.hasOwnProperty(itemid)) {
           if (treeItem.connectorPlacement & SideFlag.Bottom) {
@@ -69,3 +69,3 @@ parents.push(itemid);
             for (var index = 0, len = parents.length; index < len; index += 1) {
-              bundlesByItemmId[parents[index]] = bundle;
+              bundlesByItemId[parents[index]] = bundle;
             }
@@ -72,0 +72,0 @@

src/tasks/transformations/VisualTreeTask.js

 import Family from '../../algorithms/Family';
 import Tree from '../../algorithms/Tree';
-import { SideFlag, Visibility, HorizontalAlignmentType, AdviserPlacementType, 
-  Enabled, ChildrenPlacementType, ItemType } from '../../enums';
-import TreeItem from '../../models/TreeItem';
+import VisualTreeBuilder from './visualTreeBuilder/VisualTreeBuilder';
 
-/* method uses structures created in orgTreeTask to create visual tree used to render chart
-  It populates visualTree structure with TreeItem objects.
-  
-  1. Create invisible visual root item, so all orphans added to it, but since it is invisible, no connections are going to be drawn between them
-  2. Loop orgTree nodes and populate visual tree hierarchy: visualTree
-*/
-export default function VisualTreeTask(orgTreeTask, activeItemsTask, visualTreeOptionTask, isFamilyChartMode) {
-  var _data = {
-    visualTree: null, /* Tree(); key: TreeItem.id value: TreeItem */
-    leftMargins: {},
-    rightMargins: {},
-    navigationFamily: null /* Family structure where key: TreeItem.id and value: TreeItem */
-  },
+export default function VisualTreeTask(orgTreeTask, activeItemsTask, visualTreeOptionTask) {
+  var _visualTree, /* Tree(); key: TreeItem.id value: TreeItem */
+    _leftMargins,
+    _rightMargins,
+    _navigationFamily, /* Family structure where key: TreeItem.id and value: TreeItem */
     _treeItemCounter,
-    _activeItems;
+    _visualTreeBuilder = VisualTreeBuilder();
 
   function process() {
-    var orgTree = orgTreeTask.getOrgTree(),
-      options = visualTreeOptionTask.getOptions();
+    var orgTree = orgTreeTask.getOrgTree();
+    var options = visualTreeOptionTask.getOptions();
+    var activeItems = activeItemsTask != null ? activeItemsTask.getActiveItems() : {};
 
-    _activeItems = activeItemsTask != null ? activeItemsTask.getActiveItems() : {};
-
-    _data.visualTree = Tree();
-    _data.navigationFamily = Family();
-
     _treeItemCounter = orgTreeTask.getMaximumId();
 
     if (orgTree.hasNodes()) {
-      createVisualTreeItems(orgTree, options, _data.visualTree);
+      ({ 
+        visualTree: _visualTree, 
+        navigationFamily: _navigationFamily,
+        treeItemCounter: _treeItemCounter 
+      } = _visualTreeBuilder.build(orgTree, _treeItemCounter, activeItems, options));
+    } else {
+      _visualTree = Tree();
+      _navigationFamily = Family();
     }
 
+    ({
+      leftMargins: _leftMargins,
+      rightMargins: _rightMargins
+    } = getVisualTreeMargins(_visualTree));
 
-    _data.leftMargins = {},
-      _data.rightMargins = {};
-    updateVisualTreeMargins(_data.visualTree, _data.leftMargins, _data.rightMargins);
-
     return true;
   }
 
-  function createVisualTreeItems(orgTree, options, visualTree) {
-    var treeItem,
-      visualParent,
-      visualAggregator,
-      leftSiblingIndex,
-      rightSiblingIndex,
-      index, len,
-      item,
-      childIndex,
-      childrenLen,
-      depth,
-      rowDepths,
-      rowDepth,
-      rowAggregators = {},
-      rowAggregator,
-      rowChildren = {},
-      children,
-      leftSiblingOffset,
-      rightSiblingOffset,
-      partners = {}, tempPartners;
-
-
-    /* org tree item has visible children */
-    orgTree.loopPostOrder(this, function (nodeid, node, parentid, parent) {
-      node.hasVisibleChildren = node.isVisible || node.hasVisibleChildren;
-      if (parent != null) {
-        parent.hasVisibleChildren = parent.hasVisibleChildren || node.hasVisibleChildren;
-      }
-    });
-
-    orgTree.loopLevels(this, function (parentOrgItemId, parentOrgItem, levelid) {
-      var logicalParentItem,
-        regularChildrenLevels,
-        shiftParent;
-      if (!isFamilyChartMode && !parentOrgItem.hasVisibleChildren) {
-        return orgTree.SKIP;
-      }
-
-      logicalParentItem = visualTree.node(parentOrgItemId);
-      if (!logicalParentItem) {
-        logicalParentItem = getNewTreeItem({
-          visibility: Visibility.Invisible,
-          connectorPlacement: 0,
-          parentId: null,
-          actualItemType: ItemType.Regular
-        }, parentOrgItem);
-        visualTree.add(null, parentOrgItemId, logicalParentItem);
-      }
-
-      /* find left and right siblings margins of logical parent item
-        they are needed to properly place GeneralPartner & LimitedPartner nodes. */
-      leftSiblingOffset = 0;
-      rightSiblingOffset = 0;
-      if ((index = visualTree.indexOf(parentOrgItemId)) != null) {
-        leftSiblingOffset = index;
-        rightSiblingOffset = visualTree.countSiblings(parentOrgItemId) - index - 1;
-      }
-
-      /* populate children */
-      regularChildrenLevels = []; /* children added after all other custom item types */
-      orgTree.loopChildren(this, parentOrgItemId, function (orgItemId, orgItem, index) {
-        if (isFamilyChartMode || orgItem.hasVisibleChildren) {
-          treeItem = getNewTreeItem({
-            parentId: parentOrgItemId,
-            actualItemType: orgItem.itemType
-          }, orgItem);
-
-          switch (logicalParentItem.actualItemType) {
-            case ItemType.LimitedPartner:
-            case ItemType.AdviserPartner:
-            case ItemType.GeneralPartner:
-              switch (treeItem.actualItemType) {
-                case ItemType.LimitedPartner:
-                case ItemType.AdviserPartner:
-                case ItemType.GeneralPartner:
-                  /* Don't support partner of partner */
-                  treeItem.actualItemType = ItemType.Adviser;
-                  break;
-                case ItemType.Regular:
-                  /* Don't support regular children of partner */
-                  treeItem.actualItemType = ItemType.Assistant;
-                  break;
-              }
-              break;
-          }
-
-          switch (treeItem.actualItemType) {
-            case ItemType.SubAdviser:
-              defineNavigationParent(logicalParentItem, treeItem);
-              treeItem.connectorPlacement = SideFlag.Top | SideFlag.Bottom;
-              shiftParent = getNewTreeItem({ visibility: Visibility.Invisible });
-              visualTree.add(shiftParent.id, treeItem.id, treeItem);
-              treeItem = shiftParent;//ignore jslint
-            case ItemType.AdviserPartner://ignore jslint
-            case ItemType.Adviser://ignore jslint
-              visualParent = visualTree.parent(parentOrgItemId);
-              if (logicalParentItem.connectorPlacement & SideFlag.Right) {
-                leftSiblingIndex = findLeftSiblingIndex(visualTree, _data.navigationFamily, logicalParentItem);
-                visualTree.add(visualParent.id, treeItem.id, treeItem, leftSiblingIndex + 1);
-                treeItem.connectorPlacement = SideFlag.Right | SideFlag.Bottom;
-                treeItem.gravity = HorizontalAlignmentType.Right;
-              } else if (logicalParentItem.connectorPlacement & SideFlag.Left) {
-                rightSiblingIndex = findRightSiblingIndex(visualTree, _data.navigationFamily, logicalParentItem);
-                visualTree.add(visualParent.id, treeItem.id, treeItem, rightSiblingIndex);
-                treeItem.connectorPlacement = SideFlag.Left | SideFlag.Bottom;
-                treeItem.gravity = HorizontalAlignmentType.Left;
-              } else {
-                switch (orgItem.adviserPlacementType) {
-                  case AdviserPlacementType.Left:
-                    leftSiblingIndex = findLeftSiblingIndex(visualTree, _data.navigationFamily, logicalParentItem);
-                    visualTree.add(visualParent.id, treeItem.id, treeItem, leftSiblingIndex + 1);
-                    treeItem.connectorPlacement = SideFlag.Right | SideFlag.Bottom;
-                    treeItem.gravity = HorizontalAlignmentType.Right;
-                    break;
-                  default:
-                    rightSiblingIndex = findRightSiblingIndex(visualTree, _data.navigationFamily, logicalParentItem);
-                    visualTree.add(visualParent.id, treeItem.id, treeItem, rightSiblingIndex);
-                    treeItem.connectorPlacement = SideFlag.Left | SideFlag.Bottom;
-                    treeItem.gravity = HorizontalAlignmentType.Left;
-                    break;
-                }
-              }
-
-              switch (treeItem.actualItemType) {
-                case ItemType.SubAdviser:
-                  break;
-                case ItemType.AdviserPartner:
-                  if (logicalParentItem.parentId != null) {
-                    defineNavigationParent(visualTree.node(logicalParentItem.parentId), treeItem);
-                  } else {
-                    defineNavigationParent(logicalParentItem, treeItem, true);
-                  }
-                  break;
-                case ItemType.Adviser:
-                  defineNavigationParent(logicalParentItem, treeItem);
-                  break;
-              }
-              break;
-            case ItemType.SubAssistant:
-              defineNavigationParent(logicalParentItem, treeItem);
-              treeItem.connectorPlacement = SideFlag.Top | SideFlag.Bottom;
-              shiftParent = getNewTreeItem({ visibility: Visibility.Invisible });
-              visualTree.add(shiftParent.id, treeItem.id, treeItem);
-              treeItem = shiftParent;//ignore jslint
-            case ItemType.Assistant://ignore jslint
-              var parent = createNewVisualAggregatorWithGivenDepth(visualTree, logicalParentItem, false, false, orgItem.levelOffset || 0);
-              switch (orgItem.adviserPlacementType) {
-                case AdviserPlacementType.Left:
-                  visualTree.add(parent.id, treeItem.id, treeItem, 0);
-                  treeItem.connectorPlacement = SideFlag.Right | SideFlag.Bottom;
-                  treeItem.gravity = HorizontalAlignmentType.Right;
-                  break;
-                default:
-                  visualTree.add(parent.id, treeItem.id, treeItem);
-                  treeItem.connectorPlacement = SideFlag.Left | SideFlag.Bottom;
-                  treeItem.gravity = HorizontalAlignmentType.Left;
-                  break;
-              }
-              if (treeItem.actualItemType == ItemType.Assistant) {
-                defineNavigationParent(logicalParentItem, treeItem);
-              }
-              break;
-            case ItemType.Regular:
-              var levelOffset = orgItem.levelOffset || 0;
-              if (regularChildrenLevels[levelOffset] == null) {
-                regularChildrenLevels[levelOffset] = [treeItem];
-              } else {
-                regularChildrenLevels[levelOffset].push(treeItem);
-              }
-              defineNavigationParent(logicalParentItem, treeItem);
-              break;
-            case ItemType.LimitedPartner:
-            case ItemType.GeneralPartner:
-              visualParent = visualTree.parent(parentOrgItemId);
-              if (logicalParentItem.connectorPlacement & SideFlag.Right) {
-                visualTree.add(visualParent.id, treeItem.id, treeItem, leftSiblingOffset);
-                treeItem.connectorPlacement = SideFlag.Right | SideFlag.Bottom;
-                treeItem.gravity = HorizontalAlignmentType.Right;
-              } else if (logicalParentItem.connectorPlacement & SideFlag.Left) {
-                visualTree.add(visualParent.id, treeItem.id, treeItem, visualTree.countChildren(visualParent.id) - rightSiblingOffset);
-                treeItem.connectorPlacement = SideFlag.Left | SideFlag.Bottom;
-                treeItem.gravity = HorizontalAlignmentType.Left;
-              } else {
-                switch (orgItem.adviserPlacementType) {
-                  case AdviserPlacementType.Left:
-                    visualTree.add(visualParent.id, treeItem.id, treeItem, leftSiblingOffset);
-                    treeItem.gravity = HorizontalAlignmentType.Right;
-                    break;
-                  default:
-                    visualTree.add(visualParent.id, treeItem.id, treeItem, visualTree.countChildren(visualParent.id) - rightSiblingOffset);
-                    treeItem.gravity = HorizontalAlignmentType.Left;
-                    break;
-                }
-                switch (treeItem.actualItemType) {
-                  case ItemType.GeneralPartner:
-                    treeItem.connectorPlacement = SideFlag.Top | SideFlag.Bottom;
-                    break;
-                  case ItemType.LimitedPartner:
-                    treeItem.connectorPlacement = SideFlag.Bottom;
-                    break;
-                }
-              }
-              if (logicalParentItem.parentId != null) {
-                defineNavigationParent(visualTree.node(logicalParentItem.parentId), treeItem);
-              } else {
-                defineNavigationParent(logicalParentItem, treeItem, true);
-              }
-              break;
-          }
-        }
-      });
-
-      /* collect partners, add logicalParentItem into partners collection */
-      switch (logicalParentItem.actualItemType) {
-        case ItemType.LimitedPartner:
-        case ItemType.AdviserPartner:
-        case ItemType.GeneralPartner:
-          break;
-        default:
-          tempPartners = [];
-          if ((visualParent = visualTree.parent(parentOrgItemId)) != null) {
-            visualTree.loopChildrenRange(this, visualParent.id, leftSiblingOffset, visualTree.countChildren(visualParent.id) - rightSiblingOffset, function (childItemId, childItem, index) {
-              if (childItem.id == parentOrgItemId) {
-                tempPartners.push(childItem);
-              } else {
-                switch (childItem.actualItemType) {
-                  case ItemType.LimitedPartner:
-                  case ItemType.AdviserPartner:
-                  case ItemType.GeneralPartner:
-                    if (orgTree.parentid(childItem.id) == parentOrgItemId) {
-                      tempPartners.push(childItem);
-                    }
-                    break;
-                }
-              }
-            });
-          }
-          if (tempPartners.length > 1) {
-            partners[parentOrgItemId] = tempPartners;
-          }
-          break;
-      }
-
-      rowAggregators[parentOrgItemId] = [];
-      rowChildren[parentOrgItemId] = [];
-
-      var aggregators = [];
-      if (regularChildrenLevels.length > 0) {
-        visualParent = getLastVisualAggregator(visualTree, logicalParentItem);
-        for (var indexLevel = 0; indexLevel < regularChildrenLevels.length - 1; indexLevel += 1) {
-          var regularChildrenLevel = regularChildrenLevels[indexLevel] || [];
-          if (regularChildrenLevel != null) {
-            var hideChildConnector = (logicalParentItem.visibility == Visibility.Invisible) && (logicalParentItem.connectorPlacement === 0);
-            var nextVisualParent = createNewVisualAggregator(visualTree, visualParent, hideChildConnector);
-
-            aggregators.push([nextVisualParent]);
-
-
-            var medianIndex = 0;
-            switch (options.horizontalAlignment) {
-              case HorizontalAlignmentType.Center:
-                medianIndex = Math.ceil(regularChildrenLevel.length / 2) - 1;
-                break;
-              case HorizontalAlignmentType.Left:
-                medianIndex = -1;
-                break;
-              case HorizontalAlignmentType.Right:
-                medianIndex = regularChildrenLevel.length - 1;
-                break;
-            }
-
-            for (index = medianIndex; index >= 0; index -= 1) {
-              item = regularChildrenLevel[index];
-              visualTree.add(visualParent.id, item.id, item, 0);
-              item.connectorPlacement = SideFlag.Top | SideFlag.Bottom;
-              item.gravity = HorizontalAlignmentType.Right;
-            }
-
-            for (index = medianIndex + 1; index < regularChildrenLevel.length; index += 1) {
-              item = regularChildrenLevel[index];
-              visualTree.add(visualParent.id, item.id, item);
-              item.connectorPlacement = SideFlag.Top | SideFlag.Bottom;
-              item.gravity = HorizontalAlignmentType.Left;
-            }
-
-            visualParent = nextVisualParent;
-          }
-        }
-
-        /* add children */
-        var regularChildren = regularChildrenLevels[regularChildrenLevels.length - 1];
-        layoutChildren(orgTree, visualTree, options, logicalParentItem, regularChildren, parentOrgItem.childrenPlacementType, rowAggregators[parentOrgItemId], rowChildren[parentOrgItemId]);
-
-        rowAggregators[parentOrgItemId] = rowAggregators[parentOrgItemId].concat(aggregators);
-        rowChildren[parentOrgItemId] = rowChildren[parentOrgItemId].concat(regularChildrenLevels.slice(0, regularChildrenLevels.length - 1));
-      }
-    });
-
-    /* transform tree to place children sub branches inside of hierarchy */
-    orgTree.loopPostOrder(this, function (nodeid, node, parentid, parent) {
-      var logicalParentItem = visualTree.node(nodeid),
-        itemRowChildren,
-        itemRowAggregators,
-        hasChildren,
-        hasPartners = (partners[parentid] != null),
-        extendChildren;
-      if (logicalParentItem != null) {
-        itemRowChildren = rowChildren[nodeid];
-        itemRowAggregators = rowAggregators[nodeid];
-
-        /* Move assistants children inside */
-        if (parent != null) {
-          extendChildren = hasPartners;
-          switch (parent.placeAssistantsAboveChildren) {
-            case Enabled.Auto:
-              if (options.placeAssistantsAboveChildren) {
-                extendChildren = true;
-              }
-              break;
-            case Enabled.True:
-              extendChildren = true;
-              break;
-          }
-
-          if (extendChildren) {
-            depth = getAssistantsDepth(visualTree, logicalParentItem);
-            if (depth > 0) {
-              logicalParentItem.visualDepth = depth + 1;
-              if (logicalParentItem.visualAggregatorId !== null) {
-                visualAggregator = visualTree.node(logicalParentItem.visualAggregatorId);
-                hasChildren = visualTree.hasChildren(visualAggregator.id);
-                for (index = 0; index < depth - 1; index += 1) {
-                  visualAggregator = createNewVisualAggregator(visualTree, visualAggregator, !hasChildren);
-                }
-              }
-            }
-          }
-        }
-        /* Move advisers children inside */
-        if (parent != null) {
-          extendChildren = hasPartners;
-          switch (parent.placeAdvisersAboveChildren) {
-            case Enabled.Auto:
-              if (options.placeAdvisersAboveChildren) {
-                extendChildren = true;
-              }
-              break;
-            case Enabled.True:
-              extendChildren = true;
-              break;
-          }
-          if (extendChildren) {
-            depth = getAdvisersDepth(visualTree, logicalParentItem);
-            if (depth > 1) {
-              logicalParentItem.visualDepth += (depth - 1);
-              hasChildren = visualTree.hasChildren(nodeid);
-              visualAggregator = logicalParentItem;
-              for (index = 0; index < depth - 1; index += 1) {
-                visualAggregator = createNewVisualAggregator(visualTree, visualAggregator, !hasChildren);
-              }
-            }
-          }
-        }
-        /* Move children of children inside */
-        rowDepths = [];
-        for (index = 0, len = itemRowChildren.length; index < len; index += 1) {
-          children = itemRowChildren[index];
-          rowDepths[index] = 0;
-          if(children != null) {
-            for (childIndex = 0, childrenLen = children.length; childIndex < childrenLen; childIndex += 1) {
-              rowDepths[index] = Math.max(rowDepths[index], getItemDepth(visualTree, children[childIndex]));
-            }
-          }
-        }
-
-        for (index = 0, len = rowDepths.length; index < len; index += 1) {
-          rowDepth = rowDepths[index];
-          if (rowDepth > 1) {
-            for (childIndex = 0, childrenLen = itemRowAggregators[index].length; childIndex < childrenLen; childIndex += 1) {
-              rowAggregator = itemRowAggregators[index][childIndex];
-              if (visualTree.hasChildren(rowAggregator.id)) {
-                depth = rowDepth;
-                while (depth > 1) {
-                  rowAggregator = createNewVisualAggregator(visualTree, rowAggregator, false);
-                  depth -= 1;
-                }
-              }
-            }
-          }
-        }
-
-        /* Align heights of partner branches in order to draw connector lines between them and logical parent children */
-        if (partners[nodeid] != null) {
-          /* partners collection includes treeItem so we should have at least 2 items */
-          layoutPartners(visualTree, logicalParentItem, partners[nodeid]);
-        }
-      }
-    });
-  }
-
-  function layoutPartners(visualTree, treeItem, partners) {
-    var partner,
-      index, len,
-      depth,
-      maxDepth = 0,
-      visualPartners = [],
-      visualPartner,
-      visualParent,
-      visualAggregator,
-      leftSiblingIndex,
-      gravity;
-
-    /* Find maximum depth required to enclose partners branches */
-    for (index = 0, len = partners.length; index < len; index += 1) {
-      partner = partners[index];
-      maxDepth = Math.max(maxDepth, partner.visualDepth);
-    }
-
-    /* Extend visual aggregators lines and ensure that connector lines are visible */
-    for (index = 0, len = partners.length; index < len; index += 1) {
-      partner = partners[index];
-      visualPartner = getLastVisualAggregator(visualTree, partner);
-      depth = 1;
-      visualAggregator = partner;
-      while (visualAggregator.visualAggregatorId != null) {
-        visualAggregator = visualTree.node(visualAggregator.visualAggregatorId);
-        visualAggregator.connectorPlacement = SideFlag.Top | SideFlag.Bottom;
-        depth += 1;
-      }
-      while (depth < maxDepth) {
-        visualPartner = createNewVisualAggregator(visualTree, visualPartner, false);
-        depth += 1;
-      }
-      visualPartners.push(getLastVisualAggregator(visualTree, visualPartner).id);
-    }
-
-
-    visualAggregator = getLastVisualAggregator(visualTree, treeItem);
-    if (visualTree.hasChildren(visualAggregator.id)) {
-      /* Select middle partner */
-      visualPartner = partners[Math.floor(partners.length / 2)];
-      if (partners.length > 1 && partners.length % 2 === 0) {
-        /* insert invisble partner for alignemnt */
-        visualParent = visualTree.parent(visualPartner.id);
-        leftSiblingIndex = findLeftSiblingIndex(visualTree, _data.navigationFamily, visualPartner);
-
-        gravity = visualTree.getChild(visualParent.id, leftSiblingIndex).gravity ||
-          visualTree.getChild(visualParent.id, leftSiblingIndex + 1).gravity;
-
-        // visualParent.id,
-        visualPartner = getNewTreeItem({
-          visibility: Visibility.Invisible,
-          connectorPlacement: visualPartner.connectorPlacement & (SideFlag.Left | SideFlag.Right),
-          gravity: gravity
-        });
-
-        visualTree.add(visualParent.id, visualPartner.id, visualPartner, leftSiblingIndex + 1);
-
-        depth = 1;
-        while (depth < maxDepth) {
-          visualPartner = createNewVisualAggregator(visualTree, visualPartner, false);
-          visualPartner.connectorPlacement = 0;
-          depth += 1;
-        }
-      }
-
-      /* every child logically belongs to every partner */
-      for (index = 0, len = partners.length; index < len; index += 1) {
-        partner = partners[index];
-        /* select all parents up to the root */
-        _data.navigationFamily.loopChildren(this, treeItem.id, function (childItemId, childItem, level) {
-          switch (childItem.actualItemType) {
-            case ItemType.SubAdviser:
-            case ItemType.Adviser:
-            case ItemType.SubAssistant:
-            case ItemType.Assistant:
-              break;
-            default:
-              /* partners share only regular items */
-              if (treeItem.id != partner.id) {
-                defineNavigationParent(partner, childItem);
-              }
-              break;
-          }
-          return _data.navigationFamily.SKIP;
-        }); //ignore jslint
-      }
-
-      /* Move children to new visual partner node */
-      visualPartner = getLastVisualAggregator(visualTree, visualPartner);
-      visualTree.moveChildren(visualAggregator.id, visualPartner.id);
-    }
-
-    /* Store collection of visual partners to draw connector lines*/
-    visualPartner.partners = visualPartners;
-  }
-
-  function getLastVisualAggregator(visualTree, treeItem) {
-    var result = treeItem;
-
-    while (result.visualAggregatorId != null) {
-      result = visualTree.node(result.visualAggregatorId);
-    }
-    return result;
-  }
-
-  function getAdvisersDepth(visualTree, treeItem) {
-    var result = 0,
-      parentItem = visualTree.parent(treeItem.id),
-      treeItemIndex,
-      position,
-      childItem;
-    if (parentItem !== null) {
-      treeItemIndex = visualTree.indexOf(treeItem.id);
-
-      position = 1;
-      while ((childItem = visualTree.getChild(parentItem.id, treeItemIndex + position)) != null) {
-        if (childItem.connectorPlacement & SideFlag.Left) {
-          result = Math.max(result, getItemDepth(visualTree, childItem));
-          position += 1;
-        }
-        else {
-          break;
-        }
-      }
-      position = 1;
-      while ((childItem = visualTree.getChild(parentItem.id, treeItemIndex - position)) != null) {
-        if (childItem.connectorPlacement & SideFlag.Right) {
-          result = Math.max(result, getItemDepth(visualTree, childItem));
-          position += 1;
-        }
-        else {
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  function getAssistantsDepth(visualTree, treeItem) {
-    var result = 0;
-    if (treeItem.visualAggregatorId != null) {
-      visualTree.loopLevels(this, treeItem.id, function (childItemId, childItem, level) {
-        if (treeItem.visualAggregatorId == childItemId) {
-          return visualTree.SKIP;
-        }
-        result = level + 1;
-      });
-    }
-    return result;
-  }
-
-  function getItemDepth(visualTree, treeItem) {
-    var result = 0;
-    visualTree.loopLevels(this, treeItem.id, function (childid, child, level) {
-      result = level + 1;
-    });
-    return result + 1;
-  }
-
-  function layoutChildren(orgTree, visualTree, options, treeItem, regularChildren, childrenPlacementType, rowAggregators, rowChildren) {
-    var visualParent,
-      currentVisualParent,
-      leftChildItem,
-      rightChildItem,
-      newAggregatorItem,
-      childItem, orgChildItem,
-      width,
-      height,
-      twinColumns,
-      column,
-      row,
-      index, len,
-      singleItemPlacement,
-      hideParentConnector = (treeItem.visibility == Visibility.Invisible) && (treeItem.connectorPlacement === 0);
-
-    switch (options.horizontalAlignment) {
-      case HorizontalAlignmentType.Center:
-      case HorizontalAlignmentType.Left:
-        singleItemPlacement = AdviserPlacementType.Right;
-        break;
-      case HorizontalAlignmentType.Right:
-        singleItemPlacement = AdviserPlacementType.Left;
-        break;
-    }
-
-    if (childrenPlacementType === ChildrenPlacementType.Auto) {
-      if (hasRegularLeavesOnly(orgTree, treeItem)) {
-        childrenPlacementType = (options.leavesPlacementType === ChildrenPlacementType.Auto) ?
-          ChildrenPlacementType.Matrix : options.leavesPlacementType;
-      }
-      else {
-        childrenPlacementType = (options.childrenPlacementType === ChildrenPlacementType.Auto) ?
-          ChildrenPlacementType.Horizontal : options.childrenPlacementType;
-      }
-    }
-
-    visualParent = getLastVisualAggregator(visualTree, treeItem);
-
-    if (childrenPlacementType == ChildrenPlacementType.Matrix && regularChildren.length < 3) {
-      childrenPlacementType = ChildrenPlacementType.Horizontal;
-    }
-
-    switch (childrenPlacementType) {
-      case ChildrenPlacementType.Horizontal:
-        for (index = 0, len = regularChildren.length; index < len; index += 1) {
-          childItem = regularChildren[index];
-          orgChildItem = orgTree.node(childItem.id);
-          visualTree.add(visualParent.id, childItem.id, childItem);
-          childItem.connectorPlacement = (orgChildItem.hideParentConnection ? 0 : SideFlag.Top) | (orgChildItem.hideChildrenConnection ? 0 : SideFlag.Bottom);
-
-          if (index === 0) {
-            childItem.relationDegree = 1;
-          }
-        }
-        break;
-      case ChildrenPlacementType.Matrix:
-        width = Math.min(options.maximumColumnsInMatrix, Math.ceil(Math.sqrt(regularChildren.length)));
-        height = Math.ceil(regularChildren.length / width);
-        twinColumns = Math.ceil(width / 2.0);
-        for (column = 0; column < twinColumns; column += 1) {
-          currentVisualParent = visualParent;
-          for (row = 0; row < height; row += 1) {
-            leftChildItem = getMatrixItem(regularChildren, column * 2, row, width);
-            rightChildItem = getMatrixItem(regularChildren, column * 2 + 1, row, width);
-            if (rowAggregators[row] === undefined) {
-              rowAggregators[row] = [];
-              rowChildren[row] = [];
-            }
-            if (leftChildItem !== null) {
-              if (column === 0) {
-                leftChildItem.relationDegree = 1;
-              }
-              visualTree.add(currentVisualParent.id, leftChildItem.id, leftChildItem);
-              leftChildItem.connectorPlacement = (hideParentConnector ? 0 : SideFlag.Right) | SideFlag.Bottom;
-              leftChildItem.gravity = HorizontalAlignmentType.Right;
-
-              rowChildren[row].push(leftChildItem);
-            }
-            if (leftChildItem !== null || rightChildItem !== null) {
-              // currentVisualParent.id,
-              newAggregatorItem = getNewTreeItem({
-                visibility: Visibility.Invisible,
-                connectorPlacement: hideParentConnector ? 0 : SideFlag.Top | SideFlag.Bottom
-              });
-              visualTree.add(currentVisualParent.id, newAggregatorItem.id, newAggregatorItem);
-              rowAggregators[row].push(newAggregatorItem);
-            }
-            if (rightChildItem !== null) {
-              visualTree.add(currentVisualParent.id, rightChildItem.id, rightChildItem);
-              rightChildItem.connectorPlacement = (hideParentConnector ? 0 : SideFlag.Left) | SideFlag.Bottom;
-              rightChildItem.gravity = HorizontalAlignmentType.Left;
-
-              rowChildren[row].push(rightChildItem);
-            }
-
-            currentVisualParent = newAggregatorItem;
-          }
-        }
-        if (width > 2) {
-          // No center alignment to aggregator required
-          visualParent.visualAggregatorId = null;
-        }
-        break;
-      case ChildrenPlacementType.Vertical:
-        for (index = 0, len = regularChildren.length; index < len; index += 1) {
-          childItem = regularChildren[index];
-
-          // visualParent.id,
-          newAggregatorItem = getNewTreeItem({
-            visibility: Visibility.Invisible,
-            connectorPlacement: hideParentConnector ? 0 : SideFlag.Top | SideFlag.Bottom
-          });
-
-
-          switch (singleItemPlacement) {
-            case AdviserPlacementType.Left:
-              visualTree.add(visualParent.id, childItem.id, childItem);
-              visualTree.add(visualParent.id, newAggregatorItem.id, newAggregatorItem);
-              childItem.connectorPlacement = (hideParentConnector ? 0 : SideFlag.Right) | SideFlag.Bottom;
-              childItem.gravity = HorizontalAlignmentType.Right;
-              break;
-            case AdviserPlacementType.Right:
-              visualTree.add(visualParent.id, newAggregatorItem.id, newAggregatorItem);
-              visualTree.add(visualParent.id, childItem.id, childItem);
-              childItem.connectorPlacement = (hideParentConnector ? 0 : SideFlag.Left) | SideFlag.Bottom;
-              childItem.gravity = HorizontalAlignmentType.Left;
-              break;
-          }
-
-          rowAggregators[index] = [newAggregatorItem];
-          rowChildren[index] = [childItem];
-
-          visualParent = newAggregatorItem;
-        }
-        break;
-      default:
-        throw "Children placement is undefined!";
-    }
-  }
-
-  function getMatrixItem(items, x, y, width) {
-    var result,
-      isOdd = (width % 2 > 0),
-      index;
-
-    if (isOdd) {
-      if (x === width - 1) {
-        x = items.length;
-      }
-      else if (x === width) {
-        x = width - 1;
-      }
-    }
-    index = y * width + x;
-
-    result = (index > items.length - 1) ? null : items[index];
-
-    return result;
-  }
-
-  function hasRegularLeavesOnly(orgTree, treeItem) {
-    var hasChildren = false,
-      hasLeavesOnly = true;
-
-    orgTree.loopChildren(this, treeItem.id, function (nodeid, node, index) {
-      hasChildren = true;
-      if (node.itemType === ItemType.Regular &&
-        orgTree.hasChildren(nodeid)) {
-        hasLeavesOnly = false;
-        return true; // break
-      }
-    });
-    return hasChildren && hasLeavesOnly;
-  }
-
-  /* Sibling is the first item which does not belongs to items logical hierarchy */
-  function findLeftSiblingIndex(visualTree, navigationFamily, treeItem) {
-    var result = null,
-      ignore = {},
-      visualParent = visualTree.parent(treeItem.id);
-
-    visualTree.loopChildrenReversed(this, visualParent.id, function (childItemId, childItem, index) {
-      if (result === null) {
-        if (childItemId == treeItem.id) {
-          result = -1;
-          ignore[treeItem.id] = true;
-          navigationFamily.loopChildren(this, treeItem.id, function (childid, child, level) {
-            if (level > 0) {
-              return navigationFamily.BREAK;
-            }
-            ignore[childid] = true;
-          });
-        }
-      }
-      else {
-        if (!ignore.hasOwnProperty(childItemId)) {
-          result = index;
-          return true; //ignore jslint
-        } else {
-          navigationFamily.loopChildren(this, childItem.id, function (childid, child, level) {
-            if (level > 0) {
-              return navigationFamily.BREAK;
-            }
-            ignore[childid] = true;
-          });
-        }
-      }
-    });
-
-    return result;
-  }
-
-  /* Sibling is the first item which does not belongs to items logical hierarchy */
-  function findRightSiblingIndex(visualTree, navigationFamily, treeItem) {
-    var result = null,
-      ignore = {},
-      visualParent = visualTree.parent(treeItem.id);
-
-    visualTree.loopChildren(this, visualParent.id, function (childItemId, childItem, index, lastIndex) {
-      if (result === null) {
-        if (childItemId == treeItem.id) {
-          result = lastIndex + 1;
-          ignore[treeItem.id] = true;
-          navigationFamily.loopChildren(this, treeItem.id, function (childid, child, level) {
-            if (level > 0) {
-              return navigationFamily.BREAK;
-            }
-            ignore[childid] = true;
-          });
-        }
-      }
-      else {
-        if (!ignore.hasOwnProperty(childItemId)) {
-          result = index;
-          return true; //ignore jslint
-        } else {
-          navigationFamily.loopChildren(this, childItemId, function (childid, child, level) {
-            if (level > 0) {
-              return navigationFamily.BREAK;
-            }
-            ignore[childid] = true;
-          });
-        }
-      }
-    });
-    return result;
-  }
-
-  function createNewVisualAggregatorWithGivenDepth(visualTree, treeItem, hideParentConnector, hideChildrenConnector, depth) {
-    var result = null,
-      newAggregatorItem;
-    hideParentConnector = hideParentConnector || hideChildrenConnector;
-
-    var index = 0;
-    while (index <= depth) {
-      if (result == null) {
-        result = treeItem;
-      } else {
-        result = visualTree.node(result.visualAggregatorId);
-      }
-      if (result.visualAggregatorId == null) {
-        newAggregatorItem = getNewTreeItem({
-          visibility: Visibility.Invisible,
-          visualAggregatorId: null,
-          connectorPlacement: hideParentConnector ? 0 : (SideFlag.Top | SideFlag.Bottom)
-        });
-        visualTree.insert(result.id, newAggregatorItem.id, newAggregatorItem);
-        result.visualAggregatorId = newAggregatorItem.id;
-      }
-      index += 1;
-    }
-    return result;
-  }
-
-  function createNewVisualAggregator(visualTree, treeItem, hideChildrenConnector) {
-    var newAggregatorItem,
-      hideParentConnector = ((treeItem.visibility == Visibility.Invisible) && (treeItem.connectorPlacement === 0)) || hideChildrenConnector;
-
-    newAggregatorItem = getNewTreeItem({
-      visibility: Visibility.Invisible,
-      visualAggregatorId: treeItem.visualAggregatorId,
-      connectorPlacement: hideParentConnector ? 0 : (SideFlag.Top | SideFlag.Bottom)
-    });
-
-    visualTree.insert(treeItem.id, newAggregatorItem.id, newAggregatorItem);
-
-    treeItem.visualAggregatorId = newAggregatorItem.id;
-    return newAggregatorItem;
-  }
-
-  function getNewTreeItem(properties, orgItem) {
-    var result = new TreeItem(),
-      optionKey;
-
-    for (optionKey in properties) {
-      if (properties.hasOwnProperty(optionKey)) {
-        result[optionKey] = properties[optionKey];
-      }
-    }
-
-    if (orgItem != null) {
-      result.id = orgItem.id;
-      result.visibility = orgItem.isVisible ? Visibility.Auto : Visibility.Invisible;
-    } else {
-      _treeItemCounter += 1;
-      result.id = _treeItemCounter;
-    }
-
-    return result;
-  }
-
-  function defineNavigationParent(parentItem, treeItem, skipFirstParent) {
-    var parents = [];
-
-    /* take logicalParentItem when it is visible or collect all visible immediate parents of logicalParentItem */
-    if (skipFirstParent || parentItem.visibility == Visibility.Invisible || !_activeItems.hasOwnProperty(parentItem.id)) {
-      if (!skipFirstParent) {
-        parents.push(parentItem.id);
-      }
-      _data.navigationFamily.loopParents(this, parentItem.id, function (parentid, parent, level) {
-        if (parent.visibility != Visibility.Invisible) {
-          parents.push(parentid);
-          if (_activeItems.hasOwnProperty(parentid)) {
-            return _data.navigationFamily.SKIP;
-          }
-        }
-      });
-    } else {
-      parents.push(parentItem.id);
-    }
-    if (_data.navigationFamily.node(treeItem.id) != null) {
-      _data.navigationFamily.adopt(parents, treeItem.id);
-    } else {
-      _data.navigationFamily.add(parents, treeItem.id, treeItem);
-    }
-  }
-
-  function updateVisualTreeMargins(visualTree, leftMargins, rightMargins) {
+  function getVisualTreeMargins(visualTree) {
+    var leftMargins = {}
+    var rightMargins = {};
     visualTree.loop(this, function (nodeid, node) {
@@ -977,22 +74,23 @@ leftMargins[nodeid] = [];
     });
+
+    return {
+      leftMargins: leftMargins,
+      rightMargins: rightMargins
+    }
   }
 
   function getVisualTree() {
-    return _data.visualTree;
+    return _visualTree;
   }
 
   function getLogicalFamily() {
-    return _data.navigationFamily;
+    return _navigationFamily;
   }
 
-  function getConnectionsFamily() {
-    return _data.connectionsFamily;
-  }
-
   function getLeftMargins() {
-    return _data.leftMargins;
+    return _leftMargins;
   }
 
   function getRightMargins() {
-    return _data.rightMargins;
+    return _rightMargins;
   }
@@ -1008,3 +106,2 @@
     getLogicalFamily: getLogicalFamily,
-    getConnectionsFamily: getConnectionsFamily,
     getLeftMargins: getLeftMargins,
@@ -1011,0 +108,0 @@ getRightMargins: getRightMargins,

todo.md

 API:
 * Remove HTML templates. Keep onItemRender callback only. Pure ReactJS dedicated API. Align PDF and core JavaScript controls APIs.
 
-Organizational Chart Layout
-* Add new item types to draw org diagram in all directions. Star Layered Layout. Preserve layers as a core feature. 
-* Align children into levels with account for available assistants in parallel branches. 
-* Fix inactive cursor neighbors nodes visibility for PageFitMode.SelectedItemsOnly mode
-
 Family Layout
@@ -21,2 +16,12 @@ * Project relative item options to the root nodes of the diagram
 
+Connector Annotation
+* Fix connector annotation line placement, so its label or spline does not go outside diagram boundaries
+* Improve labels placement and offset along with connection line annotation (Pomex)
+* Improve parallel splines rendering for connector annotation (Pomex)
+
+Organizational Chart Layout
+* Add new item types to draw org diagram in all directions. Star Layered Layout. Preserve layers as a core feature. 
+* Align children into levels with account for available assistants in parallel branches. 
+* Fix inactive cursor neighbors nodes visibility for PageFitMode.SelectedItemsOnly mode
+
 Frame Markers
@@ -30,7 +35,2 @@ * Show annotated nodes markers on the frame. Add showFrameMarkers option for various annotations
 
-Connector Annotation
-* Fix connector annotation line placement, so its label or spline never goes outside diagram boundaries
-* Improve labels placement and offset along with connection line annotation (Pomex)
-* Improve parallel splines rendering for connector annotation (Pomex)
-
 Family Label Annotations
@@ -37,0 +37,0 @@ * Fix labels placement on loops

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

5740651

increased by2.58%

Number of package files

369

increased by2.79%

Lines of code

75497

increased by3.74%

No dependency changes