This repository was archived by the owner on May 14, 2020. It is now read-only.

Commit a25890f

committed

prevent redundant state change for nested node

1 parent 2ffba79 commit a25890fCopy full SHA for a25890f

File tree

+22

-6

lines changed

+22

-6

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,14 @@ function getStateFromProps(props) {`
`68`	`68`	`};`
`69`	`69`	`}`
`70`	`70`
	`71`	`+function propsAreNotEqual(props, nextProps, keys) {`
	`72`	`+ return keys.find(k => nextProps[k] !== props[k]);`
	`73`	`+}`
	`74`	`+`
	`75`	`+function keyPathIsNotEqual(keyPath, nextKeyPath) {`
	`76`	`+ return keyPath.join('/') !== nextKeyPath.join('/');`
	`77`	`+}`
	`78`	`+`
`71`	`79`	`export default class JSONNestedNode extends React.Component {`
`72`	`80`	`static propTypes = {`
`73`	`81`	`getItemString: PropTypes.func.isRequired,`
`@@ -102,8 +110,11 @@ export default class JSONNestedNode extends React.Component {`
`102`	`110`	`}`
`103`	`111`
`104`	`112`	`componentWillReceiveProps(nextProps) {`
`105`		`- if (['shouldExpandNode', 'isCircular', 'keyPath', 'data', 'level'].find(k =>`
`106`		`- nextProps[k] !== this.props[k])`
	`113`	`+ if (`
	`114`	`+ propsAreNotEqual(`
	`115`	`+ this.props, nextProps, ['shouldExpandNode', 'isCircular', 'level']`
	`116`	`+ ) \|\|`
	`117`	`+ keyPathIsNotEqual(this.props.keyPath, nextProps.keyPath)`
`107`	`118`	`) {`
`108`	`119`	`this.setState(getStateFromProps(nextProps));`
`109`	`120`	`}`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,11 @@ import JSONNode from './JSONNode';`
`8`	`8`	`import createStylingFromTheme from './createStylingFromTheme';`
`9`	`9`
`10`	`10`	`const identity = value => value;`
	`11`	`+const expandRootNode = (keyName, data, level) => level === 0;`
	`12`	`+const defaultItemString = (type, data, itemType, itemString) =>`
	`13`	`+ <span>{itemType} {itemString}</span>;`
	`14`	`+const defaultLabelRenderer = ([label]) => <span>{label}:</span>;`
	`15`	`+const noCustomNode = () => false;`
`11`	`16`
`12`	`17`	`function checkLegacyTheming(theme, props) {`
`13`	`18`	`const deprecatedStylingMethodsMap = {`
`@@ -65,14 +70,14 @@ export default class JSONTree extends React.Component {`
`65`	`70`	`};`
`66`	`71`
`67`	`72`	`static defaultProps = {`
`68`		`- shouldExpandNode: (keyName,data,level)=>level===0,// expands root by default,`
	`73`	`+ shouldExpandNode: expandRootNode,`
`69`	`74`	`hideRoot: false,`
`70`	`75`	`keyPath: ['root'],`
`71`		`- getItemString: (type,data,itemType,itemString)=><span>{itemType}{itemString}</span>,`
`72`		`- labelRenderer: ([label])=><span>{label}:</span>,`
	`76`	`+ getItemString: defaultItemString,`
	`77`	`+ labelRenderer: defaultLabelRenderer,`
`73`	`78`	`valueRenderer: identity,`
`74`	`79`	`postprocessValue: identity,`
`75`		`- isCustomNode: ()=>false,`
	`80`	`+ isCustomNode: noCustomNode,`
`76`	`81`	`collectionLimit: 50,`
`77`	`82`	`invertTheme: true`
`78`	`83`	`};`

Comments

(0)