Merge branch 'development' into createWethPage

* development:
  Add additional public changes introduced to changelog
  Update CHANGELOG
  Add a comment
  Introduce a variable for true
  Remove redundant template string
  Implement the address derivations
  Add hdnode dependency
  Move web3 import after subprovider imports in test web3_factory
  Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering of markdownCodeBlock renderer if props haven't updated
  Add convenience `rebuild` command
  Update website calls to deposit/withdraw
  Add entry to CHANGELOG
This commit is contained in:
Fabio Berger
2017-12-19 10:28:11 +01:00
15 changed files with 91 additions and 36 deletions

View File

@@ -7,14 +7,23 @@ interface MarkdownCodeBlockProps {
language: string;
}
export function MarkdownCodeBlock(props: MarkdownCodeBlockProps) {
return (
<span style={{fontSize: 16}}>
<HighLight
className={props.language || 'js'}
>
{props.literal}
</HighLight>
</span>
);
interface MarkdownCodeBlockState {}
export class MarkdownCodeBlock extends React.Component<MarkdownCodeBlockProps, MarkdownCodeBlockState> {
// Re-rendering a codeblock causes any use selection to become de-selected. This is annoying when trying
// to copy-paste code examples. We therefore noop re-renders on this component if it's props haven't changed.
public shouldComponentUpdate(nextProps: MarkdownCodeBlockProps, nextState: MarkdownCodeBlockState) {
return nextProps.literal !== this.props.literal || nextProps.language !== this.props.language;
}
public render() {
return (
<span style={{fontSize: 16}}>
<HighLight
className={this.props.language || 'javascript'}
>
{this.props.literal}
</HighLight>
</span>
);
}
}