Skip to content

Commit d63881f

Browse files
committed
#3, minor docs fixes
1 parent 9267432 commit d63881f

File tree

7 files changed

+240
-109
lines changed

7 files changed

+240
-109
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.0.1
2+
==================
3+
* bump `peerDependencies` to support react 16.x
4+
15
2.0.0
26
==================
37
* deprecate 1.x due to dependency conflicts occurring from over-strict versioning of codemirror as a `dependency`. Codemirror is now designated as a `peerDependency`

docs/app.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/src/components/Syntax.jsx

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import React from 'react';
2+
3+
let prism = require('prismjs');
4+
5+
export default class Syntax extends React.Component {
6+
7+
constructor(props) {
8+
super(props);
9+
10+
this.code = `
11+
require('codemirror/lib/codemirror.css'); // e.g. webpack css loader
12+
require('codemirror/theme/material.css');
13+
require('codemirror/theme/neat.css');
14+
require('codemirror/mode/xml/xml.js');
15+
require('codemirror/mode/javascript/javascript.js');
16+
17+
import 'Codemirror' from 'react-codemirror';
18+
19+
<CodeMirror
20+
value={this.value}
21+
options={{
22+
mode: this.mode
23+
theme: this.theme,
24+
lineNumbers: true
25+
}}
26+
onSet={(editor, value) => {
27+
console.log('set', {value});
28+
}}
29+
onChange={(editor, metadata, value) => {
30+
console.log('change', {value});
31+
}}
32+
/>`.trim();
33+
34+
}
35+
36+
tokenize() {
37+
38+
let code = prism.highlight(this.code, prism.languages.jsx);
39+
40+
return {
41+
__html: code
42+
};
43+
};
44+
45+
render() {
46+
47+
return (
48+
<pre className='syntax-block'>
49+
<code dangerouslySetInnerHTML={this.tokenize()}/>
50+
</pre>
51+
)
52+
}
53+
}

docs/src/index.jsx

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {createStore, combineReducers} from 'redux';
55
import reducer from './reducers';
66
import Editor from './components/Editor.jsx'
77
import Controls from './components/Controls.jsx';
8-
9-
let prism = require('prismjs');
8+
import Syntax from './components/Syntax.jsx';
109

1110
require('./index.scss');
1211
require('codemirror/mode/xml/xml');
@@ -38,35 +37,7 @@ render(
3837
<Editor/>
3938
</section>
4039
<section>
41-
<pre>
42-
<code className='language-jsx'>
43-
{
44-
`
45-
require('codemirror/lib/codemirror.css'); // e.g. webpack css loader
46-
require('codemirror/theme/material.css');
47-
require('codemirror/theme/neat.css');
48-
require('codemirror/mode/xml/xml.js');
49-
require('codemirror/mode/javascript/javascript.js');
50-
51-
import 'Codemirror' from 'react-codemirror';
52-
53-
<CodeMirror
54-
value={this.value}
55-
options={{
56-
mode: this.mode
57-
theme: this.theme,
58-
lineNumbers: true
59-
}}
60-
onSet={(editor, value) => {
61-
console.log('set', {value});
62-
}}
63-
onChange={(editor, metadata, value) => {
64-
console.log('change', {value});
65-
}}
66-
/>
67-
`.trim()}
68-
</code>
69-
</pre>
40+
<Syntax/>
7041
</section>
7142
</div>
7243
</div>

docs/src/index.scss

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,22 @@ html, body, #app {
128128
}
129129
}
130130

131-
pre {
131+
pre.syntax-block {
132132
height: 100%;
133133
font-size: 10pt;
134-
margin: 0 !important;
134+
margin: 0;
135+
padding: 1em;
136+
overflow: auto;
137+
background-color: #f5f2f0;
138+
color: black;
139+
text-shadow: 0 1px white;
140+
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
141+
text-align: left;
142+
white-space: pre;
143+
word-spacing: normal;
144+
word-break: normal;
145+
word-wrap: normal;
146+
line-height: 1.5;
147+
tab-size: 4;
148+
hyphens: none;
135149
}

0 commit comments

Comments
 (0)