Added link to downloads

.eslintrc

@@ -1,6 +1,6 @@
 {
-  "extends": ["standard", "standard-jsx", "plugin:react/recommended", "prettier"],
+  "extends": ["standard", "standard-jsx", "plugin:react/recommended"],
-  "plugins": ["react", "prettier"],
+  "plugins": ["react"],
   "rules": {
     "no-useless-escape": 0,
     "prefer-const": ["warn", {
@@ -13,8 +13,7 @@
     "react/no-string-refs": 0,
     "react/no-find-dom-node": "warn",
     "react/no-render-return-value": "warn",
-    "react/no-deprecated": "warn",
+    "react/no-deprecated": "warn"
-    "prettier/prettier": ["error"]
   },
   "globals": {
     "FileReader": true,

.prettierrc

@@ -1,5 +0,0 @@
-{
-  "singleQuote": true,
-  "semi": false,
-  "jsxSingleQuote": true
-}

ISSUE_TEMPLATE.md

@@ -5,19 +5,19 @@ Let us know what is currently happening.
 
 Please include some **screenshots** with the **developer tools** open (console tab) when you report a bug.
 
-If your issue is regarding the new Boost Note.next, please open an issue in the new repo 👉 https://github.com/BoostIO/BoostNote.next/issues.
+If your issue is regarding Boostnote mobile, please open an issue in the Boostnote Mobile repo 👉 https://github.com/BoostIO/boostnote-mobile.
 -->
 
 # Expected behavior
 
 <!--
-Let us know what you think should happen.
+Let us know what you think should happen!
 -->
 
 # Steps to reproduce
 
 <!-- 
-Please be thorough, issues we can reproduce are easier to fix.
+Please be thorough, issues we can reproduce are easier to fix!
 -->
 
 1. 
@@ -26,8 +26,8 @@ Please be thorough, issues we can reproduce are easier to fix.
 
 # Environment
 
-- Boostnote version: <!-- 0.x.x -->
+- Version :
-- OS version and name: <!-- Windows 10 / Ubuntu 18.04 / etc -->
+- OS Version and name :
 
 <!--
 Love Boostnote? Please consider supporting us on IssueHunt:

PULL_REQUEST_TEMPLATE.md

@@ -3,16 +3,13 @@ Before submitting this PR, please make sure that:
 - You have read and understand the contributing.md
 - You have checked docs/code_style.md for information on code style
 -->
-
 ## Description
-
 <!--
 Tell us what your PR does.
 Please attach a screenshot/ video/gif image describing your PR if possible.
 -->
 
 ## Issue fixed
-
 <!--
 Please list out all issue fixed with this PR here.
 -->
@@ -23,7 +20,6 @@ your PR will be reviewed faster if we know exactly what it does.
 
 Change :white_circle: to :radio_button: in all the options that apply
 -->
-
 ## Type of changes
 
 - :white_circle: Bug fix (Change that fixed an issue)
@@ -38,5 +34,3 @@ Change :white_circle: to :radio_button: in all the options that apply
 - :white_circle: I have written test for my code and it has been tested
 - :white_circle: All existing tests have been passed
 - :white_circle: I have attached a screenshot/video to visualize my change if possible
-- :white_circle: This PR will modify the UI or affects the UX
-- :white_circle: This PR will add/update/delete a keybinding

browser/components/CodeEditor.js

@@ -6,7 +6,11 @@ import hljs from 'highlight.js'
 import 'codemirror-mode-elixir'
 import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
 import convertModeName from 'browser/lib/convertModeName'
-import { options, TableEditor, Alignment } from '@susisu/mte-kernel'
+import {
+  options,
+  TableEditor,
+  Alignment
+} from '@susisu/mte-kernel'
 import TextEditorInterface from 'browser/lib/TextEditorInterface'
 import eventEmitter from 'browser/main/lib/eventEmitter'
 import iconv from 'iconv-lite'
@@ -16,15 +20,11 @@ import styles from '../components/CodeEditor.styl'
 const { ipcRenderer, remote, clipboard } = require('electron')
 import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
 const spellcheck = require('browser/lib/spellcheck')
-const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
+const buildEditorContextMenu = require('browser/lib/contextMenuBuilder').buildEditorContextMenu
-  .buildEditorContextMenu
 import { createTurndownService } from '../lib/turndown'
-import { languageMaps } from '../lib/CMLanguageList'
+import {languageMaps} from '../lib/CMLanguageList'
 import snippetManager from '../lib/SnippetManager'
-import {
+import {generateInEditor, tocExistsInEditor} from 'browser/lib/markdown-toc-generator'
-  generateInEditor,
-  tocExistsInEditor
-} from 'browser/lib/markdown-toc-generator'
 import markdownlint from 'markdownlint'
 import Jsonlint from 'jsonlint-mod'
 import { DEFAULT_CONFIG } from '../main/lib/ConfigManager'
@@ -33,38 +33,28 @@ import prettier from 'prettier'
 CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
 
 const buildCMRulers = (rulers, enableRulers) =>
-  enableRulers
+  (enableRulers ? rulers.map(ruler => ({
-    ? rulers.map(ruler => ({
+    column: ruler
-        column: ruler
+  })) : [])
-      }))
-    : []
 
-function translateHotkey(hotkey) {
+function translateHotkey (hotkey) {
-  return hotkey
+  return hotkey.replace(/\s*\+\s*/g, '-').replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl')
-    .replace(/\s*\+\s*/g, '-')
-    .replace(/Command/g, 'Cmd')
-    .replace(/Control/g, 'Ctrl')
 }
 
 export default class CodeEditor extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
       leading: false,
       trailing: true
     })
-    this.changeHandler = (editor, changeObject) =>
+    this.changeHandler = (editor, changeObject) => this.handleChange(editor, changeObject)
-      this.handleChange(editor, changeObject)
+    this.highlightHandler = (editor, changeObject) => this.handleHighlight(editor, changeObject)
-    this.highlightHandler = (editor, changeObject) =>
-      this.handleHighlight(editor, changeObject)
     this.focusHandler = () => {
       ipcRenderer.send('editor:focused', true)
     }
-    const debouncedDeletionOfAttachments = _.debounce(
+    const debouncedDeletionOfAttachments = _.debounce(attachmentManagement.deleteAttachmentsNotPresentInNote, 30000)
-      attachmentManagement.deleteAttachmentsNotPresentInNote,
-      30000
-    )
     this.blurHandler = (editor, e) => {
       ipcRenderer.send('editor:focused', false)
       if (e == null) return null
@@ -76,13 +66,12 @@ export default class CodeEditor extends React.Component {
         el = el.parentNode
       }
       this.props.onBlur != null && this.props.onBlur(e)
-      const { storageKey, noteKey } = this.props
+      const {
+        storageKey,
+        noteKey
+      } = this.props
       if (this.props.deleteUnusedAttachments === true) {
-        debouncedDeletionOfAttachments(
+        debouncedDeletionOfAttachments(this.editor.getValue(), storageKey, noteKey)
-          this.editor.getValue(),
-          storageKey,
-          noteKey
-        )
       }
     }
     this.pasteHandler = (editor, e) => {
@@ -102,7 +91,7 @@ export default class CodeEditor extends React.Component {
     this.formatTable = () => this.handleFormatTable()
 
     if (props.switchPreview !== 'RIGHTCLICK') {
-      this.contextMenuHandler = function(editor, event) {
+      this.contextMenuHandler = function (editor, event) {
         const menu = buildEditorContextMenu(editor, event)
         if (menu != null) {
           setTimeout(() => menu.popup(remote.getCurrentWindow()), 30)
@@ -115,24 +104,24 @@ export default class CodeEditor extends React.Component {
     this.turndownService = createTurndownService()
   }
 
-  handleSearch(msg) {
+  handleSearch (msg) {
     const cm = this.editor
     const component = this
 
     if (component.searchState) cm.removeOverlay(component.searchState)
     if (msg.length < 1) return
 
-    cm.operation(function() {
+    cm.operation(function () {
       component.searchState = makeOverlay(msg, 'searching')
       cm.addOverlay(component.searchState)
 
-      function makeOverlay(query, style) {
+      function makeOverlay (query, style) {
         query = new RegExp(
           query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
           'gi'
         )
         return {
-          token: function(stream) {
+          token: function (stream) {
             query.lastIndex = stream.pos
             var match = query.exec(stream.string)
             if (match && match.index === stream.pos) {
@@ -149,27 +138,25 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  handleFormatTable() {
+  handleFormatTable () {
-    this.tableEditor.formatAll(
+    this.tableEditor.formatAll(options({
-      options({
+      textWidthOptions: {}
-        textWidthOptions: {}
+    }))
-      })
-    )
   }
 
-  handleEditorActivity() {
+  handleEditorActivity () {
     if (!this.textEditorInterface.transaction) {
       this.updateTableEditorState()
     }
   }
 
-  updateDefaultKeyMap() {
+  updateDefaultKeyMap () {
     const { hotkey } = this.props
     const self = this
     const expandSnippet = snippetManager.expandSnippet
 
     this.defaultKeyMap = CodeMirror.normalizeKeyMap({
-      Tab: function(cm) {
+      Tab: function (cm) {
         const cursor = cm.getCursor()
         const line = cm.getLine(cursor.line)
         const cursorPosition = cursor.ch
@@ -211,17 +198,17 @@ export default class CodeEditor extends React.Component {
           }
         }
       },
-      'Cmd-Left': function(cm) {
+      'Cmd-Left': function (cm) {
         cm.execCommand('goLineLeft')
       },
-      'Cmd-T': function(cm) {
+      'Cmd-T': function (cm) {
         // Do nothing
       },
-      [translateHotkey(hotkey.insertDate)]: function(cm) {
+      [translateHotkey(hotkey.insertDate)]: function (cm) {
         const dateNow = new Date()
         cm.replaceSelection(dateNow.toLocaleDateString())
       },
-      [translateHotkey(hotkey.insertDateTime)]: function(cm) {
+      [translateHotkey(hotkey.insertDateTime)]: function (cm) {
         const dateNow = new Date()
         cm.replaceSelection(dateNow.toLocaleString())
       },
@@ -244,10 +231,7 @@ export default class CodeEditor extends React.Component {
         currentConfig.cursorOffset = cm.doc.indexFromPos(cursorPos)
 
         // Prettify contents of editor
-        const formattedTextDetails = prettier.formatWithCursor(
+        const formattedTextDetails = prettier.formatWithCursor(cm.doc.getValue(), currentConfig)
-          cm.doc.getValue(),
-          currentConfig
-        )
 
         const formattedText = formattedTextDetails.formatted
         const formattedCursorPos = formattedTextDetails.cursorOffset
@@ -262,8 +246,7 @@ export default class CodeEditor extends React.Component {
         const appendLineBreak = /\n$/.test(selection)
 
         const sorted = _.split(selection.trim(), '\n').sort()
-        const sortedString =
+        const sortedString = _.join(sorted, '\n') + (appendLineBreak ? '\n' : '')
-          _.join(sorted, '\n') + (appendLineBreak ? '\n' : '')
 
         cm.doc.replaceSelection(sortedString)
       },
@@ -273,7 +256,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  updateTableEditorState() {
+  updateTableEditorState () {
     const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
     if (active) {
       if (this.extraKeysMode !== 'editor') {
@@ -289,8 +272,8 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
-    const { rulers, enableRulers, enableMarkdownLint, RTL } = this.props
+    const { rulers, enableRulers, enableMarkdownLint } = this.props
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
     snippetManager.init()
@@ -311,15 +294,9 @@ export default class CodeEditor extends React.Component {
       scrollPastEnd: this.props.scrollPastEnd,
       inputStyle: 'textarea',
       dragDrop: false,
-      direction: RTL ? 'rtl' : 'ltr',
-      rtlMoveVisually: RTL,
       foldGutter: true,
       lint: enableMarkdownLint ? this.getCodeEditorLintConfig() : false,
-      gutters: [
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
-        'CodeMirror-linenumbers',
-        'CodeMirror-foldgutter',
-        'CodeMirror-lint-markers'
-      ],
       autoCloseBrackets: {
         pairs: this.props.matchingPairs,
         triples: this.props.matchingTriples,
@@ -330,9 +307,7 @@ export default class CodeEditor extends React.Component {
       prettierConfig: this.props.prettierConfig
     })
 
-    document.querySelector(
+    document.querySelector('.CodeMirror-lint-markers').style.display = enableMarkdownLint ? 'inline-block' : 'none'
-      '.CodeMirror-lint-markers'
-    ).style.display = enableMarkdownLint ? 'inline-block' : 'none'
 
     if (!this.props.mode && this.props.value && this.props.autoDetect) {
       this.autoDetectLanguage(this.props.value)
@@ -365,7 +340,7 @@ export default class CodeEditor extends React.Component {
     this.textEditorInterface = new TextEditorInterface(this.editor)
     this.tableEditor = new TableEditor(this.textEditorInterface)
     if (this.props.spellCheck) {
-      this.editor.addPanel(this.createSpellCheckPanel(), { position: 'bottom' })
+      this.editor.addPanel(this.createSpellCheckPanel(), {position: 'bottom'})
     }
 
     eventEmitter.on('code:format-table', this.formatTable)
@@ -375,13 +350,13 @@ export default class CodeEditor extends React.Component {
     })
 
     this.editorKeyMap = CodeMirror.normalizeKeyMap({
-      Tab: () => {
+      'Tab': () => {
         this.tableEditor.nextCell(this.tableEditorOptions)
       },
       'Shift-Tab': () => {
         this.tableEditor.previousCell(this.tableEditorOptions)
       },
-      Enter: () => {
+      'Enter': () => {
         this.tableEditor.nextRow(this.tableEditorOptions)
       },
       'Ctrl-Enter': () => {
@@ -500,7 +475,7 @@ export default class CodeEditor extends React.Component {
     this.initialHighlighting()
   }
 
-  getWordBeforeCursor(line, lineNumber, cursorPosition) {
+  getWordBeforeCursor (line, lineNumber, cursorPosition) {
     let wordBeforeCursor = ''
     const originCursorPosition = cursorPosition
     const emptyChars = /\t|\s|\r|\n|\$/
@@ -537,11 +512,11 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  quitEditor() {
+  quitEditor () {
     document.querySelector('textarea').blur()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     this.editor.off('focus', this.focusHandler)
     this.editor.off('blur', this.blurHandler)
     this.editor.off('change', this.changeHandler)
@@ -556,7 +531,7 @@ export default class CodeEditor extends React.Component {
     eventEmitter.off('code:format-table', this.formatTable)
   }
 
-  componentDidUpdate(prevProps, prevState) {
+  componentDidUpdate (prevProps, prevState) {
     let needRefresh = false
     const {
       rulers,
@@ -580,22 +555,13 @@ export default class CodeEditor extends React.Component {
     if (prevProps.keyMap !== this.props.keyMap) {
       needRefresh = true
     }
-    if (prevProps.RTL !== this.props.RTL) {
+    if (prevProps.enableMarkdownLint !== enableMarkdownLint || prevProps.customMarkdownLintConfig !== customMarkdownLintConfig) {
-      this.editor.setOption('direction', this.props.RTL ? 'rtl' : 'ltr')
-      this.editor.setOption('rtlMoveVisually', this.props.RTL)
-    }
-    if (
-      prevProps.enableMarkdownLint !== enableMarkdownLint ||
-      prevProps.customMarkdownLintConfig !== customMarkdownLintConfig
-    ) {
       if (!enableMarkdownLint) {
-        this.editor.setOption('lint', { default: false })
+        this.editor.setOption('lint', {default: false})
-        document.querySelector('.CodeMirror-lint-markers').style.display =
+        document.querySelector('.CodeMirror-lint-markers').style.display = 'none'
-          'none'
       } else {
         this.editor.setOption('lint', this.getCodeEditorLintConfig())
-        document.querySelector('.CodeMirror-lint-markers').style.display =
+        document.querySelector('.CodeMirror-lint-markers').style.display = 'inline-block'
-          'inline-block'
       }
       needRefresh = true
     }
@@ -627,11 +593,9 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('scrollPastEnd', this.props.scrollPastEnd)
     }
 
-    if (
+    if (prevProps.matchingPairs !== this.props.matchingPairs ||
-      prevProps.matchingPairs !== this.props.matchingPairs ||
       prevProps.matchingTriples !== this.props.matchingTriples ||
-      prevProps.explodingPairs !== this.props.explodingPairs
+      prevProps.explodingPairs !== this.props.explodingPairs) {
-    ) {
       const bracketObject = {
         pairs: this.props.matchingPairs,
         triples: this.props.matchingTriples,
@@ -676,18 +640,11 @@ export default class CodeEditor extends React.Component {
         const elem = document.getElementById('editor-bottom-panel')
         elem.parentNode.removeChild(elem)
       } else {
-        this.editor.addPanel(this.createSpellCheckPanel(), {
+        this.editor.addPanel(this.createSpellCheckPanel(), {position: 'bottom'})
-          position: 'bottom'
-        })
       }
     }
-    if (
+    if (prevProps.deleteUnusedAttachments !== this.props.deleteUnusedAttachments) {
-      prevProps.deleteUnusedAttachments !== this.props.deleteUnusedAttachments
+      this.editor.setOption('deleteUnusedAttachments', this.props.deleteUnusedAttachments)
-    ) {
-      this.editor.setOption(
-        'deleteUnusedAttachments',
-        this.props.deleteUnusedAttachments
-      )
     }
 
     if (needRefresh) {
@@ -695,19 +652,17 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  getCodeEditorLintConfig() {
+  getCodeEditorLintConfig () {
     const { mode } = this.props
     const checkMarkdownNoteIsOpen = mode === 'Boost Flavored Markdown'
 
-    return checkMarkdownNoteIsOpen
+    return checkMarkdownNoteIsOpen ? {
-      ? {
+      'getAnnotations': this.validatorOfMarkdown,
-          getAnnotations: this.validatorOfMarkdown,
+      'async': true
-          async: true
+    } : false
-        }
-      : false
   }
 
-  validatorOfMarkdown(text, updateLinting) {
+  validatorOfMarkdown (text, updateLinting) {
     const { customMarkdownLintConfig } = this.props
     let lintConfigJson
     try {
@@ -718,10 +673,10 @@ export default class CodeEditor extends React.Component {
       return
     }
     const lintOptions = {
-      strings: {
+      'strings': {
-        content: text
+        'content': text
       },
-      config: lintConfigJson
+      'config': lintConfigJson
     }
 
     return markdownlint(lintOptions, (err, result) => {
@@ -732,7 +687,7 @@ export default class CodeEditor extends React.Component {
           let ruleNames = ''
           item.ruleNames.map((ruleName, index) => {
             ruleNames += ruleName
-            ruleNames += index === item.ruleNames.length - 1 ? ': ' : '/'
+            ruleNames += (index === item.ruleNames.length - 1) ? ': ' : '/'
           })
           const lineNumber = item.lineNumber - 1
           foundIssues.push({
@@ -747,7 +702,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  setMode(mode) {
+  setMode (mode) {
     let syntax = CodeMirror.findModeByName(convertModeName(mode || 'text'))
     if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
@@ -755,7 +710,7 @@ export default class CodeEditor extends React.Component {
     CodeMirror.autoLoadMode(this.editor, syntax.mode)
   }
 
-  handleChange(editor, changeObject) {
+  handleChange (editor, changeObject) {
     spellcheck.handleChange(editor, changeObject)
 
     // The current note contains an toc. We'll check for changes on headlines.
@@ -765,11 +720,7 @@ export default class CodeEditor extends React.Component {
 
       // Check if one of the changed lines contains a headline
       for (let line = 0; line < changeObject.text.length; line++) {
-        if (
+        if (this.linePossibleContainsHeadline(editor.getLine(changeObject.from.line + line))) {
-          this.linePossibleContainsHeadline(
-            editor.getLine(changeObject.from.line + line)
-          )
-        ) {
           requireTocUpdate = true
           break
         }
@@ -798,13 +749,13 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  linePossibleContainsHeadline(currentLine) {
+  linePossibleContainsHeadline (currentLine) {
     // We can't check if the line start with # because when some write text before
     // the # we also need to update the toc
     return currentLine.includes('# ')
   }
 
-  incrementLines(start, linesAdded, linesRemoved, editor) {
+  incrementLines (start, linesAdded, linesRemoved, editor) {
     const highlightedLines = editor.options.linesHighlighted
 
     const totalHighlightedLines = highlightedLines.length
@@ -825,7 +776,7 @@ export default class CodeEditor extends React.Component {
         highlightedLines.splice(highlightedLines.indexOf(lineNumber), 1)
 
         // Lines that need to be relocated
-        if (lineNumber >= start + linesRemoved) {
+        if (lineNumber >= (start + linesRemoved)) {
           newLines.push(lineNumber + offset)
         }
       }
@@ -839,30 +790,22 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  handleHighlight(editor, changeObject) {
+  handleHighlight (editor, changeObject) {
     const lines = editor.options.linesHighlighted
 
     if (!lines.includes(changeObject)) {
       lines.push(changeObject)
-      editor.addLineClass(
+      editor.addLineClass(changeObject, 'text', 'CodeMirror-activeline-background')
-        changeObject,
-        'text',
-        'CodeMirror-activeline-background'
-      )
     } else {
       lines.splice(lines.indexOf(changeObject), 1)
-      editor.removeLineClass(
+      editor.removeLineClass(changeObject, 'text', 'CodeMirror-activeline-background')
-        changeObject,
-        'text',
-        'CodeMirror-activeline-background'
-      )
     }
     if (this.props.onChange) {
       this.props.onChange(editor)
     }
   }
 
-  updateHighlight(editor, changeObject) {
+  updateHighlight (editor, changeObject) {
     const linesAdded = changeObject.text.length - 1
     const linesRemoved = changeObject.removed.length - 1
 
@@ -893,28 +836,28 @@ export default class CodeEditor extends React.Component {
     this.incrementLines(start, linesAdded, linesRemoved, editor)
   }
 
-  moveCursorTo(row, col) {}
+  moveCursorTo (row, col) {}
 
-  scrollToLine(event, num) {
+  scrollToLine (event, num) {
     const cursor = {
       line: num,
       ch: 1
     }
     this.editor.setCursor(cursor)
-    const top = this.editor.charCoords({ line: num, ch: 0 }, 'local').top
+    const top = this.editor.charCoords({line: num, ch: 0}, 'local').top
     const middleHeight = this.editor.getScrollerElement().offsetHeight / 2
     this.editor.scrollTo(null, top - middleHeight - 5)
   }
 
-  focus() {
+  focus () {
     this.editor.focus()
   }
 
-  blur() {
+  blur () {
     this.editor.blur()
   }
 
-  reload() {
+  reload () {
     // Change event shouldn't be fired when switch note
     this.editor.off('change', this.changeHandler)
     this.value = this.props.value
@@ -925,7 +868,7 @@ export default class CodeEditor extends React.Component {
     this.editor.refresh()
   }
 
-  setValue(value) {
+  setValue (value) {
     const cursor = this.editor.getCursor()
     this.editor.setValue(value)
     this.editor.setCursor(cursor)
@@ -936,19 +879,18 @@ export default class CodeEditor extends React.Component {
    * @param {Number} lineNumber
    * @param {String} content
    */
-  setLineContent(lineNumber, content) {
+  setLineContent (lineNumber, content) {
     const prevContent = this.editor.getLine(lineNumber)
     const prevContentLength = prevContent ? prevContent.length : 0
-    this.editor.replaceRange(
+    this.editor.replaceRange(content, { line: lineNumber, ch: 0 }, { line: lineNumber, ch: prevContentLength })
-      content,
-      { line: lineNumber, ch: 0 },
-      { line: lineNumber, ch: prevContentLength }
-    )
   }
 
-  handleDropImage(dropEvent) {
+  handleDropImage (dropEvent) {
     dropEvent.preventDefault()
-    const { storageKey, noteKey } = this.props
+    const {
+      storageKey,
+      noteKey
+    } = this.props
     attachmentManagement.handleAttachmentDrop(
       this,
       storageKey,
@@ -957,44 +899,37 @@ export default class CodeEditor extends React.Component {
     )
   }
 
-  insertAttachmentMd(imageMd) {
+  insertAttachmentMd (imageMd) {
     this.editor.replaceSelection(imageMd)
   }
 
-  autoDetectLanguage(content) {
+  autoDetectLanguage (content) {
     const res = hljs.highlightAuto(content, Object.keys(languageMaps))
     this.setMode(languageMaps[res.language])
   }
 
-  handlePaste(editor, forceSmartPaste) {
+  handlePaste (editor, forceSmartPaste) {
     const { storageKey, noteKey, fetchUrlTitle, enableSmartPaste } = this.props
 
-    const isURL = str =>
+    const isURL = str => /(?:^\w+:|^)\/\/(?:[^\s\.]+\.\S{2}|localhost[\:?\d]*)/.test(str)
-      /(?:^\w+:|^)\/\/(?:[^\s\.]+\.\S{2}|localhost[\:?\d]*)/.test(str)
 
     const isInLinkTag = editor => {
       const startCursor = editor.getCursor('start')
-      const prevChar = editor.getRange(
+      const prevChar = editor.getRange({
-        {
+        line: startCursor.line,
-          line: startCursor.line,
+        ch: startCursor.ch - 2
-          ch: startCursor.ch - 2
+      }, {
-        },
+        line: startCursor.line,
-        {
+        ch: startCursor.ch
-          line: startCursor.line,
+      })
-          ch: startCursor.ch
-        }
-      )
       const endCursor = editor.getCursor('end')
-      const nextChar = editor.getRange(
+      const nextChar = editor.getRange({
-        {
+        line: endCursor.line,
-          line: endCursor.line,
+        ch: endCursor.ch
-          ch: endCursor.ch
+      }, {
-        },
+        line: endCursor.line,
-        {
+        ch: endCursor.ch + 1
-          line: endCursor.line,
+      })
-          ch: endCursor.ch + 1
-        }
-      )
       return prevChar === '](' && nextChar === ')'
     }
 
@@ -1006,7 +941,7 @@ export default class CodeEditor extends React.Component {
         return true
       }
 
-      let line = (line = cursor.line - 1)
+      let line = line = cursor.line - 1
       while (line >= 0) {
         token = editor.getTokenAt({
           ch: 3,
@@ -1038,11 +973,7 @@ export default class CodeEditor extends React.Component {
 
     if (isInFencedCodeBlock(editor)) {
       this.handlePasteText(editor, pastedTxt)
-    } else if (
+    } else if (fetchUrlTitle && isMarkdownTitleURL(pastedTxt) && !isInLinkTag(editor)) {
-      fetchUrlTitle &&
-      isMarkdownTitleURL(pastedTxt) &&
-      !isInLinkTag(editor)
-    ) {
       this.handlePasteUrl(editor, pastedTxt)
     } else if (fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
       this.handlePasteUrl(editor, pastedTxt)
@@ -1078,13 +1009,13 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  handleScroll(e) {
+  handleScroll (e) {
     if (this.props.onScroll) {
       this.props.onScroll(e)
     }
   }
 
-  handlePasteUrl(editor, pastedTxt) {
+  handlePasteUrl (editor, pastedTxt) {
     let taggedUrl = `<${pastedTxt}>`
     let urlToFetch = pastedTxt
     let titleMark = ''
@@ -1134,16 +1065,16 @@ export default class CodeEditor extends React.Component {
       })
   }
 
-  handlePasteHtml(editor, pastedHtml) {
+  handlePasteHtml (editor, pastedHtml) {
     const markdown = this.turndownService.turndown(pastedHtml)
     editor.replaceSelection(markdown)
   }
 
-  handlePasteText(editor, pastedTxt) {
+  handlePasteText (editor, pastedTxt) {
     editor.replaceSelection(pastedTxt)
   }
 
-  mapNormalResponse(response, pastedTxt) {
+  mapNormalResponse (response, pastedTxt) {
     return this.decodeResponse(response).then(body => {
       return new Promise((resolve, reject) => {
         try {
@@ -1151,12 +1082,10 @@ export default class CodeEditor extends React.Component {
             body,
             'text/html'
           )
-          const escapePipe = str => {
+          const escapePipe = (str) => {
             return str.replace('|', '\\|')
           }
-          const linkWithTitle = `[${escapePipe(
+          const linkWithTitle = `[${escapePipe(parsedBody.title)}](${pastedTxt})`
-            parsedBody.title
-          )}](${pastedTxt})`
           resolve(linkWithTitle)
         } catch (e) {
           reject(e)
@@ -1165,7 +1094,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  initialHighlighting() {
+  initialHighlighting () {
     if (this.editor.options.linesHighlighted == null) {
       return
     }
@@ -1179,20 +1108,16 @@ export default class CodeEditor extends React.Component {
         // make sure that we skip the invalid lines althrough this case should not be happened.
         continue
       }
-      this.editor.addLineClass(
+      this.editor.addLineClass(lineNumber, 'text', 'CodeMirror-activeline-background')
-        lineNumber,
-        'text',
-        'CodeMirror-activeline-background'
-      )
     }
   }
 
-  restartHighlighting() {
+  restartHighlighting () {
     this.editor.options.linesHighlighted = this.props.linesHighlighted
     this.initialHighlighting()
   }
 
-  mapImageResponse(response, pastedTxt) {
+  mapImageResponse (response, pastedTxt) {
     return new Promise((resolve, reject) => {
       try {
         const url = response.url
@@ -1205,7 +1130,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  decodeResponse(response) {
+  decodeResponse (response) {
     const headers = response.headers
     const _charset = headers.has('content-type')
       ? this.extractContentTypeCharset(headers.get('content-type'))
@@ -1213,10 +1138,10 @@ export default class CodeEditor extends React.Component {
     return response.arrayBuffer().then(buff => {
       return new Promise((resolve, reject) => {
         try {
-          const charset =
+          const charset = _charset !== undefined &&
-            _charset !== undefined && iconv.encodingExists(_charset)
+            iconv.encodingExists(_charset)
-              ? _charset
+            ? _charset
-              : 'utf-8'
+            : 'utf-8'
           resolve(iconv.decode(Buffer.from(buff), charset).toString())
         } catch (e) {
           reject(e)
@@ -1225,49 +1150,50 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  extractContentTypeCharset(contentType) {
+  extractContentTypeCharset (contentType) {
     return contentType
       .split(';')
       .filter(str => {
-        return str
+        return str.trim().toLowerCase().startsWith('charset')
-          .trim()
-          .toLowerCase()
-          .startsWith('charset')
       })
       .map(str => {
         return str.replace(/['"]/g, '').split('=')[1]
       })[0]
   }
 
-  render() {
+  render () {
-    const { className, fontSize } = this.props
+    const {
+      className,
+      fontSize
+    } = this.props
     const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
     const width = this.props.width
-    return (
+    return (<
-      <div
+      div className={
-        className={className == null ? 'CodeEditor' : `CodeEditor ${className}`}
+        className == null ? 'CodeEditor' : `CodeEditor ${className}`
-        ref='root'
+      }
-        tabIndex='-1'
+      ref='root'
-        style={{
+      tabIndex='-1'
-          fontFamily,
+      style={{
-          fontSize: fontSize,
+        fontFamily,
-          width: width
+        fontSize: fontSize,
-        }}
+        width: width
-        onDrop={e => this.handleDropImage(e)}
+      }}
+      onDrop={
+        e => this.handleDropImage(e)
+      }
       />
     )
   }
 
-  createSpellCheckPanel() {
+  createSpellCheckPanel () {
     const panel = document.createElement('div')
     panel.className = 'panel bottom'
     panel.id = 'editor-bottom-panel'
     const dropdown = document.createElement('select')
     dropdown.title = 'Spellcheck'
     dropdown.className = styles['spellcheck-select']
-    dropdown.addEventListener('change', e =>
+    dropdown.addEventListener('change', (e) => spellcheck.setLanguage(this.editor, dropdown.value))
-      spellcheck.setLanguage(this.editor, dropdown.value)
-    )
     const options = spellcheck.getAvailableDictionaries()
     for (const op of options) {
       const option = document.createElement('option')
@@ -1293,8 +1219,7 @@ CodeEditor.propTypes = {
   spellCheck: PropTypes.bool,
   enableMarkdownLint: PropTypes.bool,
   customMarkdownLintConfig: PropTypes.string,
-  deleteUnusedAttachments: PropTypes.bool,
+  deleteUnusedAttachments: PropTypes.bool
-  RTL: PropTypes.bool
 }
 
 CodeEditor.defaultProps = {
@@ -1310,6 +1235,5 @@ CodeEditor.defaultProps = {
   enableMarkdownLint: DEFAULT_CONFIG.editor.enableMarkdownLint,
   customMarkdownLintConfig: DEFAULT_CONFIG.editor.customMarkdownLintConfig,
   prettierConfig: DEFAULT_CONFIG.editor.prettierConfig,
-  deleteUnusedAttachments: DEFAULT_CONFIG.editor.deleteUnusedAttachments,
+  deleteUnusedAttachments: DEFAULT_CONFIG.editor.deleteUnusedAttachments
-  RTL: false
 }

browser/components/ColorPicker.js

@@ -7,7 +7,7 @@ import styles from './ColorPicker.styl'
 const componentHeight = 330
 
 class ColorPicker extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -18,21 +18,21 @@ class ColorPicker extends React.Component {
     this.handleConfirm = this.handleConfirm.bind(this)
   }
 
-  componentWillReceiveProps(nextProps) {
+  componentWillReceiveProps (nextProps) {
     this.onColorChange(nextProps.color)
   }
 
-  onColorChange(color) {
+  onColorChange (color) {
     this.setState({
       color
     })
   }
 
-  handleConfirm() {
+  handleConfirm () {
     this.props.onConfirm(this.state.color)
   }
 
-  render() {
+  render () {
     const { onReset, onCancel, targetRect } = this.props
     const { color } = this.state
 
@@ -44,22 +44,13 @@ class ColorPicker extends React.Component {
     }
 
     return (
-      <div
+      <div styleName='colorPicker' style={{top: `${alignY}px`, left: `${alignX}px`}}>
-        styleName='colorPicker'
-        style={{ top: `${alignY}px`, left: `${alignX}px` }}
-      >
         <div styleName='cover' onClick={onCancel} />
         <SketchPicker color={color} onChange={this.onColorChange} />
         <div styleName='footer'>
-          <button styleName='btn-reset' onClick={onReset}>
+          <button styleName='btn-reset' onClick={onReset}>Reset</button>
-            Reset
+          <button styleName='btn-cancel' onClick={onCancel}>Cancel</button>
-          </button>
+          <button styleName='btn-confirm' onClick={this.handleConfirm}>Confirm</button>
-          <button styleName='btn-cancel' onClick={onCancel}>
-            Cancel
-          </button>
-          <button styleName='btn-confirm' onClick={this.handleConfirm}>
-            Confirm
-          </button>
         </div>
       </div>
     )

browser/components/MarkdownEditor.js

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
@@ -11,7 +10,7 @@ import ConfigManager from 'browser/main/lib/ConfigManager'
 import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
 
 class MarkdownEditor extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     // char codes for ctrl + w
@@ -21,171 +20,142 @@ class MarkdownEditor extends React.Component {
     this.supportMdSelectionBold = [16, 17, 186]
 
     this.state = {
-      status:
+      status: props.config.editor.switchPreview === 'RIGHTCLICK' ? props.config.editor.delfaultStatus : 'CODE',
-        props.config.editor.switchPreview === 'RIGHTCLICK'
-          ? props.config.editor.delfaultStatus
-          : 'CODE',
       renderValue: props.value,
       keyPressed: new Set(),
       isLocked: props.isLocked
     }
 
-    this.lockEditorCode = this.handleLockEditor.bind(this)
+    this.lockEditorCode = () => this.handleLockEditor()
-    this.focusEditor = this.focusEditor.bind(this)
-
-    this.previewRef = React.createRef()
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.value = this.refs.code.value
     eventEmitter.on('editor:lock', this.lockEditorCode)
-    eventEmitter.on('editor:focus', this.focusEditor)
+    eventEmitter.on('editor:focus', this.focusEditor.bind(this))
   }
 
-  componentDidUpdate() {
+  componentDidUpdate () {
     this.value = this.refs.code.value
   }
 
-  UNSAFE_componentWillReceiveProps(props) {
+  componentWillReceiveProps (props) {
     if (props.value !== this.props.value) {
       this.queueRendering(props.value)
     }
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     this.cancelQueue()
     eventEmitter.off('editor:lock', this.lockEditorCode)
-    eventEmitter.off('editor:focus', this.focusEditor)
+    eventEmitter.off('editor:focus', this.focusEditor.bind(this))
   }
 
-  focusEditor() {
+  focusEditor () {
-    this.setState(
+    this.setState({
-      {
+      status: 'CODE'
-        status: 'CODE'
+    }, () => {
-      },
+      this.refs.code.focus()
-      () => {
+    })
-        if (this.refs.code == null) {
-          return
-        }
-        this.refs.code.focus()
-      }
-    )
   }
 
-  queueRendering(value) {
+  queueRendering (value) {
     clearTimeout(this.renderTimer)
     this.renderTimer = setTimeout(() => {
       this.renderPreview(value)
     }, 500)
   }
 
-  cancelQueue() {
+  cancelQueue () {
     clearTimeout(this.renderTimer)
   }
 
-  renderPreview(value) {
+  renderPreview (value) {
     this.setState({
       renderValue: value
     })
   }
 
-  setValue(value) {
+  setValue (value) {
     this.refs.code.setValue(value)
   }
 
-  handleChange(e) {
+  handleChange (e) {
     this.value = this.refs.code.value
     this.props.onChange(e)
   }
 
-  handleContextMenu(e) {
+  handleContextMenu (e) {
     if (this.state.isLocked) return
     const { config } = this.props
     if (config.editor.switchPreview === 'RIGHTCLICK') {
       const newStatus = this.state.status === 'PREVIEW' ? 'CODE' : 'PREVIEW'
-      this.setState(
+      this.setState({
-        {
+        status: newStatus
-          status: newStatus
+      }, () => {
-        },
+        if (newStatus === 'CODE') {
-        () => {
+          this.refs.code.focus()
-          if (newStatus === 'CODE') {
+        } else {
-            this.refs.code.focus()
+          this.refs.preview.focus()
-          } else {
-            this.previewRef.current.focus()
-          }
-          eventEmitter.emit('topbar:togglelockbutton', this.state.status)
-
-          const newConfig = Object.assign({}, config)
-          newConfig.editor.delfaultStatus = newStatus
-          ConfigManager.set(newConfig)
         }
-      )
+        eventEmitter.emit('topbar:togglelockbutton', this.state.status)
+
+        const newConfig = Object.assign({}, config)
+        newConfig.editor.delfaultStatus = newStatus
+        ConfigManager.set(newConfig)
+      })
     }
   }
 
-  handleBlur(e) {
+  handleBlur (e) {
     if (this.state.isLocked) return
     this.setState({ keyPressed: new Set() })
     const { config } = this.props
-    if (
+    if (config.editor.switchPreview === 'BLUR' ||
-      config.editor.switchPreview === 'BLUR' ||
+        (config.editor.switchPreview === 'DBL_CLICK' && this.state.status === 'CODE')
-      (config.editor.switchPreview === 'DBL_CLICK' &&
-        this.state.status === 'CODE')
     ) {
       const cursorPosition = this.refs.code.editor.getCursor()
-      this.setState(
+      this.setState({
-        {
+        status: 'PREVIEW'
-          status: 'PREVIEW'
+      }, () => {
-        },
+        this.refs.preview.focus()
-        () => {
+        this.refs.preview.scrollTo(cursorPosition.line)
-          this.previewRef.current.focus()
+      })
-          this.previewRef.current.scrollToRow(cursorPosition.line)
-        }
-      )
       eventEmitter.emit('topbar:togglelockbutton', this.state.status)
     }
   }
 
-  handleDoubleClick(e) {
+  handleDoubleClick (e) {
     if (this.state.isLocked) return
-    this.setState({ keyPressed: new Set() })
+    this.setState({keyPressed: new Set()})
     const { config } = this.props
     if (config.editor.switchPreview === 'DBL_CLICK') {
-      this.setState(
+      this.setState({
-        {
+        status: 'CODE'
-          status: 'CODE'
+      }, () => {
-        },
+        this.refs.code.focus()
-        () => {
+        eventEmitter.emit('topbar:togglelockbutton', this.state.status)
-          this.refs.code.focus()
+      })
-          eventEmitter.emit('topbar:togglelockbutton', this.state.status)
-        }
-      )
     }
   }
 
-  handlePreviewMouseDown(e) {
+  handlePreviewMouseDown (e) {
     this.previewMouseDownedAt = new Date()
   }
 
-  handlePreviewMouseUp(e) {
+  handlePreviewMouseUp (e) {
     const { config } = this.props
-    if (
+    if (config.editor.switchPreview === 'BLUR' && new Date() - this.previewMouseDownedAt < 200) {
-      config.editor.switchPreview === 'BLUR' &&
+      this.setState({
-      new Date() - this.previewMouseDownedAt < 200
+        status: 'CODE'
-    ) {
+      }, () => {
-      this.setState(
+        this.refs.code.focus()
-        {
+      })
-          status: 'CODE'
-        },
-        () => {
-          this.refs.code.focus()
-        }
-      )
       eventEmitter.emit('topbar:togglelockbutton', this.state.status)
     }
   }
 
-  handleCheckboxClick(e) {
+  handleCheckboxClick (e) {
     e.preventDefault()
     e.stopPropagation()
     const idMatch = /checkbox-([0-9]+)/
@@ -194,9 +164,9 @@ class MarkdownEditor extends React.Component {
     const checkReplace = /\[x]/i
     const uncheckReplace = /\[ ]/
     if (idMatch.test(e.target.getAttribute('id'))) {
-      const lineIndex =
+      const lineIndex = parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1
-        parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1
+      const lines = this.refs.code.value
-      const lines = this.refs.code.value.split('\n')
+        .split('\n')
 
       const targetLine = lines[lineIndex]
       let newLine = targetLine
@@ -211,56 +181,45 @@ class MarkdownEditor extends React.Component {
     }
   }
 
-  focus() {
+  focus () {
     if (this.state.status === 'PREVIEW') {
-      this.setState(
+      this.setState({
-        {
+        status: 'CODE'
-          status: 'CODE'
+      }, () => {
-        },
+        this.refs.code.focus()
-        () => {
+      })
-          this.refs.code.focus()
-        }
-      )
     } else {
       this.refs.code.focus()
     }
     eventEmitter.emit('topbar:togglelockbutton', this.state.status)
   }
 
-  reload() {
+  reload () {
     this.refs.code.reload()
     this.cancelQueue()
     this.renderPreview(this.props.value)
   }
 
-  handleKeyDown(e) {
+  handleKeyDown (e) {
     const { config } = this.props
     if (this.state.status !== 'CODE') return false
     const keyPressed = this.state.keyPressed
     keyPressed.add(e.keyCode)
     this.setState({ keyPressed })
-    const isNoteHandlerKey = el => {
+    const isNoteHandlerKey = (el) => { return keyPressed.has(el) }
-      return keyPressed.has(el)
-    }
     // These conditions are for ctrl-e and ctrl-w
-    if (
+    if (keyPressed.size === this.escapeFromEditor.length &&
-      keyPressed.size === this.escapeFromEditor.length &&
+        !this.state.isLocked && this.state.status === 'CODE' &&
-      !this.state.isLocked &&
+        this.escapeFromEditor.every(isNoteHandlerKey)) {
-      this.state.status === 'CODE' &&
-      this.escapeFromEditor.every(isNoteHandlerKey)
-    ) {
       this.handleContextMenu()
       if (config.editor.switchPreview === 'BLUR') document.activeElement.blur()
     }
-    if (
+    if (keyPressed.size === this.supportMdSelectionBold.length && this.supportMdSelectionBold.every(isNoteHandlerKey)) {
-      keyPressed.size === this.supportMdSelectionBold.length &&
-      this.supportMdSelectionBold.every(isNoteHandlerKey)
-    ) {
       this.addMdAroundWord('**')
     }
   }
 
-  addMdAroundWord(mdElement) {
+  addMdAroundWord (mdElement) {
     if (this.refs.code.editor.getSelection()) {
       return this.addMdAroundSelection(mdElement)
     }
@@ -268,63 +227,47 @@ class MarkdownEditor extends React.Component {
     const word = this.refs.code.editor.findWordAt(currentCaret)
     const cmDoc = this.refs.code.editor.getDoc()
     cmDoc.replaceRange(mdElement, word.anchor)
-    cmDoc.replaceRange(mdElement, {
+    cmDoc.replaceRange(mdElement, { line: word.head.line, ch: word.head.ch + mdElement.length })
-      line: word.head.line,
-      ch: word.head.ch + mdElement.length
-    })
   }
 
-  addMdAroundSelection(mdElement) {
+  addMdAroundSelection (mdElement) {
-    this.refs.code.editor.replaceSelection(
+    this.refs.code.editor.replaceSelection(`${mdElement}${this.refs.code.editor.getSelection()}${mdElement}`)
-      `${mdElement}${this.refs.code.editor.getSelection()}${mdElement}`
-    )
   }
 
-  handleDropImage(dropEvent) {
+  handleDropImage (dropEvent) {
     dropEvent.preventDefault()
     const { storageKey, noteKey } = this.props
 
-    this.setState(
+    this.setState({
-      {
+      status: 'CODE'
-        status: 'CODE'
+    }, () => {
-      },
+      this.refs.code.focus()
-      () => {
-        this.refs.code.focus()
 
-        this.refs.code.editor.execCommand('goDocEnd')
+      this.refs.code.editor.execCommand('goDocEnd')
-        this.refs.code.editor.execCommand('goLineEnd')
+      this.refs.code.editor.execCommand('goLineEnd')
-        this.refs.code.editor.execCommand('newlineAndIndent')
+      this.refs.code.editor.execCommand('newlineAndIndent')
 
-        attachmentManagement.handleAttachmentDrop(
+      attachmentManagement.handleAttachmentDrop(
-          this.refs.code,
+        this.refs.code,
-          storageKey,
+        storageKey,
-          noteKey,
+        noteKey,
-          dropEvent
+        dropEvent
-        )
+      )
-      }
+    })
-    )
   }
 
-  handleKeyUp(e) {
+  handleKeyUp (e) {
     const keyPressed = this.state.keyPressed
     keyPressed.delete(e.keyCode)
     this.setState({ keyPressed })
   }
 
-  handleLockEditor() {
+  handleLockEditor () {
     this.setState({ isLocked: !this.state.isLocked })
   }
 
-  render() {
+  render () {
-    const {
+    const {className, value, config, storageKey, noteKey, linesHighlighted} = this.props
-      className,
-      value,
-      config,
-      storageKey,
-      noteKey,
-      linesHighlighted,
-      RTL
-    } = this.props
 
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
@@ -332,24 +275,23 @@ class MarkdownEditor extends React.Component {
     if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
 
     const previewStyle = {}
-    if (this.props.ignorePreviewPointerEvents)
+    if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none'
-      previewStyle.pointerEvents = 'none'
 
     const storage = findStorage(storageKey)
 
     return (
-      <div
+      <div className={className == null
-        className={
+          ? 'MarkdownEditor'
-          className == null ? 'MarkdownEditor' : `MarkdownEditor ${className}`
+          : `MarkdownEditor ${className}`
         }
-        onContextMenu={e => this.handleContextMenu(e)}
+        onContextMenu={(e) => this.handleContextMenu(e)}
         tabIndex='-1'
-        onKeyDown={e => this.handleKeyDown(e)}
+        onKeyDown={(e) => this.handleKeyDown(e)}
-        onKeyUp={e => this.handleKeyUp(e)}
+        onKeyUp={(e) => this.handleKeyUp(e)}
       >
-        <CodeEditor
+        <CodeEditor styleName={this.state.status === 'CODE'
-          styleName={
+            ? 'codeEditor'
-            this.state.status === 'CODE' ? 'codeEditor' : 'codeEditor--hide'
+            : 'codeEditor--hide'
           }
           ref='code'
           mode='Boost Flavored Markdown'
@@ -373,8 +315,8 @@ class MarkdownEditor extends React.Component {
           fetchUrlTitle={config.editor.fetchUrlTitle}
           enableTableEditor={config.editor.enableTableEditor}
           linesHighlighted={linesHighlighted}
-          onChange={e => this.handleChange(e)}
+          onChange={(e) => this.handleChange(e)}
-          onBlur={e => this.handleBlur(e)}
+          onBlur={(e) => this.handleBlur(e)}
           spellCheck={config.editor.spellcheck}
           enableSmartPaste={config.editor.enableSmartPaste}
           hotkey={config.hotkey}
@@ -383,12 +325,10 @@ class MarkdownEditor extends React.Component {
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
           prettierConfig={config.editor.prettierConfig}
           deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
-          RTL={RTL}
         />
-        <MarkdownPreview
+        <MarkdownPreview styleName={this.state.status === 'PREVIEW'
-          ref={this.previewRef}
+            ? 'preview'
-          styleName={
+            : 'preview--hide'
-            this.state.status === 'PREVIEW' ? 'preview' : 'preview--hide'
           }
           style={previewStyle}
           theme={config.ui.theme}
@@ -405,21 +345,21 @@ class MarkdownEditor extends React.Component {
           breaks={config.preview.breaks}
           sanitize={config.preview.sanitize}
           mermaidHTMLLabel={config.preview.mermaidHTMLLabel}
-          onContextMenu={e => this.handleContextMenu(e)}
+          ref='preview'
-          onDoubleClick={e => this.handleDoubleClick(e)}
+          onContextMenu={(e) => this.handleContextMenu(e)}
+          onDoubleClick={(e) => this.handleDoubleClick(e)}
           tabIndex='0'
           value={this.state.renderValue}
-          onMouseUp={e => this.handlePreviewMouseUp(e)}
+          onMouseUp={(e) => this.handlePreviewMouseUp(e)}
-          onMouseDown={e => this.handlePreviewMouseDown(e)}
+          onMouseDown={(e) => this.handlePreviewMouseDown(e)}
-          onCheckboxClick={e => this.handleCheckboxClick(e)}
+          onCheckboxClick={(e) => this.handleCheckboxClick(e)}
           showCopyNotification={config.ui.showCopyNotification}
           storagePath={storage.path}
           noteKey={noteKey}
           customCSS={config.preview.customCSS}
           allowCustomCSS={config.preview.allowCustomCSS}
           lineThroughCheckbox={config.preview.lineThroughCheckbox}
-          onDrop={e => this.handleDropImage(e)}
+          onDrop={(e) => this.handleDropImage(e)}
-          RTL={RTL}
         />
       </div>
     )

browser/components/MarkdownPreview.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types'
 import React from 'react'
-import { connect } from 'react-redux'
 import Markdown from 'browser/lib/markdown'
 import _ from 'lodash'
 import CodeMirror from 'codemirror'
@@ -12,7 +11,6 @@ import mermaidRender from './render/MermaidRender'
 import SequenceDiagram from '@rokt33r/js-sequence-diagrams'
 import Chart from 'chart.js'
 import eventEmitter from 'browser/main/lib/eventEmitter'
-import config from 'browser/main/lib/ConfigManager'
 import htmlTextHelper from 'browser/lib/htmlTextHelper'
 import convertModeName from 'browser/lib/convertModeName'
 import copy from 'copy-to-clipboard'
@@ -22,15 +20,11 @@ import { escapeHtmlCharacters } from 'browser/lib/utils'
 import yaml from 'js-yaml'
 import { render } from 'react-dom'
 import Carousel from 'react-image-carousel'
-import { push } from 'connected-react-router'
 import ConfigManager from '../main/lib/ConfigManager'
-import uiThemes from 'browser/lib/ui-themes'
-import i18n from 'browser/lib/i18n'
 
 const { remote, shell } = require('electron')
 const attachmentManagement = require('../main/lib/dataApi/attachmentManagement')
-const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder')
+const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder').buildMarkdownPreviewContextMenu
-  .buildMarkdownPreviewContextMenu
 
 const { app } = remote
 const path = require('path')
@@ -56,21 +50,22 @@ const CSS_FILES = [
  * @param {String} opts.theme
  * @param {Boolean} [opts.lineNumber] Should show line number
  * @param {Boolean} [opts.scrollPastEnd]
+ * @param {Boolean} [opts.optimizeOverflowScroll] Should tweak body style to optimize overflow scrollbar display
  * @param {Boolean} [opts.allowCustomCSS] Should add custom css
  * @param {String} [opts.customCSS] Will be added to bottom, only if `opts.allowCustomCSS` is truthy
  * @returns {String}
  */
-function buildStyle(opts) {
+function buildStyle (opts) {
   const {
     fontFamily,
     fontSize,
     codeBlockFontFamily,
     lineNumber,
     scrollPastEnd,
+    optimizeOverflowScroll,
     theme,
     allowCustomCSS,
-    customCSS,
+    customCSS
-    RTL
   } = opts
   return `
 @font-face {
@@ -107,17 +102,8 @@ ${markdownStyle}
 body {
   font-family: '${fontFamily.join("','")}';
   font-size: ${fontSize}px;
-
+  ${scrollPastEnd ? 'padding-bottom: 90vh;' : ''}
-  ${
+  ${optimizeOverflowScroll ? 'height: 100%;' : ''}
-    scrollPastEnd
-      ? `
-    padding-bottom: 90vh;
-    box-sizing: border-box;
-    `
-      : ''
-  }
-  ${RTL ? 'direction: rtl;' : ''}
-  ${RTL ? 'text-align: right;' : ''}
 }
 @media print {
   body {
@@ -127,8 +113,6 @@ body {
 code {
   font-family: '${codeBlockFontFamily.join("','")}';
   background-color: rgba(0,0,0,0.04);
-  text-align: left;
-  direction: ltr;
 }
 .lineNumber {
   ${lineNumber && 'display: block !important;'}
@@ -159,22 +143,14 @@ h1, h2 {
   border: none;
 }
 
-h3 {
-  margin: 1em 0 0.8em;
-}
-
-h4, h5, h6 {
-  margin: 1.1em 0 0.5em;
-}
-
 h1 {
-  padding: 0.2em 0 0.2em;
+  padding-bottom: 4px;
   margin: 1em 0 8px;
 }
 
 h2 {
-  padding: 0.2em 0 0.2em;
+  padding-bottom: 0.2em;
-  margin: 1em 0 0.7em;
+  margin: 1em 0 0.37em;
 }
 
 body p {
@@ -197,33 +173,21 @@ ${allowCustomCSS ? customCSS : ''}
 
 const scrollBarStyle = `
 ::-webkit-scrollbar {
-  ${config.get().ui.showScrollBar ? '' : 'display: none;'}
   width: 12px;
 }
 
 ::-webkit-scrollbar-thumb {
-  ${config.get().ui.showScrollBar ? '' : 'display: none;'}
   background-color: rgba(0, 0, 0, 0.15);
 }
-
-::-webkit-scrollbar-track-piece {
-  background-color: inherit;
-}
 `
 const scrollBarDarkStyle = `
 ::-webkit-scrollbar {
-  ${config.get().ui.showScrollBar ? '' : 'display: none;'}
   width: 12px;
 }
 
 ::-webkit-scrollbar-thumb {
-  ${config.get().ui.showScrollBar ? '' : 'display: none;'}
   background-color: rgba(0, 0, 0, 0.3);
 }
-
-::-webkit-scrollbar-track-piece {
-  background-color: inherit;
-}
 `
 
 const OSX = global.process.platform === 'darwin'
@@ -244,7 +208,7 @@ const defaultCodeBlockFontFamily = [
 
 // return the line number of the line that used to generate the specified element
 // return -1 if the line is not found
-function getSourceLineNumberByElement(element) {
+function getSourceLineNumberByElement (element) {
   let isHasLineNumber = element.dataset.line !== undefined
   let parent = element
   while (!isHasLineNumber && parent.parentElement !== null) {
@@ -254,8 +218,8 @@ function getSourceLineNumberByElement(element) {
   return parent.dataset.line !== undefined ? parseInt(parent.dataset.line) : -1
 }
 
-class MarkdownPreview extends React.Component {
+export default class MarkdownPreview extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.contextMenuHandler = e => this.handleContextMenu(e)
@@ -272,14 +236,13 @@ class MarkdownPreview extends React.Component {
     this.saveAsHtmlHandler = () => this.handleSaveAsHtml()
     this.saveAsPdfHandler = () => this.handleSaveAsPdf()
     this.printHandler = () => this.handlePrint()
-    this.resizeHandler = _.throttle(this.handleResize.bind(this), 100)
 
     this.linkClickHandler = this.handleLinkClick.bind(this)
     this.initMarkdown = this.initMarkdown.bind(this)
     this.initMarkdown()
   }
 
-  initMarkdown() {
+  initMarkdown () {
     const { smartQuotes, sanitize, breaks } = this.props
     this.markdown = new Markdown({
       typographer: smartQuotes,
@@ -288,17 +251,17 @@ class MarkdownPreview extends React.Component {
     })
   }
 
-  handleCheckboxClick(e) {
+  handleCheckboxClick (e) {
     this.props.onCheckboxClick(e)
   }
 
-  handleScroll(e) {
+  handleScroll (e) {
     if (this.props.onScroll) {
       this.props.onScroll(e)
     }
   }
 
-  handleContextMenu(event) {
+  handleContextMenu (event) {
     const menu = buildMarkdownPreviewContextMenu(this, event)
     const switchPreview = ConfigManager.get().editor.switchPreview
     if (menu != null && switchPreview !== 'RIGHTCLICK') {
@@ -308,21 +271,17 @@ class MarkdownPreview extends React.Component {
     }
   }
 
-  handleDoubleClick(e) {
+  handleDoubleClick (e) {
     if (this.props.onDoubleClick != null) this.props.onDoubleClick(e)
   }
 
-  handleMouseDown(e) {
+  handleMouseDown (e) {
     const config = ConfigManager.get()
     const clickElement = e.target
     const targetTag = clickElement.tagName // The direct parent HTML of where was clicked ie "BODY" or "DIV"
     const lineNumber = getSourceLineNumberByElement(clickElement) // Line location of element clicked.
 
-    if (
+    if (config.editor.switchPreview === 'RIGHTCLICK' && e.buttons === 2 && config.editor.type === 'SPLIT') {
-      config.editor.switchPreview === 'RIGHTCLICK' &&
-      e.buttons === 2 &&
-      config.editor.type === 'SPLIT'
-    ) {
       eventEmitter.emit('topbar:togglemodebutton', 'CODE')
     }
     if (e.ctrlKey) {
@@ -338,11 +297,10 @@ class MarkdownPreview extends React.Component {
       }
     }
 
-    if (this.props.onMouseDown != null && targetTag === 'BODY')
+    if (this.props.onMouseDown != null && targetTag === 'BODY') this.props.onMouseDown(e)
-      this.props.onMouseDown(e)
   }
 
-  handleMouseUp(e) {
+  handleMouseUp (e) {
     if (!this.props.onMouseUp) return
     if (e.target != null && e.target.tagName === 'A') {
       return null
@@ -350,15 +308,15 @@ class MarkdownPreview extends React.Component {
     if (this.props.onMouseUp != null) this.props.onMouseUp(e)
   }
 
-  handleSaveAsText() {
+  handleSaveAsText () {
     this.exportAsDocument('txt')
   }
 
-  handleSaveAsMd() {
+  handleSaveAsMd () {
     this.exportAsDocument('md')
   }
 
-  htmlContentFormatter(noteContent, exportTasks, targetDir) {
+  htmlContentFormatter (noteContent, exportTasks, targetDir) {
     const {
       fontFamily,
       fontSize,
@@ -368,8 +326,7 @@ class MarkdownPreview extends React.Component {
       scrollPastEnd,
       theme,
       allowCustomCSS,
-      customCSS,
+      customCSS
-      RTL
     } = this.getStyleParams()
 
     const inlineStyles = buildStyle({
@@ -380,11 +337,13 @@ class MarkdownPreview extends React.Component {
       scrollPastEnd,
       theme,
       allowCustomCSS,
-      customCSS,
+      customCSS
-      RTL
     })
-    let body = this.refs.root.contentWindow.document.body.innerHTML
+    let body = this.markdown.render(noteContent)
-    body = attachmentManagement.fixLocalURLS(body, this.props.storagePath)
+    body = attachmentManagement.fixLocalURLS(
+      body,
+      this.props.storagePath
+    )
     const files = [this.getCodeThemeLink(codeBlockTheme), ...CSS_FILES]
     files.forEach(file => {
       if (global.process.platform === 'win32') {
@@ -400,7 +359,7 @@ class MarkdownPreview extends React.Component {
 
     let styles = ''
     files.forEach(file => {
-      styles += `<link rel="stylesheet" href="../css/${path.basename(file)}">`
+      styles += `<link rel="stylesheet" href="css/${path.basename(file)}">`
     })
 
     return `<html>
@@ -415,24 +374,14 @@ class MarkdownPreview extends React.Component {
             </html>`
   }
 
-  handleSaveAsHtml() {
+  handleSaveAsHtml () {
-    this.exportAsDocument('html', (noteContent, exportTasks, targetDir) =>
+    this.exportAsDocument('html', (noteContent, exportTasks, targetDir) => Promise.resolve(this.htmlContentFormatter(noteContent, exportTasks, targetDir)))
-      Promise.resolve(
-        this.htmlContentFormatter(noteContent, exportTasks, targetDir)
-      )
-    )
   }
 
-  handleSaveAsPdf() {
+  handleSaveAsPdf () {
     this.exportAsDocument('pdf', (noteContent, exportTasks, targetDir) => {
-      const printout = new remote.BrowserWindow({
+      const printout = new remote.BrowserWindow({show: false, webPreferences: {webSecurity: false, javascript: false}})
-        show: false,
+      printout.loadURL('data:text/html;charset=UTF-8,' + this.htmlContentFormatter(noteContent, exportTasks, targetDir))
-        webPreferences: { webSecurity: false, javascript: false }
-      })
-      printout.loadURL(
-        'data:text/html;charset=UTF-8,' +
-          this.htmlContentFormatter(noteContent, exportTasks, targetDir)
-      )
       return new Promise((resolve, reject) => {
         printout.webContents.on('did-finish-load', () => {
           printout.webContents.printToPDF({}, (err, data) => {
@@ -445,11 +394,11 @@ class MarkdownPreview extends React.Component {
     })
   }
 
-  handlePrint() {
+  handlePrint () {
     this.refs.root.contentWindow.print()
   }
 
-  exportAsDocument(fileType, contentFormatter) {
+  exportAsDocument (fileType, contentFormatter) {
     const options = {
       filters: [{ name: 'Documents', extensions: [fileType] }],
       properties: ['openFile', 'createDirectory']
@@ -465,8 +414,7 @@ class MarkdownPreview extends React.Component {
           .then(res => {
             dialog.showMessageBox(remote.getCurrentWindow(), {
               type: 'info',
-              message: `Exported to ${filename}`,
+              message: `Exported to ${filename}`
-              buttons: [i18n.__('Ok')]
             })
           })
           .catch(err => {
@@ -480,7 +428,7 @@ class MarkdownPreview extends React.Component {
     })
   }
 
-  fixDecodedURI(node) {
+  fixDecodedURI (node) {
     if (
       node &&
       node.children.length === 1 &&
@@ -497,18 +445,17 @@ class MarkdownPreview extends React.Component {
    * @param {string[]} splitWithCodeTag Array of HTML strings separated by three ```
    * @returns {string} HTML in which special characters between three ``` have been converted
    */
-  escapeHtmlCharactersInCodeTag(splitWithCodeTag) {
+  escapeHtmlCharactersInCodeTag (splitWithCodeTag) {
     for (let index = 0; index < splitWithCodeTag.length; index++) {
-      const codeTagRequired =
+      const codeTagRequired = (splitWithCodeTag[index] !== '\`\`\`' && index < splitWithCodeTag.length - 1)
-        splitWithCodeTag[index] !== '```' && index < splitWithCodeTag.length - 1
       if (codeTagRequired) {
-        splitWithCodeTag.splice(index + 1, 0, '```')
+        splitWithCodeTag.splice((index + 1), 0, '\`\`\`')
       }
     }
     let inCodeTag = false
     let result = ''
     for (let content of splitWithCodeTag) {
-      if (content === '```') {
+      if (content === '\`\`\`') {
         inCodeTag = !inCodeTag
       } else if (inCodeTag) {
         content = escapeHtmlCharacters(content)
@@ -518,15 +465,21 @@ class MarkdownPreview extends React.Component {
     return result
   }
 
-  getScrollBarStyle() {
+  getScrollBarStyle () {
     const { theme } = this.props
 
-    return uiThemes.some(item => item.name === theme && item.isDark)
+    switch (theme) {
-      ? scrollBarDarkStyle
+      case 'dark':
-      : scrollBarStyle
+      case 'solarized-dark':
+      case 'monokai':
+      case 'dracula':
+        return scrollBarDarkStyle
+      default:
+        return scrollBarStyle
+    }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     const { onDrop } = this.props
 
     this.refs.root.setAttribute('sandbox', 'allow-scripts')
@@ -576,7 +529,6 @@ class MarkdownPreview extends React.Component {
       'scroll',
       this.scrollHandler
     )
-    this.refs.root.contentWindow.addEventListener('resize', this.resizeHandler)
     eventEmitter.on('export:save-text', this.saveAsTextHandler)
     eventEmitter.on('export:save-md', this.saveAsMdHandler)
     eventEmitter.on('export:save-html', this.saveAsHtmlHandler)
@@ -584,7 +536,7 @@ class MarkdownPreview extends React.Component {
     eventEmitter.on('print', this.printHandler)
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { onDrop } = this.props
 
     this.refs.root.contentWindow.document.body.removeEventListener(
@@ -615,10 +567,6 @@ class MarkdownPreview extends React.Component {
       'scroll',
       this.scrollHandler
     )
-    this.refs.root.contentWindow.removeEventListener(
-      'resize',
-      this.resizeHandler
-    )
     eventEmitter.off('export:save-text', this.saveAsTextHandler)
     eventEmitter.off('export:save-md', this.saveAsMdHandler)
     eventEmitter.off('export:save-html', this.saveAsHtmlHandler)
@@ -626,7 +574,7 @@ class MarkdownPreview extends React.Component {
     eventEmitter.off('print', this.printHandler)
   }
 
-  componentDidUpdate(prevProps) {
+  componentDidUpdate (prevProps) {
     // actual rewriteIframe function should be called only once
     let needsRewriteIframe = false
     if (prevProps.value !== this.props.value) needsRewriteIframe = true
@@ -651,8 +599,7 @@ class MarkdownPreview extends React.Component {
       prevProps.theme !== this.props.theme ||
       prevProps.scrollPastEnd !== this.props.scrollPastEnd ||
       prevProps.allowCustomCSS !== this.props.allowCustomCSS ||
-      prevProps.customCSS !== this.props.customCSS ||
+      prevProps.customCSS !== this.props.customCSS
-      prevProps.RTL !== this.props.RTL
     ) {
       this.applyStyle()
       needsRewriteIframe = true
@@ -664,11 +611,11 @@ class MarkdownPreview extends React.Component {
 
     // Should scroll to top after selecting another note
     if (prevProps.noteKey !== this.props.noteKey) {
-      this.scrollTo(0, 0)
+      this.getWindow().scrollTo(0, 0)
     }
   }
 
-  getStyleParams() {
+  getStyleParams () {
     const {
       fontSize,
       lineNumber,
@@ -676,24 +623,22 @@ class MarkdownPreview extends React.Component {
       scrollPastEnd,
       theme,
       allowCustomCSS,
-      customCSS,
+      customCSS
-      RTL
     } = this.props
     let { fontFamily, codeBlockFontFamily } = this.props
-    fontFamily =
+    fontFamily = _.isString(fontFamily) && fontFamily.trim().length > 0
-      _.isString(fontFamily) && fontFamily.trim().length > 0
+      ? fontFamily
-        ? fontFamily
+          .split(',')
-            .split(',')
+          .map(fontName => fontName.trim())
-            .map(fontName => fontName.trim())
+          .concat(defaultFontFamily)
-            .concat(defaultFontFamily)
+      : defaultFontFamily
-        : defaultFontFamily
+    codeBlockFontFamily = _.isString(codeBlockFontFamily) &&
-    codeBlockFontFamily =
+      codeBlockFontFamily.trim().length > 0
-      _.isString(codeBlockFontFamily) && codeBlockFontFamily.trim().length > 0
+      ? codeBlockFontFamily
-        ? codeBlockFontFamily
+          .split(',')
-            .split(',')
+          .map(fontName => fontName.trim())
-            .map(fontName => fontName.trim())
+          .concat(defaultCodeBlockFontFamily)
-            .concat(defaultCodeBlockFontFamily)
+      : defaultCodeBlockFontFamily
-        : defaultCodeBlockFontFamily
 
     return {
       fontFamily,
@@ -704,12 +649,11 @@ class MarkdownPreview extends React.Component {
       scrollPastEnd,
       theme,
       allowCustomCSS,
-      customCSS,
+      customCSS
-      RTL
     }
   }
 
-  applyStyle() {
+  applyStyle () {
     const {
       fontFamily,
       fontSize,
@@ -719,8 +663,7 @@ class MarkdownPreview extends React.Component {
       scrollPastEnd,
       theme,
       allowCustomCSS,
-      customCSS,
+      customCSS
-      RTL
     } = this.getStyleParams()
 
     this.getWindow().document.getElementById(
@@ -732,14 +675,15 @@ class MarkdownPreview extends React.Component {
       codeBlockFontFamily,
       lineNumber,
       scrollPastEnd,
+      optimizeOverflowScroll: true,
       theme,
       allowCustomCSS,
-      customCSS,
+      customCSS
-      RTL
     })
+    this.getWindow().document.documentElement.style.overflowY = 'hidden'
   }
 
-  getCodeThemeLink(name) {
+  getCodeThemeLink (name) {
     const theme = consts.THEMES.find(theme => theme.name === name)
 
     return theme != null
@@ -747,7 +691,7 @@ class MarkdownPreview extends React.Component {
       : `${appPath}/node_modules/codemirror/theme/elegant.css`
   }
 
-  rewriteIframe() {
+  rewriteIframe () {
     _.forEach(
       this.refs.root.contentWindow.document.querySelectorAll(
         'input[type="checkbox"]'
@@ -805,9 +749,7 @@ class MarkdownPreview extends React.Component {
 
     codeBlockTheme = consts.THEMES.find(theme => theme.name === codeBlockTheme)
 
-    const codeBlockThemeClassName = codeBlockTheme
+    const codeBlockThemeClassName = codeBlockTheme ? codeBlockTheme.className : 'cm-s-default'
-      ? codeBlockTheme.className
-      : 'cm-s-default'
 
     _.forEach(
       this.refs.root.contentWindow.document.querySelectorAll('.code code'),
@@ -893,10 +835,7 @@ class MarkdownPreview extends React.Component {
       el => {
         try {
           const format = el.attributes.getNamedItem('data-format').value
-          const chartConfig =
+          const chartConfig = format === 'yaml' ? yaml.load(el.innerHTML) : JSON.parse(el.innerHTML)
-            format === 'yaml'
-              ? yaml.load(el.innerHTML)
-              : JSON.parse(el.innerHTML)
           el.innerHTML = ''
 
           const canvas = document.createElement('canvas')
@@ -919,12 +858,7 @@ class MarkdownPreview extends React.Component {
     _.forEach(
       this.refs.root.contentWindow.document.querySelectorAll('.mermaid'),
       el => {
-        mermaidRender(
+        mermaidRender(el, htmlTextHelper.decodeEntities(el.innerHTML), theme, mermaidHTMLLabel)
-          el,
-          htmlTextHelper.decodeEntities(el.innerHTML),
-          theme,
-          mermaidHTMLLabel
-        )
       }
     )
 
@@ -946,14 +880,20 @@ class MarkdownPreview extends React.Component {
           autoplay = 0
         }
 
-        render(<Carousel images={images} autoplay={autoplay} />, el)
+        render(
+          <Carousel
+            images={images}
+            autoplay={autoplay}
+          />,
+          el
+        )
       }
     )
 
     const markdownPreviewIframe = document.querySelector('.MarkdownPreview')
     const rect = markdownPreviewIframe.getBoundingClientRect()
     const config = { attributes: true, subtree: true }
-    const imgObserver = new MutationObserver(mutationList => {
+    const imgObserver = new MutationObserver((mutationList) => {
       for (const mu of mutationList) {
         if (mu.target.className === 'carouselContent-enter-done') {
           this.setImgOnClickEventHelper(mu.target, rect)
@@ -962,32 +902,26 @@ class MarkdownPreview extends React.Component {
       }
     })
 
-    const imgList = markdownPreviewIframe.contentWindow.document.body.querySelectorAll(
+    const imgList = markdownPreviewIframe.contentWindow.document.body.querySelectorAll('img')
-      'img'
-    )
     for (const img of imgList) {
       const parentEl = img.parentElement
       this.setImgOnClickEventHelper(img, rect)
       imgObserver.observe(parentEl, config)
     }
 
-    const aList = markdownPreviewIframe.contentWindow.document.body.querySelectorAll(
+    const aList = markdownPreviewIframe.contentWindow.document.body.querySelectorAll('a')
-      'a'
-    )
     for (const a of aList) {
       a.removeEventListener('click', this.linkClickHandler)
       a.addEventListener('click', this.linkClickHandler)
     }
   }
 
-  setImgOnClickEventHelper(img, rect) {
+  setImgOnClickEventHelper (img, rect) {
     img.onclick = () => {
       const widthMagnification = document.body.clientWidth / img.width
       const heightMagnification = document.body.clientHeight / img.height
       const baseOnWidth = widthMagnification < heightMagnification
-      const magnification = baseOnWidth
+      const magnification = baseOnWidth ? widthMagnification : heightMagnification
-        ? widthMagnification
-        : heightMagnification
 
       const zoomImgWidth = img.width * magnification
       const zoomImgHeight = img.height * magnification
@@ -1018,7 +952,10 @@ class MarkdownPreview extends React.Component {
         width: ${zoomImgWidth};
         height: ${zoomImgHeight}px;
         `
-      zoomImg.animate([originalImgRect, zoomInImgRect], animationSpeed)
+      zoomImg.animate([
+        originalImgRect,
+        zoomInImgRect
+      ], animationSpeed)
 
       const overlay = document.createElement('div')
       overlay.style = `
@@ -1039,10 +976,10 @@ class MarkdownPreview extends React.Component {
           width: ${img.width}px;
           height: ${img.height}px;
           `
-        const zoomOutImgAnimation = zoomImg.animate(
+        const zoomOutImgAnimation = zoomImg.animate([
-          [zoomInImgRect, originalImgRect],
+          zoomInImgRect,
-          animationSpeed
+          originalImgRect
-        )
+        ], animationSpeed)
         zoomOutImgAnimation.onfinish = () => overlay.remove()
       }
 
@@ -1051,28 +988,15 @@ class MarkdownPreview extends React.Component {
     }
   }
 
-  handleResize() {
+  focus () {
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('svg[ratio]'),
-      el => {
-        el.setAttribute('height', el.clientWidth / el.getAttribute('ratio'))
-      }
-    )
-  }
-
-  focus() {
     this.refs.root.focus()
   }
 
-  getWindow() {
+  getWindow () {
     return this.refs.root.contentWindow
   }
 
-  /**
+  scrollTo (targetRow) {
-   * @public
-   * @param {Number} targetRow
-   */
-  scrollToRow(targetRow) {
     const blocks = this.getWindow().document.querySelectorAll(
       'body>[data-line]'
     )
@@ -1082,27 +1006,18 @@ class MarkdownPreview extends React.Component {
       const row = parseInt(block.getAttribute('data-line'))
       if (row > targetRow || index === blocks.length - 1) {
         block = blocks[index - 1]
-        block != null && this.scrollTo(0, block.offsetTop)
+        block != null && this.getWindow().scrollTo(0, block.offsetTop)
         break
       }
     }
   }
 
-  /**
+  preventImageDroppedHandler (e) {
-   * `document.body.scrollTo`
-   * @param {Number} x
-   * @param {Number} y
-   */
-  scrollTo(x, y) {
-    this.getWindow().document.body.scrollTo(x, y)
-  }
-
-  preventImageDroppedHandler(e) {
     e.preventDefault()
     e.stopPropagation()
   }
 
-  notify(title, options) {
+  notify (title, options) {
     if (global.process.platform === 'win32') {
       options.icon = path.join(
         'file://',
@@ -1113,12 +1028,11 @@ class MarkdownPreview extends React.Component {
     return new window.Notification(title, options)
   }
 
-  handleLinkClick(e) {
+  handleLinkClick (e) {
     e.preventDefault()
     e.stopPropagation()
 
     const rawHref = e.target.getAttribute('href')
-    const { dispatch } = this.props
     if (!rawHref) return // not checked href because parser will create file://... string for [empty link]()
 
     const parser = document.createElement('a')
@@ -1126,8 +1040,6 @@ class MarkdownPreview extends React.Component {
     const isStartWithHash = rawHref[0] === '#'
     const { href, hash } = parser
 
-    if (!rawHref) return // not checked href because parser will create file://... string for [empty link]()
-
     const linkHash = hash === '' ? rawHref : hash // needed because we're having special link formats that are removed by parser e.g. :line:10
 
     const extractIdRegex = /file:\/\/.*main.?\w*.html#/ // file://path/to/main(.development.)html
@@ -1137,10 +1049,12 @@ class MarkdownPreview extends React.Component {
       if (posOfHash > -1) {
         const extractedId = linkHash.slice(posOfHash + 1)
         const targetId = mdurl.encode(extractedId)
-        const targetElement = this.getWindow().document.getElementById(targetId)
+        const targetElement = this.refs.root.contentWindow.document.getElementById(
+          targetId
+        )
 
         if (targetElement != null) {
-          this.scrollTo(0, targetElement.offsetTop)
+          this.getWindow().scrollTo(0, targetElement.offsetTop)
         }
         return
       }
@@ -1174,29 +1088,11 @@ class MarkdownPreview extends React.Component {
       return
     }
 
-    const regexIsTagLink = /^:tag:([\w]+)$/
-    if (regexIsTagLink.test(rawHref)) {
-      const tag = rawHref.match(regexIsTagLink)[1]
-      dispatch(push(`/tags/${encodeURIComponent(tag)}`))
-      return
-    }
-
     // other case
-    this.openExternal(href)
+    shell.openExternal(href)
   }
 
-  openExternal(href) {
+  render () {
-    try {
-      const success =
-        shell.openExternal(href) || shell.openExternal(decodeURI(href))
-      if (!success) console.error('failed to open url ' + href)
-    } catch (e) {
-      // URI Error threw from decodeURI
-      console.error(e)
-    }
-  }
-
-  render() {
     const { className, style, tabIndex } = this.props
     return (
       <iframe
@@ -1225,10 +1121,3 @@ MarkdownPreview.propTypes = {
   smartArrows: PropTypes.bool,
   breaks: PropTypes.bool
 }
-
-export default connect(
-  null,
-  null,
-  null,
-  { forwardRef: true }
-)(MarkdownPreview)

browser/components/MarkdownSplitEditor.js

@@ -8,7 +8,7 @@ import styles from './MarkdownSplitEditor.styl'
 import CSSModules from 'browser/lib/CSSModules'
 
 class MarkdownSplitEditor extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.value = props.value
     this.focus = () => this.refs.code.focus()
@@ -20,22 +20,19 @@ class MarkdownSplitEditor extends React.Component {
     }
   }
 
-  setValue(value) {
+  setValue (value) {
     this.refs.code.setValue(value)
   }
 
-  handleOnChange(e) {
+  handleOnChange (e) {
     this.value = this.refs.code.value
     this.props.onChange(e)
   }
 
-  handleScroll(e) {
+  handleScroll (e) {
     if (!this.props.config.preview.scrollSync) return
 
-    const previewDoc = _.get(
+    const previewDoc = _.get(this, 'refs.preview.refs.root.contentWindow.document')
-      this,
-      'refs.preview.refs.root.contentWindow.document'
-    )
     const codeDoc = _.get(this, 'refs.code.editor.doc')
     let srcTop, srcHeight, targetTop, targetHeight
 
@@ -52,7 +49,7 @@ class MarkdownSplitEditor extends React.Component {
         targetHeight = _.get(codeDoc, 'height')
       }
 
-      const distance = (targetHeight * srcTop) / srcHeight - targetTop
+      const distance = (targetHeight * srcTop / srcHeight) - targetTop
       const framerate = 1000 / 60
       const frames = 20
       const refractory = frames * framerate
@@ -63,29 +60,21 @@ class MarkdownSplitEditor extends React.Component {
       let scrollPos, time
       const timer = setInterval(() => {
         time = frame / frames
-        scrollPos =
+        scrollPos = time < 0.5
-          time < 0.5
+                  ? 2 * time * time // ease in
-            ? 2 * time * time // ease in
+                  : -1 + (4 - 2 * time) * time // ease out
-            : -1 + (4 - 2 * time) * time // ease out
+        if (e.doc) _.set(previewDoc, 'body.scrollTop', targetTop + scrollPos * distance)
-        if (e.doc)
+        else _.get(this, 'refs.code.editor').scrollTo(0, targetTop + scrollPos * distance)
-          _.set(previewDoc, 'body.scrollTop', targetTop + scrollPos * distance)
-        else
-          _.get(this, 'refs.code.editor').scrollTo(
-            0,
-            targetTop + scrollPos * distance
-          )
         if (frame >= frames) {
           clearInterval(timer)
-          setTimeout(() => {
+          setTimeout(() => { this.userScroll = true }, refractory)
-            this.userScroll = true
-          }, refractory)
         }
         frame++
       }, framerate)
     }
   }
 
-  handleCheckboxClick(e) {
+  handleCheckboxClick (e) {
     e.preventDefault()
     e.stopPropagation()
     const idMatch = /checkbox-([0-9]+)/
@@ -94,9 +83,9 @@ class MarkdownSplitEditor extends React.Component {
     const checkReplace = /\[x]/i
     const uncheckReplace = /\[ ]/
     if (idMatch.test(e.target.getAttribute('id'))) {
-      const lineIndex =
+      const lineIndex = parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1
-        parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1
+      const lines = this.refs.code.value
-      const lines = this.refs.code.value.split('\n')
+        .split('\n')
 
       const targetLine = lines[lineIndex]
       let newLine = targetLine
@@ -111,12 +100,12 @@ class MarkdownSplitEditor extends React.Component {
     }
   }
 
-  handleMouseMove(e) {
+  handleMouseMove (e) {
     if (this.state.isSliderFocused) {
       const rootRect = this.refs.root.getBoundingClientRect()
       const rootWidth = rootRect.width
       const offset = rootRect.left
-      let newCodeEditorWidthInPercent = ((e.pageX - offset) / rootWidth) * 100
+      let newCodeEditorWidthInPercent = (e.pageX - offset) / rootWidth * 100
 
       // limit minSize to 10%, maxSize to 90%
       if (newCodeEditorWidthInPercent <= 10) {
@@ -133,45 +122,34 @@ class MarkdownSplitEditor extends React.Component {
     }
   }
 
-  handleMouseUp(e) {
+  handleMouseUp (e) {
     e.preventDefault()
     this.setState({
       isSliderFocused: false
     })
   }
 
-  handleMouseDown(e) {
+  handleMouseDown (e) {
     e.preventDefault()
     this.setState({
       isSliderFocused: true
     })
   }
 
-  render() {
+  render () {
-    const {
+    const {config, value, storageKey, noteKey, linesHighlighted} = this.props
-      config,
-      value,
-      storageKey,
-      noteKey,
-      linesHighlighted,
-      RTL
-    } = this.props
     const storage = findStorage(storageKey)
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
     let editorIndentSize = parseInt(config.editor.indentSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
     const previewStyle = {}
-    previewStyle.width = 100 - this.state.codeEditorWidthInPercent + '%'
+    previewStyle.width = (100 - this.state.codeEditorWidthInPercent) + '%'
-    if (this.props.ignorePreviewPointerEvents || this.state.isSliderFocused)
+    if (this.props.ignorePreviewPointerEvents || this.state.isSliderFocused) previewStyle.pointerEvents = 'none'
-      previewStyle.pointerEvents = 'none'
     return (
-      <div
+      <div styleName='root' ref='root'
-        styleName='root'
-        ref='root'
         onMouseMove={e => this.handleMouseMove(e)}
-        onMouseUp={e => this.handleMouseUp(e)}
+        onMouseUp={e => this.handleMouseUp(e)}>
-      >
         <CodeEditor
           ref='code'
           width={this.state.codeEditorWidthInPercent + '%'}
@@ -196,7 +174,7 @@ class MarkdownSplitEditor extends React.Component {
           storageKey={storageKey}
           noteKey={noteKey}
           linesHighlighted={linesHighlighted}
-          onChange={e => this.handleOnChange(e)}
+          onChange={(e) => this.handleOnChange(e)}
           onScroll={this.handleScroll.bind(this)}
           spellCheck={config.editor.spellcheck}
           enableSmartPaste={config.editor.enableSmartPaste}
@@ -205,13 +183,8 @@ class MarkdownSplitEditor extends React.Component {
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
           deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
-          RTL={RTL}
+       />
-        />
+        <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
-        <div
-          styleName='slider'
-          style={{ left: this.state.codeEditorWidthInPercent + '%' }}
-          onMouseDown={e => this.handleMouseDown(e)}
-        >
           <div styleName='slider-hitbox' />
         </div>
         <MarkdownPreview
@@ -229,9 +202,10 @@ class MarkdownSplitEditor extends React.Component {
           breaks={config.preview.breaks}
           sanitize={config.preview.sanitize}
           mermaidHTMLLabel={config.preview.mermaidHTMLLabel}
+          ref='preview'
           tabInde='0'
           value={value}
-          onCheckboxClick={e => this.handleCheckboxClick(e)}
+          onCheckboxClick={(e) => this.handleCheckboxClick(e)}
           onScroll={this.handleScroll.bind(this)}
           showCopyNotification={config.ui.showCopyNotification}
           storagePath={storage.path}
@@ -239,8 +213,7 @@ class MarkdownSplitEditor extends React.Component {
           customCSS={config.preview.customCSS}
           allowCustomCSS={config.preview.allowCustomCSS}
           lineThroughCheckbox={config.preview.lineThroughCheckbox}
-          RTL={RTL}
+       />
-        />
       </div>
     )
   }

browser/components/MarkdownSplitEditor.styl

@@ -16,14 +16,22 @@
     z-index 10
     cursor col-resize
 
-apply-theme(theme)
+body[data-theme="dark"]
-  body[data-theme={theme}]
+  .root
-    .root
+    .slider
-      .slider
+      border-left 1px solid $ui-dark-borderColor
-        border-left 1px solid get-theme-var(theme, 'borderColor')
 
-for theme in 'dark' 'dracula' 'solarized-dark'
+body[data-theme="solarized-dark"]
-  apply-theme(theme)
+  .root
+    .slider
+      border-left 1px solid $ui-solarized-dark-borderColor
 
-for theme in $themes
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .root
+    .slider
+      border-left 1px solid $ui-monokai-borderColor
+
+body[data-theme="dracula"]
+  .root
+    .slider
+      border-left 1px solid $ui-dracula-borderColor

browser/components/ModalEscButton.js

@@ -3,7 +3,9 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './ModalEscButton.styl'
 
-const ModalEscButton = ({ handleEscButtonClick }) => (
+const ModalEscButton = ({
+  handleEscButtonClick
+}) => (
   <button styleName='escButton' onClick={handleEscButtonClick}>
     <div styleName='esc-mark'>×</div>
     <div>esc</div>

browser/components/NavToggleButton.js

@@ -1,23 +1,24 @@
 /**
- * @fileoverview Micro component for toggle SideNav
+* @fileoverview Micro component for toggle SideNav
- */
+*/
 import PropTypes from 'prop-types'
 import React from 'react'
 import styles from './NavToggleButton.styl'
 import CSSModules from 'browser/lib/CSSModules'
 
 /**
- * @param {boolean} isFolded
+* @param {boolean} isFolded
- * @param {Function} handleToggleButtonClick
+* @param {Function} handleToggleButtonClick
- */
+*/
 
-const NavToggleButton = ({ isFolded, handleToggleButtonClick }) => (
+const NavToggleButton = ({isFolded, handleToggleButtonClick}) => (
-  <button styleName='navToggle' onClick={e => handleToggleButtonClick(e)}>
+  <button styleName='navToggle'
-    {isFolded ? (
+    onClick={(e) => handleToggleButtonClick(e)}
-      <i className='fa fa-angle-double-right fa-2x' />
+  >
-    ) : (
+    {isFolded
-      <i className='fa fa-angle-double-left fa-2x' />
+     ? <i className='fa fa-angle-double-right fa-2x' />
-    )}
+     : <i className='fa fa-angle-double-left fa-2x' />
+    }
   </button>
 )
 

browser/components/NavToggleButton.styl

@@ -17,16 +17,10 @@
 body[data-theme="white"]
   navWhiteButtonColor()
 
-apply-theme(theme)
+body[data-theme="dark"]
-  body[data-theme={theme}]
+  .navToggle
-    .navToggle:hover
+    &:hover
-      background-color alpha(get-theme-var(theme, 'button--active-backgroundColor'), 20%)
+      background-color alpha($ui-dark-button--active-backgroundColor, 20%)
-      border 1px solid get-theme-var(theme, 'button--active-backgroundColor')
       transition 0.15s
-      color get-theme-var(theme, 'text-color')
+      color $ui-dark-text-color
 
-for theme in 'dark' 'dracula' 'solarized-dark'
-  apply-theme(theme)
-
-for theme in $themes
-  apply-theme(theme)

browser/components/NoteItem.js

@@ -5,7 +5,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { isArray, sortBy } from 'lodash'
 import invertColor from 'invert-color'
-import Emoji from 'react-emoji-render'
 import CSSModules from 'browser/lib/CSSModules'
 import { getTodoStatus } from 'browser/lib/getTodoStatus'
 import styles from './NoteItem.styl'
@@ -22,11 +21,7 @@ const TagElement = ({ tagName, color }) => {
   const style = {}
   if (color) {
     style.backgroundColor = color
-    style.color = invertColor(color, {
+    style.color = invertColor(color, { black: '#222', white: '#f1f1f1', threshold: 0.3 })
-      black: '#222',
-      white: '#f1f1f1',
-      threshold: 0.3
-    })
   }
   return (
     <span styleName='item-bottom-tagList-item' key={tagName} style={style}>
@@ -48,13 +43,9 @@ const TagElementList = (tags, showTagsAlphabetically, coloredTags) => {
   }
 
   if (showTagsAlphabetically) {
-    return sortBy(tags).map(tag =>
+    return sortBy(tags).map(tag => TagElement({ tagName: tag, color: coloredTags[tag] }))
-      TagElement({ tagName: tag, color: coloredTags[tag] })
-    )
   } else {
-    return tags.map(tag =>
+    return tags.map(tag => TagElement({ tagName: tag, color: coloredTags[tag] }))
-      TagElement({ tagName: tag, color: coloredTags[tag] })
-    )
   }
 }
 
@@ -91,17 +82,13 @@ const NoteItem = ({
     draggable='true'
   >
     <div styleName='item-wrapper'>
-      {note.type === 'SNIPPET_NOTE' ? (
+      {note.type === 'SNIPPET_NOTE'
-        <i styleName='item-title-icon' className='fa fa-fw fa-code' />
+        ? <i styleName='item-title-icon' className='fa fa-fw fa-code' />
-      ) : (
+        : <i styleName='item-title-icon' className='fa fa-fw fa-file-text-o' />}
-        <i styleName='item-title-icon' className='fa fa-fw fa-file-text-o' />
-      )}
       <div styleName='item-title'>
-        {note.title.trim().length > 0 ? (
+        {note.title.trim().length > 0
-          <Emoji text={note.title} />
+          ? note.title
-        ) : (
+          : <span styleName='item-title-empty'>{i18n.__('Empty note')}</span>}
-          <span styleName='item-title-empty'>{i18n.__('Empty note')}</span>
-        )}
       </div>
       <div styleName='item-middle'>
         <div styleName='item-middle-time'>{dateDisplay}</div>
@@ -110,9 +97,7 @@ const NoteItem = ({
             title={
               viewType === 'ALL'
                 ? storageName
-                : viewType === 'STORAGE'
+                : viewType === 'STORAGE' ? folderName : null
-                ? folderName
-                : null
             }
             styleName='item-middle-app-meta-label'
           >
@@ -123,36 +108,28 @@ const NoteItem = ({
       </div>
       <div styleName='item-bottom'>
         <div styleName='item-bottom-tagList'>
-          {note.tags.length > 0 ? (
+          {note.tags.length > 0
-            TagElementList(note.tags, showTagsAlphabetically, coloredTags)
+            ? TagElementList(note.tags, showTagsAlphabetically, coloredTags)
-          ) : (
+            : <span
-            <span
               style={{ fontStyle: 'italic', opacity: 0.5 }}
               styleName='item-bottom-tagList-empty'
-            >
+              >
               {i18n.__('No tags')}
-            </span>
+            </span>}
-          )}
         </div>
         <div>
-          {note.isStarred ? (
+          {note.isStarred
-            <img
+            ? <img
               styleName='item-star'
               src='../resources/icon/icon-starred.svg'
-            />
+              />
-          ) : (
+            : ''}
-            ''
+          {note.isPinned && !pathname.match(/\/starred|\/trash/)
-          )}
+            ? <i styleName='item-pin' className='fa fa-thumb-tack' />
-          {note.isPinned && !pathname.match(/\/starred|\/trash/) ? (
+            : ''}
-            <i styleName='item-pin' className='fa fa-thumb-tack' />
+          {note.type === 'MARKDOWN_NOTE'
-          ) : (
+            ? <TodoProcess todoStatus={getTodoStatus(note.content)} />
-            ''
+            : ''}
-          )}
-          {note.type === 'MARKDOWN_NOTE' ? (
-            <TodoProcess todoStatus={getTodoStatus(note.content)} />
-          ) : (
-            ''
-          )}
         </div>
       </div>
     </div>

browser/components/NoteItem.styl

@@ -194,7 +194,7 @@ body[data-theme="dark"]
         color $ui-dark-text-color
       .item-bottom-tagList-item
         transition 0.15s
-        background-color alpha($ui-dark-tagList-backgroundColor, 20%)
+        background-color alpha(#fff, 20%)
         color $ui-dark-text-color
     &:active
       transition 0.15s
@@ -207,7 +207,7 @@ body[data-theme="dark"]
         color $ui-dark-text-color
       .item-bottom-tagList-item
         transition 0.15s
-        background-color alpha($ui-dark-tagList-backgroundColor, 10%)
+        background-color alpha(white, 10%)
         color $ui-dark-text-color
 
   .item-wrapper
@@ -223,13 +223,13 @@ body[data-theme="dark"]
     .item-bottom-time
       color $ui-dark-text-color
     .item-bottom-tagList-item
-      background-color alpha($ui-dark-tagList-backgroundColor, 10%)
+      background-color alpha(white, 10%)
       color $ui-dark-text-color
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 60%)
-      color $ui-dark-button--hover-color
+      color #c0392b
       .item-bottom-tagList-item
-        background-color alpha($ui-dark-tagList-backgroundColor, 20%)
+        background-color alpha(#fff, 20%)
 
   .item-title
     color $ui-inactive-text-color
@@ -322,82 +322,148 @@ body[data-theme="solarized-dark"]
     color $ui-inactive-text-color
     vertical-align middle
 
-apply-theme(theme)
+body[data-theme="monokai"]
-  body[data-theme={theme}]
+  .root
-    .root
+    border-color $ui-monokai-borderColor
-      border-color get-theme-var(theme, 'borderColor')
+    background-color $ui-monokai-noteList-backgroundColor
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
 
-    .item
+  .item
-      border-color get-theme-var(theme, 'borderColor')
+    border-color $ui-monokai-borderColor
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
+    background-color $ui-monokai-noteList-backgroundColor
-      &:hover
+    &:hover
-        transition 0.15s
+      transition 0.15s
-        // background-color alpha(get-theme-var(theme, 'noteList-backgroundColor'), 20%)
+      // background-color alpha($ui-monokai-noteList-backgroundColor, 20%)
-        color get-theme-var(theme, 'text-color')
+      color $ui-monokai-text-color
-        .item-title
-        .item-title-icon
-        .item-bottom-time
-          transition 0.15s
-          color get-theme-var(theme, 'text-color')
-        .item-bottom-tagList-item
-          transition 0.15s
-          background-color alpha(get-theme-var(theme, 'noteList-backgroundColor'), 20%)
-          color get-theme-var(theme, 'text-color')
-      &:active
-        transition 0.15s
-        background-color get-theme-var(theme, 'noteList-backgroundColor')
-        color get-theme-var(theme, 'text-color')
-        .item-title
-        .item-title-icon
-        .item-bottom-time
-          transition 0.15s
-          color get-theme-var(theme, 'text-color')
-        .item-bottom-tagList-item
-          transition 0.15s
-          background-color alpha(get-theme-var(theme, 'noteList-backgroundColor'), 10%)
-          color get-theme-var(theme, 'text-color')
-
-    .item-wrapper
-      border-color alpha(get-theme-var(theme, 'button-backgroundColor'), 60%)
-
-    .item--active
-      border-color get-theme-var(theme, 'borderColor')
-      background-color get-theme-var(theme, 'button-backgroundColor')
-      .item-wrapper
-        border-color transparent
       .item-title
       .item-title-icon
       .item-bottom-time
-        color get-theme-var(theme, 'active-color')
+        transition 0.15s
+        color $ui-monokai-text-color
       .item-bottom-tagList-item
-        background-color alpha(get-theme-var(theme, 'tagList-backgroundColor'), 10%)
+        transition 0.15s
-        color get-theme-var(theme, 'text-color')
+        background-color alpha($ui-monokai-noteList-backgroundColor, 20%)
-      &:hover
+        color $ui-monokai-text-color
-        // background-color alpha(get-theme-var(theme, 'button--active-backgroundColor'), 60%)
+    &:active
-        color get-theme-var(theme, 'button--hover-color')
+      transition 0.15s
-        .item-bottom-tagList-item
+      background-color $ui-monokai-noteList-backgroundColor
-          background-color alpha(get-theme-var(theme, 'tagList-backgroundColor'), 20%)
+      color $ui-monokai-text-color
+      .item-title
+      .item-title-icon
+      .item-bottom-time
+        transition 0.15s
+        color $ui-monokai-text-color
+      .item-bottom-tagList-item
+        transition 0.15s
+        background-color alpha($ui-monokai-noteList-backgroundColor, 10%)
+        color $ui-monokai-text-color
 
+  .item-wrapper
+    border-color alpha($ui-monokai-button-backgroundColor, 60%)
+
+  .item--active
+    border-color $ui-monokai-borderColor
+    background-color $ui-monokai-button-backgroundColor
+    .item-wrapper
+      border-color transparent
     .item-title
-      color $ui-inactive-text-color
-
     .item-title-icon
-      color $ui-inactive-text-color
+    .item-bottom-time
-
+      color $ui-monokai-active-color
-    .item-title-empty
-      color $ui-inactive-text-color
-
     .item-bottom-tagList-item
-      background-color alpha($ui-dark-button--active-backgroundColor, 40%)
+      background-color alpha(white, 10%)
-      color $ui-inactive-text-color
+      color $ui-monokai-text-color
+    &:hover
+      // background-color alpha($ui-monokai-button--active-backgroundColor, 60%)
+      color #f92672
+      .item-bottom-tagList-item
+        background-color alpha(#fff, 20%)
 
-    .item-bottom-tagList-empty
+  .item-title
-      color $ui-inactive-text-color
+    color $ui-inactive-text-color
-      vertical-align middle
 
-for theme in 'dracula'
+  .item-title-icon
-  apply-theme(theme)
+    color $ui-inactive-text-color
 
-for theme in $themes
+  .item-title-empty
-  apply-theme(theme)
+    color $ui-inactive-text-color
+
+  .item-bottom-tagList-item
+    background-color alpha($ui-dark-button--active-backgroundColor, 40%)
+    color $ui-inactive-text-color
+
+  .item-bottom-tagList-empty
+    color $ui-inactive-text-color
+    vertical-align middle
+
+body[data-theme="dracula"]
+  .root
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-noteList-backgroundColor
+
+  .item
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-noteList-backgroundColor
+    &:hover
+      transition 0.15s
+      // background-color alpha($ui-dracula-noteList-backgroundColor, 20%)
+      color $ui-dracula-text-color
+      .item-title
+      .item-title-icon
+      .item-bottom-time
+        transition 0.15s
+        color $ui-dracula-text-color
+      .item-bottom-tagList-item
+        transition 0.15s
+        background-color alpha($ui-dracula-noteList-backgroundColor, 20%)
+        color $ui-dracula-text-color
+    &:active
+      transition 0.15s
+      background-color $ui-dracula-noteList-backgroundColor
+      color $ui-dracula-text-color
+      .item-title
+      .item-title-icon
+      .item-bottom-time
+        transition 0.15s
+        color $ui-dracula-text-color
+      .item-bottom-tagList-item
+        transition 0.15s
+        background-color alpha($ui-dracula-noteList-backgroundColor, 10%)
+        color $ui-dracula-text-color
+
+  .item-wrapper
+    border-color alpha($ui-dracula-button-backgroundColor, 60%)
+
+  .item--active
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-button-backgroundColor
+    .item-wrapper
+      border-color transparent
+    .item-title
+    .item-title-icon
+    .item-bottom-time
+      color $ui-dracula-active-color
+    .item-bottom-tagList-item
+      background-color alpha(#f8f8f2, 10%)
+      color $ui-dracula-text-color
+    &:hover
+      // background-color alpha($ui-dracula-button--active-backgroundColor, 60%)
+      color #ff79c6
+      .item-bottom-tagList-item
+        background-color alpha(#f8f8f2, 20%)
+
+  .item-title
+    color $ui-inactive-text-color
+
+  .item-title-icon
+    color $ui-inactive-text-color
+
+  .item-title-empty
+    color $ui-inactive-text-color
+
+  .item-bottom-tagList-item
+    background-color alpha($ui-dark-button--active-backgroundColor, 40%)
+    color $ui-inactive-text-color
+
+  .item-bottom-tagList-empty
+    color $ui-inactive-text-color
+    vertical-align middle

browser/components/NoteItemSimple.js

@@ -25,8 +25,10 @@ const NoteItemSimple = ({
   pathname,
   storage
 }) => (
-  <div
+  <div styleName={isActive
-    styleName={isActive ? 'item-simple--active' : 'item-simple'}
+    ? 'item-simple--active'
+    : 'item-simple'
+  }
     key={note.key}
     onClick={e => handleNoteClick(e, note.key)}
     onContextMenu={e => handleNoteContextMenu(e, note.key)}
@@ -34,29 +36,23 @@ const NoteItemSimple = ({
     draggable='true'
   >
     <div styleName='item-simple-title'>
-      {note.type === 'SNIPPET_NOTE' ? (
+      {note.type === 'SNIPPET_NOTE'
-        <i styleName='item-simple-title-icon' className='fa fa-fw fa-code' />
+        ? <i styleName='item-simple-title-icon' className='fa fa-fw fa-code' />
-      ) : (
+        : <i styleName='item-simple-title-icon' className='fa fa-fw fa-file-text-o' />
-        <i
+      }
-          styleName='item-simple-title-icon'
+      {note.isPinned && !pathname.match(/\/starred|\/trash/)
-          className='fa fa-fw fa-file-text-o'
+        ? <i styleName='item-pin' className='fa fa-thumb-tack' />
-        />
+        : ''
-      )}
+      }
-      {note.isPinned && !pathname.match(/\/starred|\/trash/) ? (
+      {note.title.trim().length > 0
-        <i styleName='item-pin' className='fa fa-thumb-tack' />
+        ? note.title
-      ) : (
+        : <span styleName='item-simple-title-empty'>{i18n.__('Empty note')}</span>
-        ''
+      }
-      )}
+      {isAllNotesView && <div styleName='item-simple-right'>
-      {note.title.trim().length > 0 ? (
+        <span styleName='item-simple-right-storageName'>
-        note.title
+          {storage.name}
-      ) : (
+        </span>
-        <span styleName='item-simple-title-empty'>{i18n.__('Empty note')}</span>
+      </div>}
-      )}
-      {isAllNotesView && (
-        <div styleName='item-simple-right'>
-          <span styleName='item-simple-right-storageName'>{storage.name}</span>
-        </div>
-      )}
     </div>
   </div>
 )

browser/components/NoteItemSimple.styl

@@ -223,73 +223,130 @@ body[data-theme="solarized-dark"]
       padding-left 4px
       opacity 0.4
 
-apply-theme(theme)
+body[data-theme="monokai"]
-  body[data-theme={theme}]
+  .root
-    .root
+    border-color $ui-monokai-borderColor
-      border-color get-theme-var(theme, 'borderColor')
+    background-color $ui-monokai-noteList-backgroundColor
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
 
-    .item-simple
+  .item-simple
-      border-color get-theme-var(theme, 'borderColor')
+    border-color $ui-monokai-borderColor
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
+    background-color $ui-monokai-noteList-backgroundColor
-      &:hover
+    &:hover
-        transition 0.15s
+      transition 0.15s
-        background-color alpha(get-theme-var(theme, 'button-backgroundColor'), 60%)
+      background-color alpha($ui-monokai-button-backgroundColor, 60%)
-        color get-theme-var(theme, 'text-color')
+      color $ui-monokai-text-color
-        .item-simple-title
-        .item-simple-title-empty
-        .item-simple-title-icon
-        .item-simple-bottom-time
-          transition 0.15s
-          color get-theme-var(theme, 'text-color')
-        .item-simple-bottom-tagList-item
-          transition 0.15s
-          background-color alpha(get-theme-var(theme, 'tagList-backgroundColor'), 20%)
-          color get-theme-var(theme, 'text-color')
-      &:active
-        transition 0.15s
-        background-color get-theme-var(theme, 'button--active-backgroundColor')
-        color get-theme-var(theme, 'text-color')
-        .item-simple-title
-        .item-simple-title-empty
-        .item-simple-title-icon
-        .item-simple-bottom-time
-          transition 0.15s
-          color get-theme-var(theme, 'text-color')
-        .item-simple-bottom-tagList-item
-          transition 0.15s
-          background-color alpha(get-theme-var(theme, 'tagList-backgroundColor'), 10%)
-          color get-theme-var(theme, 'text-color')
-
-    .item-simple--active
-      border-color get-theme-var(theme, 'borderColor')
-      background-color get-theme-var(theme, 'button--active-backgroundColor')
-      .item-simple-wrapper
-        border-color transparent
       .item-simple-title
       .item-simple-title-empty
       .item-simple-title-icon
       .item-simple-bottom-time
-        color get-theme-var(theme, 'text-color')
+        transition 0.15s
+        color $ui-monokai-text-color
       .item-simple-bottom-tagList-item
-        background-color alpha(get-theme-var(theme, 'tagList-backgroundColor'), 10%)
+        transition 0.15s
-        color get-theme-var(theme, 'text-color')
+        background-color alpha(#fff, 20%)
-      &:hover
+        color $ui-monokai-text-color
-        // background-color alpha(get-theme-var(theme, 'button--active-backgroundColor'), 60%)
+    &:active
-        color #c0392b
+      transition 0.15s
-        .item-simple-bottom-tagList-item
+      background-color $ui-monokai-button--active-backgroundColor
-          background-color alpha(get-theme-var(theme, 'tagList-backgroundColor'), 20%)
+      color $ui-monokai-text-color
+      .item-simple-title
+      .item-simple-title-empty
+      .item-simple-title-icon
+      .item-simple-bottom-time
+        transition 0.15s
+        color $ui-monokai-text-color
+      .item-simple-bottom-tagList-item
+        transition 0.15s
+        background-color alpha(white, 10%)
+        color $ui-monokai-text-color
+
+  .item-simple--active
+    border-color $ui-monokai-borderColor
+    background-color $ui-monokai-button--active-backgroundColor
+    .item-simple-wrapper
+      border-color transparent
     .item-simple-title
-      color $ui-dark-text-color
+    .item-simple-title-empty
-      border-bottom $ui-dark-borderColor
+    .item-simple-title-icon
-    .item-simple-right
+    .item-simple-bottom-time
-      float right
+      color $ui-monokai-text-color
-      .item-simple-right-storageName
+    .item-simple-bottom-tagList-item
-        padding-left 4px
+      background-color alpha(white, 10%)
-        opacity 0.4
+      color $ui-monokai-text-color
+    &:hover
+      // background-color alpha($ui-dark-button--active-backgroundColor, 60%)
+      color #c0392b
+      .item-simple-bottom-tagList-item
+        background-color alpha(#fff, 20%)
+  .item-simple-title
+    color $ui-dark-text-color
+    border-bottom $ui-dark-borderColor
+  .item-simple-right
+    float right
+    .item-simple-right-storageName
+      padding-left 4px
+      opacity 0.4
 
-for theme in 'dracula'
+body[data-theme="dracula"]
-  apply-theme(theme)
+  .root
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-noteList-backgroundColor
 
-for theme in $themes
+  .item-simple
-  apply-theme(theme)
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-noteList-backgroundColor
+    &:hover
+      transition 0.15s
+      background-color alpha($ui-dracula-button-backgroundColor, 60%)
+      color $ui-dracula-text-color
+      .item-simple-title
+      .item-simple-title-empty
+      .item-simple-title-icon
+      .item-simple-bottom-time
+        transition 0.15s
+        color $ui-dracula-text-color
+      .item-simple-bottom-tagList-item
+        transition 0.15s
+        background-color alpha(#f8f8f2, 20%)
+        color $ui-dracula-text-color
+    &:active
+      transition 0.15s
+      background-color $ui-dracula-button--active-backgroundColor
+      color $ui-dracula-text-color
+      .item-simple-title
+      .item-simple-title-empty
+      .item-simple-title-icon
+      .item-simple-bottom-time
+        transition 0.15s
+        color $ui-dracula-text-color
+      .item-simple-bottom-tagList-item
+        transition 0.15s
+        background-color alpha(#f8f8f2, 10%)
+        color $ui-dracula-text-color
+
+  .item-simple--active
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-button--active-backgroundColor
+    .item-simple-wrapper
+      border-color transparent
+    .item-simple-title
+    .item-simple-title-empty
+    .item-simple-title-icon
+    .item-simple-bottom-time
+      color $ui-dracula-text-color
+    .item-simple-bottom-tagList-item
+      background-color alpha(#f8f8f2, 10%)
+      color $ui-dracula-text-color
+    &:hover
+      // background-color alpha($ui-dark-button--active-backgroundColor, 60%)
+      color #c0392b
+      .item-simple-bottom-tagList-item
+        background-color alpha(#f8f8f2, 20%)
+  .item-simple-title
+    color $ui-dark-text-color
+    border-bottom $ui-dark-borderColor
+  .item-simple-right
+    float right
+    .item-simple-right-storageName
+      padding-left 4px
+      opacity 0.4

browser/components/RealtimeNotification.js

@@ -6,7 +6,7 @@ const electron = require('electron')
 const { shell } = electron
 
 class RealtimeNotification extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -14,46 +14,38 @@ class RealtimeNotification extends React.Component {
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.fetchNotifications()
   }
 
-  fetchNotifications() {
+  fetchNotifications () {
-    const notificationsUrl =
+    const notificationsUrl = 'https://raw.githubusercontent.com/BoostIO/notification/master/notification.json'
-      'https://raw.githubusercontent.com/BoostIO/notification/master/notification.json'
     fetch(notificationsUrl)
       .then(response => {
         return response.json()
       })
       .then(json => {
-        this.setState({ notifications: json.notifications })
+        this.setState({notifications: json.notifications})
       })
   }
 
-  handleLinkClick(e) {
+  handleLinkClick (e) {
     shell.openExternal(e.currentTarget.href)
     e.preventDefault()
   }
 
-  render() {
+  render () {
     const { notifications } = this.state
-    const link =
+    const link = notifications.length > 0
-      notifications.length > 0 ? (
+      ? <a styleName='notification-link' href={notifications[0].linkUrl}
-        <a
+        onClick={(e) => this.handleLinkClick(e)}
-          styleName='notification-link'
+      >
-          href={notifications[0].linkUrl}
+        Info: {notifications[0].text}
-          onClick={e => this.handleLinkClick(e)}
+      </a>
-        >
+    : ''
-          Info: {notifications[0].text}
-        </a>
-      ) : (
-        ''
-      )
 
     return (
-      <div styleName='notification-area' style={this.props.style}>
+      <div styleName='notification-area' style={this.props.style}>{link}</div>
-        {link}
-      </div>
     )
   }
 }

browser/components/RealtimeNotification.styl

@@ -30,20 +30,36 @@ body[data-theme="dark"]
     &:hover
       color #5CB85C
 
-apply-theme(theme)
-  body[data-theme={theme}]
-    .notification-area
-      background-color none
 
-    .notification-link
+body[data-theme="solarized-dark"]
-      color get-theme-var(theme, 'text-color')
+  .notification-area
-      border none
+    background-color none
-      background-color get-theme-var(theme, 'button-backgroundColor')
-      &:hover
-        color get-theme-var(theme, 'button--hover-color')
 
-for theme in 'solarized-dark' 'dracula'
+  .notification-link
-  apply-theme(theme)
+    color $ui-solarized-dark-text-color
+    border none
+    background-color $ui-solarized-dark-button-backgroundColor
+    &:hover
+      color #5CB85C
 
-for theme in $themes
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .notification-area
+    background-color none
+
+  .notification-link
+    color $ui-monokai-text-color
+    border none
+    background-color $ui-monokai-button-backgroundColor
+    &:hover
+      color #5CB85C
+
+body[data-theme="dracula"]
+  .notification-area
+    background-color none
+
+  .notification-link
+    color $ui-dracula-text-color
+    border none
+    background-color $ui-dracula-button-backgroundColor
+    &:hover
+      color #ff79c6

browser/components/SideNavFilter.js

@@ -16,70 +16,54 @@ import i18n from 'browser/lib/i18n'
  * @return {React.Component}
  */
 const SideNavFilter = ({
-  isFolded,
+  isFolded, isHomeActive, handleAllNotesButtonClick,
-  isHomeActive,
+  isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote,
-  handleAllNotesButtonClick,
+  counterTotalNote, counterStarredNote, handleFilterButtonContextMenu
-  isStarredActive,
-  handleStarredButtonClick,
-  isTrashedActive,
-  handleTrashedButtonClick,
-  counterDelNote,
-  counterTotalNote,
-  counterStarredNote,
-  handleFilterButtonContextMenu
 }) => (
   <div styleName={isFolded ? 'menu--folded' : 'menu'}>
-    <button
+
-      styleName={isHomeActive ? 'menu-button--active' : 'menu-button'}
+    <button styleName={isHomeActive ? 'menu-button--active' : 'menu-button'}
       onClick={handleAllNotesButtonClick}
     >
       <div styleName='iconWrap'>
-        <img
+        <img src={isHomeActive
-          src={
+          ? '../resources/icon/icon-all-active.svg'
-            isHomeActive
+          : '../resources/icon/icon-all.svg'
-              ? '../resources/icon/icon-all-active.svg'
+        }
-              : '../resources/icon/icon-all.svg'
-          }
         />
       </div>
       <span styleName='menu-button-label'>{i18n.__('All Notes')}</span>
       <span styleName='counters'>{counterTotalNote}</span>
     </button>
 
-    <button
+    <button styleName={isStarredActive ? 'menu-button-star--active' : 'menu-button'}
-      styleName={isStarredActive ? 'menu-button-star--active' : 'menu-button'}
       onClick={handleStarredButtonClick}
     >
       <div styleName='iconWrap'>
-        <img
+        <img src={isStarredActive
-          src={
+          ? '../resources/icon/icon-star-active.svg'
-            isStarredActive
+          : '../resources/icon/icon-star-sidenav.svg'
-              ? '../resources/icon/icon-star-active.svg'
+        }
-              : '../resources/icon/icon-star-sidenav.svg'
-          }
         />
       </div>
       <span styleName='menu-button-label'>{i18n.__('Starred')}</span>
       <span styleName='counters'>{counterStarredNote}</span>
     </button>
 
-    <button
+    <button styleName={isTrashedActive ? 'menu-button-trash--active' : 'menu-button'}
-      styleName={isTrashedActive ? 'menu-button-trash--active' : 'menu-button'}
+      onClick={handleTrashedButtonClick} onContextMenu={handleFilterButtonContextMenu}
-      onClick={handleTrashedButtonClick}
-      onContextMenu={handleFilterButtonContextMenu}
     >
       <div styleName='iconWrap'>
-        <img
+        <img src={isTrashedActive
-          src={
+          ? '../resources/icon/icon-trash-active.svg'
-            isTrashedActive
+          : '../resources/icon/icon-trash-sidenav.svg'
-              ? '../resources/icon/icon-trash-active.svg'
+        }
-              : '../resources/icon/icon-trash-sidenav.svg'
-          }
         />
       </div>
       <span styleName='menu-button-label'>{i18n.__('Trash')}</span>
       <span styleName='counters'>{counterDelNote}</span>
     </button>
+
   </div>
 )
 

browser/components/SideNavFilter.styl

@@ -1,5 +1,5 @@
 .menu
-  margin-bottom 20px
+  margin-bottom 30px
 
 .menu-button
   navButtonColor()
@@ -180,51 +180,129 @@ body[data-theme="dark"]
       .menu-button-label
         color $ui-dark-text-color
 
-apply-theme(theme)
-  body[data-theme={theme}]
-    .menu-button
-      &:active
-        background-color get-theme-var(theme, 'noteList-backgroundColor')
-        color get-theme-var(theme, 'text-color')
-      &:hover
-        background-color get-theme-var(theme, 'button-backgroundColor')
-        color get-theme-var(theme, 'text-color')
 
-    .menu-button--active
+body[data-theme="solarized-dark"]
-      color get-theme-var(theme, 'text-color')
+  .menu-button
-      background-color get-theme-var(theme, 'button-backgroundColor')
+    &:active
+      background-color $ui-solarized-dark-noteList-backgroundColor
+      color $ui-solarized-dark-text-color
+    &:hover
+      background-color $ui-solarized-dark-button-backgroundColor
+      color $ui-solarized-dark-text-color
+
+  .menu-button--active
+    color $ui-solarized-dark-text-color
+    background-color $ui-solarized-dark-button-backgroundColor
+    .menu-button-label
+      color $ui-solarized-dark-text-color
+    &:hover
+      background-color $ui-solarized-dark-button-backgroundColor
+      color $ui-solarized-dark-text-color
       .menu-button-label
-        color get-theme-var(theme, 'text-color')
+        color $ui-solarized-dark-text-color
-      &:hover
-        background-color get-theme-var(theme, 'button-backgroundColor')
-        color get-theme-var(theme, 'text-color')
-        .menu-button-label
-          color get-theme-var(theme, 'text-color')
 
-    .menu-button-star--active
+  .menu-button-star--active
-      color get-theme-var(theme, 'text-color')
+    color $ui-solarized-dark-text-color
-      background-color get-theme-var(theme, 'button-backgroundColor')
+    background-color $ui-solarized-dark-button-backgroundColor
+    .menu-button-label
+      color $ui-solarized-dark-text-color
+    &:hover
+      background-color $ui-solarized-dark-button-backgroundColor
+      color $ui-solarized-dark-text-color
       .menu-button-label
-        color get-theme-var(theme, 'text-color')
+        color $ui-solarized-dark-text-color
-      &:hover
-        background-color get-theme-var(theme, 'button-backgroundColor')
-        color get-theme-var(theme, 'text-color')
-        .menu-button-label
-          color get-theme-var(theme, 'text-color')
 
-    .menu-button-trash--active
+  .menu-button-trash--active
-      color get-theme-var(theme, 'text-color')
+    color $ui-solarized-dark-text-color
-      background-color get-theme-var(theme, 'button-backgroundColor')
+    background-color $ui-solarized-dark-button-backgroundColor
+    .menu-button-label
+      color $ui-solarized-dark-text-color
+    &:hover
+      background-color $ui-solarized-dark-button-backgroundColor
+      color $ui-solarized-dark-text-color
       .menu-button-label
-        color get-theme-var(theme, 'text-color')
+        color $ui-solarized-dark-text-color
-      &:hover
-        background-color get-theme-var(theme, 'button-backgroundColor')
-        color get-theme-var(theme, 'text-color')
-        .menu-button-label
-          color get-theme-var(theme, 'text-color')
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .menu-button
+    &:active
+      background-color $ui-monokai-noteList-backgroundColor
+      color $ui-monokai-text-color
+    &:hover
+      background-color $ui-monokai-button-backgroundColor
+      color $ui-monokai-text-color
 
-for theme in $themes
+  .menu-button--active
-  apply-theme(theme)
+    color $ui-monokai-text-color
+    background-color $ui-monokai-button-backgroundColor
+    .menu-button-label
+      color $ui-monokai-text-color
+    &:hover
+      background-color $ui-monokai-button-backgroundColor
+      color $ui-monokai-text-color
+      .menu-button-label
+        color $ui-monokai-text-color
+
+  .menu-button-star--active
+    color $ui-monokai-text-color
+    background-color $ui-monokai-button-backgroundColor
+    .menu-button-label
+      color $ui-monokai-text-color
+    &:hover
+      background-color $ui-monokai-button-backgroundColor
+      color $ui-monokai-text-color
+      .menu-button-label
+        color $ui-monokai-text-color
+
+  .menu-button-trash--active
+    color $ui-monokai-text-color
+    background-color $ui-monokai-button-backgroundColor
+    .menu-button-label
+      color $ui-monokai-text-color
+    &:hover
+      background-color $ui-monokai-button-backgroundColor
+      color $ui-monokai-text-color
+      .menu-button-label
+        color $ui-monokai-text-color
+
+body[data-theme="dracula"]
+  .menu-button
+    &:active
+      background-color $ui-dracula-noteList-backgroundColor
+      color $ui-dracula-text-color
+    &:hover
+      background-color $ui-dracula-button-backgroundColor
+      color $ui-dracula-text-color
+
+  .menu-button--active
+    color $ui-dracula-text-color
+    background-color $ui-dracula-button-backgroundColor
+    .menu-button-label
+      color $ui-dracula-text-color
+    &:hover
+      background-color $ui-dracula-button-backgroundColor
+      color $ui-dracula-text-color
+      .menu-button-label
+        color $ui-dracula-text-color
+
+  .menu-button-star--active
+    color $ui-dracula-text-color
+    background-color $ui-dracula-button-backgroundColor
+    .menu-button-label
+      color $ui-dracula-text-color
+    &:hover
+      background-color $ui-dracula-button-backgroundColor
+      color $ui-dracula-text-color
+      .menu-button-label
+        color $ui-dracula-text-color
+
+  .menu-button-trash--active
+    color $ui-dracula-text-color
+    background-color $ui-dracula-button-backgroundColor
+    .menu-button-label
+      color $ui-dracula-text-color
+    &:hover
+      background-color $ui-dracula-button-backgroundColor
+      color $ui-dracula-text-color
+      .menu-button-label
+        color $ui-dracula-text-color

browser/components/SnippetTab.js

@@ -5,7 +5,7 @@ import context from 'browser/lib/context'
 import i18n from 'browser/lib/i18n'
 
 class SnippetTab extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -14,7 +14,7 @@ class SnippetTab extends React.Component {
     }
   }
 
-  componentWillUpdate(nextProps) {
+  componentWillUpdate (nextProps) {
     if (nextProps.snippet.name !== this.props.snippet.name) {
       this.setState({
         name: nextProps.snippet.name
@@ -22,34 +22,34 @@ class SnippetTab extends React.Component {
     }
   }
 
-  handleClick(e) {
+  handleClick (e) {
     this.props.onClick(e)
   }
 
-  handleContextMenu(e) {
+  handleContextMenu (e) {
     context.popup([
       {
         label: i18n.__('Rename'),
-        click: e => this.handleRenameClick(e)
+        click: (e) => this.handleRenameClick(e)
       }
     ])
   }
 
-  handleRenameClick(e) {
+  handleRenameClick (e) {
     this.startRenaming()
   }
 
-  handleNameInputBlur(e) {
+  handleNameInputBlur (e) {
     this.handleRename()
   }
 
-  handleNameInputChange(e) {
+  handleNameInputChange (e) {
     this.setState({
       name: e.target.value
     })
   }
 
-  handleNameInputKeyDown(e) {
+  handleNameInputKeyDown (e) {
     switch (e.keyCode) {
       case 13:
         this.handleRename()
@@ -63,87 +63,84 @@ class SnippetTab extends React.Component {
     }
   }
 
-  handleRename() {
+  handleRename () {
-    this.setState(
+    this.setState({
-      {
+      isRenaming: false
-        isRenaming: false
+    }, () => {
-      },
+      if (this.props.snippet.name !== this.state.name) {
-      () => {
+        this.props.onRename(this.state.name)
-        if (this.props.snippet.name !== this.state.name) {
-          this.props.onRename(this.state.name)
-        }
       }
-    )
+    })
   }
 
-  handleDeleteButtonClick(e) {
+  handleDeleteButtonClick (e) {
     this.props.onDelete(e)
   }
 
-  startRenaming() {
+  startRenaming () {
-    this.setState(
+    this.setState({
-      {
+      isRenaming: true
-        isRenaming: true
+    }, () => {
-      },
+      this.refs.name.focus()
-      () => {
+      this.refs.name.select()
-        this.refs.name.focus()
+    })
-        this.refs.name.select()
-      }
-    )
   }
 
-  handleDragStart(e) {
+  handleDragStart (e) {
     e.dataTransfer.dropEffect = 'move'
     this.props.onDragStart(e)
   }
 
-  handleDrop(e) {
+  handleDrop (e) {
     this.props.onDrop(e)
   }
 
-  render() {
+  render () {
     const { isActive, snippet, isDeletable } = this.props
     return (
-      <div styleName={isActive ? 'root--active' : 'root'}>
+      <div styleName={isActive
-        {!this.state.isRenaming ? (
+          ? 'root--active'
-          <button
+          : 'root'
-            styleName='button'
+        }
-            onClick={e => this.handleClick(e)}
+      >
-            onDoubleClick={e => this.handleRenameClick(e)}
+        {!this.state.isRenaming
-            onContextMenu={e => this.handleContextMenu(e)}
+          ? <button styleName='button'
-            onDragStart={e => this.handleDragStart(e)}
+            onClick={(e) => this.handleClick(e)}
-            onDrop={e => this.handleDrop(e)}
+            onDoubleClick={(e) => this.handleRenameClick(e)}
+            onContextMenu={(e) => this.handleContextMenu(e)}
+            onDragStart={(e) => this.handleDragStart(e)}
+            onDrop={(e) => this.handleDrop(e)}
             draggable='true'
           >
-            {snippet.name.trim().length > 0 ? (
+            {snippet.name.trim().length > 0
-              snippet.name
+              ? snippet.name
-            ) : (
+              : <span>
-              <span>{i18n.__('Unnamed')}</span>
+                {i18n.__('Unnamed')}
-            )}
+              </span>
+            }
           </button>
-        ) : (
+          : <input styleName='input'
-          <input
-            styleName='input'
             ref='name'
             value={this.state.name}
-            onChange={e => this.handleNameInputChange(e)}
+            onChange={(e) => this.handleNameInputChange(e)}
-            onBlur={e => this.handleNameInputBlur(e)}
+            onBlur={(e) => this.handleNameInputBlur(e)}
-            onKeyDown={e => this.handleNameInputKeyDown(e)}
+            onKeyDown={(e) => this.handleNameInputKeyDown(e)}
           />
-        )}
+        }
-        {isDeletable && (
+        {isDeletable &&
-          <button
+          <button styleName='deleteButton'
-            styleName='deleteButton'
+            onClick={(e) => this.handleDeleteButtonClick(e)}
-            onClick={e => this.handleDeleteButtonClick(e)}
           >
             <i className='fa fa-times' />
           </button>
-        )}
+        }
       </div>
     )
   }
 }
 
-SnippetTab.propTypes = {}
+SnippetTab.propTypes = {
+
+}
 
 export default CSSModules(SnippetTab, styles)

browser/components/SnippetTab.styl

@@ -61,7 +61,7 @@
   width 100%
   outline none
 
-body[data-theme="default"], body[data-theme="white"]
+body[data-theme="default"], body[data-theme="white"]  
   .root--active
     &:hover
       background-color alpha($ui-button--active-backgroundColor, 60%)
@@ -100,43 +100,103 @@ body[data-theme="dark"]
     color $ui-dark-text-color
     transition 0.15s
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .root
-    .root
+    border-color $ui-solarized-dark-borderColor
-      border-color get-theme-var(theme, 'borderColor')
+    &:hover
-      &:hover
+      background-color $ui-solarized-dark-noteDetail-backgroundColor
-        background-color get-theme-var(theme, 'noteDetail-backgroundColor')
-        transition 0.15s
-        .deleteButton
-          color get-theme-var(theme, 'text-color')
-          transition 0.15s
-        .button
-          color get-theme-var(theme, 'text-color')
-          transition 0.15s
-
-    .root--active
-      color get-theme-var(theme, 'active-color')
-      background-color get-theme-var(theme, 'button-backgroundColor')
-      border-color get-theme-var(theme, 'borderColor')
-      .deleteButton
-        color get-theme-var(theme, 'text-color')
-      .button
-        color get-theme-var(theme, 'active-color')
-
-    .button
-      border none
-      color $ui-inactive-text-color
-      background-color transparent
-      transition color background-color 0.15s
-      border-left 4px solid transparent
-
-    .input
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
-      color get-theme-var(theme, 'text-color')
       transition 0.15s
+      .deleteButton
+        color $ui-solarized-dark-button--active-color
+        transition 0.15s
+      .button
+        color $ui-solarized-dark-button--active-color
+        transition 0.15s
 
-for theme in 'solarized-dark' 'dracula'
+  .root--active
-  apply-theme(theme)
+    color $ui-solarized-dark-button--active-color
+    background-color $ui-solarized-dark-button-backgroundColor
+    border-color $ui-solarized-dark-borderColor
+    .deleteButton
+      color $ui-solarized-dark-button--active-color
+    .button
+      color $ui-solarized-dark-button--active-color
 
-for theme in $themes
+  .button
-  apply-theme(theme)
+    border none
+    color $ui-solarized-dark-text-color
+    background-color transparent
+    transition color background-color 0.15s
+    border-left 4px solid transparent
+
+  .input
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
+    color $ui-solarized-dark-button--active-color
+    transition 0.15s
+
+body[data-theme="monokai"]
+  .root
+    border-color $ui-monokai-borderColor
+    &:hover
+      background-color $ui-monokai-noteDetail-backgroundColor
+      transition 0.15s
+      .deleteButton
+        color $ui-monokai-text-color
+        transition 0.15s
+      .button
+        color $ui-monokai-text-color
+        transition 0.15s
+
+  .root--active
+    color $ui-monokai-active-color
+    background-color $ui-monokai-button-backgroundColor
+    border-color $ui-monokai-borderColor
+    .deleteButton
+      color $ui-monokai-text-color
+    .button
+      color $ui-monokai-active-color
+        
+  .button
+    border none
+    color $ui-inactive-text-color
+    background-color transparent
+    transition color background-color 0.15s
+    border-left 4px solid transparent
+
+  .input
+    background-color $ui-monokai-noteDetail-backgroundColor
+    color $ui-monokai-text-color
+    transition 0.15s
+
+body[data-theme="dracula"]
+  .root
+    border-color $ui-dracula-borderColor
+    &:hover
+      background-color $ui-dracula-noteDetail-backgroundColor
+      transition 0.15s
+      .deleteButton
+        color $ui-dracula-text-color
+        transition 0.15s
+      .button
+        color $ui-dracula-text-color
+        transition 0.15s
+
+  .root--active
+    color $ui-dracula-text-color
+    background-color $ui-dracula-button-backgroundColor
+    border-color $ui-dracula-borderColor
+    .deleteButton
+      color $ui-dracula-text-color
+    .button
+      color $ui-dracula-active-color
+
+  .button
+    border none
+    color $ui-inactive-text-color
+    background-color transparent
+    transition color background-color 0.15s
+    border-left 4px solid transparent
+
+  .input
+    background-color $ui-dracula-noteDetail-backgroundColor
+    color $ui-dracula-text-color

browser/components/StorageItem.js

@@ -21,9 +21,7 @@ const FolderIcon = ({ className, color, isActive }) => {
 
 /**
  * @param {boolean} isActive
- * @param {object} tooltipRef,
  * @param {Function} handleButtonClick
- * @param {Function} handleMouseEnter
  * @param {Function} handleContextMenu
  * @param {string} folderName
  * @param {string} folderColor
@@ -37,9 +35,7 @@ const FolderIcon = ({ className, color, isActive }) => {
 const StorageItem = ({
   styles,
   isActive,
-  tooltipRef,
   handleButtonClick,
-  handleMouseEnter,
   handleContextMenu,
   folderName,
   folderColor,
@@ -53,15 +49,13 @@ const StorageItem = ({
     <button
       styleName={isActive ? 'folderList-item--active' : 'folderList-item'}
       onClick={handleButtonClick}
-      onMouseEnter={handleMouseEnter}
       onContextMenu={handleContextMenu}
       onDrop={handleDrop}
       onDragEnter={handleDragEnter}
       onDragLeave={handleDragLeave}
     >
-      {!isFolded && (
+      {!isFolded &&
-        <DraggableIcon className={styles['folderList-item-reorder']} />
+        <DraggableIcon className={styles['folderList-item-reorder']} />}
-      )}
       <span
         styleName={
           isFolded ? 'folderList-item-name--folded' : 'folderList-item-name'
@@ -76,23 +70,18 @@ const StorageItem = ({
           ? _.truncate(folderName, { length: 1, omission: '' })
           : folderName}
       </span>
-      {!isFolded && _.isNumber(noteCount) && (
+      {!isFolded &&
-        <span styleName='folderList-item-noteCount'>{noteCount}</span>
+        _.isNumber(noteCount) &&
-      )}
+        <span styleName='folderList-item-noteCount'>{noteCount}</span>}
-      {isFolded && (
+      {isFolded &&
-        <span styleName='folderList-item-tooltip' ref={tooltipRef}>
+        <span styleName='folderList-item-tooltip'>{folderName}</span>}
-          {folderName}
-        </span>
-      )}
     </button>
   )
 }
 
 StorageItem.propTypes = {
   isActive: PropTypes.bool.isRequired,
-  tooltipRef: PropTypes.object,
   handleButtonClick: PropTypes.func,
-  handleMouseEnter: PropTypes.func,
   handleContextMenu: PropTypes.func,
   folderName: PropTypes.string.isRequired,
   folderColor: PropTypes.string,

browser/components/StorageItem.styl

@@ -60,7 +60,6 @@
   border-bottom-right-radius 2px
   height 34px
   line-height 32px
-  transition-property opacity
 
 .folderList-item:hover, .folderList-item--active:hover
   .folderList-item-tooltip
@@ -121,28 +120,59 @@ body[data-theme="dark"]
       color $ui-dark-text-color
       background-color alpha($ui-dark-button--active-backgroundColor, 50%)
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .folderList-item
-    .folderList-item
+    &:hover
-      &:hover
+      background-color $ui-solarized-dark-button-backgroundColor
-        background-color get-theme-var(theme, 'button-backgroundColor')
+      color $ui-solarized-dark-text-color
-        color get-theme-var(theme, 'text-color')
+    &:active
-      &:active
+      color $ui-solarized-dark-text-color
-        color get-theme-var(theme, 'text-color')
+      background-color $ui-solarized-dark-button-backgroundColor
-        background-color get-theme-var(theme, 'button-backgroundColor')
 
-    .folderList-item--active
+  .folderList-item--active
-      @extend .folderList-item
+    @extend .folderList-item
-      color get-theme-var(theme, 'text-color')
+    color $ui-solarized-dark-text-color
-      background-color get-theme-var(theme, 'button-backgroundColor')
+    background-color $ui-solarized-dark-button-backgroundColor
-      &:active
+    &:active
-        background-color get-theme-var(theme, 'button-backgroundColor')
+      background-color $ui-solarized-dark-button-backgroundColor
-      &:hover
+    &:hover
-        color get-theme-var(theme, 'text-color')
+      color $ui-solarized-dark-text-color
-        background-color get-theme-var(theme, 'button-backgroundColor')
+      background-color $ui-solarized-dark-button-backgroundColor
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .folderList-item
+    &:hover
+      background-color $ui-monokai-button-backgroundColor
+      color $ui-monokai-text-color
+    &:active
+      color $ui-monokai-text-color
+      background-color $ui-monokai-button-backgroundColor
 
-for theme in $themes
+  .folderList-item--active
-  apply-theme(theme)
+    @extend .folderList-item
+    color $ui-monokai-text-color
+    background-color $ui-monokai-button-backgroundColor
+    &:active
+      background-color $ui-monokai-button-backgroundColor
+    &:hover
+      color $ui-monokai-text-color
+      background-color $ui-monokai-button-backgroundColor
+
+body[data-theme="dracula"]
+  .folderList-item
+    &:hover
+      background-color $ui-dracula-button-backgroundColor
+      color $ui-dracula-text-color
+    &:active
+      color $ui-dracula-text-color
+      background-color $ui-dracula-button-backgroundColor
+
+  .folderList-item--active
+    @extend .folderList-item
+    color $ui-dracula-text-color
+    background-color $ui-dracula-button-backgroundColor
+    &:active
+      background-color $ui-dracula-button-backgroundColor
+    &:hover
+      color $ui-dracula-text-color
+      background-color $ui-dracula-button-backgroundColor

browser/components/StorageList.js

@@ -1,20 +1,18 @@
 /**
- * @fileoverview Micro component for showing StorageList
+* @fileoverview Micro component for showing StorageList
- */
+*/
 import PropTypes from 'prop-types'
 import React from 'react'
 import styles from './StorageList.styl'
 import CSSModules from 'browser/lib/CSSModules'
 
 /**
- * @param {Array} storageList
+* @param {Array} storageList
- */
+*/
 
-const StorageList = ({ storageList, isFolded }) => (
+const StorageList = ({storageList, isFolded}) => (
   <div styleName={isFolded ? 'storageList-folded' : 'storageList'}>
-    {storageList.length > 0 ? (
+    {storageList.length > 0 ? storageList : (
-      storageList
-    ) : (
       <div styleName='storageList-empty'>No storage mount.</div>
     )}
   </div>

browser/components/TagListItem.js

@@ -1,58 +1,30 @@
 /**
- * @fileoverview Micro component for showing TagList.
+* @fileoverview Micro component for showing TagList.
- */
+*/
 import PropTypes from 'prop-types'
 import React from 'react'
 import styles from './TagListItem.styl'
 import CSSModules from 'browser/lib/CSSModules'
 
 /**
- * @param {string} name
+* @param {string} name
- * @param {Function} handleClickTagListItem
+* @param {Function} handleClickTagListItem
- * @param {Function} handleClickNarrowToTag
+* @param {Function} handleClickNarrowToTag
- * @param {boolean} isActive
+* @param {boolean} isActive
- * @param {boolean} isRelated
+* @param {boolean} isRelated
- * @param {string} bgColor tab backgroundColor
+* @param {string} bgColor tab backgroundColor
- */
+*/
 
-const TagListItem = ({
+const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, handleContextMenu, isActive, isRelated, count, color}) => (
-  name,
+  <div styleName='tagList-itemContainer' onContextMenu={e => handleContextMenu(e, name)}>
-  handleClickTagListItem,
+    {isRelated
-  handleClickNarrowToTag,
+      ? <button styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} onClick={() => handleClickNarrowToTag(name)}>
-  handleContextMenu,
-  isActive,
-  isRelated,
-  count,
-  color
-}) => (
-  <div
-    styleName='tagList-itemContainer'
-    onContextMenu={e => handleContextMenu(e, name)}
-  >
-    {isRelated ? (
-      <button
-        styleName={
-          isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'
-        }
-        onClick={() => handleClickNarrowToTag(name)}
-      >
         <i className={isActive ? 'fa fa-minus-circle' : 'fa fa-plus-circle'} />
       </button>
-    ) : (
+      : <div styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} />
-      <div
+    }
-        styleName={
+    <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
-          isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'
+      <span styleName='tagList-item-color' style={{backgroundColor: color || 'transparent'}} />
-        }
-      />
-    )}
-    <button
-      styleName={isActive ? 'tagList-item-active' : 'tagList-item'}
-      onClick={() => handleClickTagListItem(name)}
-    >
-      <span
-        styleName='tagList-item-color'
-        style={{ backgroundColor: color || 'transparent' }}
-      />
       <span styleName='tagList-item-name'>
         {`# ${name}`}
         <span styleName='tagList-item-count'>{count !== 0 ? count : ''}</span>

browser/components/TagListItem.styl

@@ -94,30 +94,23 @@ body[data-theme="white"]
   .tagList-item-count
     color $ui-text-color
 
-apply-theme(theme)
+body[data-theme="dark"]
-  body[data-theme={theme}]
+  .tagList-item
-    .tagList-item
+    color $ui-dark-inactive-text-color
-      color get-theme-var(theme, 'inactive-text-color')
+    &:hover
-      &:hover
+      color $ui-dark-text-color
-        color get-theme-var(theme, 'text-color')
+      background-color alpha($ui-dark-button--active-backgroundColor, 20%)
-        background-color alpha(get-theme-var(theme, 'button--active-backgroundColor'), 20%)
+    &:active
-      &:active
+      color $ui-dark-text-color
-        color get-theme-var(theme, 'text-color')
+      background-color $ui-dark-button--active-backgroundColor
-        background-color get-theme-var(theme, 'button--active-backgroundColor')
 
-    .tagList-item-active
+  .tagList-item-active
-      background-color get-theme-var(theme, 'button--active-backgroundColor')
+    background-color $ui-dark-button--active-backgroundColor
-      color get-theme-var(theme, 'text-color')
+    color $ui-dark-text-color
-      &:active
+    &:active
-        background-color alpha(get-theme-var(theme, 'button--active-backgroundColor'), 50%)
+      background-color alpha($ui-dark-button--active-backgroundColor, 50%)
-      &:hover
+    &:hover
-        color get-theme-var(theme, 'text-color')
+      color $ui-dark-text-color
-        background-color alpha(get-theme-var(theme, 'button--active-backgroundColor'), 50%)
+      background-color alpha($ui-dark-button--active-backgroundColor, 50%)
-    .tagList-item-count
+  .tagList-item-count
-      color get-theme-var(theme, 'button--active-color')
+    color $ui-dark-button--active-color
-
-for theme in 'dark'
-  apply-theme(theme)
-
-for theme in $themes
-  apply-theme(theme)

browser/components/TodoListPercentage.js

@@ -11,20 +11,17 @@ import styles from './TodoListPercentage.styl'
  * @param {number} percentageOfTodo
  */
 
-const TodoListPercentage = ({ percentageOfTodo, onClearCheckboxClick }) => (
+const TodoListPercentage = ({
-  <div
+  percentageOfTodo, onClearCheckboxClick
-    styleName='percentageBar'
+}) => (
-    style={{ display: isNaN(percentageOfTodo) ? 'none' : '' }}
+  <div styleName='percentageBar' style={{display: isNaN(percentageOfTodo) ? 'none' : ''}}>
-  >
+    <div styleName='progressBar' style={{width: `${percentageOfTodo}%`}}>
-    <div styleName='progressBar' style={{ width: `${percentageOfTodo}%` }}>
       <div styleName='progressBarInner'>
         <p styleName='percentageText'>{percentageOfTodo}%</p>
       </div>
     </div>
     <div styleName='todoClear'>
-      <p styleName='todoClearText' onClick={e => onClearCheckboxClick(e)}>
+      <p styleName='todoClearText' onClick={(e) => onClearCheckboxClick(e)}>clear</p>
-        clear
-      </p>
     </div>
   </div>
 )

browser/components/TodoListPercentage.styl

@@ -54,7 +54,7 @@ body[data-theme="dark"]
 
   .percentageText
     color $ui-dark-text-color
-
+  
   .todoClearText
     color $ui-dark-text-color
 
@@ -71,19 +71,25 @@ body[data-theme="solarized-dark"]
   .todoClearText
     color #fdf6e3
 
-apply-theme(theme)
+body[data-theme="monokai"]
-  body[data-theme={theme}]
+  .percentageBar
-    .percentageBar
+    background-color: $ui-monokai-borderColor
-      background-color: get-theme-var(theme, 'borderColor')
 
-    .progressBar
+  .progressBar
-      background-color get-theme-var(theme, 'active-color')
+    background-color $ui-monokai-active-color
 
-    .percentageText
+  .percentageText
-      color get-theme-var(theme, 'text-color')
+    color $ui-monokai-text-color
 
-for theme in 'dracula'
+body[data-theme="dracula"]
-  apply-theme(theme)
+  .percentageBar
+    background-color $ui-dracula-borderColor
 
-for theme in $themes
+  .progressBar
-  apply-theme(theme)
+    background-color: $ui-dracula-active-color
+
+  .percentageText
+    color $ui-dracula-text-color
+
+  .percentageText
+    color $ui-dracula-text-color

browser/components/TodoProcess.js

@@ -8,21 +8,18 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './TodoProcess.styl'
 
 const TodoProcess = ({
-  todoStatus: { total: totalTodo, completed: completedTodo }
+  todoStatus: {
+    total: totalTodo,
+    completed: completedTodo
+  }
 }) => (
-  <div
+  <div styleName='todo-process' style={{display: totalTodo > 0 ? '' : 'none'}}>
-    styleName='todo-process'
-    style={{ display: totalTodo > 0 ? '' : 'none' }}
-  >
     <div styleName='todo-process-text'>
       <i className='fa fa-fw fa-check-square-o' />
       {completedTodo} of {totalTodo}
     </div>
     <div styleName='todo-process-bar'>
-      <div
+      <div styleName='todo-process-bar--inner' style={{width: parseInt(completedTodo / totalTodo * 100) + '%'}} />
-        styleName='todo-process-bar--inner'
-        style={{ width: parseInt((completedTodo / totalTodo) * 100) + '%' }}
-      />
     </div>
   </div>
 )

browser/components/markdown.styl

@@ -124,34 +124,40 @@ hr
   border-bottom solid 1px borderColor
   margin 15px 0
 h1, h2, h3, h4, h5, h6
-  margin 1em 0 1.5em
-  line-height 1.4
   font-weight bold
   word-wrap break-word
-  padding .2em 0 .2em
 h1
   font-size 2.55em
-  line-height 1.2
+  padding-bottom 0.3em
+  line-height 1.2em
   border-bottom solid 1px borderColor
+  margin 1em 0 0.44em
   &:first-child
     margin-top 0
 h2
   font-size 1.75em
-  line-height 1.225
+  padding-bottom 0.3em
+  line-height 1.225em
   border-bottom solid 1px borderColor
+  margin 1em 0 0.57em
   &:first-child
     margin-top 0
 h3
   font-size 1.5em
-  line-height 1.43
+  line-height 1.43em
+  margin 1em 0 0.66em
 h4
   font-size 1.25em
-  line-height 1.4
+  line-height 1.4em
+  margin 1em 0 0.8em
 h5
   font-size 1em
-  line-height 1.1
+  line-height 1.4em
+  margin 1em 0 1em
 h6
   font-size 1em
+  line-height 1.4em
+  margin 1em 0 1em
   color #777
 p
   line-height 1.6em
@@ -357,10 +363,7 @@ admonition_types = {
     danger: {color: #c2185b, icon: "block"},
     caution: {color: #ffa726, icon: "warning"},
     error: {color: #d32f2f, icon: "error_outline"},
-    question: {color: #64dd17, icon: "help_outline"},
+    attention: {color: #455a64, icon: "priority_high"}
-    quote: {color: #9e9e9e, icon: "format_quote"},
-    abstract: {color: #00b0ff, icon: "subject"},
-    attention: {color: #455a64, icon: "priority_high"},
 }
 
 for name, val in admonition_types
@@ -421,9 +424,6 @@ pre.fence
     canvas, svg
       max-width 100% !important
 
-    svg[ratio]
-      width 100%
-
   .gallery
     width 100%
     height 50vh
@@ -444,44 +444,6 @@ pre.fence
         color $ui-text-color
         background-color $ui-tag-backgroundColor
 
-.markdownIt-TOC-wrapper
-  list-style none
-  position fixed
-  right 0
-  top 0
-  margin-left 15px
-  z-index 1000
-  transition transform .2s ease-in-out
-  transform translateX(100%)
-
-  .markdownIt-TOC
-    display block
-    max-height 90vh
-    overflow-y auto
-    padding 25px
-    padding-left 38px
-
-  &,
-  &:before
-    background-color $ui-dark-backgroundColor
-    color: $ui-dark-text-color
-
-  &:hover
-    transform translateX(-15px)
-
-  &:before
-    content 'TOC'
-    position absolute
-    width 60px
-    height 30px
-    top 60px
-    left -29px
-    display flex
-    align-items center
-    justify-content center
-    transform-origin top left
-    transform rotate(-90deg)
-
 themeDarkBackground = darken(#21252B, 10%)
 themeDarkText = #f9f9f9
 themeDarkBorder = lighten(themeDarkBackground, 20%)
@@ -549,63 +511,137 @@ body[data-theme="dark"]
         color $ui-dark-text-color
         background-color $ui-dark-tag-backgroundColor
 
-  .markdownIt-TOC-wrapper
+themeSolarizedDarkTableOdd = $ui-solarized-dark-noteDetail-backgroundColor
-    &,
+themeSolarizedDarkTableEven = darken($ui-solarized-dark-noteDetail-backgroundColor, 10%)
-    &:before
+themeSolarizedDarkTableHead = themeSolarizedDarkTableEven
-      background-color darken(themeDarkBackground, 5%)
+themeSolarizedDarkTableBorder = themeDarkBorder
-      color themeDarkText
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  color $ui-solarized-dark-text-color
-    color get-theme-var(theme, 'text-color')
+  border-color themeDarkBorder
+  background-color $ui-solarized-dark-noteDetail-backgroundColor
+  table
+    thead
+      tr
+        background-color themeSolarizedDarkTableHead
+      th
+        border-color themeSolarizedDarkTableBorder
+        &:last-child
+          border-right solid 1px themeSolarizedDarkTableBorder
+    tbody
+      tr:nth-child(2n + 1)
+        background-color themeSolarizedDarkTableOdd
+      tr:nth-child(2n)
+        background-color themeSolarizedDarkTableEven
+      td
+        border-color themeSolarizedDarkTableBorder
+        &:last-child
+          border-right solid 1px themeSolarizedDarkTableBorder
+  dl
     border-color themeDarkBorder
-    background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+    background-color themeSolarizedDarkTableHead
-    table
+  dt
-      thead
+    border-color themeDarkBorder
-        tr
+  dd
-          background-color get-theme-var(theme, 'table-head-backgroundColor')
+    border-color themeDarkBorder
-        th
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
-          border-color get-theme-var(theme, 'table-borderColor')
-          &:last-child
-            border-right solid 1px get-theme-var(theme, 'table-borderColor')
-      tbody
-        tr:nth-child(2n + 1)
-          background-color get-theme-var(theme, 'table-odd-backgroundColor')
-        tr:nth-child(2n)
-          background-color get-theme-var(theme, 'table-even-backgroundColor')
-        td
-          border-color get-theme-var(theme, 'table-borderColor')
-          &:last-child
-            border-right solid 1px get-theme-var(theme, 'table-borderColor')
-    kbd
-      background-color get-theme-var(theme, 'kbd-backgroundColor')
-      color get-theme-var(theme, 'kbd-color')
 
-    dl
+  pre.fence
-      border-color themeDarkBorder
+    .gallery
-      background-color get-theme-var(theme, 'table-head-backgroundColor')
+      .carousel-main, .carousel-footer
-    dt
+        background-color $ui-solarized-dark-noteDetail-backgroundColor
-      border-color themeDarkBorder
+      .prev, .next
-    dd
+        color $ui-solarized-dark-button--active-color
-      border-color themeDarkBorder
+        background-color $ui-solarized-dark-button-backgroundColor
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
 
-    pre.fence
+themeMonokaiTableOdd = $ui-monokai-noteDetail-backgroundColor
-      .gallery
+themeMonokaiTableEven = darken($ui-monokai-noteDetail-backgroundColor, 10%)
-        .carousel-main, .carousel-footer
+themeMonokaiTableHead = themeMonokaiTableEven
-          background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+themeMonokaiTableBorder = themeDarkBorder
-        .prev, .next
-          color get-theme-var(theme, 'button--active-color')
-          background-color get-theme-var(theme, 'button-backgroundColor')
 
-    .markdownIt-TOC-wrapper
+body[data-theme="monokai"]
-      &,
+  color $ui-monokai-text-color
-      &:before
+  border-color themeDarkBorder
-        background-color darken(get-theme-var(theme, 'noteDetail-backgroundColor'), 15%)
+  background-color $ui-monokai-noteDetail-backgroundColor
-        color themeDarkText
+  table
+    thead
+      tr
+        background-color themeMonokaiTableHead
+      th
+        border-color themeMonokaiTableBorder
+        &:last-child
+          border-right solid 1px themeMonokaiTableBorder
+    tbody
+      tr:nth-child(2n + 1)
+        background-color themeMonokaiTableOdd
+      tr:nth-child(2n)
+        background-color themeMonokaiTableEven
+      td
+        border-color themeMonokaiTableBorder
+        &:last-child
+          border-right solid 1px themeMonokaiTableBorder
+  kbd
+    background-color themeDarkBackground
 
-for theme in 'solarized-dark' 'dracula'
+  dl
-  apply-theme(theme)
+    border-color themeDarkBorder
+    background-color themeMonokaiTableHead
+  dt
+    border-color themeDarkBorder
+  dd
+    border-color themeDarkBorder
+    background-color $ui-monokai-noteDetail-backgroundColor
 
-for theme in $themes
+  pre.fence
-  apply-theme(theme)
+    .gallery
+      .carousel-main, .carousel-footer
+        background-color $ui-monokai-noteDetail-backgroundColor
+      .prev, .next
+        color $ui-monokai-button--active-color
+        background-color $ui-monokai-button-backgroundColor
+
+themeDraculaTableOdd = $ui-dracula-noteDetail-backgroundColor
+themeDraculaTableEven = darken($ui-dracula-noteDetail-backgroundColor, 10%)
+themeDraculaTableHead = themeDraculaTableEven
+themeDraculaTableBorder = themeDarkBorder
+
+body[data-theme="dracula"]
+  color $ui-dracula-text-color
+  border-color themeDarkBorder
+  background-color $ui-dracula-noteDetail-backgroundColor
+  table
+    thead
+      tr
+        background-color themeDraculaTableHead
+      th
+        border-color themeDraculaTableBorder
+        &:last-child
+          border-right solid 1px themeDraculaTableBorder
+    tbody
+      tr:nth-child(2n + 1)
+        background-color themeDraculaTableOdd
+      tr:nth-child(2n)
+        background-color themeDraculaTableEven
+      td
+        border-color themeDraculaTableBorder
+        &:last-child
+          border-right solid 1px themeDraculaTableBorder
+  kbd
+    background-color themeDarkBackground
+
+  dl
+    border-color themeDarkBorder
+    background-color themeDraculaTableHead
+  dt
+    border-color themeDarkBorder
+  dd
+    border-color themeDarkBorder
+    background-color $ui-dracula-noteDetail-backgroundColor
+
+  pre.fence
+    .gallery
+      .carousel-main, .carousel-footer
+        background-color $ui-dracula-noteDetail-backgroundColor
+      .prev, .next
+        color $ui-dracula-button--active-color
+        background-color $ui-dracula-button-backgroundColor

browser/components/render/MermaidRender.js

@@ -1,5 +1,4 @@
 import mermaidAPI from 'mermaid'
-import uiThemes from 'browser/lib/ui-themes'
 
 // fixes bad styling in the mermaid dark theme
 const darkThemeStyling = `
@@ -7,11 +6,11 @@ const darkThemeStyling = `
   fill: white;
 }`
 
-function getRandomInt(min, max) {
+function getRandomInt (min, max) {
   return Math.floor(Math.random() * (max - min)) + min
 }
 
-function getId() {
+function getId () {
   const pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
   let id = 'm-'
   for (let i = 0; i < 7; i++) {
@@ -20,49 +19,21 @@ function getId() {
   return id
 }
 
-function render(element, content, theme, enableHTMLLabel) {
+function render (element, content, theme, enableHTMLLabel) {
   try {
     const height = element.attributes.getNamedItem('data-height')
-    const isPredefined = height && height.value !== 'undefined'
+    if (height && height.value !== 'undefined') {
-
-    if (isPredefined) {
       element.style.height = height.value + 'vh'
     }
-
+    const isDarkTheme = theme === 'dark' || theme === 'solarized-dark' || theme === 'monokai' || theme === 'dracula'
-    const isDarkTheme = uiThemes.some(
-      item => item.name === theme && item.isDark
-    )
-
     mermaidAPI.initialize({
       theme: isDarkTheme ? 'dark' : 'default',
       themeCSS: isDarkTheme ? darkThemeStyling : '',
-      flowchart: {
+      useMaxWidth: false,
-        htmlLabels: enableHTMLLabel
+      flowchart: { htmlLabels: enableHTMLLabel }
-      },
-      gantt: {
-        useWidth: element.clientWidth
-      }
     })
-
+    mermaidAPI.render(getId(), content, (svgGraph) => {
-    mermaidAPI.render(getId(), content, svgGraph => {
       element.innerHTML = svgGraph
-
-      if (!isPredefined) {
-        const el = element.firstChild
-        const viewBox = el.getAttribute('viewBox').split(' ')
-
-        let ratio = viewBox[2] / viewBox[3]
-
-        if (el.style.maxWidth) {
-          const maxWidth = parseFloat(el.style.maxWidth)
-
-          ratio *= el.parentNode.clientWidth / maxWidth
-        }
-
-        el.setAttribute('ratio', ratio)
-        el.setAttribute('height', el.parentNode.clientWidth / ratio)
-        console.log(el)
-      }
     })
   } catch (e) {
     element.className = 'mermaid-error'

browser/lib/CSSModules.js

@@ -1,5 +1,5 @@
 import CSSModules from 'react-css-modules'
 
-export default function(component, styles) {
+export default function (component, styles) {
-  return CSSModules(component, styles, { handleNotFoundStyleName: 'log' })
+  return CSSModules(component, styles, {handleNotFoundStyleName: 'log'})
 }

browser/lib/Languages.js

@@ -11,10 +11,6 @@ const languages = [
     name: 'Chinese (zh-TW)',
     locale: 'zh-TW'
   },
-  {
-    name: 'Czech',
-    locale: 'cs'
-  },
   {
     name: 'Danish',
     locale: 'da'
@@ -78,13 +74,13 @@ const languages = [
 ]
 
 module.exports = {
-  getLocales() {
+  getLocales () {
-    return languages.reduce(function(localeList, locale) {
+    return languages.reduce(function (localeList, locale) {
       localeList.push(locale.locale)
       return localeList
     }, [])
   },
-  getLanguages() {
+  getLanguages () {
     return languages
   }
 }

browser/lib/Mutable.js

@@ -1,43 +1,43 @@
 class MutableMap {
-  constructor(iterable) {
+  constructor (iterable) {
     this._map = new Map(iterable)
     Object.defineProperty(this, 'size', {
       get: () => this._map.size,
-      set: function(value) {
+      set: function (value) {
         this['size'] = value
       }
     })
   }
 
-  get(...args) {
+  get (...args) {
     return this._map.get(...args)
   }
 
-  set(...args) {
+  set (...args) {
     return this._map.set(...args)
   }
 
-  delete(...args) {
+  delete (...args) {
     return this._map.delete(...args)
   }
 
-  has(...args) {
+  has (...args) {
     return this._map.has(...args)
   }
 
-  clear(...args) {
+  clear (...args) {
     return this._map.clear(...args)
   }
 
-  forEach(...args) {
+  forEach (...args) {
     return this._map.forEach(...args)
   }
 
-  [Symbol.iterator]() {
+  [Symbol.iterator] () {
     return this._map[Symbol.iterator]()
   }
 
-  map(cb) {
+  map (cb) {
     const result = []
     for (const [key, value] of this._map) {
       result.push(cb(value, key))
@@ -45,7 +45,7 @@ class MutableMap {
     return result
   }
 
-  toJS() {
+  toJS () {
     const result = {}
     for (let [key, value] of this._map) {
       if (value instanceof MutableSet || value instanceof MutableMap) {
@@ -58,42 +58,42 @@ class MutableMap {
 }
 
 class MutableSet {
-  constructor(iterable) {
+  constructor (iterable) {
     this._set = new Set(iterable)
     Object.defineProperty(this, 'size', {
       get: () => this._set.size,
-      set: function(value) {
+      set: function (value) {
         this['size'] = value
       }
     })
   }
 
-  add(...args) {
+  add (...args) {
     return this._set.add(...args)
   }
 
-  delete(...args) {
+  delete (...args) {
     return this._set.delete(...args)
   }
 
-  forEach(...args) {
+  forEach (...args) {
     return this._set.forEach(...args)
   }
 
-  [Symbol.iterator]() {
+  [Symbol.iterator] () {
     return this._set[Symbol.iterator]()
   }
 
-  map(cb) {
+  map (cb) {
     const result = []
-    this._set.forEach(function(value, key) {
+    this._set.forEach(function (value, key) {
       result.push(cb(value, key))
     })
 
     return result
   }
 
-  toJS() {
+  toJS () {
     return Array.from(this._set)
   }
 }

browser/lib/RcParser.js

@@ -5,13 +5,13 @@ const BOOSTNOTERC = '.boostnoterc'
 const homePath = global.process.env.HOME || global.process.env.USERPROFILE
 const _boostnotercPath = path.join(homePath, BOOSTNOTERC)
 
-export function parse(boostnotercPath = _boostnotercPath) {
+export function parse (boostnotercPath = _boostnotercPath) {
   if (!sander.existsSync(boostnotercPath)) return {}
   try {
     return JSON.parse(sander.readFileSync(boostnotercPath).toString())
   } catch (e) {
     console.warn(e)
-    console.warn("Your .boostnoterc is broken so it's not used.")
+    console.warn('Your .boostnoterc is broken so it\'s not used.')
     return {}
   }
 }

browser/lib/SnippetManager.js

@@ -3,14 +3,13 @@ import fs from 'fs'
 import consts from './consts'
 
 class SnippetManager {
-  constructor() {
+  constructor () {
     this.defaultSnippet = [
       {
         id: crypto.randomBytes(16).toString('hex'),
         name: 'Dummy text',
         prefix: ['lorem', 'ipsum'],
-        content:
+        content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
       }
     ]
     this.snippets = []
@@ -19,7 +18,7 @@ class SnippetManager {
     this.assignSnippets = this.assignSnippets.bind(this)
   }
 
-  init() {
+  init () {
     if (fs.existsSync(consts.SNIPPET_FILE)) {
       try {
         this.snippets = JSON.parse(
@@ -38,11 +37,11 @@ class SnippetManager {
     this.snippets = this.defaultSnippet
   }
 
-  assignSnippets(snippets) {
+  assignSnippets (snippets) {
     this.snippets = snippets
   }
 
-  expandSnippet(wordBeforeCursor, cursor, cm) {
+  expandSnippet (wordBeforeCursor, cursor, cm) {
     const templateCursorString = ':{}'
     for (let i = 0; i < this.snippets.length; i++) {
       if (this.snippets[i].prefix.indexOf(wordBeforeCursor.text) === -1) {

browser/lib/TextEditorInterface.js

@@ -1,44 +1,44 @@
 import { Point } from '@susisu/mte-kernel'
 
 export default class TextEditorInterface {
-  constructor(editor) {
+  constructor (editor) {
     this.editor = editor
     this.doc = editor.getDoc()
     this.transaction = false
   }
 
-  getCursorPosition() {
+  getCursorPosition () {
     const { line, ch } = this.doc.getCursor()
     return new Point(line, ch)
   }
 
-  setCursorPosition(pos) {
+  setCursorPosition (pos) {
     this.doc.setCursor({
       line: pos.row,
       ch: pos.column
     })
   }
 
-  setSelectionRange(range) {
+  setSelectionRange (range) {
     this.doc.setSelection(
       { line: range.start.row, ch: range.start.column },
       { line: range.end.row, ch: range.end.column }
     )
   }
 
-  getLastRow() {
+  getLastRow () {
     return this.doc.lineCount() - 1
   }
 
-  acceptsTableEdit() {
+  acceptsTableEdit () {
     return true
   }
 
-  getLine(row) {
+  getLine (row) {
     return this.doc.getLine(row)
   }
 
-  insertLine(row, line) {
+  insertLine (row, line) {
     const lastRow = this.getLastRow()
     if (row > lastRow) {
       const lastLine = this.getLine(lastRow)
@@ -56,7 +56,7 @@ export default class TextEditorInterface {
     }
   }
 
-  deleteLine(row) {
+  deleteLine (row) {
     const lastRow = this.getLastRow()
     if (row >= lastRow) {
       if (lastRow > 0) {
@@ -76,11 +76,15 @@ export default class TextEditorInterface {
         )
       }
     } else {
-      this.doc.replaceRange('', { line: row, ch: 0 }, { line: row + 1, ch: 0 })
+      this.doc.replaceRange(
+        '',
+        { line: row, ch: 0 },
+        { line: row + 1, ch: 0 }
+      )
     }
   }
 
-  replaceLines(startRow, endRow, lines) {
+  replaceLines (startRow, endRow, lines) {
     const lastRow = this.getLastRow()
     if (endRow > lastRow) {
       const lastLine = this.getLine(lastRow)
@@ -98,7 +102,7 @@ export default class TextEditorInterface {
     }
   }
 
-  transact(func) {
+  transact (func) {
     this.transaction = true
     func()
     this.transaction = false

browser/lib/confirmDeleteNote.js

@@ -3,18 +3,17 @@ import i18n from 'browser/lib/i18n'
 const { remote } = electron
 const { dialog } = remote
 
-export function confirmDeleteNote(confirmDeletion, permanent) {
+export function confirmDeleteNote (confirmDeletion, permanent) {
   if (confirmDeletion || permanent) {
     const alertConfig = {
-      type: 'warning',
+      ype: 'warning',
       message: i18n.__('Confirm note deletion'),
       detail: i18n.__('This will permanently remove this note.'),
       buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
     }
 
     const dialogButtonIndex = dialog.showMessageBox(
-      remote.getCurrentWindow(),
+      remote.getCurrentWindow(), alertConfig
-      alertConfig
     )
 
     return dialogButtonIndex === 0

browser/lib/consts.js

@@ -9,53 +9,41 @@ const CODEMIRROR_EXTRA_THEME_PATH = 'extra_scripts/codemirror/theme'
 const isProduction = process.env.NODE_ENV === 'production'
 
 const paths = [
-  isProduction
+  isProduction ? path.join(app.getAppPath(), CODEMIRROR_THEME_PATH) : path.resolve(CODEMIRROR_THEME_PATH),
-    ? path.join(app.getAppPath(), CODEMIRROR_THEME_PATH)
+  isProduction ? path.join(app.getAppPath(), CODEMIRROR_EXTRA_THEME_PATH) : path.resolve(CODEMIRROR_EXTRA_THEME_PATH)
-    : path.resolve(CODEMIRROR_THEME_PATH),
-  isProduction
-    ? path.join(app.getAppPath(), CODEMIRROR_EXTRA_THEME_PATH)
-    : path.resolve(CODEMIRROR_EXTRA_THEME_PATH)
 ]
 
 const themes = paths
-  .map(directory =>
+  .map(directory => fs.readdirSync(directory).map(file => {
-    fs.readdirSync(directory).map(file => {
+    const name = file.substring(0, file.lastIndexOf('.'))
-      const name = file.substring(0, file.lastIndexOf('.'))
 
-      return {
+    return {
-        name,
+      name,
-        path: path.join(directory, file),
+      path: path.join(directory, file),
-        className: `cm-s-${name}`
+      className: `cm-s-${name}`
-      }
+    }
-    })
+  }))
-  )
   .reduce((accumulator, value) => accumulator.concat(value), [])
   .sort((a, b) => a.name.localeCompare(b.name))
 
-themes.splice(
+themes.splice(themes.findIndex(({ name }) => name === 'solarized'), 1, {
-  themes.findIndex(({ name }) => name === 'solarized'),
+  name: 'solarized dark',
-  1,
+  path: path.join(paths[0], 'solarized.css'),
-  {
+  className: `cm-s-solarized cm-s-dark`
-    name: 'solarized dark',
+}, {
-    path: path.join(paths[0], 'solarized.css'),
+  name: 'solarized light',
-    className: `cm-s-solarized cm-s-dark`
+  path: path.join(paths[0], 'solarized.css'),
-  },
+  className: `cm-s-solarized cm-s-light`
-  {
+})
-    name: 'solarized light',
-    path: path.join(paths[0], 'solarized.css'),
-    className: `cm-s-solarized cm-s-light`
-  }
-)
 themes.splice(0, 0, {
   name: 'default',
   path: path.join(paths[0], 'elegant.css'),
   className: `cm-s-default`
 })
 
-const snippetFile =
+const snippetFile = process.env.NODE_ENV !== 'test'
-  process.env.NODE_ENV !== 'test'
+  ? path.join(app.getPath('userData'), 'snippets.json')
-    ? path.join(app.getPath('userData'), 'snippets.json')
+  : '' // return nothing as we specified different path to snippets.json in test
-    : '' // return nothing as we specified different path to snippets.json in test
 
 const consts = {
   FOLDER_COLORS: [

browser/lib/context.js

@@ -1,9 +1,9 @@
 const { remote } = require('electron')
 const { Menu, MenuItem } = remote
 
-function popup(templates) {
+function popup (templates) {
   const menu = new Menu()
-  templates.forEach(item => {
+  templates.forEach((item) => {
     menu.append(new MenuItem(item))
   })
   menu.popup(remote.getCurrentWindow())

browser/lib/contextMenuBuilder.js

@@ -1,10 +1,10 @@
 import i18n from 'browser/lib/i18n'
 import fs from 'fs'
 
-const { remote } = require('electron')
+const {remote} = require('electron')
-const { Menu } = remote.require('electron')
+const {Menu} = remote.require('electron')
-const { clipboard } = remote.require('electron')
+const {clipboard} = remote.require('electron')
-const { shell } = remote.require('electron')
+const {shell} = remote.require('electron')
 const spellcheck = require('./spellcheck')
 const uri2path = require('file-uri-to-path')
 
@@ -16,16 +16,11 @@ const uri2path = require('file-uri-to-path')
  * @param {MouseEvent} event that has triggered the creation of the context menu
  * @returns {Electron.Menu} The created electron context menu
  */
-const buildEditorContextMenu = function(editor, event) {
+const buildEditorContextMenu = function (editor, event) {
-  if (
+  if (editor == null || event == null || event.pageX == null || event.pageY == null) {
-    editor == null ||
-    event == null ||
-    event.pageX == null ||
-    event.pageY == null
-  ) {
     return null
   }
-  const cursor = editor.coordsChar({ left: event.pageX, top: event.pageY })
+  const cursor = editor.coordsChar({left: event.pageX, top: event.pageY})
   const wordRange = editor.findWordAt(cursor)
   const word = editor.getRange(wordRange.anchor, wordRange.head)
   const existingMarks = editor.findMarks(wordRange.anchor, wordRange.head) || []
@@ -45,44 +40,30 @@ const buildEditorContextMenu = function(editor, event) {
     isMisspelled: isMisspelled,
     spellingSuggestions: suggestion
   }
-  const template = [
+  const template = [{
-    {
+    role: 'cut'
-      role: 'cut'
+  }, {
-    },
+    role: 'copy'
-    {
+  }, {
-      role: 'copy'
+    role: 'paste'
-    },
+  }, {
-    {
+    role: 'selectall'
-      role: 'paste'
+  }]
-    },
-    {
-      role: 'selectall'
-    }
-  ]
 
   if (selection.isMisspelled) {
     const suggestions = selection.spellingSuggestions
-    template.unshift.apply(
+    template.unshift.apply(template, suggestions.map(function (suggestion) {
-      template,
+      return {
-      suggestions
+        label: suggestion,
-        .map(function(suggestion) {
+        click: function (suggestion) {
-          return {
+          if (editor != null) {
-            label: suggestion,
+            editor.replaceRange(suggestion.label, wordRange.anchor, wordRange.head)
-            click: function(suggestion) {
-              if (editor != null) {
-                editor.replaceRange(
-                  suggestion.label,
-                  wordRange.anchor,
-                  wordRange.head
-                )
-              }
-            }
           }
-        })
+        }
-        .concat({
+      }
-          type: 'separator'
+    }).concat({
-        })
+      type: 'separator'
-    )
+    }))
   }
   return Menu.buildFromTemplate(template)
 }
@@ -93,30 +74,19 @@ const buildEditorContextMenu = function(editor, event) {
  * @param {MouseEvent} event that has triggered the creation of the context menu
  * @returns {Electron.Menu} The created electron context menu
  */
-const buildMarkdownPreviewContextMenu = function(markdownPreview, event) {
+const buildMarkdownPreviewContextMenu = function (markdownPreview, event) {
-  if (
+  if (markdownPreview == null || event == null || event.pageX == null || event.pageY == null) {
-    markdownPreview == null ||
-    event == null ||
-    event.pageX == null ||
-    event.pageY == null
-  ) {
     return null
   }
 
   // Default context menu inclusions
-  const template = [
+  const template = [{
-    {
+    role: 'copy'
-      role: 'copy'
+  }, {
-    },
+    role: 'selectall'
-    {
+  }]
-      role: 'selectall'
-    }
-  ]
 
-  if (
+  if (event.target.tagName.toLowerCase() === 'a' && event.target.getAttribute('href')) {
-    event.target.tagName.toLowerCase() === 'a' &&
-    event.target.getAttribute('href')
-  ) {
     // Link opener for files on the local system pointed to by href
     const href = event.target.href
     const isLocalFile = href.startsWith('file:')
@@ -124,29 +94,31 @@ const buildMarkdownPreviewContextMenu = function(markdownPreview, event) {
       const absPath = uri2path(href)
       try {
         if (fs.lstatSync(absPath).isFile()) {
-          template.push({
+          template.push(
-            label: i18n.__('Show in explorer'),
+            {
-            click: e => shell.showItemInFolder(absPath)
+              label: i18n.__('Show in explorer'),
-          })
+              click: (e) => shell.showItemInFolder(absPath)
+            }
+          )
         }
       } catch (e) {
-        console.log(
+        console.log('Error while evaluating if the file is locally available', e)
-          'Error while evaluating if the file is locally available',
-          e
-        )
       }
     }
 
     // Add option to context menu to copy url
-    template.push({
+    template.push(
-      label: i18n.__('Copy Url'),
+      {
-      click: e => clipboard.writeText(href)
+        label: i18n.__('Copy Url'),
-    })
+        click: (e) => clipboard.writeText(href)
+      }
+    )
   }
   return Menu.buildFromTemplate(template)
 }
 
-module.exports = {
+module.exports =
+{
   buildEditorContextMenu: buildEditorContextMenu,
   buildMarkdownPreviewContextMenu: buildMarkdownPreviewContextMenu
 }

browser/lib/convertModeName.js

@@ -1,4 +1,4 @@
-export default function convertModeName(name) {
+export default function convertModeName (name) {
   switch (name) {
     case 'ejs':
       return 'Embedded Javascript'

browser/lib/customMeta.js

@@ -3,19 +3,8 @@ import 'codemirror-mode-elixir'
 
 const stylusCodeInfo = CodeMirror.modeInfo.find(info => info.name === 'Stylus')
 if (stylusCodeInfo == null) {
-  CodeMirror.modeInfo.push({
+  CodeMirror.modeInfo.push({name: 'Stylus', mime: 'text/x-styl', mode: 'stylus', ext: ['styl'], alias: ['styl']})
-    name: 'Stylus',
-    mime: 'text/x-styl',
-    mode: 'stylus',
-    ext: ['styl'],
-    alias: ['styl']
-  })
 } else {
   stylusCodeInfo.alias = ['styl']
 }
-CodeMirror.modeInfo.push({
+CodeMirror.modeInfo.push({name: 'Elixir', mime: 'text/x-elixir', mode: 'elixir', ext: ['ex']})
-  name: 'Elixir',
-  mime: 'text/x-elixir',
-  mode: 'elixir',
-  ext: ['ex']
-})

browser/lib/date-formatter.js

@@ -8,7 +8,7 @@ import moment from 'moment'
  * @param {mixed}
  * @return {string}
  */
-export function formatDate(date) {
+export function formatDate (date) {
   const m = moment(date)
   if (!m.isValid()) {
     throw Error('Invalid argument.')

browser/lib/findNoteTitle.js

@@ -1,8 +1,4 @@
-export function findNoteTitle(
+export function findNoteTitle (value, enableFrontMatterTitle, frontMatterTitleField = 'title') {
-  value,
-  enableFrontMatterTitle,
-  frontMatterTitleField = 'title'
-) {
   const splitted = value.split('\n')
   let title = null
   let isInsideCodeBlock = false
@@ -10,13 +6,8 @@ export function findNoteTitle(
   if (splitted[0] === '---') {
     let line = 0
     while (++line < splitted.length) {
-      if (
+      if (enableFrontMatterTitle && splitted[line].startsWith(frontMatterTitleField + ':')) {
-        enableFrontMatterTitle &&
+        title = splitted[line].substring(frontMatterTitleField.length + 1).trim()
-        splitted[line].startsWith(frontMatterTitleField + ':')
-      ) {
-        title = splitted[line]
-          .substring(frontMatterTitleField.length + 1)
-          .trim()
 
         break
       }
@@ -31,15 +22,11 @@ export function findNoteTitle(
   if (title === null) {
     splitted.some((line, index) => {
       const trimmedLine = line.trim()
-      const trimmedNextLine =
+      const trimmedNextLine = splitted[index + 1] === undefined ? '' : splitted[index + 1].trim()
-        splitted[index + 1] === undefined ? '' : splitted[index + 1].trim()
       if (trimmedLine.match('```')) {
         isInsideCodeBlock = !isInsideCodeBlock
       }
-      if (
+      if (isInsideCodeBlock === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match(/^=+$/))) {
-        isInsideCodeBlock === false &&
-        (trimmedLine.match(/^# +/) || trimmedNextLine.match(/^=+$/))
-      ) {
         title = trimmedLine
         return true
       }
@@ -48,7 +35,7 @@ export function findNoteTitle(
 
   if (title === null) {
     title = ''
-    splitted.some(line => {
+    splitted.some((line) => {
       if (line.trim().length > 0) {
         title = line.trim()
         return true

browser/lib/findStorage.js

@@ -1,11 +1,10 @@
 const _ = require('lodash')
 
-export function findStorage(storageKey) {
+export function findStorage (storageKey) {
   const cachedStorageList = JSON.parse(localStorage.getItem('storages'))
-  if (!_.isArray(cachedStorageList))
+  if (!_.isArray(cachedStorageList)) throw new Error('Target storage doesn\'t exist.')
-    throw new Error("Target storage doesn't exist.")
+  const storage = _.find(cachedStorageList, {key: storageKey})
-  const storage = _.find(cachedStorageList, { key: storageKey })
+  if (storage === undefined) throw new Error('Target storage doesn\'t exist.')
-  if (storage === undefined) throw new Error("Target storage doesn't exist.")
 
   return storage
 }

browser/lib/getTodoStatus.js

@@ -1,9 +1,9 @@
-export function getTodoStatus(content) {
+export function getTodoStatus (content) {
   const splitted = content.split('\n')
   let numberOfTodo = 0
   let numberOfCompletedTodo = 0
 
-  splitted.forEach(line => {
+  splitted.forEach((line) => {
     const trimmedLine = line.trim().replace(/^(>\s*)*/, '')
     if (trimmedLine.match(/^[+\-*] \[(\s|x)] ./i)) {
       numberOfTodo++
@@ -19,7 +19,7 @@ export function getTodoStatus(content) {
   }
 }
 
-export function getTodoPercentageOfCompleted(content) {
+export function getTodoPercentageOfCompleted (content) {
   const state = getTodoStatus(content)
-  return Math.floor((state.completed / state.total) * 100)
+  return Math.floor(state.completed / state.total * 100)
 }

browser/lib/htmlTextHelper.js

@@ -7,9 +7,9 @@
  * @return {string}
  */
 
-export function decodeEntities(text) {
+export function decodeEntities (text) {
   var entities = [
-    ['apos', "'"],
+    ['apos', '\''],
     ['amp', '&'],
     ['lt', '<'],
     ['gt', '>'],
@@ -24,16 +24,16 @@ export function decodeEntities(text) {
   return text
 }
 
-export function encodeEntities(text) {
+export function encodeEntities (text) {
   const entities = [
-    ["'", 'apos'],
+    ['\'', 'apos'],
     ['<', 'lt'],
     ['>', 'gt'],
     ['\\?', '#63'],
     ['\\$', '#36']
   ]
 
-  entities.forEach(entity => {
+  entities.forEach((entity) => {
     text = text.replace(new RegExp(entity[0], 'g'), `&${entity[1]};`)
   })
   return text

browser/lib/i18n.js

@@ -8,10 +8,9 @@ const i18n = new (require('i18n-2'))({
   // setup some locales - other locales default to the first locale
   locales: getLocales(),
   extension: '.json',
-  directory:
+  directory: process.env.NODE_ENV === 'production'
-    process.env.NODE_ENV === 'production'
+    ? path.join(app.getAppPath(), './locales')
-      ? path.join(app.getAppPath(), './locales')
+    : path.resolve('./locales'),
-      : path.resolve('./locales'),
   devMode: false
 })
 

browser/lib/keygen.js

@@ -1,7 +1,7 @@
 const crypto = require('crypto')
 const uuidv4 = require('uuid/v4')
 
-module.exports = function(uuid) {
+module.exports = function (uuid) {
   if (typeof uuid === typeof true && uuid) {
     return uuidv4()
   }

browser/lib/markdown-it-deflist.js

@@ -1,44 +1,35 @@
 'use strict'
 
-module.exports = function definitionListPlugin(md) {
+module.exports = function definitionListPlugin (md) {
   var isSpace = md.utils.isSpace
 
   // Search `[:~][\n ]`, returns next pos after marker on success
   // or -1 on fail.
-  function skipMarker(state, line) {
+  function skipMarker (state, line) {
     let start = state.bMarks[line] + state.tShift[line]
     const max = state.eMarks[line]
 
-    if (start >= max) {
+    if (start >= max) { return -1 }
-      return -1
-    }
 
     // Check bullet
     const marker = state.src.charCodeAt(start++)
-    if (marker !== 0x7e /* ~ */ && marker !== 0x3a /* : */) {
+    if (marker !== 0x7E/* ~ */ && marker !== 0x3A/* : */) { return -1 }
-      return -1
-    }
 
     const pos = state.skipSpaces(start)
 
     // require space after ":"
-    if (start === pos) {
+    if (start === pos) { return -1 }
-      return -1
-    }
 
     return start
   }
 
-  function markTightParagraphs(state, idx) {
+  function markTightParagraphs (state, idx) {
     const level = state.level + 2
 
     let i
     let l
     for (i = idx + 2, l = state.tokens.length - 2; i < l; i++) {
-      if (
+      if (state.tokens[i].level === level && state.tokens[i].type === 'paragraph_open') {
-        state.tokens[i].level === level &&
-        state.tokens[i].type === 'paragraph_open'
-      ) {
         state.tokens[i + 2].hidden = true
         state.tokens[i].hidden = true
         i += 2
@@ -46,7 +37,7 @@ module.exports = function definitionListPlugin(md) {
     }
   }
 
-  function deflist(state, startLine, endLine, silent) {
+  function deflist (state, startLine, endLine, silent) {
     var ch,
       contentStart,
       ddLine,
@@ -72,38 +63,28 @@ module.exports = function definitionListPlugin(md) {
 
     if (silent) {
       // quirk: validation mode validates a dd block only, not a whole deflist
-      if (state.ddIndent < 0) {
+      if (state.ddIndent < 0) { return false }
-        return false
-      }
       return skipMarker(state, startLine) >= 0
     }
 
     nextLine = startLine + 1
-    if (nextLine >= endLine) {
+    if (nextLine >= endLine) { return false }
-      return false
-    }
 
     if (state.isEmpty(nextLine)) {
       nextLine++
-      if (nextLine >= endLine) {
+      if (nextLine >= endLine) { return false }
-        return false
-      }
     }
 
-    if (state.sCount[nextLine] < state.blkIndent) {
+    if (state.sCount[nextLine] < state.blkIndent) { return false }
-      return false
-    }
     contentStart = skipMarker(state, nextLine)
-    if (contentStart < 0) {
+    if (contentStart < 0) { return false }
-      return false
-    }
 
     // Start list
     listTokIdx = state.tokens.length
     tight = true
 
     token = state.push('dl_open', 'dl', 1)
-    token.map = listLines = [startLine, 0]
+    token.map = listLines = [ startLine, 0 ]
 
     //
     // Iterate list items
@@ -119,38 +100,34 @@ module.exports = function definitionListPlugin(md) {
     // needed to break out of the second one
     //
     /* eslint no-labels:0,block-scoped-var:0 */
-    OUTER: for (;;) {
+    OUTER:
+    for (;;) {
       prevEmptyEnd = false
 
       token = state.push('dt_open', 'dt', 1)
-      token.map = [dtLine, dtLine]
+      token.map = [ dtLine, dtLine ]
 
       token = state.push('inline', '', 0)
-      token.map = [dtLine, dtLine]
+      token.map = [ dtLine, dtLine ]
-      token.content = state
+      token.content = state.getLines(dtLine, dtLine + 1, state.blkIndent, false).trim()
-        .getLines(dtLine, dtLine + 1, state.blkIndent, false)
-        .trim()
       token.children = []
 
       token = state.push('dt_close', 'dt', -1)
 
       for (;;) {
         token = state.push('dd_open', 'dd', 1)
-        token.map = itemLines = [ddLine, 0]
+        token.map = itemLines = [ ddLine, 0 ]
 
         pos = contentStart
         max = state.eMarks[ddLine]
-        offset =
+        offset = state.sCount[ddLine] + contentStart - (state.bMarks[ddLine] + state.tShift[ddLine])
-          state.sCount[ddLine] +
-          contentStart -
-          (state.bMarks[ddLine] + state.tShift[ddLine])
 
         while (pos < max) {
           ch = state.src.charCodeAt(pos)
 
           if (isSpace(ch)) {
             if (ch === 0x09) {
-              offset += 4 - (offset % 4)
+              offset += 4 - offset % 4
             } else {
               offset++
             }
@@ -176,11 +153,8 @@ module.exports = function definitionListPlugin(md) {
         state.parentType = 'deflist'
 
         newEndLine = ddLine
-        while (
+        while (++newEndLine < endLine && (state.sCount[newEndLine] >= state.sCount[ddLine] || state.isEmpty(newEndLine))) {
-          ++newEndLine < endLine &&
+        }
-          (state.sCount[newEndLine] >= state.sCount[ddLine] ||
-            state.isEmpty(newEndLine))
-        ) {}
 
         oldLineMax = state.lineMax
         state.lineMax = newEndLine
@@ -195,7 +169,7 @@ module.exports = function definitionListPlugin(md) {
         }
         // Item become loose if finish with empty line,
         // but we should filter last element, because it means list finish
-        prevEmptyEnd = state.line - ddLine > 1 && state.isEmpty(state.line - 1)
+        prevEmptyEnd = (state.line - ddLine) > 1 && state.isEmpty(state.line - 1)
 
         state.tShift[ddLine] = oldTShift
         state.sCount[ddLine] = oldSCount
@@ -208,17 +182,11 @@ module.exports = function definitionListPlugin(md) {
 
         itemLines[1] = nextLine = state.line
 
-        if (nextLine >= endLine) {
+        if (nextLine >= endLine) { break OUTER }
-          break OUTER
-        }
 
-        if (state.sCount[nextLine] < state.blkIndent) {
+        if (state.sCount[nextLine] < state.blkIndent) { break OUTER }
-          break OUTER
-        }
         contentStart = skipMarker(state, nextLine)
-        if (contentStart < 0) {
+        if (contentStart < 0) { break }
-          break
-        }
 
         ddLine = nextLine
 
@@ -226,36 +194,20 @@ module.exports = function definitionListPlugin(md) {
         // insert DD tag and repeat checking
       }
 
-      if (nextLine >= endLine) {
+      if (nextLine >= endLine) { break }
-        break
-      }
       dtLine = nextLine
 
-      if (state.isEmpty(dtLine)) {
+      if (state.isEmpty(dtLine)) { break }
-        break
+      if (state.sCount[dtLine] < state.blkIndent) { break }
-      }
-      if (state.sCount[dtLine] < state.blkIndent) {
-        break
-      }
 
       ddLine = dtLine + 1
-      if (ddLine >= endLine) {
+      if (ddLine >= endLine) { break }
-        break
+      if (state.isEmpty(ddLine)) { ddLine++ }
-      }
+      if (ddLine >= endLine) { break }
-      if (state.isEmpty(ddLine)) {
-        ddLine++
-      }
-      if (ddLine >= endLine) {
-        break
-      }
 
-      if (state.sCount[ddLine] < state.blkIndent) {
+      if (state.sCount[ddLine] < state.blkIndent) { break }
-        break
-      }
       contentStart = skipMarker(state, ddLine)
-      if (contentStart < 0) {
+      if (contentStart < 0) { break }
-        break
-      }
 
       // go to the next loop iteration:
       // insert DT and DD tags and repeat checking
@@ -276,7 +228,5 @@ module.exports = function definitionListPlugin(md) {
     return true
   }
 
-  md.block.ruler.before('paragraph', 'deflist', deflist, {
+  md.block.ruler.before('paragraph', 'deflist', deflist, { alt: [ 'paragraph', 'reference' ] })
-    alt: ['paragraph', 'reference']
-  })
 }

browser/lib/markdown-it-fence.js

@@ -1,9 +1,9 @@
 'use strict'
 
-module.exports = function(md, renderers, defaultRenderer) {
+module.exports = function (md, renderers, defaultRenderer) {
   const paramsRE = /^[ \t]*([\w+#-]+)?(?:\(((?:\s*\w[-\w]*(?:=(?:'(?:.*?[^\\])?'|"(?:.*?[^\\])?"|(?:[^'"][^\s]*)))?)*)\))?(?::([^:]*)(?::(\d+))?)?\s*$/
 
-  function fence(state, startLine, endLine, silent) {
+  function fence (state, startLine, endLine, silent) {
     let pos = state.bMarks[startLine] + state.tShift[startLine]
     let max = state.eMarks[startLine]
 
@@ -12,7 +12,7 @@ module.exports = function(md, renderers, defaultRenderer) {
     }
 
     const marker = state.src.charCodeAt(pos)
-    if (marker !== 0x7e /* ~ */ && marker !== 0x60 /* ` */) {
+    if (marker !== 0x7E/* ~ */ && marker !== 0x60 /* ` */) {
       return false
     }
 
@@ -46,10 +46,7 @@ module.exports = function(md, renderers, defaultRenderer) {
       if (pos < max && state.sCount[nextLine] < state.blkIndent) {
         break
       }
-      if (
+      if (state.src.charCodeAt(pos) !== marker || state.sCount[nextLine] - state.blkIndent >= 4) {
-        state.src.charCodeAt(pos) !== marker ||
-        state.sCount[nextLine] - state.blkIndent >= 4
-      ) {
         continue
       }
 
@@ -130,12 +127,10 @@ module.exports = function(md, renderers, defaultRenderer) {
   })
 
   for (const name in renderers) {
-    md.renderer.rules[`${name}_fence`] = (tokens, index) =>
+    md.renderer.rules[`${name}_fence`] = (tokens, index) => renderers[name](tokens[index])
-      renderers[name](tokens[index])
   }
 
   if (defaultRenderer) {
-    md.renderer.rules['_fence'] = (tokens, index) =>
+    md.renderer.rules['_fence'] = (tokens, index) => defaultRenderer(tokens[index])
-      defaultRenderer(tokens[index])
   }
 }

browser/lib/markdown-it-frontmatter.js

@@ -1,19 +1,14 @@
 'use strict'
 
-module.exports = function frontMatterPlugin(md) {
+module.exports = function frontMatterPlugin (md) {
-  function frontmatter(state, startLine, endLine, silent) {
+  function frontmatter (state, startLine, endLine, silent) {
-    if (
+    if (startLine !== 0 || state.src.substr(startLine, state.eMarks[0]) !== '---') {
-      startLine !== 0 ||
-      state.src.substr(startLine, state.eMarks[0]) !== '---'
-    ) {
       return false
     }
 
     let line = 0
     while (++line < state.lineMax) {
-      if (
+      if (state.src.substring(state.bMarks[line], state.eMarks[line]) === '---') {
-        state.src.substring(state.bMarks[line], state.eMarks[line]) === '---'
-      ) {
         state.line = line + 1
 
         return true
@@ -24,6 +19,6 @@ module.exports = function frontMatterPlugin(md) {
   }
 
   md.block.ruler.before('table', 'frontmatter', frontmatter, {
-    alt: ['paragraph', 'reference', 'blockquote', 'list']
+    alt: [ 'paragraph', 'reference', 'blockquote', 'list' ]
   })
 }

browser/lib/markdown-it-sanitize-html.js

@@ -4,7 +4,7 @@ import sanitizeHtml from 'sanitize-html'
 import { escapeHtmlCharacters } from './utils'
 import url from 'url'
 
-module.exports = function sanitizePlugin(md, options) {
+module.exports = function sanitizePlugin (md, options) {
   options = options || {}
 
   md.core.ruler.after('linkify', 'sanitize_inline', state => {
@@ -38,20 +38,15 @@ module.exports = function sanitizePlugin(md, options) {
 }
 
 const tagRegex = /<([A-Z][A-Z0-9]*)\s*((?:\s*[A-Z][A-Z0-9]*(?:=("|')(?:[^\3]+?)\3)?)*)\s*\/?>|<\/([A-Z][A-Z0-9]*)\s*>/i
-const attributesRegex = /([A-Z][A-Z0-9]*)(?:=("|')([^\2]+?)\2)?/gi
+const attributesRegex = /([A-Z][A-Z0-9]*)(?:=("|')([^\2]+?)\2)?/ig
 
-function sanitizeInline(html, options) {
+function sanitizeInline (html, options) {
   let match = tagRegex.exec(html)
   if (!match) {
     return ''
   }
 
-  const {
+  const { allowedTags, allowedAttributes, selfClosing, allowedSchemesAppliedToAttributes } = options
-    allowedTags,
-    allowedAttributes,
-    selfClosing,
-    allowedSchemesAppliedToAttributes
-  } = options
 
   if (match[1] !== undefined) {
     // opening tag
@@ -70,17 +65,9 @@ function sanitizeInline(html, options) {
       name = match[1].toLowerCase()
       value = match[3]
 
-      if (
+      if (allowedAttributes['*'].indexOf(name) !== -1 || (allowedAttributes[tag] && allowedAttributes[tag].indexOf(name) !== -1)) {
-        allowedAttributes['*'].indexOf(name) !== -1 ||
-        (allowedAttributes[tag] && allowedAttributes[tag].indexOf(name) !== -1)
-      ) {
         if (allowedSchemesAppliedToAttributes.indexOf(name) !== -1) {
-          if (
+          if (naughtyHRef(value, options) || (tag === 'iframe' && name === 'src' && naughtyIFrame(value, options))) {
-            naughtyHRef(value, options) ||
-            (tag === 'iframe' &&
-              name === 'src' &&
-              naughtyIFrame(value, options))
-          ) {
             continue
           }
         }
@@ -107,7 +94,7 @@ function sanitizeInline(html, options) {
   }
 }
 
-function naughtyHRef(href, options) {
+function naughtyHRef (href, options) {
   // href = href.replace(/[\x00-\x20]+/g, '')
   if (!href) {
     // No href
@@ -130,7 +117,7 @@ function naughtyHRef(href, options) {
   return options.allowedSchemes.indexOf(scheme) === -1
 }
 
-function naughtyIFrame(src, options) {
+function naughtyIFrame (src, options) {
   try {
     const parsed = url.parse(src, false, true)
 

browser/lib/markdown-toc-generator.js

@@ -12,7 +12,7 @@ const hasProp = Object.prototype.hasOwnProperty
 /**
  * From @enyaxu/markdown-it-anchor
  */
-function uniqueSlug(slug, slugs, opts) {
+function uniqueSlug (slug, slugs, opts) {
   let uniq = slug
   let i = opts.uniqueSlugStartIndex
   while (hasProp.call(slugs, uniq)) uniq = `${slug}-${i++}`
@@ -20,7 +20,7 @@ function uniqueSlug(slug, slugs, opts) {
   return uniq
 }
 
-function linkify(token) {
+function linkify (token) {
   token.content = mdlink(token.content, `#${decodeURI(token.slug)}`)
   return token
 }
@@ -36,8 +36,8 @@ const tocRegex = new RegExp(`${TOC_MARKER_START}[\\s\\S]*?${TOC_MARKER_END}`)
  * Otherwise,TOC is updated in place.
  * @param editor CodeMirror editor to be updated with TOC
  */
-export function generateInEditor(editor) {
+export function generateInEditor (editor) {
-  function updateExistingToc() {
+  function updateExistingToc () {
     const toc = generate(editor.getValue())
     const search = editor.getSearchCursor(tocRegex)
     while (search.findNext()) {
@@ -45,10 +45,8 @@ export function generateInEditor(editor) {
     }
   }
 
-  function addTocAtCursorPosition() {
+  function addTocAtCursorPosition () {
-    const toc = generate(
+    const toc = generate(editor.getRange(editor.getCursor(), {line: Infinity}))
-      editor.getRange(editor.getCursor(), { line: Infinity })
-    )
     editor.replaceRange(wrapTocWithEol(toc, editor), editor.getCursor())
   }
 
@@ -59,7 +57,7 @@ export function generateInEditor(editor) {
   }
 }
 
-export function tocExistsInEditor(editor) {
+export function tocExistsInEditor (editor) {
   return tocRegex.test(editor.getValue())
 }
 
@@ -68,7 +66,7 @@ export function tocExistsInEditor(editor) {
  * @param markdownText MD document
  * @returns generatedTOC String containing generated TOC
  */
-export function generate(markdownText) {
+export function generate (markdownText) {
   const slugs = {}
   const opts = {
     uniqueSlugStartIndex: 1
@@ -88,12 +86,9 @@ export function generate(markdownText) {
   return TOC_MARKER_START + EOL + EOL + md + EOL + EOL + TOC_MARKER_END
 }
 
-function wrapTocWithEol(toc, editor) {
+function wrapTocWithEol (toc, editor) {
   const leftWrap = editor.getCursor().ch === 0 ? '' : EOL
-  const rightWrap =
+  const rightWrap = editor.getLine(editor.getCursor().line).length === editor.getCursor().ch ? '' : EOL
-    editor.getLine(editor.getCursor().line).length === editor.getCursor().ch
-      ? ''
-      : EOL
   return leftWrap + toc + rightWrap
 }
 

browser/lib/markdown.js

@@ -10,20 +10,18 @@ import ConfigManager from 'browser/main/lib/ConfigManager'
 import katex from 'katex'
 import { lastFindInArray } from './utils'
 
-function createGutter(str, firstLineNumber) {
+function createGutter (str, firstLineNumber) {
   if (Number.isNaN(firstLineNumber)) firstLineNumber = 1
   const lastLineNumber = (str.match(/\n/g) || []).length + firstLineNumber - 1
   const lines = []
   for (let i = firstLineNumber; i <= lastLineNumber; i++) {
     lines.push('<span class="CodeMirror-linenumber">' + i + '</span>')
   }
-  return (
+  return '<span class="lineNumber CodeMirror-gutters">' + lines.join('') + '</span>'
-    '<span class="lineNumber CodeMirror-gutters">' + lines.join('') + '</span>'
-  )
 }
 
 class Markdown {
-  constructor(options = {}) {
+  constructor (options = {}) {
     const config = ConfigManager.get()
     const defaultOptions = {
       typographer: config.preview.smartQuotes,
@@ -39,129 +37,29 @@ class Markdown {
     this.md.linkify.set({ fuzzyLink: false })
 
     if (updatedOptions.sanitize !== 'NONE') {
-      const allowedTags = [
+      const allowedTags = ['iframe', 'input', 'b',
-        'iframe',
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7', 'h8', 'br', 'b', 'i', 'strong', 'em', 'a', 'pre', 'code', 'img', 'tt',
-        'input',
+        'div', 'ins', 'del', 'sup', 'sub', 'p', 'ol', 'ul', 'table', 'thead', 'tbody', 'tfoot', 'blockquote',
-        'b',
+        'dl', 'dt', 'dd', 'kbd', 'q', 'samp', 'var', 'hr', 'ruby', 'rt', 'rp', 'li', 'tr', 'td', 'th', 's', 'strike', 'summary', 'details'
-        'h1',
-        'h2',
-        'h3',
-        'h4',
-        'h5',
-        'h6',
-        'h7',
-        'h8',
-        'br',
-        'b',
-        'i',
-        'strong',
-        'em',
-        'a',
-        'pre',
-        'code',
-        'img',
-        'tt',
-        'div',
-        'ins',
-        'del',
-        'sup',
-        'sub',
-        'p',
-        'ol',
-        'ul',
-        'table',
-        'thead',
-        'tbody',
-        'tfoot',
-        'blockquote',
-        'dl',
-        'dt',
-        'dd',
-        'kbd',
-        'q',
-        'samp',
-        'var',
-        'hr',
-        'ruby',
-        'rt',
-        'rp',
-        'li',
-        'tr',
-        'td',
-        'th',
-        's',
-        'strike',
-        'summary',
-        'details'
       ]
       const allowedAttributes = [
-        'abbr',
+        'abbr', 'accept', 'accept-charset',
-        'accept',
+        'accesskey', 'action', 'align', 'alt', 'axis',
-        'accept-charset',
+        'border', 'cellpadding', 'cellspacing', 'char',
-        'accesskey',
+        'charoff', 'charset', 'checked',
-        'action',
+        'clear', 'cols', 'colspan', 'color',
-        'align',
+        'compact', 'coords', 'datetime', 'dir',
-        'alt',
+        'disabled', 'enctype', 'for', 'frame',
-        'axis',
+        'headers', 'height', 'hreflang',
-        'border',
+        'hspace', 'ismap', 'label', 'lang',
-        'cellpadding',
+        'maxlength', 'media', 'method',
-        'cellspacing',
+        'multiple', 'name', 'nohref', 'noshade',
-        'char',
+        'nowrap', 'open', 'prompt', 'readonly', 'rel', 'rev',
-        'charoff',
+        'rows', 'rowspan', 'rules', 'scope',
-        'charset',
+        'selected', 'shape', 'size', 'span',
-        'checked',
+        'start', 'summary', 'tabindex', 'target',
-        'clear',
+        'title', 'type', 'usemap', 'valign', 'value',
-        'cols',
+        'vspace', 'width', 'itemprop'
-        'colspan',
-        'color',
-        'compact',
-        'coords',
-        'datetime',
-        'dir',
-        'disabled',
-        'enctype',
-        'for',
-        'frame',
-        'headers',
-        'height',
-        'hreflang',
-        'hspace',
-        'ismap',
-        'label',
-        'lang',
-        'maxlength',
-        'media',
-        'method',
-        'multiple',
-        'name',
-        'nohref',
-        'noshade',
-        'nowrap',
-        'open',
-        'prompt',
-        'readonly',
-        'rel',
-        'rev',
-        'rows',
-        'rowspan',
-        'rules',
-        'scope',
-        'selected',
-        'shape',
-        'size',
-        'span',
-        'start',
-        'summary',
-        'tabindex',
-        'target',
-        'title',
-        'type',
-        'usemap',
-        'valign',
-        'value',
-        'vspace',
-        'width',
-        'itemprop'
       ]
 
       if (updatedOptions.sanitize === 'ALLOW_STYLES') {
@@ -174,20 +72,20 @@ class Markdown {
         allowedTags,
         allowedAttributes: {
           '*': allowedAttributes,
-          a: ['href'],
+          'a': ['href'],
-          div: ['itemscope', 'itemtype'],
+          'div': ['itemscope', 'itemtype'],
-          blockquote: ['cite'],
+          'blockquote': ['cite'],
-          del: ['cite'],
+          'del': ['cite'],
-          ins: ['cite'],
+          'ins': ['cite'],
-          q: ['cite'],
+          'q': ['cite'],
-          img: ['src', 'width', 'height'],
+          'img': ['src', 'width', 'height'],
-          iframe: ['src', 'width', 'height', 'frameborder', 'allowfullscreen'],
+          'iframe': ['src', 'width', 'height', 'frameborder', 'allowfullscreen'],
-          input: ['type', 'id', 'checked']
+          'input': ['type', 'id', 'checked']
         },
         allowedIframeHostnames: ['www.youtube.com'],
-        selfClosing: ['img', 'br', 'hr', 'input'],
+        selfClosing: [ 'img', 'br', 'hr', 'input' ],
-        allowedSchemes: ['http', 'https', 'ftp', 'mailto'],
+        allowedSchemes: [ 'http', 'https', 'ftp', 'mailto' ],
-        allowedSchemesAppliedToAttributes: ['href', 'src', 'cite'],
+        allowedSchemesAppliedToAttributes: [ 'href', 'src', 'cite' ],
         allowProtocolRelative: true
       })
     }
@@ -200,7 +98,7 @@ class Markdown {
       inlineClose: config.preview.latexInlineClose,
       blockOpen: config.preview.latexBlockOpen,
       blockClose: config.preview.latexBlockClose,
-      inlineRenderer: function(str) {
+      inlineRenderer: function (str) {
         let output = ''
         try {
           output = katex.renderToString(str.trim())
@@ -209,7 +107,7 @@ class Markdown {
         }
         return output
       },
-      blockRenderer: function(str) {
+      blockRenderer: function (str) {
         let output = ''
         try {
           output = katex.renderToString(str.trim(), { displayMode: true })
@@ -226,118 +124,76 @@ class Markdown {
       slugify: require('./slugify')
     })
     this.md.use(require('markdown-it-kbd'))
-    this.md.use(require('markdown-it-admonition'), {
+    this.md.use(require('markdown-it-admonition'), {types: ['note', 'hint', 'attention', 'caution', 'danger', 'error']})
-      types: [
-        'note',
-        'hint',
-        'attention',
-        'caution',
-        'danger',
-        'error',
-        'quote',
-        'abstract',
-        'question'
-      ]
-    })
     this.md.use(require('markdown-it-abbr'))
     this.md.use(require('markdown-it-sub'))
     this.md.use(require('markdown-it-sup'))
-
+    this.md.use(markdownItTocAndAnchor, {
-    this.md.use(md => {
+      toc: true,
-      markdownItTocAndAnchor(md, {
+      tocPattern: /\[TOC\]/i,
-        toc: true,
+      anchorLink: false,
-        tocPattern: /\[TOC\]/i,
+      appendIdToHeading: false
-        anchorLink: false,
-        appendIdToHeading: false
-      })
-
-      md.renderer.rules.toc_open = () => '<div class="markdownIt-TOC-wrapper">'
-      md.renderer.rules.toc_close = () => '</div>'
     })
-
     this.md.use(require('./markdown-it-deflist'))
     this.md.use(require('./markdown-it-frontmatter'))
 
-    this.md.use(
+    this.md.use(require('./markdown-it-fence'), {
-      require('./markdown-it-fence'),
+      chart: token => {
-      {
+        if (token.parameters.hasOwnProperty('yaml')) {
-        chart: token => {
+          token.parameters.format = 'yaml'
-          if (token.parameters.hasOwnProperty('yaml')) {
-            token.parameters.format = 'yaml'
-          }
-
-          return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="chart" data-height="${
-            token.parameters.height
-          }" data-format="${token.parameters.format || 'json'}">${
-            token.content
-          }</div>
-        </pre>`
-        },
-        flowchart: token => {
-          return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="flowchart" data-height="${token.parameters.height}">${
-            token.content
-          }</div>
-        </pre>`
-        },
-        gallery: token => {
-          const content = token.content
-            .split('\n')
-            .slice(0, -1)
-            .map(line => {
-              const match = /!\[[^\]]*]\(([^\)]*)\)/.exec(line)
-              if (match) {
-                return mdurl.encode(match[1])
-              } else {
-                return mdurl.encode(line)
-              }
-            })
-            .join('\n')
-
-          return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="gallery" data-autoplay="${
-            token.parameters.autoplay
-          }" data-height="${token.parameters.height}">${content}</div>
-        </pre>`
-        },
-        mermaid: token => {
-          return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="mermaid" data-height="${token.parameters.height}">${
-            token.content
-          }</div>
-        </pre>`
-        },
-        sequence: token => {
-          return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="sequence" data-height="${token.parameters.height}">${
-            token.content
-          }</div>
-        </pre>`
         }
+
+        return `<pre class="fence" data-line="${token.map[0]}">
+          <span class="filename">${token.fileName}</span>
+          <div class="chart" data-height="${token.parameters.height}" data-format="${token.parameters.format || 'json'}">${token.content}</div>
+        </pre>`
       },
-      token => {
+      flowchart: token => {
-        return `<pre class="code CodeMirror" data-line="${token.map[0]}">
+        return `<pre class="fence" data-line="${token.map[0]}">
+          <span class="filename">${token.fileName}</span>
+          <div class="flowchart" data-height="${token.parameters.height}">${token.content}</div>
+        </pre>`
+      },
+      gallery: token => {
+        const content = token.content.split('\n').slice(0, -1).map(line => {
+          const match = /!\[[^\]]*]\(([^\)]*)\)/.exec(line)
+          if (match) {
+            return mdurl.encode(match[1])
+          } else {
+            return mdurl.encode(line)
+          }
+        }).join('\n')
+
+        return `<pre class="fence" data-line="${token.map[0]}">
+          <span class="filename">${token.fileName}</span>
+          <div class="gallery" data-autoplay="${token.parameters.autoplay}" data-height="${token.parameters.height}">${content}</div>
+        </pre>`
+      },
+      mermaid: token => {
+        return `<pre class="fence" data-line="${token.map[0]}">
+          <span class="filename">${token.fileName}</span>
+          <div class="mermaid" data-height="${token.parameters.height}">${token.content}</div>
+        </pre>`
+      },
+      sequence: token => {
+        return `<pre class="fence" data-line="${token.map[0]}">
+          <span class="filename">${token.fileName}</span>
+          <div class="sequence" data-height="${token.parameters.height}">${token.content}</div>
+        </pre>`
+      }
+    }, token => {
+      return `<pre class="code CodeMirror" data-line="${token.map[0]}">
         <span class="filename">${token.fileName}</span>
         ${createGutter(token.content, token.firstLineNumber)}
         <code class="${token.langType}">${token.content}</code>
       </pre>`
-      }
+    })
-    )
 
     const deflate = require('markdown-it-plantuml/lib/deflate')
     const plantuml = require('markdown-it-plantuml')
-    const plantUmlStripTrailingSlash = url =>
+    const plantUmlStripTrailingSlash = (url) => url.endsWith('/') ? url.slice(0, -1) : url
-      url.endsWith('/') ? url.slice(0, -1) : url
+    const plantUmlServerAddress = plantUmlStripTrailingSlash(config.preview.plantUMLServerAddress)
-    const plantUmlServerAddress = plantUmlStripTrailingSlash(
+    const parsePlantUml = function (umlCode, openMarker, closeMarker, type) {
-      config.preview.plantUMLServerAddress
-    )
-    const parsePlantUml = function(umlCode, openMarker, closeMarker, type) {
       const s = unescape(encodeURIComponent(umlCode))
       const zippedCode = deflate.encode64(
         deflate.zip_deflate(`${openMarker}\n${s}\n${closeMarker}`, 9)
@@ -346,47 +202,39 @@ class Markdown {
     }
 
     this.md.use(plantuml, {
-      generateSource: umlCode =>
+      generateSource: (umlCode) => parsePlantUml(umlCode, '@startuml', '@enduml', 'svg')
-        parsePlantUml(umlCode, '@startuml', '@enduml', 'svg')
     })
 
     // Ditaa support. PlantUML server doesn't support Ditaa in SVG, so we set the format as PNG at the moment.
     this.md.use(plantuml, {
       openMarker: '@startditaa',
       closeMarker: '@endditaa',
-      generateSource: umlCode =>
+      generateSource: (umlCode) => parsePlantUml(umlCode, '@startditaa', '@endditaa', 'png')
-        parsePlantUml(umlCode, '@startditaa', '@endditaa', 'png')
     })
 
     // Mindmap support
     this.md.use(plantuml, {
       openMarker: '@startmindmap',
       closeMarker: '@endmindmap',
-      generateSource: umlCode =>
+      generateSource: (umlCode) => parsePlantUml(umlCode, '@startmindmap', '@endmindmap', 'svg')
-        parsePlantUml(umlCode, '@startmindmap', '@endmindmap', 'svg')
     })
 
     // WBS support
     this.md.use(plantuml, {
       openMarker: '@startwbs',
       closeMarker: '@endwbs',
-      generateSource: umlCode =>
+      generateSource: (umlCode) => parsePlantUml(umlCode, '@startwbs', '@endwbs', 'svg')
-        parsePlantUml(umlCode, '@startwbs', '@endwbs', 'svg')
     })
 
     // Gantt support
     this.md.use(plantuml, {
       openMarker: '@startgantt',
       closeMarker: '@endgantt',
-      generateSource: umlCode =>
+      generateSource: (umlCode) => parsePlantUml(umlCode, '@startgantt', '@endgantt', 'svg')
-        parsePlantUml(umlCode, '@startgantt', '@endgantt', 'svg')
     })
 
     // Override task item
-    this.md.block.ruler.at('paragraph', function(
+    this.md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
-      state,
-      startLine /*, endLine */
-    ) {
       let content, terminate, i, l, token
       let nextLine = startLine + 1
       const terminatorRules = state.md.block.ruler.getRules('paragraph')
@@ -396,14 +244,10 @@ class Markdown {
       for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
         // this would be a code block normally, but after paragraph
         // it's considered a lazy continuation regardless of what's there
-        if (state.sCount[nextLine] - state.blkIndent > 3) {
+        if (state.sCount[nextLine] - state.blkIndent > 3) { continue }
-          continue
-        }
 
         // quirk for blockquotes, this line should already be checked by that rule
-        if (state.sCount[nextLine] < 0) {
+        if (state.sCount[nextLine] < 0) { continue }
-          continue
-        }
 
         // Some tags can terminate paragraph without empty line.
         terminate = false
@@ -413,14 +257,10 @@ class Markdown {
             break
           }
         }
-        if (terminate) {
+        if (terminate) { break }
-          break
-        }
       }
 
-      content = state
+      content = state.getLines(startLine, nextLine, state.blkIndent, false).trim()
-        .getLines(startLine, nextLine, state.blkIndent, false)
-        .trim()
 
       state.line = nextLine
 
@@ -430,31 +270,18 @@ class Markdown {
       if (state.parentType === 'list') {
         const match = content.match(/^\[( |x)\] ?(.+)/i)
         if (match) {
-          const liToken = lastFindInArray(
+          const liToken = lastFindInArray(state.tokens, token => token.type === 'list_item_open')
-            state.tokens,
-            token => token.type === 'list_item_open'
-          )
           if (liToken) {
             if (!liToken.attrs) {
               liToken.attrs = []
             }
             if (config.preview.lineThroughCheckbox) {
-              liToken.attrs.push([
+              liToken.attrs.push(['class', `taskListItem${match[1] !== ' ' ? ' checked' : ''}`])
-                'class',
-                `taskListItem${match[1] !== ' ' ? ' checked' : ''}`
-              ])
             } else {
               liToken.attrs.push(['class', 'taskListItem'])
             }
           }
-          content = `<label class='taskListItem${
+          content = `<label class='taskListItem${match[1] !== ' ' ? ' checked' : ''}' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${content.substring(4, content.length)}</label>`
-            match[1] !== ' ' ? ' checked' : ''
-          }' for='checkbox-${startLine + 1}'><input type='checkbox'${
-            match[1] !== ' ' ? ' checked' : ''
-          } id='checkbox-${startLine + 1}'/> ${content.substring(
-            4,
-            content.length
-          )}</label>`
         }
       }
 
@@ -475,7 +302,7 @@ class Markdown {
     // Add line number attribute for scrolling
     const originalRender = this.md.renderer.render
     this.md.renderer.render = (tokens, options, env) => {
-      tokens.forEach(token => {
+      tokens.forEach((token) => {
         switch (token.type) {
           case 'blockquote_open':
           case 'dd_open':
@@ -496,7 +323,7 @@ class Markdown {
     window.md = this.md
   }
 
-  render(content) {
+  render (content) {
     if (!_.isString(content)) content = ''
     return this.md.render(content)
   }

browser/lib/markdownTextHelper.js

@@ -6,7 +6,7 @@
  * @param {string} input
  * @return {string}
  */
-export function strip(input) {
+export function strip (input) {
   let output = input
   try {
     output = output

browser/lib/newNote.js

@@ -4,22 +4,12 @@ import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
 import queryString from 'query-string'
 import { push } from 'connected-react-router'
 
-export function createMarkdownNote(
+export function createMarkdownNote (storage, folder, dispatch, location, params, config) {
-  storage,
-  folder,
-  dispatch,
-  location,
-  params,
-  config
-) {
   AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_MARKDOWN')
   AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
 
   let tags = []
-  if (
+  if (config.ui.tagNewNoteWithFilteringTags && location.pathname.match(/\/tags/)) {
-    config.ui.tagNewNoteWithFilteringTags &&
-    location.pathname.match(/\/tags/)
-  ) {
     tags = params.tagname.split(' ')
   }
 
@@ -39,40 +29,25 @@ export function createMarkdownNote(
         note: note
       })
 
-      dispatch(
+      dispatch(push({
-        push({
+        pathname: location.pathname,
-          pathname: location.pathname,
+        search: queryString.stringify({ key: noteHash })
-          search: queryString.stringify({ key: noteHash })
+      }))
-        })
-      )
       ee.emit('list:jump', noteHash)
       ee.emit('detail:focus')
     })
 }
 
-export function createSnippetNote(
+export function createSnippetNote (storage, folder, dispatch, location, params, config) {
-  storage,
-  folder,
-  dispatch,
-  location,
-  params,
-  config
-) {
   AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_SNIPPET')
   AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
 
   let tags = []
-  if (
+  if (config.ui.tagNewNoteWithFilteringTags && location.pathname.match(/\/tags/)) {
-    config.ui.tagNewNoteWithFilteringTags &&
-    location.pathname.match(/\/tags/)
-  ) {
     tags = params.tagname.split(' ')
   }
 
-  const defaultLanguage =
+  const defaultLanguage = config.editor.snippetDefaultLanguage === 'Auto Detect' ? null : config.editor.snippetDefaultLanguage
-    config.editor.snippetDefaultLanguage === 'Auto Detect'
-      ? null
-      : config.editor.snippetDefaultLanguage
 
   return dataApi
     .createNote(storage, {
@@ -96,12 +71,10 @@ export function createSnippetNote(
         type: 'UPDATE_NOTE',
         note: note
       })
-      dispatch(
+      dispatch(push({
-        push({
+        pathname: location.pathname,
-          pathname: location.pathname,
+        search: queryString.stringify({ key: noteHash })
-          search: queryString.stringify({ key: noteHash })
+      }))
-        })
-      )
       ee.emit('list:jump', noteHash)
       ee.emit('detail:focus')
     })

browser/lib/normalizeEditorFontFamily.js

@@ -1,7 +1,7 @@
 import consts from 'browser/lib/consts'
 import isString from 'lodash/isString'
 
-export default function normalizeEditorFontFamily(fontFamily) {
+export default function normalizeEditorFontFamily (fontFamily) {
   const defaultEditorFontFamily = consts.DEFAULT_EDITOR_FONT_FAMILY
   return isString(fontFamily) && fontFamily.length > 0
     ? [fontFamily].concat(defaultEditorFontFamily).join(', ')

browser/lib/search.js

@@ -1,38 +1,31 @@
 import _ from 'lodash'
 
-export default function searchFromNotes(notes, search) {
+export default function searchFromNotes (notes, search) {
   if (search.trim().length === 0) return []
-  const searchBlocks = search.split(' ').filter(block => {
+  const searchBlocks = search.split(' ').filter(block => { return block !== '' })
-    return block !== ''
-  })
 
   let foundNotes = notes
-  searchBlocks.forEach(block => {
+  searchBlocks.forEach((block) => {
     foundNotes = findByWordOrTag(foundNotes, block)
   })
   return foundNotes
 }
 
-function findByWordOrTag(notes, block) {
+function findByWordOrTag (notes, block) {
   let tag = block
   if (tag.match(/^#.+/)) {
     tag = tag.match(/#(.+)/)[1]
   }
   const tagRegExp = new RegExp(_.escapeRegExp(tag), 'i')
   const wordRegExp = new RegExp(_.escapeRegExp(block), 'i')
-  return notes.filter(note => {
+  return notes.filter((note) => {
-    if (_.isArray(note.tags) && note.tags.some(_tag => _tag.match(tagRegExp))) {
+    if (_.isArray(note.tags) && note.tags.some((_tag) => _tag.match(tagRegExp))) {
       return true
     }
     if (note.type === 'SNIPPET_NOTE') {
-      return (
+      return note.description.match(wordRegExp) || note.snippets.some((snippet) => {
-        note.description.match(wordRegExp) ||
+        return snippet.name.match(wordRegExp) || snippet.content.match(wordRegExp)
-        note.snippets.some(snippet => {
+      })
-          return (
-            snippet.name.match(wordRegExp) || snippet.content.match(wordRegExp)
-          )
-        })
-      )
     } else if (note.type === 'MARKDOWN_NOTE') {
       return note.content.match(wordRegExp)
     }

browser/lib/slugify.js

@@ -1,14 +1,10 @@
-module.exports = function slugify(title) {
+module.exports = function slugify (title) {
   const slug = encodeURI(
-    title
+    title.trim()
-      .trim()
       .replace(/^\s+/, '')
       .replace(/\s+$/, '')
       .replace(/\s+/g, '-')
-      .replace(
+      .replace(/[\]\[\!\'\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\{\|\}\~\`]/g, '')
-        /[\]\[\!\'\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\{\|\}\~\`]/g,
-        ''
-      )
   )
 
   return slug

browser/lib/spellcheck.js

@@ -12,19 +12,19 @@ const MILLISECONDS_TILL_LIVECHECK = 500
 let dictionary = null
 let self
 
-function getAvailableDictionaries() {
+function getAvailableDictionaries () {
   return [
-    { label: i18n.__('Spellcheck disabled'), value: SPELLCHECK_DISABLED },
+    {label: i18n.__('Spellcheck disabled'), value: SPELLCHECK_DISABLED},
-    { label: i18n.__('English'), value: 'en_GB' },
+    {label: i18n.__('English'), value: 'en_GB'},
-    { label: i18n.__('German'), value: 'de_DE' },
+    {label: i18n.__('German'), value: 'de_DE'},
-    { label: i18n.__('French'), value: 'fr_FR' }
+    {label: i18n.__('French'), value: 'fr_FR'}
   ]
 }
 
 /**
  * Only to be used in the tests :)
  */
-function setDictionaryForTestsOnly(newDictionary) {
+function setDictionaryForTestsOnly (newDictionary) {
   dictionary = newDictionary
 }
 
@@ -34,7 +34,7 @@ function setDictionaryForTestsOnly(newDictionary) {
  * @param {Codemirror} editor CodeMirror-Editor
  * @param {String} lang on of the values from getAvailableDictionaries()-Method
  */
-function setLanguage(editor, lang) {
+function setLanguage (editor, lang) {
   self = this
   dictionary = null
 
@@ -50,7 +50,8 @@ function setLanguage(editor, lang) {
     dictionary = new Typo(lang, false, false, {
       dictionaryPath: DICTIONARY_PATH,
       asyncLoad: true,
-      loadedCallback: () => checkWholeDocument(editor)
+      loadedCallback: () =>
+        checkWholeDocument(editor)
     })
   }
 }
@@ -59,12 +60,12 @@ function setLanguage(editor, lang) {
  * Checks the whole content of the editor for typos
  * @param {Codemirror} editor CodeMirror-Editor
  */
-function checkWholeDocument(editor) {
+function checkWholeDocument (editor) {
   const lastLine = editor.lineCount() - 1
   const textOfLastLine = editor.getLine(lastLine) || ''
   const lastChar = textOfLastLine.length
-  const from = { line: 0, ch: 0 }
+  const from = {line: 0, ch: 0}
-  const to = { line: lastLine, ch: lastChar }
+  const to = {line: lastLine, ch: lastChar}
   checkMultiLineRange(editor, from, to)
 }
 
@@ -74,18 +75,15 @@ function checkWholeDocument(editor) {
  * @param {line, ch} from starting position of the spellcheck
  * @param {line, ch} to end position of the spellcheck
  */
-function checkMultiLineRange(editor, from, to) {
+function checkMultiLineRange (editor, from, to) {
-  function sortRange(pos1, pos2) {
+  function sortRange (pos1, pos2) {
-    if (
+    if (pos1.line > pos2.line || (pos1.line === pos2.line && pos1.ch > pos2.ch)) {
-      pos1.line > pos2.line ||
+      return {from: pos2, to: pos1}
-      (pos1.line === pos2.line && pos1.ch > pos2.ch)
-    ) {
-      return { from: pos2, to: pos1 }
     }
-    return { from: pos1, to: pos2 }
+    return {from: pos1, to: pos2}
   }
 
-  const { from: smallerPos, to: higherPos } = sortRange(from, to)
+  const {from: smallerPos, to: higherPos} = sortRange(from, to)
   for (let l = smallerPos.line; l <= higherPos.line; l++) {
     const line = editor.getLine(l) || ''
     let w = 0
@@ -97,9 +95,9 @@ function checkMultiLineRange(editor, from, to) {
       wEnd = higherPos.ch
     }
     while (w <= wEnd) {
-      const wordRange = editor.findWordAt({ line: l, ch: w })
+      const wordRange = editor.findWordAt({line: l, ch: w})
       self.checkWord(editor, wordRange)
-      w += wordRange.head.ch - wordRange.anchor.ch + 1
+      w += (wordRange.head.ch - wordRange.anchor.ch) + 1
     }
   }
 }
@@ -112,15 +110,13 @@ function checkMultiLineRange(editor, from, to) {
  * @param wordRange Object specifying the range that should be checked.
  * Having the following structure: <code>{anchor: {line: integer, ch: integer}, head: {line: integer, ch: integer}}</code>
  */
-function checkWord(editor, wordRange) {
+function checkWord (editor, wordRange) {
   const word = editor.getRange(wordRange.anchor, wordRange.head)
   if (word == null || word.length <= 3) {
     return
   }
   if (!dictionary.check(word)) {
-    editor.markText(wordRange.anchor, wordRange.head, {
+    editor.markText(wordRange.anchor, wordRange.head, {className: styles[CSS_ERROR_CLASS]})
-      className: styles[CSS_ERROR_CLASS]
-    })
   }
 }
 
@@ -130,40 +126,32 @@ function checkWord(editor, wordRange) {
  * @param fromChangeObject codeMirror changeObject describing the start of the editing
  * @param toChangeObject codeMirror changeObject describing the end of the editing
  */
-function checkChangeRange(editor, fromChangeObject, toChangeObject) {
+function checkChangeRange (editor, fromChangeObject, toChangeObject) {
   /**
    * Calculate the smallest respectively largest position as a start, resp. end, position and return it
    * @param start CodeMirror change object
    * @param end CodeMirror change object
    * @returns {{start: {line: *, ch: *}, end: {line: *, ch: *}}}
    */
-  function getStartAndEnd(start, end) {
+  function getStartAndEnd (start, end) {
     const possiblePositions = [start.from, start.to, end.from, end.to]
     let smallest = start.from
     let biggest = end.to
     for (const currentPos of possiblePositions) {
-      if (
+      if (currentPos.line < smallest.line || (currentPos.line === smallest.line && currentPos.ch < smallest.ch)) {
-        currentPos.line < smallest.line ||
-        (currentPos.line === smallest.line && currentPos.ch < smallest.ch)
-      ) {
         smallest = currentPos
       }
-      if (
+      if (currentPos.line > biggest.line || (currentPos.line === biggest.line && currentPos.ch > biggest.ch)) {
-        currentPos.line > biggest.line ||
-        (currentPos.line === biggest.line && currentPos.ch > biggest.ch)
-      ) {
         biggest = currentPos
       }
     }
-    return { start: smallest, end: biggest }
+    return {start: smallest, end: biggest}
   }
 
-  if (dictionary === null || editor == null) {
+  if (dictionary === null || editor == null) { return }
-    return
-  }
 
   try {
-    const { start, end } = getStartAndEnd(fromChangeObject, toChangeObject)
+    const {start, end} = getStartAndEnd(fromChangeObject, toChangeObject)
 
     // Expand the range to include words after/before whitespaces
     start.ch = Math.max(start.ch - 1, 0)
@@ -177,40 +165,29 @@ function checkChangeRange(editor, fromChangeObject, toChangeObject) {
 
     self.checkMultiLineRange(editor, start, end)
   } catch (e) {
-    console.info(
+    console.info('Error during the spell check. It might be due to problems figuring out the range of the new text..', e)
-      'Error during the spell check. It might be due to problems figuring out the range of the new text..',
-      e
-    )
   }
 }
 
-function saveLiveSpellCheckFrom(changeObject) {
+function saveLiveSpellCheckFrom (changeObject) {
   liveSpellCheckFrom = changeObject
 }
 let liveSpellCheckFrom
-const debouncedSpellCheckLeading = _.debounce(
+const debouncedSpellCheckLeading = _.debounce(saveLiveSpellCheckFrom, MILLISECONDS_TILL_LIVECHECK, {
-  saveLiveSpellCheckFrom,
+  'leading': true,
-  MILLISECONDS_TILL_LIVECHECK,
+  'trailing': false
-  {
+})
-    leading: true,
+const debouncedSpellCheck = _.debounce(checkChangeRange, MILLISECONDS_TILL_LIVECHECK, {
-    trailing: false
+  'leading': false,
-  }
+  'trailing': true
-)
+})
-const debouncedSpellCheck = _.debounce(
-  checkChangeRange,
-  MILLISECONDS_TILL_LIVECHECK,
-  {
-    leading: false,
-    trailing: true
-  }
-)
 
 /**
  * Handles a keystroke. Buffers the input and performs a live spell check after a certain time. Uses _debounce from lodash to buffer the input
  * @param {Codemirror} editor CodeMirror-Editor
  * @param changeObject codeMirror changeObject
  */
-function handleChange(editor, changeObject) {
+function handleChange (editor, changeObject) {
   if (dictionary === null) {
     return
   }
@@ -224,7 +201,7 @@ function handleChange(editor, changeObject) {
  * @param word word to be checked
  * @returns {String[]} Array of suggestions
  */
-function getSpellingSuggestion(word) {
+function getSpellingSuggestion (word) {
   if (dictionary == null || word == null) {
     return []
   }
@@ -234,7 +211,7 @@ function getSpellingSuggestion(word) {
 /**
  * Returns the name of the CSS class used for errors
  */
-function getCSSClassName() {
+function getCSSClassName () {
   return styles[CSS_ERROR_CLASS]
 }
 

browser/lib/turndown.js

@@ -1,7 +1,7 @@
 const TurndownService = require('turndown')
 const { gfm } = require('turndown-plugin-gfm')
 
-export const createTurndownService = function() {
+export const createTurndownService = function () {
   const turndown = new TurndownService()
   turndown.use(gfm)
   turndown.remove('script')

browser/lib/ui-themes.js

@@ -1,44 +0,0 @@
-import i18n from 'browser/lib/i18n'
-
-export default [
-  {
-    name: 'dark',
-    label: i18n.__('Dark'),
-    isDark: true
-  },
-  {
-    name: 'default',
-    label: i18n.__('Default'),
-    isDark: false
-  },
-  {
-    name: 'dracula',
-    label: i18n.__('Dracula'),
-    isDark: true
-  },
-  {
-    name: 'monokai',
-    label: i18n.__('Monokai'),
-    isDark: true
-  },
-  {
-    name: 'nord',
-    label: i18n.__('Nord'),
-    isDark: true
-  },
-  {
-    name: 'solarized-dark',
-    label: i18n.__('Solarized Dark'),
-    isDark: true
-  },
-  {
-    name: 'vulcan',
-    label: i18n.__('Vulcan'),
-    isDark: true
-  },
-  {
-    name: 'white',
-    label: i18n.__('White'),
-    isDark: false
-  }
-]

browser/lib/utils.js

@@ -1,4 +1,4 @@
-export function lastFindInArray(array, callback) {
+export function lastFindInArray (array, callback) {
   for (let i = array.length - 1; i >= 0; --i) {
     if (callback(array[i], i, array)) {
       return array[i]
@@ -6,7 +6,7 @@ export function lastFindInArray(array, callback) {
   }
 }
 
-export function escapeHtmlCharacters(
+export function escapeHtmlCharacters (
   html,
   opt = { detectCodeBlock: false, skipSingleQuote: false }
 ) {
@@ -115,7 +115,7 @@ export function escapeHtmlCharacters(
   return html
 }
 
-export function isObjectEqual(a, b) {
+export function isObjectEqual (a, b) {
   const aProps = Object.getOwnPropertyNames(a)
   const bProps = Object.getOwnPropertyNames(b)
 
@@ -132,13 +132,11 @@ export function isObjectEqual(a, b) {
   return true
 }
 
-export function isMarkdownTitleURL(str) {
+export function isMarkdownTitleURL (str) {
-  return /(^#{1,6}\s)(?:\w+:|^)\/\/(?:[^\s\.]+\.\S{2}|localhost[\:?\d]*)/.test(
+  return /(^#{1,6}\s)(?:\w+:|^)\/\/(?:[^\s\.]+\.\S{2}|localhost[\:?\d]*)/.test(str)
-    str
-  )
 }
 
-export function humanFileSize(bytes) {
+export function humanFileSize (bytes) {
   const threshold = 1000
   if (Math.abs(bytes) < threshold) {
     return bytes + ' B'

browser/main/Detail/Detail.styl

@@ -24,16 +24,23 @@ body[data-theme="dark"]
   .empty-message
     color $ui-dark-inactive-text-color
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .root
-    .root
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+    border-left 1px solid $ui-solarized-dark-borderColor
-      border-left 1px solid get-theme-var(theme, 'borderColor')
+  .empty-message
-    .empty-message
+    color $ui-solarized-dark-text-color
-      color get-theme-var(theme, 'text-color')
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .root
+    background-color $ui-monokai-noteDetail-backgroundColor
+    border-left 1px solid $ui-monokai-borderColor
+  .empty-message
+    color $ui-monokai-text-color
 
-for theme in $themes
+body[data-theme="dracula"]
-  apply-theme(theme)
+  .root
+    background-color $ui-dracula-noteDetail-backgroundColor
+    border-left 1px solid $ui-dracula-borderColor
+  .empty-message
+    color $ui-dracula-text-color

browser/main/Detail/FolderSelect.js

@@ -6,7 +6,7 @@ import _ from 'lodash'
 import i18n from 'browser/lib/i18n'
 
 class FolderSelect extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -16,27 +16,24 @@ class FolderSelect extends React.Component {
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.value = this.props.value
   }
 
-  componentDidUpdate() {
+  componentDidUpdate () {
     this.value = this.props.value
   }
 
-  handleClick(e) {
+  handleClick (e) {
-    this.setState(
+    this.setState({
-      {
+      status: 'SEARCH',
-        status: 'SEARCH',
+      optionIndex: -1
-        optionIndex: -1
+    }, () => {
-      },
+      this.refs.search.focus()
-      () => {
+    })
-        this.refs.search.focus()
-      }
-    )
   }
 
-  handleFocus(e) {
+  handleFocus (e) {
     if (this.state.status === 'IDLE') {
       this.setState({
         status: 'FOCUS'
@@ -44,7 +41,7 @@ class FolderSelect extends React.Component {
     }
   }
 
-  handleBlur(e) {
+  handleBlur (e) {
     if (this.state.status === 'FOCUS') {
       this.setState({
         status: 'IDLE'
@@ -52,49 +49,40 @@ class FolderSelect extends React.Component {
     }
   }
 
-  handleKeyDown(e) {
+  handleKeyDown (e) {
     switch (e.keyCode) {
       case 13:
         if (this.state.status === 'FOCUS') {
-          this.setState(
+          this.setState({
-            {
+            status: 'SEARCH',
-              status: 'SEARCH',
+            optionIndex: -1
-              optionIndex: -1
+          }, () => {
-            },
+            this.refs.search.focus()
-            () => {
+          })
-              this.refs.search.focus()
-            }
-          )
         }
         break
       case 40:
       case 38:
         if (this.state.status === 'FOCUS') {
-          this.setState(
+          this.setState({
-            {
+            status: 'SEARCH',
-              status: 'SEARCH',
+            optionIndex: 0
-              optionIndex: 0
+          }, () => {
-            },
+            this.refs.search.focus()
-            () => {
+          })
-              this.refs.search.focus()
-            }
-          )
         }
         break
       case 9:
         if (e.shiftKey) {
           e.preventDefault()
-          const tabbable = document.querySelectorAll(
+          const tabbable = document.querySelectorAll('a:not([disabled]), button:not([disabled]), input[type=text]:not([disabled]), [tabindex]:not([disabled]):not([tabindex="-1"])')
-            'a:not([disabled]), button:not([disabled]), input[type=text]:not([disabled]), [tabindex]:not([disabled]):not([tabindex="-1"])'
+          const previousEl = tabbable[Array.prototype.indexOf.call(tabbable, this.refs.root) - 1]
-          )
-          const previousEl =
-            tabbable[Array.prototype.indexOf.call(tabbable, this.refs.root) - 1]
           if (previousEl != null) previousEl.focus()
         }
     }
   }
 
-  handleSearchInputBlur(e) {
+  handleSearchInputBlur (e) {
     if (e.relatedTarget !== this.refs.root) {
       this.setState({
         status: 'IDLE'
@@ -102,17 +90,14 @@ class FolderSelect extends React.Component {
     }
   }
 
-  handleSearchInputChange(e) {
+  handleSearchInputChange (e) {
     const { folders } = this.props
     const search = this.refs.search.value
-    const optionIndex =
+    const optionIndex = search.length > 0
-      search.length > 0
+      ? _.findIndex(folders, (folder) => {
-        ? _.findIndex(folders, folder => {
+        return folder.name.match(new RegExp('^' + _.escapeRegExp(search), 'i'))
-            return folder.name.match(
+      })
-              new RegExp('^' + _.escapeRegExp(search), 'i')
+      : -1
-            )
-          })
-        : -1
 
     this.setState({
       search: this.refs.search.value,
@@ -120,7 +105,7 @@ class FolderSelect extends React.Component {
     })
   }
 
-  handleSearchInputKeyDown(e) {
+  handleSearchInputKeyDown (e) {
     switch (e.keyCode) {
       case 40:
         e.stopPropagation()
@@ -136,18 +121,15 @@ class FolderSelect extends React.Component {
         break
       case 27:
         e.stopPropagation()
-        this.setState(
+        this.setState({
-          {
+          status: 'FOCUS'
-            status: 'FOCUS'
+        }, () => {
-          },
+          this.refs.root.focus()
-          () => {
+        })
-            this.refs.root.focus()
-          }
-        )
     }
   }
 
-  nextOption() {
+  nextOption () {
     let { optionIndex } = this.state
     const { folders } = this.props
 
@@ -159,7 +141,7 @@ class FolderSelect extends React.Component {
     })
   }
 
-  previousOption() {
+  previousOption () {
     const { folders } = this.props
     let { optionIndex } = this.state
 
@@ -171,52 +153,46 @@ class FolderSelect extends React.Component {
     })
   }
 
-  selectOption() {
+  selectOption () {
     const { folders } = this.props
     const optionIndex = this.state.optionIndex
 
     const folder = folders[optionIndex]
     if (folder != null) {
-      this.setState(
+      this.setState({
-        {
+        status: 'FOCUS'
-          status: 'FOCUS'
+      }, () => {
-        },
+        this.setValue(folder.key)
-        () => {
+        this.refs.root.focus()
-          this.setValue(folder.key)
+      })
-          this.refs.root.focus()
-        }
-      )
     }
   }
 
-  handleOptionClick(storageKey, folderKey) {
+  handleOptionClick (storageKey, folderKey) {
-    return e => {
+    return (e) => {
       e.stopPropagation()
-      this.setState(
+      this.setState({
-        {
+        status: 'FOCUS'
-          status: 'FOCUS'
+      }, () => {
-        },
+        this.setValue(storageKey + '-' + folderKey)
-        () => {
+        this.refs.root.focus()
-          this.setValue(storageKey + '-' + folderKey)
+      })
-          this.refs.root.focus()
-        }
-      )
     }
   }
 
-  setValue(value) {
+  setValue (value) {
     this.value = value
     this.props.onChange()
   }
 
-  render() {
+  render () {
     const { className, data, value } = this.props
     const splitted = value.split('-')
     const storageKey = splitted.shift()
     const folderKey = splitted.shift()
     let options = []
     data.storageMap.forEach((storage, index) => {
-      storage.folders.forEach(folder => {
+      storage.folders.forEach((folder) => {
         options.push({
           storage: storage,
           folder: folder
@@ -224,78 +200,68 @@ class FolderSelect extends React.Component {
       })
     })
 
-    const currentOption = options.filter(
+    const currentOption = options.filter((option) => option.storage.key === storageKey && option.folder.key === folderKey)[0]
-      option =>
-        option.storage.key === storageKey && option.folder.key === folderKey
-    )[0]
 
     if (this.state.search.trim().length > 0) {
       const filter = new RegExp('^' + _.escapeRegExp(this.state.search), 'i')
-      options = options.filter(option => filter.test(option.folder.name))
+      options = options.filter((option) => filter.test(option.folder.name))
     }
 
-    const optionList = options.map((option, index) => {
+    const optionList = options
-      return (
+      .map((option, index) => {
-        <div
+        return (
-          styleName={
+          <div styleName={index === this.state.optionIndex
-            index === this.state.optionIndex
               ? 'search-optionList-item--active'
               : 'search-optionList-item'
-          }
+            }
-          key={option.storage.key + '-' + option.folder.key}
+            key={option.storage.key + '-' + option.folder.key}
-          onClick={e =>
+            onClick={(e) => this.handleOptionClick(option.storage.key, option.folder.key)(e)}
-            this.handleOptionClick(option.storage.key, option.folder.key)(e)
-          }
-        >
-          <span
-            styleName='search-optionList-item-name'
-            style={{ borderColor: option.folder.color }}
           >
-            {option.folder.name}
+            <span styleName='search-optionList-item-name'
-            <span styleName='search-optionList-item-name-surfix'>
+              style={{borderColor: option.folder.color}}
-              in {option.storage.name}
+            >
+              {option.folder.name}
+              <span styleName='search-optionList-item-name-surfix'>in {option.storage.name}</span>
             </span>
-          </span>
+          </div>
-        </div>
+        )
-      )
+      })
-    })
 
     return (
-      <div
+      <div className={_.isString(className)
-        className={
+          ? 'FolderSelect ' + className
-          _.isString(className) ? 'FolderSelect ' + className : 'FolderSelect'
+          : 'FolderSelect'
         }
-        styleName={
+        styleName={this.state.status === 'SEARCH'
-          this.state.status === 'SEARCH'
+          ? 'root--search'
-            ? 'root--search'
+          : this.state.status === 'FOCUS'
-            : this.state.status === 'FOCUS'
+          ? 'root--focus'
-            ? 'root--focus'
+          : 'root'
-            : 'root'
         }
         ref='root'
         tabIndex='0'
-        onClick={e => this.handleClick(e)}
+        onClick={(e) => this.handleClick(e)}
-        onFocus={e => this.handleFocus(e)}
+        onFocus={(e) => this.handleFocus(e)}
-        onBlur={e => this.handleBlur(e)}
+        onBlur={(e) => this.handleBlur(e)}
-        onKeyDown={e => this.handleKeyDown(e)}
+        onKeyDown={(e) => this.handleKeyDown(e)}
       >
-        {this.state.status === 'SEARCH' ? (
+        {this.state.status === 'SEARCH'
-          <div styleName='search'>
+          ? <div styleName='search'>
-            <input
+            <input styleName='search-input'
-              styleName='search-input'
               ref='search'
               value={this.state.search}
               placeholder={i18n.__('Folder...')}
-              onChange={e => this.handleSearchInputChange(e)}
+              onChange={(e) => this.handleSearchInputChange(e)}
-              onBlur={e => this.handleSearchInputBlur(e)}
+              onBlur={(e) => this.handleSearchInputBlur(e)}
-              onKeyDown={e => this.handleSearchInputKeyDown(e)}
+              onKeyDown={(e) => this.handleSearchInputKeyDown(e)}
             />
-            <div styleName='search-optionList' ref='optionList'>
+            <div styleName='search-optionList'
+              ref='optionList'
+            >
               {optionList}
             </div>
           </div>
-        ) : (
+          : <div styleName='idle' style={{color: currentOption.folder.color}}>
-          <div styleName='idle' style={{ color: currentOption.folder.color }}>
             <div styleName='idle-label'>
               <i className='fa fa-folder' />
               <span styleName='idle-label-name'>
@@ -303,7 +269,8 @@ class FolderSelect extends React.Component {
               </span>
             </div>
           </div>
-        )}
+        }
+
       </div>
     )
   }
@@ -313,13 +280,11 @@ FolderSelect.propTypes = {
   className: PropTypes.string,
   onChange: PropTypes.func,
   value: PropTypes.string,
-  folders: PropTypes.arrayOf(
+  folders: PropTypes.arrayOf(PropTypes.shape({
-    PropTypes.shape({
+    key: PropTypes.string,
-      key: PropTypes.string,
+    name: PropTypes.string,
-      name: PropTypes.string,
+    color: PropTypes.string
-      color: PropTypes.string
+  }))
-    })
-  )
 }
 
 export default CSSModules(FolderSelect, styles)

browser/main/Detail/FolderSelect.styl

@@ -134,39 +134,54 @@ body[data-theme="dark"]
   .search-optionList-item-name-surfix
     color $ui-dark-inactive-text-color
 
-apply-theme(theme)
+body[data-theme="monokai"]
-  body[data-theme={theme}]
+ .root
-    .root
+    color $ui-dark-text-color
-      &:hover
+    &:hover
-        background-color get-theme-var(theme, 'button--hover-backgroundColor')
+      color white
-        border-color get-theme-var(theme, 'borderColor')
+      background-color $ui-monokai-button--hover-backgroundColor
+      border-color $ui-monokai-borderColor
 
-    .search-input
+  .search-optionList
-      color get-theme-var(theme, 'text-color')
+    color white
-      background-color transparent
+    border-color $ui-monokai-borderColor
-      border-color get-theme-var(theme, 'borderColor')
+    background-color $ui-monokai-button-backgroundColor
 
-    .search-optionList
+  .search-optionList-item
-      color get-theme-var(theme, 'text-color')
+    &:hover
-      border-color get-theme-var(theme, 'borderColor')
+      background-color lighten($ui-monokai-button--hover-backgroundColor, 15%)
-      background-color get-theme-var(theme, 'button-backgroundColor')
 
-    .search-optionList-item
+  .search-optionList-item--active
-      &:hover
+    background-color $ui-monokai-button--active-backgroundColor
-        background-color lighten(get-theme-var(theme, 'button--hover-backgroundColor'), 15%)
+    color $ui-monokai-button--active-color
+    &:hover
+      background-color $ui-monokai-button--active-backgroundColor
+      color $ui-monokai-button--active-color
+  .search-optionList-item-name-surfix
+    color $ui-monokai-inactive-text-color
 
-    .search-optionList-item--active
+body[data-theme="dracula"]
-      background-color get-theme-var(theme, 'button--active-backgroundColor')
+ .root
-      color get-theme-var(theme, 'button--active-color')
+    color $ui-dracula-text-color
-      &:hover
+    &:hover
-        background-color get-theme-var(theme, 'button--active-backgroundColor')
+      color #f8f8f2
-        color get-theme-var(theme, 'button--active-color')
+      background-color $ui-dark-button--hover-backgroundColor
+      border-color $ui-dracula-borderColor
 
-    .search-optionList-item-name-surfix
+  .search-optionList
-      color get-theme-var(theme, 'inactive-text-color')
+    color #f8f8f2
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-button-backgroundColor
 
-for theme in 'solarized-dark' 'dracula'
+  .search-optionList-item
-  apply-theme(theme)
+    &:hover
+      background-color lighten($ui-dracula-button--hover-backgroundColor, 15%)
 
-for theme in $themes
+  .search-optionList-item--active
-  apply-theme(theme)
+    background-color $ui-dracula-button--active-backgroundColor
+    color $ui-dracula-button--active-color
+    &:hover
+      background-color $ui-dark-button--hover-backgroundColor
+      color $ui-dracula-button--active-color
+  .search-optionList-item-name-surfix
+    color $ui-dracula-inactive-text-color

browser/main/Detail/FromUrlButton.js

@@ -6,7 +6,7 @@ import _ from 'lodash'
 import i18n from 'browser/lib/i18n'
 
 class FromUrlButton extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -14,46 +14,44 @@ class FromUrlButton extends React.Component {
     }
   }
 
-  handleMouseDown(e) {
+  handleMouseDown (e) {
     this.setState({
       isActive: true
     })
   }
 
-  handleMouseUp(e) {
+  handleMouseUp (e) {
     this.setState({
       isActive: false
     })
   }
 
-  handleMouseLeave(e) {
+  handleMouseLeave (e) {
     this.setState({
       isActive: false
     })
   }
 
-  render() {
+  render () {
     const { className } = this.props
 
     return (
-      <button
+      <button className={_.isString(className)
-        className={
+          ? 'FromUrlButton ' + className
-          _.isString(className) ? 'FromUrlButton ' + className : 'FromUrlButton'
+          : 'FromUrlButton'
         }
-        styleName={
+        styleName={this.state.isActive || this.props.isActive
-          this.state.isActive || this.props.isActive ? 'root--active' : 'root'
+          ? 'root--active'
+          : 'root'
         }
-        onMouseDown={e => this.handleMouseDown(e)}
+        onMouseDown={(e) => this.handleMouseDown(e)}
-        onMouseUp={e => this.handleMouseUp(e)}
+        onMouseUp={(e) => this.handleMouseUp(e)}
-        onMouseLeave={e => this.handleMouseLeave(e)}
+        onMouseLeave={(e) => this.handleMouseLeave(e)}
-        onClick={this.props.onClick}
+        onClick={this.props.onClick}>
-      >
+        <img styleName='icon'
-        <img
+          src={this.state.isActive || this.props.isActive
-          styleName='icon'
+            ? '../resources/icon/icon-external.svg'
-          src={
+            : '../resources/icon/icon-external.svg'
-            this.state.isActive || this.props.isActive
-              ? '../resources/icon/icon-external.svg'
-              : '../resources/icon/icon-external.svg'
           }
         />
         <span styleName='tooltip'>{i18n.__('Convert URL to Markdown')}</span>

browser/main/Detail/FullscreenButton.js

@@ -5,18 +5,14 @@ import styles from './FullscreenButton.styl'
 import i18n from 'browser/lib/i18n'
 
 const OSX = global.process.platform === 'darwin'
-const FullscreenButton = ({ onClick }) => {
+const FullscreenButton = ({
+ onClick
+}) => {
   const hotkey = (OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')) + '+B'
   return (
-    <button
+    <button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')} onMouseDown={(e) => onClick(e)}>
-      styleName='control-fullScreenButton'
-      title={i18n.__('Fullscreen')}
-      onMouseDown={e => onClick(e)}
-    >
       <img src='../resources/icon/icon-full.svg' />
-      <span lang={i18n.locale} styleName='tooltip'>
+      <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
-        {i18n.__('Fullscreen')}({hotkey})
-      </span>
     </button>
   )
 }

browser/main/Detail/FullscreenButton.styl

@@ -1,26 +1,26 @@
-.control-fullScreenButton
+.control-fullScreenButton
-  top 80px
+  top 80px
-  topBarButtonRight()
+  topBarButtonRight()
-  &:hover .tooltip
+  &:hover .tooltip
-    opacity 1
+    opacity 1
-
+
-.tooltip
+.tooltip
-  tooltip()
+  tooltip()
-  position absolute
+  position absolute
-  pointer-events none
+  pointer-events none
-  top 50px
+  top 50px
-  right 70px
+  right 70px
-  z-index 200
+  z-index 200
-  padding 5px
+  padding 5px
-  line-height normal
+  line-height normal
-  border-radius 2px
+  border-radius 2px
-  opacity 0
+  opacity 0
-  transition 0.1s
+  transition 0.1s
-
+
-.tooltip:lang(ja)
+.tooltip:lang(ja)
-  @extend .tooltip
+  @extend .tooltip
-  right 35px
+  right 35px
-
+
-body[data-theme="dark"]
+body[data-theme="dark"]
-  .control-fullScreenButton
+  .control-fullScreenButton
     topBarButtonDark()

browser/main/Detail/InfoButton.js

@@ -4,8 +4,12 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './InfoButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const InfoButton = ({ onClick }) => (
+const InfoButton = ({
-  <button styleName='control-infoButton' onClick={e => onClick(e)}>
+  onClick
+}) => (
+  <button styleName='control-infoButton'
+    onClick={(e) => onClick(e)}
+  >
     <img className='infoButton' src='../resources/icon/icon-info.svg' />
     <span styleName='tooltip'>{i18n.__('Info')}</span>
   </button>

browser/main/Detail/InfoPanel.js

@@ -6,47 +6,28 @@ import copy from 'copy-to-clipboard'
 import i18n from 'browser/lib/i18n'
 
 class InfoPanel extends React.Component {
-  copyNoteLink() {
+  copyNoteLink () {
-    const { noteLink } = this.props
+    const {noteLink} = this.props
     this.refs.noteLink.select()
     copy(noteLink)
   }
 
-  render() {
+  render () {
     const {
-      storageName,
+      storageName, folderName, noteLink, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, exportAsPdf, wordCount, letterCount, type, print
-      folderName,
-      noteLink,
-      updatedAt,
-      createdAt,
-      exportAsMd,
-      exportAsTxt,
-      exportAsHtml,
-      exportAsPdf,
-      wordCount,
-      letterCount,
-      type,
-      print
     } = this.props
     return (
-      <div
+      <div className='infoPanel' styleName='control-infoButton-panel' style={{display: 'none'}}>
-        className='infoPanel'
-        styleName='control-infoButton-panel'
-        style={{ display: 'none' }}
-      >
         <div>
           <p styleName='modification-date'>{updatedAt}</p>
-          <p styleName='modification-date-desc'>
+          <p styleName='modification-date-desc'>{i18n.__('MODIFICATION DATE')}</p>
-            {i18n.__('MODIFICATION DATE')}
-          </p>
         </div>
 
         <hr />
 
-        {type === 'SNIPPET_NOTE' ? (
+        {type === 'SNIPPET_NOTE'
-          ''
+          ? ''
-        ) : (
+          : <div styleName='count-wrap'>
-          <div styleName='count-wrap'>
             <div styleName='count-number'>
               <p styleName='infoPanel-defaul-count'>{wordCount}</p>
               <p styleName='infoPanel-sub-count'>{i18n.__('Words')}</p>
@@ -56,9 +37,12 @@ class InfoPanel extends React.Component {
               <p styleName='infoPanel-sub-count'>{i18n.__('Letters')}</p>
             </div>
           </div>
-        )}
+        }
 
-        {type === 'SNIPPET_NOTE' ? '' : <hr />}
+        {type === 'SNIPPET_NOTE'
+          ? ''
+          : <hr />
+        }
 
         <div>
           <p styleName='infoPanel-default'>{storageName}</p>
@@ -76,18 +60,8 @@ class InfoPanel extends React.Component {
         </div>
 
         <div>
-          <input
+          <input styleName='infoPanel-noteLink' ref='noteLink' defaultValue={noteLink} onClick={(e) => { e.target.select() }} />
-            styleName='infoPanel-noteLink'
+          <button onClick={() => this.copyNoteLink()} styleName='infoPanel-copyButton'>
-            ref='noteLink'
-            defaultValue={noteLink}
-            onClick={e => {
-              e.target.select()
-            }}
-          />
-          <button
-            onClick={() => this.copyNoteLink()}
-            styleName='infoPanel-copyButton'
-          >
             <i className='fa fa-clipboard' />
           </button>
           <p styleName='infoPanel-sub'>{i18n.__('NOTE LINK')}</p>
@@ -96,39 +70,27 @@ class InfoPanel extends React.Component {
         <hr />
 
         <div id='export-wrap'>
-          <button
+          <button styleName='export--enable' onClick={(e) => exportAsMd(e, 'export-md')}>
-            styleName='export--enable'
-            onClick={e => exportAsMd(e, 'export-md')}
-          >
             <i className='fa fa-file-code-o' />
             <p>{i18n.__('.md')}</p>
           </button>
 
-          <button
+          <button styleName='export--enable' onClick={(e) => exportAsTxt(e, 'export-txt')}>
-            styleName='export--enable'
-            onClick={e => exportAsTxt(e, 'export-txt')}
-          >
             <i className='fa fa-file-text-o' />
             <p>{i18n.__('.txt')}</p>
           </button>
 
-          <button
+          <button styleName='export--enable' onClick={(e) => exportAsHtml(e, 'export-html')}>
-            styleName='export--enable'
-            onClick={e => exportAsHtml(e, 'export-html')}
-          >
             <i className='fa fa-html5' />
             <p>{i18n.__('.html')}</p>
           </button>
 
-          <button
+          <button styleName='export--enable' onClick={(e) => exportAsPdf(e, 'export-pdf')}>
-            styleName='export--enable'
-            onClick={e => exportAsPdf(e, 'export-pdf')}
-          >
             <i className='fa fa-file-pdf-o' />
             <p>{i18n.__('.pdf')}</p>
           </button>
 
-          <button styleName='export--enable' onClick={e => print(e, 'print')}>
+          <button styleName='export--enable' onClick={(e) => print(e, 'print')}>
             <i className='fa fa-print' />
             <p>{i18n.__('Print')}</p>
           </button>

browser/main/Detail/InfoPanel.styl

@@ -138,49 +138,162 @@
 .export--unable
   cursor not-allowed
 
-apply-theme(theme)
+body[data-theme="dark"]
-  body[data-theme={theme}]
+  .control-infoButton-panel
-    .control-infoButton-panel
+    background-color $ui-dark-noteList-backgroundColor
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
 
-    .control-infoButton-panel-trash
+  .control-infoButton-panel-trash
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
+    background-color $ui-dark-noteList-backgroundColor
 
-    .modification-date
+  .modification-date
-      color get-theme-var(theme, 'text-color')
+    color $ui-dark-text-color
 
-    .modification-date-desc
+  .modification-date-desc
-      color $ui-inactive-text-color
+    color $ui-inactive-text-color
 
-    .infoPanel-defaul-count
+  .infoPanel-defaul-count
-      color get-theme-var(theme, 'text-color')
+    color $ui-dark-text-color
 
-    .infoPanel-sub-count
+  .infoPanel-sub-count
-      color $ui-inactive-text-color
+    color $ui-inactive-text-color
 
-    .infoPanel-default
+  .infoPanel-default
-      color get-theme-var(theme, 'text-color')
+    color $ui-dark-text-color
 
-    .infoPanel-sub
+  .infoPanel-sub
-      color $ui-inactive-text-color
+    color $ui-inactive-text-color
 
-    .infoPanel-noteLink
+  .infoPanel-noteLink
-      background-color alpha(get-theme-var(theme, 'borderColor'), 20%)
+    background-color alpha($ui-dark-borderColor, 60%)
-      color get-theme-var(theme, 'text-color')
+    color $ui-dark-text-color
 
-    [id=export-wrap]
+  [id=export-wrap]
-      button
+    button
-        color $ui-dark-inactive-text-color
+      color $ui-dark-inactive-text-color
-        &:hover
+      &:hover
-          background-color alpha(get-theme-var(theme, 'borderColor'), 20%)
+        background-color alpha($ui-dark-borderColor, 20%)
-          color get-theme-var(theme, 'text-color')
+        color $ui-dark-text-color
-      p
+    p
-        color $ui-dark-inactive-text-color
+      color $ui-dark-inactive-text-color
-        &:hover
+      &:hover
-          color get-theme-var(theme, 'text-color')
+        color $ui-dark-text-color
 
-for theme in 'dark' 'solarized-dark' 'dracula'
+body[data-theme="solarized-dark"]
-  apply-theme(theme)
+  .control-infoButton-panel
+    background-color $ui-solarized-dark-noteList-backgroundColor
 
-for theme in $themes
+  .control-infoButton-panel-trash
-  apply-theme(theme)
+    background-color $ui-solarized-ark-noteList-backgroundColor
+
+  .modification-date
+    color $ui-solarized-ark-text-color
+
+  .modification-date-desc
+    color $ui-inactive-text-color
+
+  .infoPanel-defaul-count
+    color $ui-solarized-dark-text-color
+
+  .infoPanel-sub-count
+    color $ui-inactive-text-color
+
+  .infoPanel-default
+    color $ui-solarized-ark-text-color
+
+  .infoPanel-sub
+    color $ui-inactive-text-color
+
+  .infoPanel-noteLink
+    background-color alpha($ui-solarized-dark-borderColor, 20%)
+    color $ui-solarized-dark-text-color
+
+  [id=export-wrap]
+    button
+      color $ui-dark-inactive-text-color
+      &:hover
+        background-color alpha($ui-solarized-dark-borderColor, 20%)
+        color $ui-solarized-ark-text-color
+    p
+      color $ui-dark-inactive-text-color
+      &:hover
+        color $ui-solarized-ark-text-color
+
+body[data-theme="monokai"]
+  .control-infoButton-panel
+    background-color $ui-monokai-noteList-backgroundColor
+
+  .control-infoButton-panel-trash
+    background-color $ui-monokai-noteList-backgroundColor
+
+  .modification-date
+    color $ui-monokai-text-color
+
+  .modification-date-desc
+    color $ui-inactive-text-color
+
+  .infoPanel-defaul-count
+    color $ui-monokai-text-color
+
+  .infoPanel-sub-count
+    color $ui-inactive-text-color
+
+  .infoPanel-default
+    color $ui-monokai-text-color
+
+  .infoPanel-sub
+    color $ui-inactive-text-color
+
+  .infoPanel-noteLink
+    background-color alpha($ui-monokai-borderColor, 20%)
+    color $ui-monokai-text-color
+
+  [id=export-wrap]
+    button
+      color $ui-dark-inactive-text-color
+      &:hover
+        background-color alpha($ui-monokai-borderColor, 20%)
+        color $ui-monokai-text-color
+    p
+      color $ui-dark-inactive-text-color
+      &:hover
+        color $ui-monokai-text-color
+
+body[data-theme="dracula"]
+  .control-infoButton-panel
+    background-color $ui-dracula-noteList-backgroundColor
+
+  .control-infoButton-panel-trash
+    background-color $ui-dracula-noteList-backgroundColor
+
+  .modification-date
+    color $ui-dracula-text-color
+
+  .modification-date-desc
+    color $ui-inactive-text-color
+
+  .infoPanel-defaul-count
+    color $ui-dracula-text-color
+
+  .infoPanel-sub-count
+    color $ui-inactive-text-color
+
+  .infoPanel-default
+    color $ui-dracula-text-color
+
+  .infoPanel-sub
+    color $ui-inactive-text-color
+
+  .infoPanel-noteLink
+    background-color alpha($ui-dracula-borderColor, 20%)
+    color $ui-dracula-text-color
+
+  [id=export-wrap]
+    button
+      color $ui-dark-inactive-text-color
+      &:hover
+        background-color alpha($ui-dracula-borderColor, 20%)
+        color $ui-dracula-text-color
+    p
+      color $ui-dark-inactive-text-color
+      &:hover
+        color $ui-dracula-text-color

browser/main/Detail/InfoPanelTrashed.js

@@ -5,20 +5,9 @@ import styles from './InfoPanel.styl'
 import i18n from 'browser/lib/i18n'
 
 const InfoPanelTrashed = ({
-  storageName,
+  storageName, folderName, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, exportAsPdf
-  folderName,
-  updatedAt,
-  createdAt,
-  exportAsMd,
-  exportAsTxt,
-  exportAsHtml,
-  exportAsPdf
 }) => (
-  <div
+  <div className='infoPanel' styleName='control-infoButton-panel-trash' style={{display: 'none'}}>
-    className='infoPanel'
-    styleName='control-infoButton-panel-trash'
-    style={{ display: 'none' }}
-  >
     <div>
       <p styleName='modification-date'>{updatedAt}</p>
       <p styleName='modification-date-desc'>{i18n.__('MODIFICATION DATE')}</p>
@@ -32,10 +21,7 @@ const InfoPanelTrashed = ({
     </div>
 
     <div>
-      <p styleName='infoPanel-default'>
+      <p styleName='infoPanel-default'><text styleName='infoPanel-trash'>Trash</text>{folderName}</p>
-        <text styleName='infoPanel-trash'>Trash</text>
-        {folderName}
-      </p>
       <p styleName='infoPanel-sub'>{i18n.__('FOLDER')}</p>
     </div>
 
@@ -45,34 +31,22 @@ const InfoPanelTrashed = ({
     </div>
 
     <div id='export-wrap'>
-      <button
+      <button styleName='export--enable' onClick={(e) => exportAsMd(e, 'export-md')}>
-        styleName='export--enable'
-        onClick={e => exportAsMd(e, 'export-md')}
-      >
         <i className='fa fa-file-code-o' />
         <p>.md</p>
       </button>
 
-      <button
+      <button styleName='export--enable' onClick={(e) => exportAsTxt(e, 'export-txt')}>
-        styleName='export--enable'
-        onClick={e => exportAsTxt(e, 'export-txt')}
-      >
         <i className='fa fa-file-text-o' />
         <p>.txt</p>
       </button>
 
-      <button
+      <button styleName='export--enable' onClick={(e) => exportAsHtml(e, 'export-html')}>
-        styleName='export--enable'
-        onClick={e => exportAsHtml(e, 'export-html')}
-      >
         <i className='fa fa-html5' />
         <p>.html</p>
       </button>
 
-      <button
+      <button styleName='export--enable' onClick={(e) => exportAsPdf(e, 'export-pdf')}>
-        styleName='export--enable'
-        onClick={e => exportAsPdf(e, 'export-pdf')}
-      >
         <i className='fa fa-file-pdf-o' />
         <p>.pdf</p>
       </button>

browser/main/Detail/MarkdownNoteDetail.js

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
@@ -32,72 +31,60 @@ import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
 import markdownToc from 'browser/lib/markdown-toc-generator'
 import queryString from 'query-string'
 import { replace } from 'connected-react-router'
-import ToggleDirectionButton from 'browser/main/Detail/ToggleDirectionButton'
 
 class MarkdownNoteDetail extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
       isMovingNote: false,
-      note: Object.assign(
+      note: Object.assign({
-        {
+        title: '',
-          title: '',
+        content: '',
-          content: '',
+        linesHighlighted: []
-          linesHighlighted: []
+      }, props.note),
-        },
-        props.note
-      ),
       isLockButtonShown: props.config.editor.type !== 'SPLIT',
       isLocked: false,
       editorType: props.config.editor.type,
-      switchPreview: props.config.editor.switchPreview,
+      switchPreview: props.config.editor.switchPreview
-      RTL: false
     }
 
     this.dispatchTimer = null
 
     this.toggleLockButton = this.handleToggleLockButton.bind(this)
-    this.generateToc = this.handleGenerateToc.bind(this)
+    this.generateToc = () => this.handleGenerateToc()
-    this.handleUpdateContent = this.handleUpdateContent.bind(this)
   }
 
-  focus() {
+  focus () {
     this.refs.content.focus()
   }
 
-  componentDidMount() {
+  componentDidMount () {
     ee.on('topbar:togglelockbutton', this.toggleLockButton)
-    ee.on('topbar:toggledirectionbutton', () => this.handleSwitchDirection())
     ee.on('topbar:togglemodebutton', () => {
-      const reversedType =
+      const reversedType = this.state.editorType === 'SPLIT' ? 'EDITOR_PREVIEW' : 'SPLIT'
-        this.state.editorType === 'SPLIT' ? 'EDITOR_PREVIEW' : 'SPLIT'
       this.handleSwitchMode(reversedType)
     })
     ee.on('hotkey:deletenote', this.handleDeleteNote.bind(this))
     ee.on('code:generate-toc', this.generateToc)
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps) {
+  componentWillReceiveProps (nextProps) {
     const isNewNote = nextProps.note.key !== this.props.note.key
-    const hasDeletedTags =
+    const hasDeletedTags = nextProps.note.tags.length < this.props.note.tags.length
-      nextProps.note.tags.length < this.props.note.tags.length
     if (!this.state.isMovingNote && (isNewNote || hasDeletedTags)) {
       if (this.saveQueue != null) this.saveNow()
-      this.setState(
+      this.setState({
-        {
+        note: Object.assign({linesHighlighted: []}, nextProps.note)
-          note: Object.assign({ linesHighlighted: [] }, nextProps.note)
+      }, () => {
-        },
+        this.refs.content.reload()
-        () => {
+        if (this.refs.tags) this.refs.tags.reset()
-          this.refs.content.reload()
+      })
-          if (this.refs.tags) this.refs.tags.reset()
-        }
-      )
     }
 
     // Focus content if using blur or double click
     // --> Moved here from componentDidMount so a re-render during search won't set focus to the editor
-    const { switchPreview } = nextProps.config.editor
+    const {switchPreview} = nextProps.config.editor
 
     if (this.state.switchPreview !== switchPreview) {
       this.setState({
@@ -110,28 +97,23 @@ class MarkdownNoteDetail extends React.Component {
     }
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     ee.off('topbar:togglelockbutton', this.toggleLockButton)
-    ee.on('topbar:toggledirectionbutton', this.handleSwitchDirection)
     ee.off('code:generate-toc', this.generateToc)
     if (this.saveQueue != null) this.saveNow()
   }
 
-  handleUpdateTag() {
+  handleUpdateTag () {
     const { note } = this.state
     if (this.refs.tags) note.tags = this.refs.tags.value
     this.updateNote(note)
   }
 
-  handleUpdateContent() {
+  handleUpdateContent () {
     const { note } = this.state
     note.content = this.refs.content.value
 
-    let title = findNoteTitle(
+    let title = findNoteTitle(note.content, this.props.config.editor.enableFrontMatterTitle, this.props.config.editor.frontMatterTitleField)
-      note.content,
-      this.props.config.editor.enableFrontMatterTitle,
-      this.props.config.editor.frontMatterTitleField
-    )
     title = striptags(title)
     title = markdown.strip(title)
     note.title = title
@@ -139,35 +121,37 @@ class MarkdownNoteDetail extends React.Component {
     this.updateNote(note)
   }
 
-  updateNote(note) {
+  updateNote (note) {
     note.updatedAt = new Date()
-    this.setState({ note }, () => {
+    this.setState({note}, () => {
       this.save()
     })
   }
 
-  save() {
+  save () {
     clearTimeout(this.saveQueue)
     this.saveQueue = setTimeout(() => {
       this.saveNow()
     }, 1000)
   }
 
-  saveNow() {
+  saveNow () {
     const { note, dispatch } = this.props
     clearTimeout(this.saveQueue)
     this.saveQueue = null
 
-    dataApi.updateNote(note.storage, note.key, this.state.note).then(note => {
+    dataApi
-      dispatch({
+      .updateNote(note.storage, note.key, this.state.note)
-        type: 'UPDATE_NOTE',
+      .then((note) => {
-        note: note
+        dispatch({
+          type: 'UPDATE_NOTE',
+          note: note
+        })
+        AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE')
       })
-      AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE')
-    })
   }
 
-  handleFolderChange(e) {
+  handleFolderChange (e) {
     const { note } = this.state
     const value = this.refs.folder.value
     const splitted = value.split('-')
@@ -176,71 +160,64 @@ class MarkdownNoteDetail extends React.Component {
 
     dataApi
       .moveNote(note.storage, note.key, newStorageKey, newFolderKey)
-      .then(newNote => {
+      .then((newNote) => {
-        this.setState(
+        this.setState({
-          {
+          isMovingNote: true,
-            isMovingNote: true,
+          note: Object.assign({}, newNote)
-            note: Object.assign({}, newNote)
+        }, () => {
-          },
+          const { dispatch, location } = this.props
-          () => {
+          dispatch({
-            const { dispatch, location } = this.props
+            type: 'MOVE_NOTE',
-            dispatch({
+            originNote: note,
-              type: 'MOVE_NOTE',
+            note: newNote
-              originNote: note,
+          })
-              note: newNote
+          dispatch(replace({
+            pathname: location.pathname,
+            search: queryString.stringify({
+              key: newNote.key
             })
-            dispatch(
+          }))
-              replace({
+          this.setState({
-                pathname: location.pathname,
+            isMovingNote: false
-                search: queryString.stringify({
+          })
-                  key: newNote.key
+        })
-                })
-              })
-            )
-            this.setState({
-              isMovingNote: false
-            })
-          }
-        )
       })
   }
 
-  handleStarButtonClick(e) {
+  handleStarButtonClick (e) {
     const { note } = this.state
-    if (!note.isStarred)
+    if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR')
-      AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR')
 
     note.isStarred = !note.isStarred
 
-    this.setState(
+    this.setState({
-      {
+      note
-        note
+    }, () => {
-      },
+      this.save()
-      () => {
+    })
-        this.save()
-      }
-    )
   }
 
-  exportAsFile() {}
+  exportAsFile () {
 
-  exportAsMd() {
+  }
+
+  exportAsMd () {
     ee.emit('export:save-md')
   }
 
-  exportAsTxt() {
+  exportAsTxt () {
     ee.emit('export:save-text')
   }
 
-  exportAsHtml() {
+  exportAsHtml () {
     ee.emit('export:save-html')
   }
 
-  exportAsPdf() {
+  exportAsPdf () {
     ee.emit('export:save-pdf')
   }
 
-  handleKeyDown(e) {
+  handleKeyDown (e) {
     switch (e.keyCode) {
       // tab key
       case 9:
@@ -250,11 +227,7 @@ class MarkdownNoteDetail extends React.Component {
         } else if (e.ctrlKey && e.shiftKey) {
           e.preventDefault()
           this.jumpPrevTab()
-        } else if (
+        } else if (!e.ctrlKey && !e.shiftKey && e.target === this.refs.description) {
-          !e.ctrlKey &&
-          !e.shiftKey &&
-          e.target === this.refs.description
-        ) {
           e.preventDefault()
           this.focusEditor()
         }
@@ -262,8 +235,9 @@ class MarkdownNoteDetail extends React.Component {
       // I key
       case 73:
         {
-          const isSuper =
+          const isSuper = global.process.platform === 'darwin'
-            global.process.platform === 'darwin' ? e.metaKey : e.ctrlKey
+            ? e.metaKey
+            : e.ctrlKey
           if (isSuper) {
             e.preventDefault()
             this.handleInfoButtonClick(e)
@@ -273,17 +247,17 @@ class MarkdownNoteDetail extends React.Component {
     }
   }
 
-  handleTrashButtonClick(e) {
+  handleTrashButtonClick (e) {
     const { note } = this.state
     const { isTrashed } = note
     const { confirmDeletion } = this.props.config.ui
 
     if (isTrashed) {
       if (confirmDeleteNote(confirmDeletion, true)) {
-        const { note, dispatch } = this.props
+        const {note, dispatch} = this.props
         dataApi
           .deleteNote(note.storage, note.key)
-          .then(data => {
+          .then((data) => {
             const dispatchHandler = () => {
               dispatch({
                 type: 'DELETE_NOTE',
@@ -299,127 +273,103 @@ class MarkdownNoteDetail extends React.Component {
       if (confirmDeleteNote(confirmDeletion, false)) {
         note.isTrashed = true
 
-        this.setState(
+        this.setState({
-          {
+          note
-            note
+        }, () => {
-          },
+          this.save()
-          () => {
+        })
-            this.save()
-          }
-        )
 
         ee.emit('list:next')
       }
     }
   }
 
-  handleUndoButtonClick(e) {
+  handleUndoButtonClick (e) {
     const { note } = this.state
 
     note.isTrashed = false
 
-    this.setState(
+    this.setState({
-      {
+      note
-        note
+    }, () => {
-      },
+      this.save()
-      () => {
+      this.refs.content.reload()
-        this.save()
+      ee.emit('list:next')
-        this.refs.content.reload()
+    })
-        ee.emit('list:next')
-      }
-    )
   }
 
-  handleFullScreenButton(e) {
+  handleFullScreenButton (e) {
     ee.emit('editor:fullscreen')
   }
 
-  handleLockButtonMouseDown(e) {
+  handleLockButtonMouseDown (e) {
     e.preventDefault()
     ee.emit('editor:lock')
     this.setState({ isLocked: !this.state.isLocked })
     if (this.state.isLocked) this.focus()
   }
 
-  getToggleLockButton() {
+  getToggleLockButton () {
-    return this.state.isLocked
+    return this.state.isLocked ? '../resources/icon/icon-lock.svg' : '../resources/icon/icon-unlock.svg'
-      ? '../resources/icon/icon-lock.svg'
-      : '../resources/icon/icon-unlock.svg'
   }
 
-  handleDeleteKeyDown(e) {
+  handleDeleteKeyDown (e) {
     if (e.keyCode === 27) this.handleDeleteCancelButtonClick(e)
   }
 
-  handleToggleLockButton(event, noteStatus) {
+  handleToggleLockButton (event, noteStatus) {
     // first argument event is not used
     if (noteStatus === 'CODE') {
-      this.setState({ isLockButtonShown: true })
+      this.setState({isLockButtonShown: true})
     } else {
-      this.setState({ isLockButtonShown: false })
+      this.setState({isLockButtonShown: false})
     }
   }
 
-  handleGenerateToc() {
+  handleGenerateToc () {
     const editor = this.refs.content.refs.code.editor
     markdownToc.generateInEditor(editor)
   }
 
-  handleFocus(e) {
+  handleFocus (e) {
     this.focus()
   }
 
-  handleInfoButtonClick(e) {
+  handleInfoButtonClick (e) {
     const infoPanel = document.querySelector('.infoPanel')
-    if (infoPanel.style)
+    if (infoPanel.style) infoPanel.style.display = infoPanel.style.display === 'none' ? 'inline' : 'none'
-      infoPanel.style.display =
-        infoPanel.style.display === 'none' ? 'inline' : 'none'
   }
 
-  print(e) {
+  print (e) {
     ee.emit('print')
   }
 
-  handleSwitchMode(type) {
+  handleSwitchMode (type) {
     // If in split mode, hide the lock button
-    this.setState(
+    this.setState({ editorType: type, isLockButtonShown: !(type === 'SPLIT') }, () => {
-      { editorType: type, isLockButtonShown: !(type === 'SPLIT') },
+      this.focus()
-      () => {
+      const newConfig = Object.assign({}, this.props.config)
-        this.focus()
+      newConfig.editor.type = type
-        const newConfig = Object.assign({}, this.props.config)
+      ConfigManager.set(newConfig)
-        newConfig.editor.type = type
+    })
-        ConfigManager.set(newConfig)
-      }
-    )
   }
 
-  handleSwitchDirection() {
+  handleDeleteNote () {
-    if (!this.props.config.editor.rtlEnabled) {
-      return
-    }
-    // If in split mode, hide the lock button
-    const direction = this.state.RTL
-    this.setState({ RTL: !direction })
-  }
-
-  handleDeleteNote() {
     this.handleTrashButtonClick()
   }
 
-  handleClearTodo() {
+  handleClearTodo () {
     const { note } = this.state
     const splitted = note.content.split('\n')
 
-    const clearTodoContent = splitted
+    const clearTodoContent = splitted.map((line) => {
-      .map(line => {
+      const trimmedLine = line.trim()
-        const trimmedLine = line.trim()
+      if (trimmedLine.match(/\[x\]/i)) {
-        if (trimmedLine.match(/\[x\]/i)) {
+        return line.replace(/\[x\]/i, '[ ]')
-          return line.replace(/\[x\]/i, '[ ]')
+      } else {
-        } else {
+        return line
-          return line
+      }
-        }
+    }).join('\n')
-      })
-      .join('\n')
 
     note.content = clearTodoContent
     this.refs.content.setValue(note.content)
@@ -427,44 +377,38 @@ class MarkdownNoteDetail extends React.Component {
     this.updateNote(note)
   }
 
-  renderEditor() {
+  renderEditor () {
     const { config, ignorePreviewPointerEvents } = this.props
     const { note } = this.state
 
     if (this.state.editorType === 'EDITOR_PREVIEW') {
-      return (
+      return <MarkdownEditor
-        <MarkdownEditor
+        ref='content'
-          ref='content'
+        styleName='body-noteEditor'
-          styleName='body-noteEditor'
+        config={config}
-          config={config}
+        value={note.content}
-          value={note.content}
+        storageKey={note.storage}
-          storageKey={note.storage}
+        noteKey={note.key}
-          noteKey={note.key}
+        linesHighlighted={note.linesHighlighted}
-          linesHighlighted={note.linesHighlighted}
+        onChange={this.handleUpdateContent.bind(this)}
-          onChange={this.handleUpdateContent}
+        isLocked={this.state.isLocked}
-          isLocked={this.state.isLocked}
+        ignorePreviewPointerEvents={ignorePreviewPointerEvents}
-          ignorePreviewPointerEvents={ignorePreviewPointerEvents}
+      />
-          RTL={config.editor.rtlEnabled && this.state.RTL}
-        />
-      )
     } else {
-      return (
+      return <MarkdownSplitEditor
-        <MarkdownSplitEditor
+        ref='content'
-          ref='content'
+        config={config}
-          config={config}
+        value={note.content}
-          value={note.content}
+        storageKey={note.storage}
-          storageKey={note.storage}
+        noteKey={note.key}
-          noteKey={note.key}
+        linesHighlighted={note.linesHighlighted}
-          linesHighlighted={note.linesHighlighted}
+        onChange={this.handleUpdateContent.bind(this)}
-          onChange={this.handleUpdateContent}
+        ignorePreviewPointerEvents={ignorePreviewPointerEvents}
-          ignorePreviewPointerEvents={ignorePreviewPointerEvents}
+      />
-          RTL={config.editor.rtlEnabled && this.state.RTL}
-        />
-      )
     }
   }
 
-  render() {
+  render () {
     const { data, dispatch, location, config } = this.props
     const { note, editorType } = this.state
     const storageKey = note.storage
@@ -472,143 +416,122 @@ class MarkdownNoteDetail extends React.Component {
 
     const options = []
     data.storageMap.forEach((storage, index) => {
-      storage.folders.forEach(folder => {
+      storage.folders.forEach((folder) => {
         options.push({
           storage: storage,
           folder: folder
         })
       })
     })
-    const currentOption = options.filter(
+    const currentOption = options.filter((option) => option.storage.key === storageKey && option.folder.key === folderKey)[0]
-      option =>
-        option.storage.key === storageKey && option.folder.key === folderKey
-    )[0]
 
-    const trashTopBar = (
+    const trashTopBar = <div styleName='info'>
-      <div styleName='info'>
+      <div styleName='info-left'>
-        <div styleName='info-left'>
+        <RestoreButton onClick={(e) => this.handleUndoButtonClick(e)} />
-          <RestoreButton onClick={e => this.handleUndoButtonClick(e)} />
-        </div>
-        <div styleName='info-right'>
-          <PermanentDeleteButton
-            onClick={e => this.handleTrashButtonClick(e)}
-          />
-          <InfoButton onClick={e => this.handleInfoButtonClick(e)} />
-          <InfoPanelTrashed
-            storageName={currentOption.storage.name}
-            folderName={currentOption.folder.name}
-            updatedAt={formatDate(note.updatedAt)}
-            createdAt={formatDate(note.createdAt)}
-            exportAsHtml={this.exportAsHtml}
-            exportAsMd={this.exportAsMd}
-            exportAsTxt={this.exportAsTxt}
-            exportAsPdf={this.exportAsPdf}
-          />
-        </div>
       </div>
-    )
+      <div styleName='info-right'>
+        <PermanentDeleteButton onClick={(e) => this.handleTrashButtonClick(e)} />
+        <InfoButton
+          onClick={(e) => this.handleInfoButtonClick(e)}
+        />
+        <InfoPanelTrashed
+          storageName={currentOption.storage.name}
+          folderName={currentOption.folder.name}
+          updatedAt={formatDate(note.updatedAt)}
+          createdAt={formatDate(note.createdAt)}
+          exportAsHtml={this.exportAsHtml}
+          exportAsMd={this.exportAsMd}
+          exportAsTxt={this.exportAsTxt}
+          exportAsPdf={this.exportAsPdf}
+        />
+      </div>
+    </div>
 
-    const detailTopBar = (
+    const detailTopBar = <div styleName='info'>
-      <div styleName='info'>
+      <div styleName='info-left'>
-        <div styleName='info-left'>
+        <div>
-          <div>
+          <FolderSelect styleName='info-left-top-folderSelect'
-            <FolderSelect
+            value={this.state.note.storage + '-' + this.state.note.folder}
-              styleName='info-left-top-folderSelect'
+            ref='folder'
-              value={this.state.note.storage + '-' + this.state.note.folder}
-              ref='folder'
-              data={data}
-              onChange={e => this.handleFolderChange(e)}
-            />
-          </div>
-
-          <TagSelect
-            ref='tags'
-            value={this.state.note.tags}
-            saveTagsAlphabetically={config.ui.saveTagsAlphabetically}
-            showTagsAlphabetically={config.ui.showTagsAlphabetically}
             data={data}
-            dispatch={dispatch}
+            onChange={(e) => this.handleFolderChange(e)}
-            onChange={this.handleUpdateTag.bind(this)}
-            coloredTags={config.coloredTags}
-          />
-          <TodoListPercentage
-            onClearCheckboxClick={e => this.handleClearTodo(e)}
-            percentageOfTodo={getTodoPercentageOfCompleted(note.content)}
           />
         </div>
-        <div styleName='info-right'>
-          <ToggleModeButton
-            onClick={e => this.handleSwitchMode(e)}
-            editorType={editorType}
-          />
-          {this.props.config.editor.rtlEnabled && (
-            <ToggleDirectionButton
-              onClick={e => this.handleSwitchDirection(e)}
-              isRTL={this.state.RTL}
-            />
-          )}
-          <StarButton
-            onClick={e => this.handleStarButtonClick(e)}
-            isActive={note.isStarred}
-          />
 
-          {(() => {
+        <TagSelect
-            const imgSrc = `${this.getToggleLockButton()}`
+          ref='tags'
-            const lockButtonComponent = (
+          value={this.state.note.tags}
-              <button
+          saveTagsAlphabetically={config.ui.saveTagsAlphabetically}
-                styleName='control-lockButton'
+          showTagsAlphabetically={config.ui.showTagsAlphabetically}
-                onFocus={e => this.handleFocus(e)}
+          data={data}
-                onMouseDown={e => this.handleLockButtonMouseDown(e)}
+          dispatch={dispatch}
-              >
+          onChange={this.handleUpdateTag.bind(this)}
-                <img src={imgSrc} />
+          coloredTags={config.coloredTags}
-                {this.state.isLocked ? (
+        />
-                  <span styleName='tooltip'>Unlock</span>
+        <TodoListPercentage onClearCheckboxClick={(e) => this.handleClearTodo(e)} percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
-                ) : (
-                  <span styleName='tooltip'>Lock</span>
-                )}
-              </button>
-            )
-
-            return this.state.isLockButtonShown ? lockButtonComponent : ''
-          })()}
-
-          <FullscreenButton onClick={e => this.handleFullScreenButton(e)} />
-
-          <TrashButton onClick={e => this.handleTrashButtonClick(e)} />
-
-          <InfoButton onClick={e => this.handleInfoButtonClick(e)} />
-
-          <InfoPanel
-            storageName={currentOption.storage.name}
-            folderName={currentOption.folder.name}
-            noteLink={`[${note.title}](:note:${
-              queryString.parse(location.search).key
-            })`}
-            updatedAt={formatDate(note.updatedAt)}
-            createdAt={formatDate(note.createdAt)}
-            exportAsMd={this.exportAsMd}
-            exportAsTxt={this.exportAsTxt}
-            exportAsHtml={this.exportAsHtml}
-            exportAsPdf={this.exportAsPdf}
-            wordCount={note.content.trim().split(/\s+/g).length}
-            letterCount={note.content.replace(/\r?\n/g, '').length}
-            type={note.type}
-            print={this.print}
-          />
-        </div>
       </div>
-    )
+      <div styleName='info-right'>
+        <ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />
+
+        <StarButton
+          onClick={(e) => this.handleStarButtonClick(e)}
+          isActive={note.isStarred}
+        />
+
+        {(() => {
+          const imgSrc = `${this.getToggleLockButton()}`
+          const lockButtonComponent =
+            <button styleName='control-lockButton'
+              onFocus={(e) => this.handleFocus(e)}
+              onMouseDown={(e) => this.handleLockButtonMouseDown(e)}
+            >
+              <img src={imgSrc} />
+              {this.state.isLocked ? <span styleName='tooltip'>Unlock</span> : <span styleName='tooltip'>Lock</span>}
+            </button>
+
+          return (
+            this.state.isLockButtonShown ? lockButtonComponent : ''
+          )
+        })()}
+
+        <FullscreenButton onClick={(e) => this.handleFullScreenButton(e)} />
+
+        <TrashButton onClick={(e) => this.handleTrashButtonClick(e)} />
+
+        <InfoButton
+          onClick={(e) => this.handleInfoButtonClick(e)}
+        />
+
+        <InfoPanel
+          storageName={currentOption.storage.name}
+          folderName={currentOption.folder.name}
+          noteLink={`[${note.title}](:note:${queryString.parse(location.search).key})`}
+          updatedAt={formatDate(note.updatedAt)}
+          createdAt={formatDate(note.createdAt)}
+          exportAsMd={this.exportAsMd}
+          exportAsTxt={this.exportAsTxt}
+          exportAsHtml={this.exportAsHtml}
+          exportAsPdf={this.exportAsPdf}
+          wordCount={note.content.trim().split(/\s+/g).length}
+          letterCount={note.content.replace(/\r?\n/g, '').length}
+          type={note.type}
+          print={this.print}
+        />
+      </div>
+    </div>
 
     return (
-      <div
+      <div className='NoteDetail'
-        className='NoteDetail'
         style={this.props.style}
         styleName='root'
-        onKeyDown={e => this.handleKeyDown(e)}
+        onKeyDown={(e) => this.handleKeyDown(e)}
       >
+
         {location.pathname === '/trashed' ? trashTopBar : detailTopBar}
 
-        <div styleName='body'>{this.renderEditor()}</div>
+        <div styleName='body'>
+          {this.renderEditor()}
+        </div>
 
         <StatusBar
           {..._.pick(this.props, ['config', 'location', 'dispatch'])}
@@ -622,7 +545,9 @@ class MarkdownNoteDetail extends React.Component {
 MarkdownNoteDetail.propTypes = {
   dispatch: PropTypes.func,
   repositories: PropTypes.array,
-  note: PropTypes.shape({}),
+  note: PropTypes.shape({
+
+  }),
   style: PropTypes.shape({
     left: PropTypes.number
   }),

browser/main/Detail/MarkdownNoteDetail.styl

@@ -15,7 +15,7 @@
 .control-lockButton
   topBarButtonRight()
   position absolute
-  right 265px
+  right 225px
   &:hover .tooltip
     opacity 1
 
@@ -66,14 +66,19 @@ body[data-theme="dark"]
   .control-fullScreenButton
     topBarButtonDark()
 
-apply-theme(theme)
-  body[data-theme={theme}]
-    .root
-      border-left 1px solid get-theme-var(theme, 'borderColor')
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="solarized-dark"]
-  apply-theme(theme)
+  .root
+    border-left 1px solid $ui-solarized-dark-borderColor
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
+
+body[data-theme="monokai"]
+  .root
+    border-left 1px solid $ui-monokai-borderColor
+    background-color $ui-monokai-noteDetail-backgroundColor
+
+body[data-theme="dracula"]
+  .root
+    border-left 1px solid $ui-dracula-borderColor
+    background-color $ui-dracula-noteDetail-backgroundColor
 
-for theme in $themes
-  apply-theme(theme)

browser/main/Detail/NoteDetailInfo.styl

@@ -15,14 +15,6 @@ $info-margin-under-border = 30px
   padding 0 20px
   z-index 99
 
-.info > div
-  > button
-    -webkit-user-drag none
-    user-select none
-    > img, span
-      -webkit-user-drag none
-      user-select none
-
 .info-left
   padding 0 10px
   width 100%
@@ -102,14 +94,25 @@ body[data-theme="dark"]
   .undo-button
     topBarButtonDark()
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .info
-    .info
+    border-color $ui-solarized-dark-borderColor
-      border-color get-theme-var(theme, 'borderColor')
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .info
+    border-color $ui-monokai-borderColor
+    background-color $ui-monokai-noteDetail-backgroundColor
 
-for theme in $themes
+body[data-theme="dracula"]
-  apply-theme(theme)
+  .info
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-noteDetail-backgroundColor
+
+.info > div
+  > button
+    -webkit-user-drag none
+    user-select none
+    > img, span
+      -webkit-user-drag none
+      user-select none

browser/main/Detail/PermanentDeleteButton.js

@@ -4,8 +4,12 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './TrashButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const PermanentDeleteButton = ({ onClick }) => (
+const PermanentDeleteButton = ({
-  <button styleName='control-trashButton--in-trash' onClick={e => onClick(e)}>
+  onClick
+}) => (
+  <button styleName='control-trashButton--in-trash'
+    onClick={(e) => onClick(e)}
+  >
     <img src='../resources/icon/icon-trash.svg' />
     <span styleName='tooltip'>{i18n.__('Permanent Delete')}</span>
   </button>

browser/main/Detail/RestoreButton.js

@@ -4,8 +4,12 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './RestoreButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const RestoreButton = ({ onClick }) => (
+const RestoreButton = ({
-  <button styleName='control-restoreButton' onClick={onClick}>
+  onClick
+}) => (
+  <button styleName='control-restoreButton'
+    onClick={onClick}
+  >
     <i className='fa fa-undo fa-fw' styleName='iconRestore' />
     <span styleName='tooltip'>{i18n.__('Restore')}</span>
   </button>

browser/main/Detail/SnippetNoteDetail.styl

@@ -156,35 +156,78 @@ body[data-theme="dark"]
   .control-fullScreenButton
     topBarButtonDark()
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .root
-    .root
+    border-left 1px solid $ui-solarized-dark-borderColor
-      border-left 1px solid get-theme-var(theme, 'borderColor')
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
 
-    .body
+  .body
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
 
-    .body .description textarea
+  .body .description textarea
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
-      color get-theme-var(theme, 'text-color')
+    color $ui-solarized-dark-text-color
-      border 1px solid get-theme-var(theme, 'borderColor')
+    border 1px solid $ui-solarized-dark-borderColor
 
-    .tabList .tabButton
+  .tabList .tabButton
-      border-color get-theme-var(theme, 'borderColor')
+    border-color $ui-solarized-dark-borderColor
 
-    .tabButton
+  .tabButton
-      &:hover
+    &:hover
-        color get-theme-var(theme, 'text-color')
+      color $ui-solarized-dark-button--active-color
-        background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+      background-color $ui-solarized-dark-noteDetail-backgroundColor
-        transition 0.15s
+      transition 0.15s
+    
+  .tabList
+    background-color $ui-solarized-dark-noteDetail-backgroundColor
+    color $ui-solarized-dark-text-color
 
-    .tabList
+body[data-theme="monokai"]
-      background-color get-theme-var(theme, 'noteDetail-backgroundColor')
+  .root
-      color get-theme-var(theme, 'text-color')
+    border-left 1px solid $ui-monokai-borderColor
+    background-color $ui-monokai-noteDetail-backgroundColor
 
-for theme in 'solarized-dark' 'dracula'
+  .body
-  apply-theme(theme)
+    background-color $ui-monokai-noteDetail-backgroundColor
 
-for theme in $themes
+  .body .description textarea
-  apply-theme(theme)
+    background-color $ui-monokai-noteDetail-backgroundColor
+    color $ui-monokai-text-color
+    border 1px solid $ui-monokai-borderColor
+
+  .tabList .tabButton
+    border-color $ui-monokai-borderColor
+
+  .tabButton
+    &:hover
+      color $ui-monokai-text-color
+      background-color $ui-monokai-noteDetail-backgroundColor
+
+  .tabList
+    background-color $ui-monokai-noteDetail-backgroundColor
+    color $ui-monokai-text-color
+
+body[data-theme="dracula"]
+  .root
+    border-left 1px solid $ui-dracula-borderColor
+    background-color $ui-dracula-noteDetail-backgroundColor
+
+  .body
+    background-color $ui-dracula-noteDetail-backgroundColor
+
+  .body .description textarea
+    background-color $ui-dracula-noteDetail-backgroundColor
+    color $ui-dracula-text-color
+    border 1px solid $ui-dracula-borderColor
+
+  .tabList .tabButton
+    border-color $ui-dracula-borderColor
+
+  .tabButton
+    &:hover
+      color $ui-dracula-text-color
+      background-color $ui-dracula-noteDetail-backgroundColor
+
+  .tabList
+    background-color $ui-dracula-noteDetail-backgroundColor
+    color $ui-dracula-text-color

browser/main/Detail/StarButton.js

@@ -6,7 +6,7 @@ import _ from 'lodash'
 import i18n from 'browser/lib/i18n'
 
 class StarButton extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -14,51 +14,47 @@ class StarButton extends React.Component {
     }
   }
 
-  handleMouseDown(e) {
+  handleMouseDown (e) {
     this.setState({
       isActive: true
     })
   }
 
-  handleMouseUp(e) {
+  handleMouseUp (e) {
     this.setState({
       isActive: false
     })
   }
 
-  handleMouseLeave(e) {
+  handleMouseLeave (e) {
     this.setState({
       isActive: false
     })
   }
 
-  render() {
+  render () {
     const { className } = this.props
 
     return (
-      <button
+      <button className={_.isString(className)
-        className={
+          ? 'StarButton ' + className
-          _.isString(className) ? 'StarButton ' + className : 'StarButton'
+          : 'StarButton'
         }
-        styleName={
+        styleName={this.state.isActive || this.props.isActive
-          this.state.isActive || this.props.isActive ? 'root--active' : 'root'
+          ? 'root--active'
+          : 'root'
         }
-        onMouseDown={e => this.handleMouseDown(e)}
+        onMouseDown={(e) => this.handleMouseDown(e)}
-        onMouseUp={e => this.handleMouseUp(e)}
+        onMouseUp={(e) => this.handleMouseUp(e)}
-        onMouseLeave={e => this.handleMouseLeave(e)}
+        onMouseLeave={(e) => this.handleMouseLeave(e)}
-        onClick={this.props.onClick}
+        onClick={this.props.onClick}>
-      >
+        <img styleName='icon'
-        <img
+          src={this.state.isActive || this.props.isActive
-          styleName='icon'
+            ? '../resources/icon/icon-starred.svg'
-          src={
+            : '../resources/icon/icon-star.svg'
-            this.state.isActive || this.props.isActive
-              ? '../resources/icon/icon-starred.svg'
-              : '../resources/icon/icon-star.svg'
           }
         />
-        <span lang={i18n.locale} styleName='tooltip'>
+        <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Star')}</span>
-          {i18n.__('Star')}
-        </span>
       </button>
     )
   }

browser/main/Detail/TagSelect.js

@@ -11,7 +11,7 @@ import Autosuggest from 'react-autosuggest'
 import { push } from 'connected-react-router'
 
 class TagSelect extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.state = {
@@ -23,16 +23,12 @@ class TagSelect extends React.Component {
     this.onInputBlur = this.onInputBlur.bind(this)
     this.onInputChange = this.onInputChange.bind(this)
     this.onInputKeyDown = this.onInputKeyDown.bind(this)
-    this.onSuggestionsClearRequested = this.onSuggestionsClearRequested.bind(
+    this.onSuggestionsClearRequested = this.onSuggestionsClearRequested.bind(this)
-      this
+    this.onSuggestionsFetchRequested = this.onSuggestionsFetchRequested.bind(this)
-    )
-    this.onSuggestionsFetchRequested = this.onSuggestionsFetchRequested.bind(
-      this
-    )
     this.onSuggestionSelected = this.onSuggestionSelected.bind(this)
   }
 
-  addNewTag(newTag) {
+  addNewTag (newTag) {
     AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG')
 
     newTag = newTag.trim().replace(/ +/g, '_')
@@ -48,7 +44,9 @@ class TagSelect extends React.Component {
     }
 
     let { value } = this.props
-    value = _.isArray(value) ? value.slice() : []
+    value = _.isArray(value)
+      ? value.slice()
+      : []
 
     if (!_.includes(value, newTag)) {
       value.push(newTag)
@@ -58,31 +56,27 @@ class TagSelect extends React.Component {
       value = _.sortBy(value)
     }
 
-    this.setState(
+    this.setState({
-      {
+      newTag: ''
-        newTag: ''
+    }, () => {
-      },
+      this.value = value
-      () => {
+      this.props.onChange()
-        this.value = value
+    })
-        this.props.onChange()
-      }
-    )
   }
 
-  buildSuggestions() {
+  buildSuggestions () {
-    this.suggestions = _.sortBy(
+    this.suggestions = _.sortBy(this.props.data.tagNoteMap.map(
-      this.props.data.tagNoteMap
+      (tag, name) => ({
-        .map((tag, name) => ({
+        name,
-          name,
+        nameLC: name.toLowerCase(),
-          nameLC: name.toLowerCase(),
+        size: tag.size
-          size: tag.size
+      })
-        }))
+    ).filter(
-        .filter(tag => tag.size > 0),
+      tag => tag.size > 0
-      ['name']
+    ), ['name'])
-    )
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.value = this.props.value
 
     this.buildSuggestions()
@@ -90,19 +84,19 @@ class TagSelect extends React.Component {
     ee.on('editor:add-tag', this.handleAddTag)
   }
 
-  componentDidUpdate() {
+  componentDidUpdate () {
     this.value = this.props.value
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     ee.off('editor:add-tag', this.handleAddTag)
   }
 
-  handleAddTag() {
+  handleAddTag () {
     this.refs.newTag.input.focus()
   }
 
-  handleTagLabelClick(tag) {
+  handleTagLabelClick (tag) {
     const { dispatch } = this.props
 
     // Note: `tag` requires encoding later.
@@ -110,23 +104,23 @@ class TagSelect extends React.Component {
     dispatch(push(`/tags/${tag}`))
   }
 
-  handleTagRemoveButtonClick(tag) {
+  handleTagRemoveButtonClick (tag) {
     this.removeTagByCallback((value, tag) => {
       value.splice(value.indexOf(tag), 1)
     }, tag)
   }
 
-  onInputBlur(e) {
+  onInputBlur (e) {
     this.submitNewTag()
   }
 
-  onInputChange(e, { newValue, method }) {
+  onInputChange (e, { newValue, method }) {
     this.setState({
       newTag: newValue
     })
   }
 
-  onInputKeyDown(e) {
+  onInputKeyDown (e) {
     switch (e.keyCode) {
       case 9:
         e.preventDefault()
@@ -142,18 +136,17 @@ class TagSelect extends React.Component {
     }
   }
 
-  onSuggestionsClearRequested() {
+  onSuggestionsClearRequested () {
     this.setState({
       suggestions: []
     })
   }
 
-  onSuggestionsFetchRequested({ value }) {
+  onSuggestionsFetchRequested ({ value }) {
     const valueLC = value.toLowerCase()
     const suggestions = _.filter(
       this.suggestions,
-      tag =>
+      tag => !_.includes(this.value, tag.name) && tag.nameLC.indexOf(valueLC) !== -1
-        !_.includes(this.value, tag.name) && tag.nameLC.indexOf(valueLC) !== -1
     )
 
     this.setState({
@@ -161,20 +154,22 @@ class TagSelect extends React.Component {
     })
   }
 
-  onSuggestionSelected(event, { suggestion, suggestionValue }) {
+  onSuggestionSelected (event, { suggestion, suggestionValue }) {
     this.addNewTag(suggestionValue)
   }
 
-  removeLastTag() {
+  removeLastTag () {
-    this.removeTagByCallback(value => {
+    this.removeTagByCallback((value) => {
       value.pop()
     })
   }
 
-  removeTagByCallback(callback, tag = null) {
+  removeTagByCallback (callback, tag = null) {
     let { value } = this.props
 
-    value = _.isArray(value) ? value.slice() : []
+    value = _.isArray(value)
+      ? value.slice()
+      : []
     callback(value, tag)
     value = _.uniq(value)
 
@@ -182,7 +177,7 @@ class TagSelect extends React.Component {
     this.props.onChange()
   }
 
-  reset() {
+  reset () {
     this.buildSuggestions()
 
     this.setState({
@@ -190,60 +185,51 @@ class TagSelect extends React.Component {
     })
   }
 
-  submitNewTag() {
+  submitNewTag () {
     this.addNewTag(this.refs.newTag.input.value)
   }
 
-  render() {
+  render () {
     const { value, className, showTagsAlphabetically, coloredTags } = this.props
 
     const tagList = _.isArray(value)
-      ? (showTagsAlphabetically ? _.sortBy(value) : value).map(tag => {
+      ? (showTagsAlphabetically ? _.sortBy(value) : value).map((tag) => {
-          const wrapperStyle = {}
+        const wrapperStyle = {}
-          const textStyle = {}
+        const textStyle = {}
-          const BLACK = '#333333'
+        const BLACK = '#333333'
-          const WHITE = '#f1f1f1'
+        const WHITE = '#f1f1f1'
-          const color = coloredTags[tag]
+        const color = coloredTags[tag]
-          const invertedColor =
+        const invertedColor = color && invertColor(color, { black: BLACK, white: WHITE })
-            color && invertColor(color, { black: BLACK, white: WHITE })
+        let iconRemove = '../resources/icon/icon-x.svg'
-          let iconRemove = '../resources/icon/icon-x.svg'
+        if (color) {
-          if (color) {
+          wrapperStyle.backgroundColor = color
-            wrapperStyle.backgroundColor = color
+          textStyle.color = invertedColor
-            textStyle.color = invertedColor
+        }
-          }
+        if (invertedColor === WHITE) {
-          if (invertedColor === WHITE) {
+          iconRemove = '../resources/icon/icon-x-light.svg'
-            iconRemove = '../resources/icon/icon-x-light.svg'
+        }
-          }
+        return (
-          return (
+          <span styleName='tag'
-            <span styleName='tag' key={tag} style={wrapperStyle}>
+            key={tag}
-              <span
+            style={wrapperStyle}
-                styleName='tag-label'
+          >
-                style={textStyle}
+            <span styleName='tag-label' style={textStyle} onClick={(e) => this.handleTagLabelClick(tag)}>#{tag}</span>
-                onClick={e => this.handleTagLabelClick(tag)}
+            <button styleName='tag-removeButton'
-              >
+              onClick={(e) => this.handleTagRemoveButtonClick(tag)}
-                #{tag}
+            >
-              </span>
+              <img className='tag-removeButton-icon' src={iconRemove} width='8px' />
-              <button
+            </button>
-                styleName='tag-removeButton'
+          </span>
-                onClick={e => this.handleTagRemoveButtonClick(tag)}
+        )
-              >
+      })
-                <img
-                  className='tag-removeButton-icon'
-                  src={iconRemove}
-                  width='8px'
-                />
-              </button>
-            </span>
-          )
-        })
       : []
 
     const { newTag, suggestions } = this.state
 
     return (
-      <div
+      <div className={_.isString(className)
-        className={
+          ? 'TagSelect ' + className
-          _.isString(className) ? 'TagSelect ' + className : 'TagSelect'
+          : 'TagSelect'
         }
         styleName='root'
       >
@@ -255,7 +241,11 @@ class TagSelect extends React.Component {
           onSuggestionsClearRequested={this.onSuggestionsClearRequested}
           onSuggestionSelected={this.onSuggestionSelected}
           getSuggestionValue={suggestion => suggestion.name}
-          renderSuggestion={suggestion => <div>{suggestion.name}</div>}
+          renderSuggestion={suggestion => (
+            <div>
+              {suggestion.name}
+            </div>
+          )}
           inputProps={{
             placeholder: i18n.__('Add tag...'),
             value: newTag,

browser/main/Detail/TagSelect.styl

@@ -54,20 +54,35 @@ body[data-theme="dark"]
   .tag-label
     color $ui-dark-text-color
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .tag
-    .tag
+    background-color $ui-solarized-dark-tag-backgroundColor
-      background-color get-theme-var(theme, 'tag-backgroundColor')
 
-    .tag-removeButton
+  .tag-removeButton
-      border-color $ui-button--focus-borderColor
+    border-color $ui-button--focus-borderColor
-      background-color transparent
+    background-color transparent
 
-    .tag-label
+  .tag-label
-      color get-theme-var(theme, 'text-color')
+    color $ui-solarized-dark-text-color
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .tag
+    background-color $ui-monokai-tag-backgroundColor
 
-for theme in $themes
+  .tag-removeButton
-  apply-theme(theme)
+    border-color $ui-button--focus-borderColor
+    background-color transparent
+
+  .tag-label
+    color $ui-monokai-text-color
+
+body[data-theme="dracula"]
+  .tag
+    background-color $ui-dracula-tag-backgroundColor
+
+  .tag-removeButton
+    border-color $ui-dracula-button--focus-borderColor
+    background-color transparent
+
+  .tag-label
+    color $ui-dracula-borderColor

browser/main/Detail/ToggleDirectionButton.js

@@ -1,26 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './ToggleDirectionButton.styl'
-import i18n from 'browser/lib/i18n'
-
-const ToggleDirectionButton = ({ onClick, isRTL }) => (
-  <div styleName='control-toggleModeButton'>
-    <div styleName={isRTL ? 'active' : undefined} onClick={() => onClick()}>
-      <img src={!isRTL ? '../resources/icon/icon-left-to-right.svg' : ''} />
-    </div>
-    <div styleName={!isRTL ? 'active' : undefined} onClick={() => onClick()}>
-      <img src={!isRTL ? '' : '../resources/icon/icon-right-to-left.svg'} />
-    </div>
-    <span lang={i18n.locale} styleName='tooltip'>
-      {i18n.__('Toggle Direction')}
-    </span>
-  </div>
-)
-
-ToggleDirectionButton.propTypes = {
-  onClick: PropTypes.func.isRequired,
-  isRTL: PropTypes.bool.isRequired
-}
-
-export default CSSModules(ToggleDirectionButton, styles)

browser/main/Detail/ToggleDirectionButton.styl

@@ -1,85 +0,0 @@
-.control-toggleModeButton
-  height 25px
-  border-radius 50px
-  background-color #F4F4F4
-  width 52px
-  display flex
-  align-items center
-  position: relative
-  top 2px
-  margin-left 5px
-  .active
-    background-color #1EC38B
-    width 33px
-    height 24px
-    box-shadow 2px 0px 7px #eee
-    z-index 1
-
-  div
-    width 40px
-    height 100%
-    border-radius 50%
-    display flex
-    align-items center
-    justify-content center
-    cursor pointer
-
-  &:hover .tooltip
-    opacity 1
-
-.tooltip
-  tooltip()
-  position absolute
-  pointer-events none
-  top 33px
-  left -10px
-  z-index 200
-  width 80px
-  padding 5px
-  line-height normal
-  border-radius 2px
-  opacity 0
-  transition 0.1s
-
-.tooltip:lang(ja)
-  @extend .tooltip
-  left -8px
-  width 70px
-
-.control-toggleModeButton
-  -webkit-user-drag none
-  user-select none
-  > div img
-    -webkit-user-drag none
-    user-select none
-
-body[data-theme="dark"]
-  .control-fullScreenButton
-    topBarButtonDark()
-
-  .control-toggleModeButton
-      background-color #3A404C
-    .active
-      background-color #1EC38B
-      box-shadow 2px 0px 7px #444444
-
-body[data-theme="solarized-dark"]
-  .control-toggleModeButton
-      background-color #002B36
-    .active
-      background-color #1EC38B
-      box-shadow 2px 0px 7px #222222
-
-apply-theme(theme)
-  body[data-theme={theme}]
-    .control-toggleModeButton
-      background-color get-theme-var(theme, 'borderColor')
-      .active
-        background-color get-theme-var(theme, 'active-color')
-        box-shadow 2px 0px 7px #222222
-
-for theme in 'dracula'
-  apply-theme(theme)
-
-for theme in $themes
-  apply-theme(theme)

browser/main/Detail/ToggleModeButton.js

@@ -4,35 +4,17 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './ToggleModeButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const ToggleModeButton = ({ onClick, editorType }) => (
+const ToggleModeButton = ({
+  onClick, editorType
+}) => (
   <div styleName='control-toggleModeButton'>
-    <div
+    <div styleName={editorType === 'SPLIT' ? 'active' : undefined} onClick={() => onClick('SPLIT')}>
-      styleName={editorType === 'SPLIT' ? 'active' : undefined}
+      <img src={editorType === 'EDITOR_PREVIEW' ? '../resources/icon/icon-mode-markdown-off-active.svg' : ''} />
-      onClick={() => onClick('SPLIT')}
-    >
-      <img
-        src={
-          editorType === 'EDITOR_PREVIEW'
-            ? '../resources/icon/icon-mode-markdown-off-active.svg'
-            : ''
-        }
-      />
     </div>
-    <div
+    <div styleName={editorType === 'EDITOR_PREVIEW' ? 'active' : undefined} onClick={() => onClick('EDITOR_PREVIEW')}>
-      styleName={editorType === 'EDITOR_PREVIEW' ? 'active' : undefined}
+      <img src={editorType === 'EDITOR_PREVIEW' ? '' : '../resources/icon/icon-mode-split-on-active.svg'} />
-      onClick={() => onClick('EDITOR_PREVIEW')}
-    >
-      <img
-        src={
-          editorType === 'EDITOR_PREVIEW'
-            ? ''
-            : '../resources/icon/icon-mode-split-on-active.svg'
-        }
-      />
     </div>
-    <span lang={i18n.locale} styleName='tooltip'>
+    <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Toggle Mode')}</span>
-      {i18n.__('Toggle Mode')}
-    </span>
   </div>
 )
 

browser/main/Detail/ToggleModeButton.styl

@@ -1,84 +1,84 @@
-.control-toggleModeButton
+.control-toggleModeButton
-  height 25px
+  height 25px
-  border-radius 50px
+  border-radius 50px
-  background-color #F4F4F4
+  background-color #F4F4F4
-  width 52px
+  width 52px
-  display flex
+  display flex
-  align-items center
+  align-items center
-  position: relative
+  position: relative
-  top 2px
+  top 2px
-  .active
+  .active
-    background-color #1EC38B
+    background-color #1EC38B
-    width 33px
+    width 33px
-    height 24px
+    height 24px
-    box-shadow 2px 0px 7px #eee
+    box-shadow 2px 0px 7px #eee
-    z-index 1
+    z-index 1
-
+
-  div
+  div
-    width 40px
+    width 40px
-    height 100%
+    height 100%
-    border-radius 50%
+    border-radius 50%
-    display flex
+    display flex
-    align-items center
+    align-items center
-    justify-content center
+    justify-content center
-    cursor pointer
+    cursor pointer
-
+
-  &:hover .tooltip
+  &:hover .tooltip
-    opacity 1
+    opacity 1
-
+
-.control-toggleModeButton
+.tooltip
-  -webkit-user-drag none
+  tooltip()
-  user-select none
+  position absolute
-  > div img
+  pointer-events none
-    -webkit-user-drag none
+  top 33px
-    user-select none
+  left -10px
-
+  z-index 200
-.tooltip
+  width 80px
-  tooltip()
+  padding 5px
-  position absolute
+  line-height normal
-  pointer-events none
+  border-radius 2px
-  top 33px
+  opacity 0
-  left -10px
+  transition 0.1s
-  z-index 200
+
-  width 80px
+.tooltip:lang(ja)
-  padding 5px
+  @extend .tooltip
-  line-height normal
+  left -8px
-  border-radius 2px
+  width 70px
-  opacity 0
+
-  transition 0.1s
+body[data-theme="dark"]
-
+  .control-fullScreenButton
-.tooltip:lang(ja)
+    topBarButtonDark()
-  @extend .tooltip
+
-  left -8px
+  .control-toggleModeButton
-  width 70px
+      background-color #3A404C
-
+    .active
-body[data-theme="dark"]
+      background-color #1EC38B
-  .control-fullScreenButton
+      box-shadow 2px 0px 7px #444444
-    topBarButtonDark()
+
-
+body[data-theme="solarized-dark"]
-  .control-toggleModeButton
+  .control-toggleModeButton
-      background-color #3A404C
+      background-color #002B36
-    .active
+    .active
-      background-color #1EC38B
+      background-color #1EC38B
-      box-shadow 2px 0px 7px #444444
+      box-shadow 2px 0px 7px #222222
-
+
-body[data-theme="solarized-dark"]
+body[data-theme="monokai"]
-  .control-toggleModeButton
+  .control-toggleModeButton
-      background-color #002B36
+      background-color #373831
-    .active
+    .active
-      background-color #1EC38B
+      background-color #f92672
-      box-shadow 2px 0px 7px #222222
+      box-shadow 2px 0px 7px #222222
-
+
-apply-theme(theme)
+body[data-theme="dracula"]
-  body[data-theme={theme}]
+  .control-toggleModeButton
-    .control-toggleModeButton
+      background-color #44475a
-      background-color get-theme-var(theme, 'borderColor')
+    .active
-      .active
+      background-color #bd93f9
-        background-color get-theme-var(theme, 'active-color')
+      box-shadow 2px 0px 7px #222222
-        box-shadow 2px 0px 7px #222222
+
-
+.control-toggleModeButton
-for theme in 'dracula'
+  -webkit-user-drag none
-  apply-theme(theme)
+  user-select none
-
+  > div img
-for theme in $themes
+    -webkit-user-drag none
-  apply-theme(theme)
+    user-select none

browser/main/Detail/TrashButton.js

@@ -4,12 +4,14 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './TrashButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const TrashButton = ({ onClick }) => (
+const TrashButton = ({
-  <button styleName='control-trashButton' onClick={e => onClick(e)}>
+  onClick
+}) => (
+  <button styleName='control-trashButton'
+    onClick={(e) => onClick(e)}
+  >
     <img src='../resources/icon/icon-trash.svg' />
-    <span lang={i18n.locale} styleName='tooltip'>
+    <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Trash')}</span>
-      {i18n.__('Trash')}
-    </span>
   </button>
 )
 

browser/main/Detail/index.js

@@ -15,7 +15,7 @@ import queryString from 'query-string'
 const OSX = global.process.platform === 'darwin'
 
 class Detail extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.focusHandler = () => {
@@ -26,55 +26,41 @@ class Detail extends React.Component {
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     ee.on('detail:focus', this.focusHandler)
     ee.on('detail:delete', this.deleteHandler)
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     ee.off('detail:focus', this.focusHandler)
     ee.off('detail:delete', this.deleteHandler)
   }
 
-  render() {
+  render () {
-    const {
+    const { location, data, match: { params }, config } = this.props
-      location,
+    const noteKey = location.search !== '' && queryString.parse(location.search).key
-      data,
-      match: { params },
-      config
-    } = this.props
-    const noteKey =
-      location.search !== '' && queryString.parse(location.search).key
     let note = null
 
     if (location.search !== '') {
       const allNotes = data.noteMap.map(note => note)
-      const trashedNotes = data.trashedSet
+      const trashedNotes = data.trashedSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey))
-        .toJS()
-        .map(uniqueKey => data.noteMap.get(uniqueKey))
       let displayedNotes = allNotes
 
       if (location.pathname.match(/\/searched/)) {
         const searchStr = params.searchword
-        displayedNotes =
+        displayedNotes = searchStr === undefined || searchStr === '' ? allNotes
-          searchStr === undefined || searchStr === ''
+          : searchFromNotes(allNotes, searchStr)
-            ? allNotes
-            : searchFromNotes(allNotes, searchStr)
       } else if (location.pathname.match(/^\/tags/)) {
         const listOfTags = params.tagname.split(' ')
-        displayedNotes = data.noteMap
+        displayedNotes = data.noteMap.map(note => note).filter(note =>
-          .map(note => note)
+          listOfTags.every(tag => note.tags.includes(tag))
-          .filter(note => listOfTags.every(tag => note.tags.includes(tag)))
+        )
       }
 
       if (location.pathname.match(/^\/trashed/)) {
         displayedNotes = trashedNotes
       } else {
-        displayedNotes = _.differenceWith(
+        displayedNotes = _.differenceWith(displayedNotes, trashedNotes, (note, trashed) => note.key === trashed.key)
-          displayedNotes,
-          trashedNotes,
-          (note, trashed) => note.key === trashed.key
-        )
       }
 
       const noteKeys = displayedNotes.map(note => note.key)
@@ -85,12 +71,12 @@ class Detail extends React.Component {
 
     if (note == null) {
       return (
-        <div styleName='root' style={this.props.style} tabIndex='0'>
+        <div styleName='root'
+          style={this.props.style}
+          tabIndex='0'
+        >
           <div styleName='empty'>
-            <div styleName='empty-message'>
+            <div styleName='empty-message'>{OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')} + N<br />{i18n.__('to create a new note')}</div>
-              {OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')} + N<br />
-              {i18n.__('to create a new note')}
-            </div>
           </div>
           <StatusBar
             {..._.pick(this.props, ['config', 'location', 'dispatch'])}

browser/main/Main.js

@@ -16,15 +16,13 @@ import { store } from 'browser/main/store'
 import i18n from 'browser/lib/i18n'
 import { getLocales } from 'browser/lib/Languages'
 import applyShortcuts from 'browser/main/lib/shortcutManager'
-import uiThemes from 'browser/lib/ui-themes'
 import { push } from 'connected-react-router'
-
 const path = require('path')
 const electron = require('electron')
 const { remote } = electron
 
 class Main extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     if (process.env.NODE_ENV === 'production') {
@@ -46,7 +44,7 @@ class Main extends React.Component {
     this.toggleFullScreen = () => this.handleFullScreenButton()
   }
 
-  getChildContext() {
+  getChildContext () {
     const { status, config } = this.props
 
     return {
@@ -55,7 +53,7 @@ class Main extends React.Component {
     }
   }
 
-  init() {
+  init () {
     dataApi
       .addStorage({
         name: 'My Storage Location',
@@ -93,21 +91,18 @@ class Main extends React.Component {
             type: 'SNIPPET_NOTE',
             folder: data.storage.folders[0].key,
             title: 'Snippet note example',
-            description:
+            description: 'Snippet note example\nYou can store a series of snippets as a single note, like Gist.',
-              'Snippet note example\nYou can store a series of snippets as a single note, like Gist.',
             snippets: [
               {
                 name: 'example.html',
                 mode: 'html',
-                content:
+                content: "<html>\n<body>\n<h1 id='hello'>Enjoy Boostnote!</h1>\n</body>\n</html>",
-                  "<html>\n<body>\n<h1 id='hello'>Enjoy Boostnote!</h1>\n</body>\n</html>",
                 linesHighlighted: []
               },
               {
                 name: 'example.js',
                 mode: 'javascript',
-                content:
+                content: "var boostnote = document.getElementById('hello').innerHTML\n\nconsole.log(boostnote)",
-                  "var boostnote = document.getElementById('hello').innerHTML\n\nconsole.log(boostnote)",
                 linesHighlighted: []
               }
             ]
@@ -123,8 +118,7 @@ class Main extends React.Component {
             type: 'MARKDOWN_NOTE',
             folder: data.storage.folders[0].key,
             title: 'Welcome to Boostnote!',
-            content:
+            content: '# Welcome to Boostnote!\n## Click here to edit markdown :wave:\n\n<iframe width="560" height="315" src="https://www.youtube.com/embed/L0qNPLsvmyM" frameborder="0" allowfullscreen></iframe>\n\n## Docs :memo:\n- [Boostnote | Boost your happiness, productivity and creativity.](https://hackernoon.com/boostnote-boost-your-happiness-productivity-and-creativity-315034efeebe)\n- [Cloud Syncing & Backups](https://github.com/BoostIO/Boostnote/wiki/Cloud-Syncing-and-Backup)\n- [How to sync your data across Desktop and Mobile apps](https://github.com/BoostIO/Boostnote/wiki/Sync-Data-Across-Desktop-and-Mobile-apps)\n- [Convert data from **Evernote** to Boostnote.](https://github.com/BoostIO/Boostnote/wiki/Evernote)\n- [Keyboard Shortcuts](https://github.com/BoostIO/Boostnote/wiki/Keyboard-Shortcuts)\n- [Keymaps in Editor mode](https://github.com/BoostIO/Boostnote/wiki/Keymaps-in-Editor-mode)\n- [How to set syntax highlight in Snippet note](https://github.com/BoostIO/Boostnote/wiki/Syntax-Highlighting)\n\n---\n\n## Article Archive :books:\n- [Reddit English](http://bit.ly/2mOJPu7)\n- [Reddit Spanish](https://www.reddit.com/r/boostnote_es/)\n- [Reddit Chinese](https://www.reddit.com/r/boostnote_cn/)\n- [Reddit Japanese](https://www.reddit.com/r/boostnote_jp/)\n\n---\n\n## Community :beers:\n- [GitHub](http://bit.ly/2AWWzkD)\n- [Twitter](http://bit.ly/2z8BUJZ)\n- [Facebook Group](http://bit.ly/2jcca8t)'
-              '# Welcome to Boostnote!\n## Click here to edit markdown :wave:\n\n<iframe width="560" height="315" src="https://www.youtube.com/embed/L0qNPLsvmyM" frameborder="0" allowfullscreen></iframe>\n\n## Docs :memo:\n- [Boostnote | Boost your happiness, productivity and creativity.](https://hackernoon.com/boostnote-boost-your-happiness-productivity-and-creativity-315034efeebe)\n- [Cloud Syncing & Backups](https://github.com/BoostIO/Boostnote/wiki/Cloud-Syncing-and-Backup)\n- [How to sync your data across Desktop and Mobile apps](https://github.com/BoostIO/Boostnote/wiki/Sync-Data-Across-Desktop-and-Mobile-apps)\n- [Convert data from **Evernote** to Boostnote.](https://github.com/BoostIO/Boostnote/wiki/Evernote)\n- [Keyboard Shortcuts](https://github.com/BoostIO/Boostnote/wiki/Keyboard-Shortcuts)\n- [Keymaps in Editor mode](https://github.com/BoostIO/Boostnote/wiki/Keymaps-in-Editor-mode)\n- [How to set syntax highlight in Snippet note](https://github.com/BoostIO/Boostnote/wiki/Syntax-Highlighting)\n\n---\n\n## Article Archive :books:\n- [Reddit English](http://bit.ly/2mOJPu7)\n- [Reddit Spanish](https://www.reddit.com/r/boostnote_es/)\n- [Reddit Chinese](https://www.reddit.com/r/boostnote_cn/)\n- [Reddit Japanese](https://www.reddit.com/r/boostnote_jp/)\n\n---\n\n## Community :beers:\n- [GitHub](http://bit.ly/2AWWzkD)\n- [Twitter](http://bit.ly/2z8BUJZ)\n- [Facebook Group](http://bit.ly/2jcca8t)'
           })
           .then(note => {
             store.dispatch({
@@ -145,10 +139,12 @@ class Main extends React.Component {
       })
   }
 
-  componentDidMount() {
+  componentDidMount () {
     const { dispatch, config } = this.props
 
-    if (uiThemes.some(theme => theme.name === config.ui.theme)) {
+    const supportedThemes = ['dark', 'white', 'solarized-dark', 'monokai', 'dracula']
+
+    if (supportedThemes.indexOf(config.ui.theme) !== -1) {
       document.body.setAttribute('data-theme', config.ui.theme)
     } else {
       document.body.setAttribute('data-theme', 'default')
@@ -177,44 +173,38 @@ class Main extends React.Component {
     delete CodeMirror.keyMap.emacs['Ctrl-V']
 
     eventEmitter.on('editor:fullscreen', this.toggleFullScreen)
-    eventEmitter.on(
+    eventEmitter.on('menubar:togglemenubar', this.toggleMenuBarVisible.bind(this))
-      'menubar:togglemenubar',
-      this.toggleMenuBarVisible.bind(this)
-    )
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     eventEmitter.off('editor:fullscreen', this.toggleFullScreen)
-    eventEmitter.off(
+    eventEmitter.off('menubar:togglemenubar', this.toggleMenuBarVisible.bind(this))
-      'menubar:togglemenubar',
-      this.toggleMenuBarVisible.bind(this)
-    )
   }
 
-  toggleMenuBarVisible() {
+  toggleMenuBarVisible () {
     const { config } = this.props
     const { ui } = config
 
-    const newUI = Object.assign(ui, { showMenuBar: !ui.showMenuBar })
+    const newUI = Object.assign(ui, {showMenuBar: !ui.showMenuBar})
     const newConfig = Object.assign(config, newUI)
     ConfigManager.set(newConfig)
   }
 
-  handleLeftSlideMouseDown(e) {
+  handleLeftSlideMouseDown (e) {
     e.preventDefault()
     this.setState({
       isLeftSliderFocused: true
     })
   }
 
-  handleRightSlideMouseDown(e) {
+  handleRightSlideMouseDown (e) {
     e.preventDefault()
     this.setState({
       isRightSliderFocused: true
     })
   }
 
-  handleMouseUp(e) {
+  handleMouseUp (e) {
     // Change width of NoteList component.
     if (this.state.isRightSliderFocused) {
       this.setState(
@@ -254,7 +244,7 @@ class Main extends React.Component {
     }
   }
 
-  handleMouseMove(e) {
+  handleMouseMove (e) {
     if (this.state.isRightSliderFocused) {
       const offset = this.refs.body.getBoundingClientRect().left
       let newListWidth = e.pageX - offset
@@ -280,7 +270,7 @@ class Main extends React.Component {
     }
   }
 
-  handleFullScreenButton(e) {
+  handleFullScreenButton (e) {
     this.setState({ fullScreen: !this.state.fullScreen }, () => {
       const noteDetail = document.querySelector('.NoteDetail')
       const noteList = document.querySelector('.NoteList')
@@ -294,7 +284,7 @@ class Main extends React.Component {
     })
   }
 
-  hideLeftLists(noteDetail, noteList, mainBody) {
+  hideLeftLists (noteDetail, noteList, mainBody) {
     this.setState({ noteDetailWidth: noteDetail.style.left })
     this.setState({ mainBodyWidth: mainBody.style.left })
     noteDetail.style.left = '0px'
@@ -302,13 +292,13 @@ class Main extends React.Component {
     noteList.style.display = 'none'
   }
 
-  showLeftLists(noteDetail, noteList, mainBody) {
+  showLeftLists (noteDetail, noteList, mainBody) {
     noteDetail.style.left = this.state.noteDetailWidth
     mainBody.style.left = this.state.mainBodyWidth
     noteList.style.display = 'inline'
   }
 
-  render() {
+  render () {
     const { config } = this.props
 
     // the width of the navigation bar when it is folded/collapsed
@@ -322,16 +312,10 @@ class Main extends React.Component {
         onMouseUp={e => this.handleMouseUp(e)}
       >
         <SideNav
-          {..._.pick(this.props, [
+          {..._.pick(this.props, ['dispatch', 'data', 'config', 'match', 'location'])}
-            'dispatch',
-            'data',
-            'config',
-            'match',
-            'location'
-          ])}
           width={this.state.navWidth}
         />
-        {!config.isSideNavFolded && (
+        {!config.isSideNavFolded &&
           <div
             styleName={
               this.state.isLeftSliderFocused ? 'slider--active' : 'slider'
@@ -341,8 +325,7 @@ class Main extends React.Component {
             draggable='false'
           >
             <div styleName='slider-hitbox' />
-          </div>
+          </div>}
-        )}
         <div
           styleName={config.isSideNavFolded ? 'body--expanded' : 'body'}
           id='main-body'

browser/main/NewNoteButton/NewNoteButton.styl

@@ -72,13 +72,14 @@ body[data-theme="dark"]
   .control-newNoteButton-tooltip
     darkTooltip()
 
-apply-theme(theme)
+body[data-theme="solarized-dark"]
-  body[data-theme={theme}]
+  .root, .root--expanded
-    .root, .root--expanded
+    background-color $ui-solarized-dark-noteList-backgroundColor
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
 
-for theme in 'solarized-dark' 'dracula'
+body[data-theme="monokai"]
-  apply-theme(theme)
+  .root, .root--expanded
+    background-color $ui-monokai-noteList-backgroundColor
 
-for theme in $themes
+body[data-theme="dracula"]
-  apply-theme(theme)
+  .root, .root--expanded
+    background-color $ui-dracula-noteList-backgroundColor

browser/main/NewNoteButton/index.js

@@ -15,48 +15,30 @@ const { dialog } = remote
 const OSX = window.process.platform === 'darwin'
 
 class NewNoteButton extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
-    this.state = {}
+    this.state = {
+    }
 
     this.handleNewNoteButtonClick = this.handleNewNoteButtonClick.bind(this)
   }
 
-  componentDidMount() {
+  componentDidMount () {
     eventEmitter.on('top:new-note', this.handleNewNoteButtonClick)
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     eventEmitter.off('top:new-note', this.handleNewNoteButtonClick)
   }
 
-  handleNewNoteButtonClick(e) {
+  handleNewNoteButtonClick (e) {
-    const {
+    const { location, dispatch, match: { params }, config } = this.props
-      location,
-      dispatch,
-      match: { params },
-      config
-    } = this.props
     const { storage, folder } = this.resolveTargetFolder()
     if (config.ui.defaultNote === 'MARKDOWN_NOTE') {
-      createMarkdownNote(
+      createMarkdownNote(storage.key, folder.key, dispatch, location, params, config)
-        storage.key,
-        folder.key,
-        dispatch,
-        location,
-        params,
-        config
-      )
     } else if (config.ui.defaultNote === 'SNIPPET_NOTE') {
-      createSnippetNote(
+      createSnippetNote(storage.key, folder.key, dispatch, location, params, config)
-        storage.key,
-        folder.key,
-        dispatch,
-        location,
-        params,
-        config
-      )
     } else {
       modal.open(NewNoteModal, {
         storage: storage.key,
@@ -69,11 +51,8 @@ class NewNoteButton extends React.Component {
     }
   }
 
-  resolveTargetFolder() {
+  resolveTargetFolder () {
-    const {
+    const { data, match: { params } } = this.props
-      data,
-      match: { params }
-    } = this.props
     let storage = data.storageMap.get(params.storageKey)
     // Find first storage
     if (storage == null) {
@@ -83,12 +62,9 @@ class NewNoteButton extends React.Component {
       }
     }
 
-    if (storage == null)
+    if (storage == null) this.showMessageBox(i18n.__('No storage to create a note'))
-      this.showMessageBox(i18n.__('No storage to create a note'))
+    const folder = _.find(storage.folders, {key: params.folderKey}) || storage.folders[0]
-    const folder =
+    if (folder == null) this.showMessageBox(i18n.__('No folder to create a note'))
-      _.find(storage.folders, { key: params.folderKey }) || storage.folders[0]
-    if (folder == null)
-      this.showMessageBox(i18n.__('No folder to create a note'))
 
     return {
       storage,
@@ -96,7 +72,7 @@ class NewNoteButton extends React.Component {
     }
   }
 
-  showMessageBox(message) {
+  showMessageBox (message) {
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
       message: message,
@@ -104,19 +80,16 @@ class NewNoteButton extends React.Component {
     })
   }
 
-  render() {
+  render () {
     const { config, style } = this.props
     return (
-      <div
+      <div className='NewNoteButton'
-        className='NewNoteButton'
         styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
         style={style}
       >
         <div styleName='control'>
-          <button
+          <button styleName='control-newNoteButton'
-            styleName='control-newNoteButton'
+            onClick={this.handleNewNoteButtonClick}>
-            onClick={this.handleNewNoteButtonClick}
-          >
             <img src='../resources/icon/icon-newnote.svg' />
             <span styleName='control-newNoteButton-tooltip'>
               {i18n.__('Make a note')} {OSX ? '⌘' : i18n.__('Ctrl')} + N

browser/main/NoteList/NoteList.styl

@@ -59,34 +59,106 @@ $control-height = 30px
   top $control-height
   overflow auto
 
-apply-theme(theme)
+body[data-theme="white"]
-  body[data-theme={theme}]
+  .root
-    .root
+    background-color $ui-white-noteList-backgroundColor
-      border-color get-theme-var(theme, 'borderColor')
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
 
-    .control
+  .control
-      background-color get-theme-var(theme, 'noteList-backgroundColor')
+    background-color $ui-white-noteList-backgroundColor
-      border-color get-theme-var(theme, 'borderColor')
 
-    .control-sortBy-select
+body[data-theme="dark"]
-      &:hover
+  .root
-        transition 0.2s
+    border-color $ui-dark-borderColor
-        color get-theme-var(theme, 'text-color')
+    background-color $ui-dark-noteList-backgroundColor
-        background-color: get-theme-var(theme, 'noteList-backgroundColor')
 
-    .control-button
+  .control
-      color get-theme-var(theme, 'inactive-text-color')
+    background-color $ui-dark-noteList-backgroundColor
-      &:hover
+    border-color $ui-dark-borderColor
-        color get-theme-var(theme, 'text-color')
 
-    .control-button--active
+  .control-sortBy-select
-      color get-theme-var(theme, 'text-color')
+    &:hover
-      &:active
+      transition 0.2s
-        color get-theme-var(theme, 'text-color')
+      color $ui-dark-text-color
 
-for theme in 'white' 'dark' 'solarized-dark' 'dracula'
+  .control-button
-  apply-theme(theme)
+    color $ui-dark-inactive-text-color
+    &:hover
+      color $ui-dark-text-color
 
-for theme in $themes
+  .control-button--active
-  apply-theme(theme)
+    color $ui-dark-text-color
+    &:active
+      color $ui-dark-text-color
+
+
+body[data-theme="solarized-dark"]
+  .root
+    border-color $ui-solarized-dark-borderColor
+    background-color $ui-solarized-dark-noteList-backgroundColor
+
+  .control
+    background-color $ui-solarized-dark-noteList-backgroundColor
+    border-color $ui-solarized-dark-borderColor
+
+  .control-sortBy-select
+    &:hover
+      transition 0.2s
+      color $ui-solarized-dark-text-color
+
+  .control-button
+    color $ui-solarized-dark-inactive-text-color
+    &:hover
+      color $ui-solarized-dark-text-color
+
+  .control-button--active
+    color $ui-solarized-dark-text-color
+    &:active
+      color $ui-solarized-dark-text-color
+
+body[data-theme="monokai"]
+  .root
+    border-color $ui-monokai-borderColor
+    background-color $ui-monokai-noteList-backgroundColor
+
+  .control
+    background-color $ui-monokai-noteList-backgroundColor
+    border-color $ui-monokai-borderColor
+
+  .control-sortBy-select
+    &:hover
+      transition 0.2s
+      color $ui-monokai-text-color
+
+  .control-button
+    color $ui-monokai-inactive-text-color
+    &:hover
+      color $ui-monokai-text-color
+
+  .control-button--active
+    color $ui-monokai-text-color
+    &:active
+      color $ui-monokai-text-color
+
+body[data-theme="dracula"]
+  .root
+    border-color $ui-dracula-borderColor
+    background-color $ui-dracula-noteList-backgroundColor
+
+  .control
+    background-color $ui-dracula-noteList-backgroundColor
+    border-color $ui-dracula-borderColor
+
+  .control-sortBy-select
+    &:hover
+      transition 0.2s
+      color $ui-dracula-text-color
+
+  .control-button
+    color $ui-dracula-inactive-text-color
+    &:hover
+      color $ui-dracula-text-color
+
+  .control-button--active
+    color $ui-dracula-text-color
+    &:active
+      color $ui-dracula-text-color

browser/main/SideNav/ListButton.js

@@ -4,17 +4,14 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './SwitchButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const ListButton = ({ onClick, isTagActive }) => (
+const ListButton = ({
-  <button
+  onClick, isTagActive
-    styleName={isTagActive ? 'non-active-button' : 'active-button'}
+}) => (
-    onClick={onClick}
+  <button styleName={isTagActive ? 'non-active-button' : 'active-button'} onClick={onClick}>
-  >
+    <img src={isTagActive
-    <img
+        ? '../resources/icon/icon-list.svg'
-      src={
+        : '../resources/icon/icon-list-active.svg'
-        isTagActive
+    }
-          ? '../resources/icon/icon-list.svg'
-          : '../resources/icon/icon-list-active.svg'
-      }
     />
     <span styleName='tooltip'>{i18n.__('Notes')}</span>
   </button>

browser/main/SideNav/PreferenceButton.js

@@ -4,8 +4,10 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './PreferenceButton.styl'
 import i18n from 'browser/lib/i18n'
 
-const PreferenceButton = ({ onClick }) => (
+const PreferenceButton = ({
-  <button styleName='top-menu-preference' onClick={e => onClick(e)}>
+  onClick
+}) => (
+  <button styleName='top-menu-preference' onClick={(e) => onClick(e)}>
     <img src='../resources/icon/icon-setting.svg' />
     <span styleName='tooltip'>{i18n.__('Preferences')}</span>
   </button>