refactor: constantize, remove redundancy

src/constants.js

@@ -0,0 +1,19 @@
+const editorChangeTypes = {
+    INSERT_CHARACTERS: 'insert-characters',
+    BACKSPACE_CHARACTER: 'backspace-character',
+    SPLIT_BLOCK: 'split-block',
+}
+
+const commitTypes = {
+    ADD: 'add',
+    DELETE: 'delete',
+    EDIT: 'edit',
+}
+
+const TAG = 'tag'
+
+module.exports = {
+    editorChangeTypes,
+    commitTypes,
+    TAG,
+}

src/utils.js

@@ -2,9 +2,15 @@ const uuid = require('uuid/v4')
 const { ContentState, EditorState } = require('draft-js')
 const Immutable = require('immutable')
 
+const { editorChangeTypes, commitTypes, TAG } = require('./constants')
+
+function getBlockTag(block) {
+    return block.getData().get(TAG)
+}
+
 function reconcileTags(previousBlockMap, currentBlockMap) {
     return previousBlockMap.valueSeq().map(block => {
-        const isTagged = block.getData().has('tag')
+        const isTagged = getBlockTag(block)
 
         if (isTagged) return block
 
@@ -13,9 +19,7 @@ function reconcileTags(previousBlockMap, currentBlockMap) {
 
         if (!currentBlock) return block
 
-        const newBlockData = block
+        const newBlockData = block.getData().set(TAG, getBlockTag(currentBlock))
-            .getData()
-            .set('tag', currentBlock.getData().get('tag'))
         return isTagged ? block : block.set('data', newBlockData)
     })
 }
@@ -23,12 +27,12 @@ function reconcileTags(previousBlockMap, currentBlockMap) {
 function processBlockDeletion(previousBlocks, currentBlocks) {
     const deletedBlocks = previousBlocks
         .valueSeq()
-        .filter(block => !currentBlocks.has(block.getData().get('tag')))
+        .filter(block => !currentBlocks.has(getBlockTag(block)))
 
     return deletedBlocks
         .map(block => ({
-            type: 'delete',
+            type: commitTypes.DELETE,
-            tag: block.getData().get('tag'),
+            tag: getBlockTag(block),
         }))
         .toJS()
 }
@@ -36,12 +40,12 @@ function processBlockDeletion(previousBlocks, currentBlocks) {
 function processBlockCreation(previousBlocks, currentBlocks) {
     const addedBlocks = currentBlocks
         .valueSeq()
-        .filter(block => !previousBlocks.has(block.getData().get('tag')))
+        .filter(block => !previousBlocks.has(getBlockTag(block)))
 
     return addedBlocks
         .map(block => ({
-            type: 'add',
+            type: commitTypes.ADD,
-            tag: block.getData().get('tag'),
+            tag: getBlockTag(block),
             text: block.getText(),
         }))
         .toJS()
@@ -49,7 +53,7 @@ function processBlockCreation(previousBlocks, currentBlocks) {
 
 function processBlockEdit(previousBlocks, currentBlocks) {
     const editedBlocks = currentBlocks.valueSeq().filter(block => {
-        const currentTag = block.getData().get('tag')
+        const currentTag = getBlockTag(block)
         const blockBefore = previousBlocks.get(currentTag)
         if (!currentTag || !blockBefore) return false
 
@@ -60,8 +64,8 @@ function processBlockEdit(previousBlocks, currentBlocks) {
 
     return editedBlocks
         .map(block => ({
-            type: 'edit',
+            type: commitTypes.EDIT,
-            tag: block.getData().get('tag'),
+            tag: getBlockTag(block),
             text: block.getText(),
         }))
         .toJS()
@@ -82,13 +86,16 @@ function deriveChangesFromStates(previous, actual) {
         : new Immutable.Map()
     const hasLessBlocks = previousBlocks.size > currentBlocks.size
     if (
-        changeType === 'insert-characters' ||
+        changeType === editorChangeTypes.INSERT_CHARACTERS ||
-        (changeType === 'backspace-character' && !hasLessBlocks)
+        (changeType === editorChangeTypes.BACKSPACE_CHARACTER && !hasLessBlocks)
     ) {
         return processBlockEdit(previousBlocks, currentBlocks)
-    } else if (changeType === 'split-block') {
+    } else if (changeType === editorChangeTypes.SPLIT_BLOCK) {
         return processBlockCreation(previousBlocks, currentBlocks)
-    } else if (changeType === 'backspace-character' && hasLessBlocks) {
+    } else if (
+        changeType === editorChangeTypes.BACKSPACE_CHARACTER &&
+        hasLessBlocks
+    ) {
         return processBlockDeletion(previousBlocks, currentBlocks)
     }
 
@@ -104,8 +111,8 @@ function tagUntaggedBlocks(editorState) {
     const blockList = contentState.getBlockMap().valueSeq()
 
     const taggedBlockList = blockList.map(block => {
-        const isTagged = block.getData().has('tag')
+        const isTagged = getBlockTag(block)
-        const newBlockData = block.getData().set('tag', uuid())
+        const newBlockData = block.getData().set(TAG, uuid())
         return isTagged ? block : block.set('data', newBlockData)
     })
 
@@ -118,7 +125,7 @@ function tagUntaggedBlocks(editorState) {
 
 function getBlockMapByTag(blocks) {
     return blocks.reduce((blockTagMap, block) => {
-        const tag = block.getData().get('tag')
+        const tag = getBlockTag(block)
         if (!tag || !block) return blockTagMap
         return blockTagMap.set(tag, block)
     }, new Immutable.Map())