public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

added CodeMirror ruler support

Browse Source
This commit is contained in:
Yu-Hung Ou
2018-03-20 20:44:44 +11:00
parent fbb7839f83
commit 281fb2afd3
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/CodeEditor.js
View File

@@ -14,6 +14,7 @@ const { ipcRenderer } = require('electron')
CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
const defaultEditorFontFamily = ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'monospace']
const buildCMRulers = rulers => rulers.map(ruler => ({ column: ruler }))
function pass (name) {
switch (name) {
@@ -91,9 +92,11 @@ export default class CodeEditor extends React.Component {
}
componentDidMount () {
const { rulers } = this.props
this.value = this.props.value
this.editor = CodeMirror(this.refs.root, {
rulers: buildCMRulers(rulers),
value: this.props.value,
lineNumbers: this.props.displayLineNumbers,
lineWrapping: true,
@@ -198,6 +201,10 @@ export default class CodeEditor extends React.Component {
needRefresh = true
}
if (prevProps.rulers !== this.props.rulers) {
this.editor.setOption('rulers', buildCMRulers(this.props.rulers))
}
if (prevProps.indentSize !== this.props.indentSize) {
this.editor.setOption('indentUnit', this.props.indentSize)
this.editor.setOption('tabSize', this.props.indentSize)
@@ -407,6 +414,7 @@ export default class CodeEditor extends React.Component {
CodeEditor.propTypes = {
value: PropTypes.string,
rulers: PropTypes.arrayOf(Number),
mode: PropTypes.string,
className: PropTypes.string,
onBlur: PropTypes.func,