-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(code): Add syntax highlighting as css (instead of inline styles …
…in js) and explicitly import specific languages (#75)
- Loading branch information
Showing
11 changed files
with
249 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import React from 'react'; | ||
| import { Code } from '@deque/cauldron-react'; | ||
| import Demo from '../../../Demo'; | ||
|
|
||
| const CodeDemo = () => ( | ||
| <Demo | ||
| component={Code} | ||
| states={[ | ||
| { | ||
| children: 'var foo = true;', | ||
| language: 'javascript', | ||
| DEMO_renderBefore: <h3>javascript</h3> | ||
| }, | ||
| { | ||
| children: '<span class="foo">Hello world!</span>', | ||
| language: 'html', | ||
| DEMO_renderBefore: <h3>html</h3> | ||
| }, | ||
| { | ||
| children: '$ npm install --save @deque/cauldron-react', | ||
| DEMO_renderBefore: <h3>(no language prop)</h3> | ||
| } | ||
| ]} | ||
| propDocs={{ | ||
| children: { | ||
| type: 'string', | ||
| description: 'code to be syntax highlighted and rendered in code block' | ||
| }, | ||
| language: { | ||
| type: 'string', | ||
| description: '"javascript", "css" or "html"' | ||
| } | ||
| }} | ||
| /> | ||
| ); | ||
|
|
||
| export default CodeDemo; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,4 +5,4 @@ | |
| [[redirects]] | ||
| from = "/*" | ||
| to = "/index.html" | ||
|
|
||
| status = 200 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| module.exports = () => ({}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,44 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import SyntaxHighlighter, { | ||
| import { | ||
| Light as SyntaxHighlighter, | ||
| SyntaxHighlighterProps | ||
| } from 'react-syntax-highlighter'; | ||
| import theme from './theme'; | ||
| import classNames from 'classnames'; | ||
| import js from 'react-syntax-highlighter/dist/esm/languages/hljs/javascript'; | ||
| import css from 'react-syntax-highlighter/dist/esm/languages/hljs/css'; | ||
| import xml from 'react-syntax-highlighter/dist/esm/languages/hljs/xml'; | ||
|
|
||
| SyntaxHighlighter.registerLanguage('javascript', js); | ||
| SyntaxHighlighter.registerLanguage('css', css); | ||
| SyntaxHighlighter.registerLanguage('html', xml); | ||
|
|
||
| interface Props extends SyntaxHighlighterProps { | ||
| children: React.ReactNode; | ||
| language?: 'javascript' | 'css' | 'html'; | ||
| className?: string; | ||
| } | ||
|
|
||
| const Code: React.ComponentType<Props> = ({ children, ...props }) => ( | ||
| <SyntaxHighlighter {...props} style={theme}> | ||
| const Code: React.ComponentType<Props> = ({ | ||
| children, | ||
| className, | ||
| ...props | ||
| }) => ( | ||
| <SyntaxHighlighter | ||
| {...props} | ||
| useInlineStyles={false} | ||
| className={classNames('Code', className)} | ||
| > | ||
| {children} | ||
| </SyntaxHighlighter> | ||
| ); | ||
|
|
||
| Code.displayName = 'Code'; | ||
|
|
||
| Code.defaultProps = { language: 'javascript' }; | ||
|
|
||
| Code.propTypes = { | ||
| children: PropTypes.string.isRequired, | ||
| language: PropTypes.string | ||
| language: PropTypes.oneOf(['javascript', 'css', 'html']), | ||
| className: PropTypes.string | ||
| }; | ||
|
|
||
| export default Code; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.