Skip to content

Commit cebcf93

Browse files
committed
Updated renderNode function & dependencies (v1.1.0)
1 parent f82e6df commit cebcf93

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-family-tree",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "React component that renders a family tree",
55
"main": "lib/index.js",
66
"typings": "index.d.ts",
@@ -36,7 +36,7 @@
3636
"typescript": "3.2.2"
3737
},
3838
"dependencies": {
39-
"relatives-tree": "1.0.0"
39+
"relatives-tree": "1.1.0"
4040
},
4141
"homepage": "https://github.com/SanichKotikov/react-family-tree"
4242
}

src/index.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
import * as React from 'react';
2-
import relTree, { IFamilyNode } from 'relatives-tree';
2+
import relTree, { hasHiddenRelatives, IFamilyNode } from 'relatives-tree';
33
import Connector from './connector';
44

5+
interface IRenderNodeOptions {
6+
x: number;
7+
y: number;
8+
sub: boolean;
9+
}
10+
511
interface Props {
612
nodes: IFamilyNode[];
713
rootId: string;
814
width: number;
915
height: number;
1016
canvasClassName?: string;
11-
renderNode: (node: IFamilyNode, point: { x: number, y: number }) => void;
17+
renderNode: (node: IFamilyNode, options: IRenderNodeOptions) => void;
1218
}
1319

1420
const ReactFamilyTree: React.FunctionComponent<Props> = (props) => {
@@ -45,6 +51,7 @@ const ReactFamilyTree: React.FunctionComponent<Props> = (props) => {
4551
unit.nodes.map((node, idx) => props.renderNode(node, {
4652
x: fX + (unit.shift * width) + (idx * (width * 2)),
4753
y: fY,
54+
sub: hasHiddenRelatives(family, node),
4855
}))
4956
))
5057
)}
@@ -53,6 +60,7 @@ const ReactFamilyTree: React.FunctionComponent<Props> = (props) => {
5360
unit.nodes.map((node, idx) => props.renderNode(node, {
5461
x: fX + (unit.shift * width) + (idx * (width * 2)),
5562
y: fY + props.height,
63+
sub: hasHiddenRelatives(family, node),
5664
}))
5765
))
5866
)}

0 commit comments

Comments
 (0)