Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
52 changes: 52 additions & 0 deletions browser/lib/markdown-toc-generator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/**
* @fileoverview Markdown table of contents generator
*/

import toc from 'markdown-toc'
import diacritics from 'diacritics-map'
import stripColor from 'strip-color'

/**
* @caseSensitiveSlugify Custom slugify function
* Same implementation that the original used by markdown-toc (node_modules/markdown-toc/lib/utils.js),
* but keeps original case to properly handle https://github.com/BoostIO/Boostnote/issues/2067
*/
function caseSensitiveSlugify (str) {
function replaceDiacritics (str) {
return str.replace(/[À-ž]/g, function (ch) {
return diacritics[ch] || ch
})
}
function getTitle (str) {
if (/^\[[^\]]+\]\(/.test(str)) {
var m = /^\[([^\]]+)\]/.exec(str)
if (m) return m[1]
}
return str
}
str = getTitle(str)
str = stripColor(str)
// str = str.toLowerCase() //let's be case sensitive

// `.split()` is often (but not always) faster than `.replace()`
str = str.split(' ').join('-')
str = str.split(/\t/).join('--')
str = str.split(/<\/?[^>]+>/).join('')
str = str.split(/[|$&`~=\\\/@+*!?({[\]})<>=.,;:'"^]/).join('')
str = str.split(/[。?!,、;:“”【】()〔〕[]﹃﹄“ ”‘’﹁﹂—…-~《》〈〉「」]/).join('')
str = replaceDiacritics(str)
return str
}

export function generate (currentValue, updateCallback) {
const TOC_MARKER = '<!-- toc -->'
if (!currentValue.includes(TOC_MARKER)) {
currentValue = TOC_MARKER + currentValue
}
updateCallback(toc.insert(currentValue, {slugify: caseSensitiveSlugify}))
}

export default {
generate
}

9 changes: 9 additions & 0 deletions browser/main/Detail/MarkdownNoteDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { formatDate } from 'browser/lib/date-formatter'
import { getTodoPercentageOfCompleted } from 'browser/lib/getTodoStatus'
import striptags from 'striptags'
import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
import markdownToc from 'browser/lib/markdown-toc-generator'

class MarkdownNoteDetail extends React.Component {
constructor (props) {
Expand All @@ -47,6 +48,7 @@ class MarkdownNoteDetail extends React.Component {
this.dispatchTimer = null

this.toggleLockButton = this.handleToggleLockButton.bind(this)
this.generateToc = () => this.handleGenerateToc()
}

focus () {
Expand All @@ -59,6 +61,7 @@ class MarkdownNoteDetail extends React.Component {
const reversedType = this.state.editorType === 'SPLIT' ? 'EDITOR_PREVIEW' : 'SPLIT'
this.handleSwitchMode(reversedType)
})
ee.on('code:generate-toc', this.generateToc)
}

componentWillReceiveProps (nextProps) {
Expand All @@ -75,6 +78,7 @@ class MarkdownNoteDetail extends React.Component {

componentWillUnmount () {
ee.off('topbar:togglelockbutton', this.toggleLockButton)
ee.off('code:generate-toc', this.generateToc)
if (this.saveQueue != null) this.saveNow()
}

Expand Down Expand Up @@ -262,6 +266,11 @@ class MarkdownNoteDetail extends React.Component {
}
}

handleGenerateToc () {
markdownToc.generate(this.refs.content.value,
(modifiedValue) => { this.refs.content.refs.code.setValue(modifiedValue) })
}

handleFocus (e) {
this.focus()
}
Expand Down
15 changes: 14 additions & 1 deletion browser/main/Detail/SnippetNoteDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import InfoPanelTrashed from './InfoPanelTrashed'
import { formatDate } from 'browser/lib/date-formatter'
import i18n from 'browser/lib/i18n'
import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
import markdownToc from 'browser/lib/markdown-toc-generator'

const electron = require('electron')
const { remote } = electron
Expand All @@ -52,6 +53,7 @@ class SnippetNoteDetail extends React.Component {
}

this.scrollToNextTabThreshold = 0.7
this.generateToc = () => this.handleGenerateToc()
}

componentDidMount () {
Expand All @@ -65,6 +67,7 @@ class SnippetNoteDetail extends React.Component {
enableLeftArrow: allTabs.offsetLeft !== 0
})
}
ee.on('code:generate-toc', this.generateToc)
}

componentWillReceiveProps (nextProps) {
Expand All @@ -91,6 +94,16 @@ class SnippetNoteDetail extends React.Component {

componentWillUnmount () {
if (this.saveQueue != null) this.saveNow()
ee.off('code:generate-toc', this.generateToc)
}

handleGenerateToc () {
const currentMode = this.state.note.snippets[this.state.snippetIndex].mode
if (currentMode.includes('Markdown')) {
const currentValue = this.refs['code-' + this.state.snippetIndex].value
const currentEditor = this.refs['code-' + this.state.snippetIndex].refs.code.editor
markdownToc.generate(currentValue, (modifiedValue) => { currentEditor.setValue(modifiedValue) })
}
}

handleChange (e) {
Expand Down Expand Up @@ -441,7 +454,7 @@ class SnippetNoteDetail extends React.Component {
const isSuper = global.process.platform === 'darwin'
? e.metaKey
: e.ctrlKey
if (isSuper && !e.shiftKey) {
if (isSuper && !e.shiftKey && !e.altKey) {
e.preventDefault()
this.addSnippet()
}
Expand Down
10 changes: 10 additions & 0 deletions lib/main-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,16 @@ const file = {
{
type: 'separator'
},
{
label: 'Generate/Update Markdown TOC',
accelerator: 'Shift+Ctrl+T',
click () {
mainWindow.webContents.send('code:generate-toc')
}
},
{
type: 'separator'
},
{
label: 'Print',
accelerator: 'CommandOrControl+P',
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"markdown-it-named-headers": "^0.0.4",
"markdown-it-plantuml": "^1.1.0",
"markdown-it-smartarrows": "^1.0.1",
"markdown-toc": "^1.2.0",
"mdurl": "^1.0.1",
"mermaid": "^8.0.0-rc.8",
"moment": "^2.10.3",
Expand Down
1 change: 1 addition & 0 deletions webpack-skeleton.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ var config = {
'markdown-it-kbd',
'markdown-it-plantuml',
'markdown-it-admonition',
'markdown-toc',
'devtron',
'@rokt33r/season',
{
Expand Down