single parser

This commit is contained in:
Lyzi Diamond
2016-03-18 15:10:48 -07:00
parent d1ff665099
commit cfd612c816
2 changed files with 10 additions and 7 deletions

View File

@ -3,6 +3,7 @@ import Section from './section';
import PureRenderMixin from 'react-pure-render/mixin'; import PureRenderMixin from 'react-pure-render/mixin';
import GithubSlugger from 'github-slugger'; import GithubSlugger from 'github-slugger';
import { transformURL } from '../../custom'; import { transformURL } from '../../custom';
import remark from 'remark';
let slugger = new GithubSlugger(); let slugger = new GithubSlugger();
let slug = title => { slugger.reset(); return slugger.slug(title); }; let slug = title => { slugger.reset(); return slugger.slug(title); };
@ -76,11 +77,13 @@ var Content = React.createClass({
}, },
render() { render() {
let { ast, language, leftClassname, rightClassname } = this.props; let { ast, language, leftClassname, rightClassname } = this.props;
let parser = remark();
return (<div className='clearfix'> return (<div className='clearfix'>
{chunkifyAST(ast, language).map((chunk, i) => <Section {chunkifyAST(ast, language).map((chunk, i) => <Section
leftClassname={leftClassname} leftClassname={leftClassname}
rightClassname={rightClassname} rightClassname={rightClassname}
chunk={chunk} chunk={chunk}
parser={parser}
key={i} />)} key={i} />)}
</div>); </div>);
} }

View File

@ -1,15 +1,14 @@
import React from 'react'; import React from 'react';
import remark from 'remark';
import remarkHTML from 'remark-html'; import remarkHTML from 'remark-html';
import remarkHighlight from '../highlight'; import remarkHighlight from '../highlight';
import PureRenderMixin from 'react-pure-render/mixin'; import PureRenderMixin from 'react-pure-render/mixin';
import { postHighlight } from '../../custom'; import { postHighlight } from '../../custom';
function renderHighlighted(nodes) { function renderHighlighted(nodes, parser) {
return { return {
__html: postHighlight(remark() __html: postHighlight(parser
.use(remarkHTML) .use(remarkHTML)
.stringify(remark().use(remarkHighlight).run({ .stringify(parser.use(remarkHighlight).run({
type: 'root', type: 'root',
children: nodes children: nodes
}))) })))
@ -21,7 +20,8 @@ var Section = React.createClass({
propTypes: { propTypes: {
chunk: React.PropTypes.object.isRequired, chunk: React.PropTypes.object.isRequired,
leftClassname: React.PropTypes.string.isRequired, leftClassname: React.PropTypes.string.isRequired,
rightClassname: React.PropTypes.string.isRequired rightClassname: React.PropTypes.string.isRequired,
parser: React.PropTypes.object.isRequired
}, },
render() { render() {
let { chunk, leftClassname, rightClassname } = this.props; let { chunk, leftClassname, rightClassname } = this.props;
@ -31,10 +31,10 @@ var Section = React.createClass({
className={`keyline-top section contain clearfix ${preview ? 'preview' : ''}`}> className={`keyline-top section contain clearfix ${preview ? 'preview' : ''}`}>
<div <div
className={leftClassname} className={leftClassname}
dangerouslySetInnerHTML={renderHighlighted(left)} /> dangerouslySetInnerHTML={renderHighlighted(left, this.props.parser)} />
{right.length > 0 && <div {right.length > 0 && <div
className={rightClassname} className={rightClassname}
dangerouslySetInnerHTML={renderHighlighted(right)} />} dangerouslySetInnerHTML={renderHighlighted(right, this.props.parser)} />}
</div>); </div>);
} }
}); });