Skip to content
Open
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions lib/index.browser.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@r365/react-checkbox-tree",
"version": "2.0.7",
"version": "2.0.9",
"description": "A simple and elegant checkbox tree for React.",
"author": "Jake Zatecky",
"license": "MIT",
Expand Down
6 changes: 4 additions & 2 deletions src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ declare module "@r365/react-checkbox-tree" {
interface CheckboxProps {
nodes: Array<Node>;
checked: Array<string>;
checkedParents: Array<string>;
expanded: Array<string>;
onCheck: (checked: Array<string>) => void;
onCheck: (checked: Array<string>, checkedNode: Node) => void;
onExpand: (expanded: Array<string>) => void;

isTreeExpanded: boolean;
disabled?: boolean;
expandDisabled?: boolean;
expandOnClick?: boolean;
Expand All @@ -54,6 +55,7 @@ declare module "@r365/react-checkbox-tree" {
showNodeIcon?: boolean;
showNodeTitle?: boolean;
onClick?: (event: { checked: boolean, value: any }) => void;
onToggleSelection: (checkedParents: Array<string>, checked: Array<string>) => void;
}

export default class CheckboxTree extends React.Component<CheckboxProps> { }
Expand Down
12 changes: 10 additions & 2 deletions src/js/CheckboxTree.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import nodeShape from './shapes/nodeShape';
class CheckboxTree extends React.Component {
static propTypes = {
nodes: PropTypes.arrayOf(nodeShape).isRequired,

isTreeExpanded: PropTypes.bool,
checked: listShape,
checkedParents: listShape,
disabled: PropTypes.bool,
Expand All @@ -42,6 +42,7 @@ class CheckboxTree extends React.Component {

static defaultProps = {
checked: [],
isTreeExpanded: false,
checkedParents: [],
disabled: false,
expandDisabled: false,
Expand Down Expand Up @@ -103,6 +104,13 @@ class CheckboxTree extends React.Component {
this.onExpandAll = this.onExpandAll.bind(this);
this.onCollapseAll = this.onCollapseAll.bind(this);
this.onToggleSelection = this.onToggleSelection.bind(this);
props.isTreeExpanded && this.expandAllNodes();
}

componentDidUpdate(prevProps){
if (this.props.isTreeExpanded != prevProps.isTreeExpanded) {
this.expandAllNodes(this.props.isTreeExpanded);
}
}

// eslint-disable-next-line react/sort-comp
Expand All @@ -116,7 +124,7 @@ class CheckboxTree extends React.Component {

// Since flattening nodes is an expensive task, only update when there is a node change
if (!isEqual(prevProps.nodes, nodes) || prevProps.disabled !== disabled) {
model.flattenNodes(nodes);
model.resetAndFlattenNodes(nodes);
}

if (id !== null) {
Expand Down
5 changes: 5 additions & 0 deletions src/js/NodeModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ class NodeModel {
return this.flatNodes[value];
}

resetAndFlattenNodes(nodes, parent = {}, depth = 0) {
this.flatNodes = {};
this.flattenNodes(nodes, parent, depth);
}

flattenNodes(nodes, parent = {}, depth = 0) {
if (!Array.isArray(nodes) || nodes.length === 0) {
return;
Expand Down