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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Tarun Thakurani 2018-09-23 11:53:24 +05:30 committed by GitHub
commit 34905eaa8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 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

@ -173,9 +173,7 @@ class Wysiwyg extends React.Component {
if (selectedText !== '') { if (selectedText !== '') {
return this.setState( return this.setState(
{ {
// Move the cursor to the end (this line forces the cursor to be at the end of the content) editorState: newEditorState,
// It may go at the end of the last block
editorState: EditorState.moveFocusToEnd(newEditorState),
}, },
() => { () => {
this.focus(); this.focus();
@ -309,7 +307,14 @@ class Wysiwyg extends React.Component {
const newContentState = this.createNewContentStateFromBlock(newBlock); const newContentState = this.createNewContentStateFromBlock(newBlock);
const newEditorState = this.createNewEditorState(newContentState, text); const newEditorState = this.createNewEditorState(newContentState, text);
return this.setState({ editorState: EditorState.moveFocusToEnd(newEditorState) }); return this.setState(
{
editorState: newEditorState,
},
() => {
this.focus();
},
);
}; };
/** /**