Skip to content

Additional Methods To Node Class's Internal Handlers #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions src/Node/index.tsx
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ import {
TreeNodeDatum,
RawNodeDatum,
RenderCustomNodeElementFn,
AddChildrenFunction,
} from '../types/common.js';
import DefaultNodeElement from './DefaultNodeElement.js';

@@ -36,7 +35,18 @@ type NodeProps = {
onNodeMouseOut: NodeEventHandler;
subscriptions: object;
centerNode: (hierarchyPointNode: HierarchyPointNode<TreeNodeDatum>) => void;
handleAddChildrenToNode: (nodeId: string, children: RawNodeDatum[]) => void;
handleAddChildrenToNode: (
nodeId: string,
children: RawNodeDatum[],
replace?: boolean,
callback?: () => void
) => void;
handleRemoveNode: (nodeId: string, parentNodeId: string, callback?: () => void) => void;
handleUpdateNodeAttributes: (
nodeId: string,
attributes: Omit<RawNodeDatum, 'children'>,
callback?: () => void
) => void;
};

type NodeState = {
@@ -149,6 +159,9 @@ export default class Node extends React.Component<NodeProps, NodeState> {
onNodeMouseOver: this.handleOnMouseOver,
onNodeMouseOut: this.handleOnMouseOut,
addChildren: this.handleAddChildren,
removeNode: this.handleRemoveNode,
replaceChildren: this.handleReplaceChildren,
updateNodeAttributes: this.handleUpdateNodeAttributes,
};

return renderNode(nodeProps);
@@ -172,8 +185,24 @@ export default class Node extends React.Component<NodeProps, NodeState> {
this.props.onNodeMouseOut(this.props.hierarchyPointNode, evt);
};

handleAddChildren: AddChildrenFunction = childrenData => {
this.props.handleAddChildrenToNode(this.props.data.__rd3t.id, childrenData);
handleAddChildren = (childrenData, callback?: () => void) => {
this.props.handleAddChildrenToNode(this.props.data.__rd3t.id, childrenData, false, callback);
};

handleReplaceChildren = (childrenData, callback?: () => void) => {
this.props.handleAddChildrenToNode(this.props.data.__rd3t.id, childrenData, true, callback);
};

handleUpdateNodeAttributes = (attributes, callback?: () => void) => {
this.props.handleUpdateNodeAttributes(this.props.data.__rd3t.id, attributes, callback);
};

handleRemoveNode = (callback?: () => void) => {
this.props.handleRemoveNode(
this.props.data.__rd3t.id,
this.props.parent.data.__rd3t.id,
callback
);
};

componentWillLeave(done) {
49 changes: 45 additions & 4 deletions src/Tree/index.tsx
Original file line number Diff line number Diff line change
@@ -328,7 +328,42 @@ class Tree extends React.Component<TreeProps, TreeState> {
}
};

handleAddChildrenToNode = (nodeId: string, childrenData: RawNodeDatum[]) => {
handleRemoveNode = (nodeId: string, parentNodeId: string, callback?: () => void) => {
const data = clone(this.state.data);
const parentMatches = this.findNodesById(parentNodeId, data, []);
if (parentMatches.length > 0) {
const targetNodeDatum = parentMatches[0];
if (targetNodeDatum.children && targetNodeDatum.children.length > 0) {
const removeNodeIndex = targetNodeDatum.children.findIndex(c => c.__rd3t.id === nodeId);
if (removeNodeIndex > -1) {
targetNodeDatum.children.splice(removeNodeIndex, 1);
this.setState({ data }, callback);
}
}
}
};

handleUpdateNodeAttributes = (
nodeId: string,
node: Omit<RawNodeDatum, 'children'>,
callback?: () => void
) => {
const data = clone(this.state.data);
const matches = this.findNodesById(nodeId, data, []);
if (matches.length > 0) {
const targetNodeDatum = matches[0];
targetNodeDatum.name = node.name;
targetNodeDatum.attributes = node.attributes;
this.setState({ data }, callback);
}
};

handleAddChildrenToNode = (
nodeId: string,
childrenData: RawNodeDatum[],
replace?: boolean,
callback?: () => void
) => {
const data = clone(this.state.data);
const matches = this.findNodesById(nodeId, data, []);

@@ -339,9 +374,13 @@ class Tree extends React.Component<TreeProps, TreeState> {
const formattedChildren = clone(childrenData).map((node: RawNodeDatum) =>
Tree.assignInternalProperties([node], depth + 1)
);
targetNodeDatum.children.push(...formattedChildren.flat());

this.setState({ data });
if (replace) {
targetNodeDatum.children = formattedChildren.flat();
} else {
targetNodeDatum.children.push(...formattedChildren.flat());
}
this.setState({ data }, callback);
}
};

@@ -584,7 +623,7 @@ class Tree extends React.Component<TreeProps, TreeState> {
const { data, x, y, parent } = hierarchyPointNode;
return (
<Node
key={'node-' + i}
key={'node-' + hierarchyPointNode.data.__rd3t.id}
data={data}
position={{ x, y }}
hierarchyPointNode={hierarchyPointNode}
@@ -602,6 +641,8 @@ class Tree extends React.Component<TreeProps, TreeState> {
handleAddChildrenToNode={this.handleAddChildrenToNode}
subscriptions={subscriptions}
centerNode={this.centerNode}
handleRemoveNode={this.handleRemoveNode}
handleUpdateNodeAttributes={this.handleUpdateNodeAttributes}
/>
);
})}
16 changes: 14 additions & 2 deletions src/types/common.ts
Original file line number Diff line number Diff line change
@@ -33,7 +33,11 @@ export type PathFunction = (link: TreeLinkDatum, orientation: Orientation) => st
export type PathClassFunction = PathFunction;

export type SyntheticEventHandler = (evt: SyntheticEvent) => void;
export type AddChildrenFunction = (children: RawNodeDatum[]) => void;
export type UpdateChildrenFunction = (children: RawNodeDatum[], callback?: () => void) => void;
export type UpdateNodeAttributesFunction = (
attributes: Omit<RawNodeDatum, 'children'>,
callback?: () => void
) => void;

/**
* The properties that are passed to the user-defined `renderCustomNodeElement` render function.
@@ -70,7 +74,15 @@ export interface CustomNodeElementProps {
/**
* The `Node` class's internal `addChildren` handler.
*/
addChildren: AddChildrenFunction;
addChildren: UpdateChildrenFunction;
/**
* The `Node` class's internal `replaceChildren` handler.
*/
replaceChildren: UpdateChildrenFunction;
/**
* The `Node` class's internal `updateNodeAttributes` handler.
*/
updateNodeAttributes: UpdateNodeAttributesFunction;
}

export type RenderCustomNodeElementFn = (rd3tNodeProps: CustomNodeElementProps) => JSX.Element;