Merge branch 'master' into fix/remove-babel-polyfill

Author: jvorcak

README.md

@@ -6,10 +6,16 @@
 
 ![alt text](https://raw.githubusercontent.com/webscopeio/react-markdown-editor/master/static/demo.gif)
 
+## Warning
+This is a work in progress. It's not well tested yet, please do not use this in production yet.
+
+## Demo
+https://webscope-react-markdown-editor.firebaseapp.com/
+
 ## Install
 
 ```bash
-npm install --save @webscopeio/react-markdown-editor
+yarn add @webscopeio/react-markdown-editor
 ```
 
 ## Usage

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

src/helpers.js

@@ -1,6 +1,6 @@
 // @flow
 
-const isEmptyAtPosition = (word: string, position: number) => word[position] === ' ' || word[position] === '\n'
+const isEmptyAtPosition = (word: string, position: number) => word[position] === ' '
 
 export const getWordStartAndEndLocation = (word: string, position: number) => {
   if (isEmptyAtPosition(word, position) && isEmptyAtPosition(word, position - 1)) {
@@ -19,7 +19,7 @@ export const getWordStartAndEndLocation = (word: string, position: number) => {
   ]
 }
 
-export const insertSymbol = (word: string, position: number, [prefix, suffix]: Array<string>) => {
+const insertSymbolInWord = (word: string, position: number, [prefix, suffix]: Array<string>) => {
   const [start, end] = getWordStartAndEndLocation(word, position)
   const startWord = word.slice(0, start)
   const actualWord = word.slice(start, end)
@@ -33,3 +33,22 @@ export const insertSymbol = (word: string, position: number, [prefix, suffix]: A
   return [`${startWord}${prefix}${actualWord}${suffix}${endWord}`, true]
 }
 
+// reduce helper
+function sum(total, num) {
+  return total + num
+}
+
+export const insertSymbol = (text: string, position: number, [prefix, suffix]: Array<string>) => {
+  const lines = text.split('\n')
+  const lineLengths = lines.map(line => line.length)
+
+  const currentLine = text.substring(0, position).split('\n').length - 1
+
+  const relativeLinePosition: number = position - lineLengths.slice(0, currentLine).reduce(sum, 0)
+  const [newLine, replaced] =
+    insertSymbolInWord(lines[currentLine], relativeLinePosition, [prefix, suffix])
+
+  lines[currentLine] = newLine
+  return [lines.join('\n'), replaced]
+}
+

src/helpers.test.js

@@ -37,7 +37,7 @@ describe('Markdown replace functions', () => {
     expect(insertSymbol(text, 14, ['_', '_'])).toEqual(['Hello _Webscope_', true])
   })
 
-  it('multiline comment', () => {
+  it('multiline comment - cursor is in an empty line', () => {
     const text =
       `This is a multiline
 comment
@@ -50,8 +50,43 @@ comment
 WOW`, true])
   })
 
+  it('multiline comment - cursor is at the word', () => {
+    const text =
+      `This is a multiline
+comment
+
+WOW`
+
+    expect(insertSymbol(text, 30, ['_', '_'])).toEqual([`This is a multiline
+comment
+
+_WOW_`, true])
+  })
+
   it('word is already wrapped, insertSymbol is invoked with this symbol, symbol is removed', () => {
     const text = '**Hello** world'
     expect(insertSymbol(text, 1, ['**', '**'])).toEqual(['Hello world', false])
   })
+
+  it('empty string is wrapped with a **** symbol, insertSymbol is invoked with the symbol, **** disappear', () => {
+    const text = `**A**
+
+****
+
+AHOJ **B**`
+    expect(insertSymbol(text, 9, ['**', '**'])).toEqual([`**A**
+
+
+
+AHOJ **B**`, false])
+  })
+
+  it('there are multiple lines, word in a middle of those lines should be wrapped if cursor is at that word', () => {
+    const text = `first
+hello world 
+last`
+    expect(insertSymbol(text, 9, ['**', '**'])).toEqual([`first
+**hello** world 
+last`, true])
+  })
 })