Skip to content
Open
Show file tree
Hide file tree
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
40 changes: 19 additions & 21 deletions Markdown.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
var React = require('react-native');
var {
import React, { Component } from 'react';
import {
View
} = React;
var _ = require('lodash');
var SimpleMarkdown = require('simple-markdown');
} from 'react-native';
import _ from 'lodash';
import SimpleMarkdown from 'simple-markdown';

var styles = {
const styles = {
view: {
},
codeBlock: {
Expand Down Expand Up @@ -116,17 +116,15 @@ var styles = {
};


var Markdown = React.createClass({
class Markdown extends Component {

getDefaultProps: function() {
return {
style: styles
};
},
static defaultProps = {
style: styles
};

componentWillMount: function() {
var mergedStyles = _.merge({}, styles, this.props.style);
var rules = require('./rules')(mergedStyles);
componentWillMount() {
const mergedStyles = _.merge({}, styles, this.props.style);
let rules = require('./rules')(mergedStyles);
rules = _.merge({}, SimpleMarkdown.defaultRules, rules);

var parser = SimpleMarkdown.parserFor(rules);
Expand All @@ -135,15 +133,15 @@ var Markdown = React.createClass({
return parser(blockSource, {inline: false});
};
this.renderer = SimpleMarkdown.reactFor(SimpleMarkdown.ruleOutput(rules, 'react'));
},
}

render: function() {
render() {

var child = _.isArray(this.props.children)
const child = _.isArray(this.props.children)
? this.props.children.join('') : this.props.children;
var tree = this.parse(child);
const tree = this.parse(child);
return <View style={[styles.view, this.props.style.view]}>{this.renderer(tree)}</View>;
}
});
}

module.exports = Markdown;
export default Markdown;
4 changes: 2 additions & 2 deletions rules.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var React = require('react-native');
var React = require('react');
var {
Image,
Text,
View,
} = React;
} = require('react-native');
var SimpleMarkdown = require('simple-markdown');
var _ = require('lodash');

Expand Down