Skip to content

Commit

Permalink
Merge branch 'master' into renovate/prettier-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas ERNY authored Jan 24, 2019
2 parents 84191af + 45f4d95 commit 408824b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/GojsDiagram.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ export interface GojsDiagramProps<N extends BaseNodeModel, L extends LinkModel>
linkFromPortIdProperty?: string;
linkToPortIdProperty?: string;
nodeCategoryProperty?: string;
linkKeyProperty?: string;
makeUniqueKeyFunction?: () => void;
makeUniqueLinkKeyFunction?: () => void;
}

export interface GojsModel extends go.Model {
Expand Down Expand Up @@ -85,11 +87,14 @@ class GojsDiagram<N extends BaseNodeModel, L extends LinkModel> extends React.Pu
...(this.props.makeUniqueKeyFunction && {
makeUniqueKeyFunction: this.props.makeUniqueKeyFunction
}),

linkFromPortIdProperty: this.props.linkFromPortIdProperty || '',
linkToPortIdProperty: this.props.linkToPortIdProperty || '',
nodeDataArray: [...this.props.model.nodeDataArray],
linkDataArray: [...this.props.model.linkDataArray],
nodeCategoryProperty: this.props.nodeCategoryProperty || 'category'
nodeCategoryProperty: this.props.nodeCategoryProperty || 'category',
linkKeyProperty: this.props.linkKeyProperty || '',
makeUniqueLinkKeyFunction: this.props.makeUniqueLinkKeyFunction || null
});
}
render() {
Expand Down

0 comments on commit 408824b

Please sign in to comment.