Merge pull request #29 from BasicPrimitives/callout

Fixed callout annotation initial placement

Author: BasicPrimitives

changelog.md

@@ -1,3 +1,6 @@
+#### Version 5.6.3
+* Fixed initial callout placement
+* Fixed neighbours selection in family diagram having inactive nodes
 #### Version 5.6.2
 * Fixed performance bug in the value reader.
 #### Version 5.6.0

min/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basicprimitives",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "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.",
   "main": "primitives.latest.js",
   "scripts": {

min/primitives.latest.js

@@ -1,5 +1,5 @@
 /**
- * @preserve Basic Primitives Diagrams v5.6.2
+ * @preserve Basic Primitives Diagrams v5.6.3
  * Copyright (c) 2013 - 2019 Basic Primitives Inc
  *
  * Non-commercial - Free
@@ -35,7 +35,7 @@
 
 var primitives = {
   common: {
-    version: "5.6.2"
+    version: "5.6.3"
   },
   orgdiagram: {},
   famdiagram: {},
@@ -18177,10 +18177,9 @@ primitives.orgdiagram.DrawHighlightAnnotationTask = function (getGraphics, creat
                 uiHash.isCursor = (cursorItemTask.getCursorTreeItem() == treeItemId);
                 uiHash.isSelected = selectedItemsTask.isSelected(treeItemId);
                 uiHash.templateName = calloutTemplate.templateConfig.name;
-
-                _graphics.position("calloutplaceholder", calloutPanelPosition.x, calloutPanelPosition.y, calloutPanelPosition.width, calloutPanelPosition.height);
                 _graphics.show("calloutplaceholder");
                 panel = _graphics.activate("calloutplaceholder", 15/*primitives.common.Layers.Annotation*/);
+                _graphics.position("calloutplaceholder", calloutPanelPosition.x, calloutPanelPosition.y, calloutPanelPosition.width, calloutPanelPosition.height);
                 element = _graphics.template(
                   position.x
                   , position.y
@@ -25272,18 +25271,18 @@ primitives.common.family = function (source) {
 
           if (onItem.call(thisArg, childid, child, 1)) {
             processed[childid] = SKIP;
+          }
 
-            loopParents(this, childid, function (parentid, parent, parentLevel) {
-              if (!processed.hasOwnProperty(parentid)) {
-                processed[parentid] = null;
+          loopParents(this, childid, function (parentid, parent, parentLevel) {
+            if (!processed.hasOwnProperty(parentid)) {
+              processed[parentid] = null;
 
-                if (onItem.call(thisArg, parentid, parent, 2)) {
-                  processed[parentid] = SKIP;
-                }
+              if (onItem.call(thisArg, parentid, parent, 2)) {
+                processed[parentid] = SKIP;
               }
-              return processed[parentid];
-            });
-          }
+            }
+            return processed[parentid];
+          });
         }
         return processed[childid];
       });
@@ -25294,18 +25293,19 @@ primitives.common.family = function (source) {
 
           if (onItem.call(thisArg, parentid, parent, 1)) {
             processed[parentid] = SKIP;
+          }
 
-            loopChildren(this, parentid, function (childid, child, childLevel) {
-              if (!processed.hasOwnProperty(childid)) {
-                processed[childid] = true;
+          loopChildren(this, parentid, function (childid, child, childLevel) {
+            if (!processed.hasOwnProperty(childid)) {
+              processed[childid] = true;
 
-                if (onItem.call(thisArg, childid, child, 2)) {
-                  processed[childid] = SKIP;
-                }
+              if (onItem.call(thisArg, childid, child, 2)) {
+                processed[childid] = SKIP;
               }
-              return processed[childid];
-            });
-          }
+            }
+            return processed[childid];
+          });
+
         }
         return processed[parentid];
       });