Skip to content

Correctly pass the options to marksy #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 1, 2017
Merged

Correctly pass the options to marksy #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a3ab81
Correctly pass the options to marksy
antoinegrant Jun 26, 2017
d44a3f6
Added support for tables
antoinegrant Jun 27, 2017
74c2af0
Be more preecise on the markdown slide split characters
antoinegrant Jun 27, 2017
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
2 changes: 1 addition & 1 deletion src/components/markdown-slides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Markdown from './markdown';

const transformStringsIntoJSX = function (strings) {
return strings
.split('---')
.split(/\n---\n/)
.map((markdown, index) => (
<Slide key={`md-slide-${index}`}>
<Markdown>{ markdown }</Markdown>
Expand Down
50 changes: 33 additions & 17 deletions src/components/markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ import Quote from './quote';
import S from './s';
import Text from './text';

import Table from './table';
import TableHeader from './table-header';
import TableRow from './table-row';
import TableHeaderItem from './table-header-item';
import TableBody from './table-body';
import TableItem from './table-item';


const _Heading = size => {
const component = ({ children }) => <Heading size={size}>{children}</Heading>;
component.propTypes = { children: PropTypes.node };
Expand All @@ -32,23 +40,31 @@ const _CombineBlockQuote = ({ children }) => (
_CombineBlockQuote.propTypes = { children: PropTypes.node };

const compile = marksy({
a: Link,
blockquote: _CombineBlockQuote,
code: CodePane,
del: _S('strikethrough'),
em: _S('italic'),
h1: _Heading(1),
h2: _Heading(2),
h3: _Heading(3),
h4: _Heading(4),
h5: _Heading(5),
h6: _Heading(6),
img: Image,
codespan: Code,
li: ListItem,
p: Text,
strong: _S('bold'),
ul: List,
elements: {
a: Link,
blockquote: _CombineBlockQuote,
code: CodePane,
del: _S('strikethrough'),
em: _S('italic'),
h1: _Heading(1),
h2: _Heading(2),
h3: _Heading(3),
h4: _Heading(4),
h5: _Heading(5),
h6: _Heading(6),
img: Image,
codespan: Code,
li: ListItem,
p: Text,
strong: _S('bold'),
ul: List,
table: Table,
thead: TableHeader,
th: TableHeaderItem,
tbody: TableBody,
tr: TableRow,
td: TableItem,
}
});

export default class Markdown extends Component {
Expand Down