File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -20,11 +20,12 @@ class Markdown extends Component {
2020 bgImage : props . bgImage ,
2121 onImageOpen : props . onImageOpen ,
2222 onImageClose : props . onImageClose ,
23+ rules : props . rules
2324 } ;
2425
2526 const mergedStyles = merge ( { } , styles , props . styles ) ;
2627 var rules = require ( './rules' ) ( mergedStyles , opts ) ;
27- rules = merge ( { } , SimpleMarkdown . defaultRules , rules ) ;
28+ rules = merge ( { } , SimpleMarkdown . defaultRules , rules , opts . rules ) ;
2829
2930 const parser = SimpleMarkdown . parserFor ( rules ) ;
3031 this . parse = function ( source ) {
@@ -64,10 +65,12 @@ Markdown.propTypes = {
6465 styles : PropTypes . shape ( {
6566 view : ViewPropTypes . style ,
6667 } ) ,
68+ rules : PropTypes . object ,
6769} ;
6870
6971Markdown . defaultProps = {
70- styles : styles
72+ styles : styles ,
73+ rules : { }
7174}
7275
7376export default Markdown ;
You can’t perform that action at this time.
0 commit comments