yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-28 18:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-upload

Browse Source
This commit is contained in:
soupette 2020-02-19 05:51:10 +01:00
commit a2ee7788b2
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/index.js
View File

@ -79,6 +79,10 @@ class Wysiwyg extends React.Component {
} }
shouldComponentUpdate(nextProps, nextState) { shouldComponentUpdate(nextProps, nextState) {
if (nextProps.value !== this.props.value && !this.state.isFocused) {
return true;
}
if (nextState.editorState !== this.state.editorState) { if (nextState.editorState !== this.state.editorState) {
return true; return true;
} }
@ -119,6 +123,11 @@ class Wysiwyg extends React.Component {
if (prevProps.resetProps !== this.props.resetProps) { if (prevProps.resetProps !== this.props.resetProps) {
this.setInitialValue(this.props); this.setInitialValue(this.props);
} }
// Update the content when used in a dynamiczone
if (prevProps.value !== this.props.value && !this.state.isFocused) {
this.setInitialValue(this.props);
}
} }
/** /**
@ -126,6 +135,10 @@ class Wysiwyg extends React.Component {
* @param {[type]} props [description] * @param {[type]} props [description]
*/ */
setInitialValue = props => { setInitialValue = props => {
if (isEmpty(props.value)) {
return this.setState({ editorState: EditorState.createEmpty() });
}
const contentState = ContentState.createFromText(props.value); const contentState = ContentState.createFromText(props.value);
const newEditorState = EditorState.createWithContent(contentState); const newEditorState = EditorState.createWithContent(contentState);
const editorState = this.state.isFocused const editorState = this.state.isFocused