Text and Background colors

src/RichTextEditor.js

@@ -336,6 +336,14 @@ export default class RichTextEditor extends Component {
     this._sendAction(actions.setOutdent);
   }
 
+  setBackgroundColor(color) {
+    this._sendAction(actions.setBackgroundColor, color);
+  }
+
+  setTextColor(color) {
+    this._sendAction(actions.setTextColor, color);
+  }
+
   setTitlePlaceholder() {
     this._sendAction(actions.setTitlePlaceholder);
   }

src/WebviewMessageHandler.js

@@ -129,6 +129,12 @@ export const InjectedMessageHandler = `
         case '${actions.setCustomCSS}':
           zss_editor.setCustomCSS(action.data);
           break;
+        case '${actions.setTextColor}':
+          zss_editor.setTextColor(action.data);
+          break;
+        case '${actions.setBackgroundColor}':
+          zss_editor.setBackgroundColor(action.data);
+          break;
       }
     };
   }

src/ZSSRichTextEditor/ZSSRichTextEditor.js

@@ -371,8 +371,10 @@ zss_editor.setFontFamily = function(fontFamily) {
 }
 
 zss_editor.setTextColor = function(color) {
-		
-    zss_editor.restorerange();
+
+    if(zss_editor.currentSelection) {
+        zss_editor.restorerange();
+    }
     document.execCommand("styleWithCSS", null, true);
     document.execCommand('foreColor', false, color);
     document.execCommand("styleWithCSS", null, false);
@@ -382,7 +384,10 @@ zss_editor.setTextColor = function(color) {
 }
 
 zss_editor.setBackgroundColor = function(color) {
-    zss_editor.restorerange();
+    
+    if(zss_editor.currentSelection) {
+        zss_editor.restorerange();
+    }
     document.execCommand("styleWithCSS", null, true);
     document.execCommand('hiliteColor', false, color);
     document.execCommand("styleWithCSS", null, false);

src/const.js

@@ -39,7 +39,9 @@ export const actions = {
   setContentFocusHandler: 'SET_CONTENT_FOCUS_HANDLER',
   prepareInsert: 'PREPARE_INSERT',
   restoreSelection: 'RESTORE_SELECTION',
-  setCustomCSS: 'SET_CUSTOM_CSS'
+  setCustomCSS: 'SET_CUSTOM_CSS',
+  setTextColor: 'SET_TEXT_COLOR',
+  setBackgroundColor: 'SET_BACKGROUND_COLOR'
 };