Updated 'relatives-tree' dependency (v1.2.0)

Author: SanichKotikov

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-family-tree",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "React component that renders a family tree",
   "main": "lib/index.js",
   "typings": "index.d.ts",
@@ -36,7 +36,7 @@
     "typescript": "3.2.2"
   },
   "dependencies": {
-    "relatives-tree": "1.1.0"
+    "relatives-tree": "1.2.0"
   },
   "homepage": "https://github.com/SanichKotikov/react-family-tree"
 }

package.json

@@ -1,20 +1,14 @@
 import * as React from 'react';
-import relTree, { hasHiddenRelatives, IFamilyNode } from 'relatives-tree';
+import relTree, { IFamilyNode, IFamilyExtNode } from 'relatives-tree';
 import Connector from './connector';
 
-interface IRenderNodeOptions {
-  x: number;
-  y: number;
-  sub: boolean;
-}
-
 interface Props {
   nodes: IFamilyNode[];
   rootId: string;
   width: number;
   height: number;
   canvasClassName?: string;
-  renderNode: (node: IFamilyNode, options: IRenderNodeOptions) => void;
+  renderNode: (node: IFamilyExtNode) => void;
 }
 
 const ReactFamilyTree: React.FunctionComponent<Props> = (props) => {
@@ -40,33 +34,7 @@ const ReactFamilyTree: React.FunctionComponent<Props> = (props) => {
           height={height}
         />
       ))}
-      {data.families.map(family => {
-        const fX = family.left * width;
-        const fY = family.top * height;
-
-        return (
-          <React.Fragment key={family.id}>
-            {(family.type === 'parent' || family.type === 'root') && (
-              family.pUnits.map((unit) => (
-                unit.nodes.map((node, idx) => props.renderNode(node, {
-                  x: fX + (unit.shift * width) + (idx * (width * 2)),
-                  y: fY,
-                  sub: hasHiddenRelatives(family, node),
-                }))
-              ))
-            )}
-            {(family.type === 'child' || family.type === 'root') && (
-              family.cUnits.map((unit) => (
-                unit.nodes.map((node, idx) => props.renderNode(node, {
-                  x: fX + (unit.shift * width) + (idx * (width * 2)),
-                  y: fY + props.height,
-                  sub: hasHiddenRelatives(family, node),
-                }))
-              ))
-            )}
-          </React.Fragment>
-        );
-      })}
+      {data.nodes.map(props.renderNode)}
     </div>
   );
 };