Added getExtendedNodes (v1.2.0)

Author: SanichKotikov

index.d.ts

@@ -1,4 +1,4 @@
-import { Family, IFamilyNode, IFamilyData } from './src/types';
+import { Family, IFamilyNode, IFamilyExtNode, IFamilyData } from './src/types';
 
 export {
   Gender,
@@ -9,11 +9,9 @@ export {
   ICanvasSize,
   IRelation,
   IFamilyNode,
+  IFamilyExtNode,
   IConnector,
   IFamilyData,
 } from './src/types';
 
-declare const hasHiddenRelatives: (family: Family, node: IFamilyNode) => boolean;
-export { hasHiddenRelatives };
-
 export default function (nodes: IFamilyNode[], rootId: string): IFamilyData;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "relatives-tree",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Calculates families and nodes positions for rendering a family tree",
   "main": "lib/index.js",
   "typings": "index.d.ts",

package.json

@@ -33,10 +33,10 @@ export default (store: Store, parentIDs: string[], type: FamilyType = 'root', is
     if (child.spouses.length) {
       const { left, middle, right } = getSpouses(store, [child]);
       [...left.map(node => [node]), middle, ...right.map(node => [node])].forEach(nodes => (
-        family.cUnits.push(new Unit(family.id, nodes))
+        family.cUnits.push(new Unit(family.id, nodes, true))
       ));
     } else {
-      family.cUnits.push(new Unit(family.id, [child]));
+      family.cUnits.push(new Unit(family.id, [child], true));
     }
   });
 

src/children/byParents.ts

@@ -6,11 +6,9 @@ import createChildren from './children/create';
 import connectors from './connectors';
 import correctPositions from './utils/correctPositions';
 import getCanvasSize from './utils/getCanvasSize';
+import getExtendedNodes from './utils/getExtendedNodes';
 import { IFamilyNode, IFamilyData } from './types';
 
-import hasHiddenRelatives from './utils/hasHiddenRelatives';
-export { hasHiddenRelatives };
-
 export default (nodes: IFamilyNode[], rootId: string): IFamilyData => {
   const store = new Store(nodes, rootId);
 
@@ -25,6 +23,7 @@ export default (nodes: IFamilyNode[], rootId: string): IFamilyData => {
   return {
     families: families,
     canvas: getCanvasSize(store),
+    nodes: getExtendedNodes(families),
     connectors: connectors(families),
   };
 }

src/index.ts

@@ -3,11 +3,13 @@ import { IFamilyNode } from '../types';
 class Unit {
 
   familyId: number;
+  isChild: boolean;
   nodes: IFamilyNode[];
   shift: number;
 
-  constructor(familyId: number, nodes: IFamilyNode[]) {
+  constructor(familyId: number, nodes: IFamilyNode[], isChild: boolean = false) {
     this.familyId = familyId;
+    this.isChild = isChild;
     this.nodes = nodes;
     this.shift = 0;
   }

src/models/unit.ts

@@ -4,7 +4,7 @@ import Unit from '../models/unit';
 
 export default (store: Store, childIDs: string[]): Family => {
   const family = new Family(store.getNextId(), 'parent');
-  const cUnit = new Unit(family.id, store.getNodes(childIDs));
+  const cUnit = new Unit(family.id, store.getNodes(childIDs), true);
 
   cUnit.nodes.forEach((child, cIndex) => {
     const parents = store

src/parents/byChildren.ts

@@ -27,12 +27,19 @@ export interface IFamilyNode {
   placeholder?: boolean;
 }
 
+export interface IFamilyExtNode extends IFamilyNode {
+  top: number;
+  left: number;
+  hasSubTree: boolean;
+}
+
 export interface IConnector {
   points: [number, number, number, number];
 }
 
 export interface IFamilyData {
   canvas: ICanvasSize;
   families: Family[];
+  nodes: IFamilyExtNode[];
   connectors: IConnector[];
 }

src/types.ts

@@ -0,0 +1,29 @@
+import hasHiddenRelatives from './hasHiddenRelatives';
+import { flat } from './index';
+import Family from '../models/family';
+import Unit from '../models/unit';
+import { IFamilyNode, IFamilyExtNode } from '../types';
+
+const PARENTS = ['root', 'parent'];
+const CHILDREN = ['root', 'child'];
+
+const extendNode = (family: Family) => (unit: Unit) => (
+  unit.nodes.map((node: IFamilyNode, idx: number) => ({
+    ...node,
+    top: family.top + (unit.isChild ? 2 : 0),
+    left: family.left + unit.shift + (idx * 2),
+    hasSubTree: hasHiddenRelatives(family, node),
+  }))
+);
+
+const getParentNodes = (family: Family) =>
+  (~PARENTS.indexOf(family.type) ? family.pUnits : []).map(extendNode(family));
+
+const getChildNodes = (family: Family) =>
+  (~CHILDREN.indexOf(family.type) ? family.cUnits : []).map(extendNode(family));
+
+const mapFamily = (family: Family) =>
+  [...getParentNodes(family), ...getChildNodes(family)].reduce(flat, []);
+
+export default (families: Family[]): IFamilyExtNode[] =>
+  families.map(mapFamily).reduce(flat, []);

src/utils/getExtendedNodes.ts

@@ -1,6 +1,7 @@
 import Store from '../store';
 import { IRelation, IFamilyNode } from '../types';
 
+const flat = (items: any[], item: any) => items.concat(item);
 const unique = (item: any, index: number, arr: any[]): boolean => arr.indexOf(item) === index;
 
 const relToNode = (store: Store) => (rel: IRelation) => store.getNode(rel.id);
@@ -9,6 +10,7 @@ const hasDiffParents = (node: IFamilyNode): boolean =>
   node.parents.map(rel => rel.type).filter(unique).length > 1;
 
 export {
+  flat,
   relToNode,
   hasDiffParents,
 };