Skip to content

Commit 92aaa5a

Browse files
committed
Merge pull request #84 from josebalius/master
Fix for issue #83 - JSONObjectNode#getChildNodes: Cannot read propert…
2 parents 4670a82 + b5a878d commit 92aaa5a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/react/JSONTree/JSONArrayNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default class JSONArrayNode extends React.Component {
5858
let childNodes = [];
5959
this.props.data.forEach((element, idx) => {
6060
let prevData;
61-
if (typeof this.props.previousData !== 'undefined') {
61+
if (typeof this.props.previousData !== 'undefined' && this.props.previousData !== null) {
6262
prevData = this.props.previousData[idx];
6363
}
6464
const node = grabNode(idx, element, prevData, this.props.theme);

src/react/JSONTree/JSONIterableNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default class JSONIterableNode extends React.Component {
6767
}
6868

6969
let prevData;
70-
if (typeof this.props.previousData !== 'undefined') {
70+
if (typeof this.props.previousData !== 'undefined' && this.props.previousData !== null) {
7171
prevData = this.props.previousData[key];
7272
}
7373
const node = grabNode(key, value, prevData, this.props.theme);

src/react/JSONTree/JSONObjectNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default class JSONObjectNode extends React.Component {
5858
for (let k in obj) {
5959
if (obj.hasOwnProperty(k)) {
6060
let prevData;
61-
if (typeof this.props.previousData !== 'undefined') {
61+
if (typeof this.props.previousData !== 'undefined' && this.props.previousData !== null) {
6262
prevData = this.props.previousData[k];
6363
}
6464
const node = grabNode(k, obj[k], prevData, this.props.theme);

0 commit comments

Comments
 (0)