Skip to content
Merged
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
105 changes: 53 additions & 52 deletions src/react-markdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,66 @@ var ReactRenderer = require('commonmark-react-renderer');

var propTypes = React.PropTypes;

var ReactMarkdown = React.createClass({
displayName: 'ReactMarkdown',
function ReactMarkdown(props) {
React.Component.call(this, props);
}

propTypes: {
className: propTypes.string,
containerProps: propTypes.object,
source: propTypes.string.isRequired,
containerTagName: propTypes.string,
childBefore: propTypes.object,
childAfter: propTypes.object,
sourcePos: propTypes.bool,
escapeHtml: propTypes.bool,
skipHtml: propTypes.bool,
softBreak: propTypes.string,
allowNode: propTypes.func,
allowedTypes: propTypes.array,
disallowedTypes: propTypes.array,
transformLinkUri: propTypes.func,
transformImageUri: propTypes.func,
unwrapDisallowed: propTypes.bool,
renderers: propTypes.object,
walker: propTypes.func,
parserOptions: propTypes.object
},
ReactMarkdown.prototype = Object.create(React.Component.prototype);
ReactMarkdown.prototype.constructor = ReactMarkdown;

getDefaultProps: function() {
return {
containerTagName: 'div',
parserOptions: {}
};
},
ReactMarkdown.prototype.render = function() {
var containerProps = this.props.containerProps || {};
var renderer = new ReactRenderer(this.props);
var parser = new Parser(this.props.parserOptions);
var ast = parser.parse(this.props.source || '');

render: function() {
var containerProps = this.props.containerProps || {};
var renderer = new ReactRenderer(this.props);
var parser = new Parser(this.props.parserOptions);
var ast = parser.parse(this.props.source || '');
if (this.props.walker) {
var walker = ast.walker();
var event;

if (this.props.walker) {
var walker = ast.walker();
var event;

while ((event = walker.next())) {
this.props.walker.call(this, event, walker);
}
}

if (this.props.className) {
containerProps.className = this.props.className;
while ((event = walker.next())) {
this.props.walker.call(this, event, walker);
}
}

return React.createElement.apply(React,
[this.props.containerTagName, containerProps, this.props.childBefore]
.concat(renderer.render(ast).concat(
[this.props.childAfter]
))
);
if (this.props.className) {
containerProps.className = this.props.className;
}
});

return React.createElement.apply(React,
[this.props.containerTagName, containerProps, this.props.childBefore]
.concat(renderer.render(ast).concat(
[this.props.childAfter]
))
);
};

ReactMarkdown.propTypes = {
className: propTypes.string,
containerProps: propTypes.object,
source: propTypes.string.isRequired,
containerTagName: propTypes.string,
childBefore: propTypes.object,
childAfter: propTypes.object,
sourcePos: propTypes.bool,
escapeHtml: propTypes.bool,
skipHtml: propTypes.bool,
softBreak: propTypes.string,
allowNode: propTypes.func,
allowedTypes: propTypes.array,
disallowedTypes: propTypes.array,
transformLinkUri: propTypes.func,
transformImageUri: propTypes.func,
unwrapDisallowed: propTypes.bool,
renderers: propTypes.object,
walker: propTypes.func,
parserOptions: propTypes.object
};

ReactMarkdown.defaultProps = {
containerTagName: 'div',
parserOptions: {}
};

ReactMarkdown.types = ReactRenderer.types;
ReactMarkdown.renderers = ReactRenderer.renderers;
Expand Down