Included componentWillRecieveProps to handle values in async

tudorilisoi · May 22, 2016 · 1cacd1c · 1cacd1c
1 parent 72e42b9
commit 1cacd1c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/example/main.js b/example/main.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { render } from 'react-dom'
-import ScribeEditor from '../src'
+import ScribeEditor from '../src/ScribeEditor'
 
 const ShowCase = props => {
   return (
@@ -27,7 +27,7 @@ class DemoApp extends Component {
   render() {
     return (
       <div>
-        <ScribeEditor defaultValue='hello world' onChange={this.handleChange} />
+        <ScribeEditor value='hello world' onChange={this.handleChange} />
         <ShowCase demoContent={this.state.text} />
       </div>
     )

diff --git a/lib/react-scribe-editor.js b/lib/react-scribe-editor.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scribe",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "The Guardian's scribe.js react component",
   "main": "lib/react-scribe-editor.js",
   "dependencies": {
@@ -9,17 +9,9 @@
     "scribe-editor": "^3.2.0",
     "scribe-plugin-blockquote-command": "^0.1.0",
     "scribe-plugin-code-command": "^0.1.0",
-    "scribe-plugin-curly-quotes": "^1.0.1",
-    "scribe-plugin-formatter-html-ensure-semantic-elements": "^1.0.1",
-    "scribe-plugin-formatter-plain-text-convert-new-lines-to-html": "^0.1.1",
     "scribe-plugin-heading-command": "^0.1.0",
-    "scribe-plugin-inline-styles-to-elements": "^0.1.0",
     "scribe-plugin-intelligent-unlink-command": "^0.1.6",
-    "scribe-plugin-keyboard-shortcuts": "^0.1.1",
     "scribe-plugin-link-prompt-command": "^1.0.0",
-    "scribe-plugin-noting": "^0.3.28",
-    "scribe-plugin-sanitizer": "^0.1.10",
-    "scribe-plugin-smart-lists": "^0.1.8",
     "scribe-plugin-toolbar": "^1.0.0",
     "lodash-amd": "^3.5.0",
     "lodash": "^4.0.0"

diff --git a/src/ScribeEditor.js b/src/ScribeEditor.js
@@ -25,7 +25,7 @@ class ScribeEditor extends Component {
     this.updateContent = this.updateContent.bind(this);
 
     this.state = {
-      value: this.isControlled() ? this.props.value : this.props.defaultValue
+      value: this.props.value
     };
   }
 
@@ -44,10 +44,19 @@ class ScribeEditor extends Component {
     // update content
     scribe.on('content-changed', () => {
       this.updateContent(scribe.getHTML());
-      if(this.props.onChange){
+      if (this.props.onChange) {
         this.props.onChange(scribe.getHTML());
       }
     });
+
+    this.scribe = scribe;
+  }
+
+  componentWillReceiveProps(nextProps) {
+    const value = this.isControlled() ? nextProps.value : nextProps.defaultValue;
+    if (this.state.value !== value) {
+      this.scribe.setContent(value);
+    }
   }
 
   isControlled() {