yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 14:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ol cursor offset

Browse Source
This commit is contained in:
soupette 2018-04-09 10:58:01 +02:00
parent 6b0a37cdb3
commit 07e61236b1
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/strapi-helper-plugin/lib/src/components/Wysiwyg/index.js
View File

@ -51,14 +51,17 @@ class Wysiwyg extends React.Component {
editorState: EditorState.createEmpty(),
initialValue: '',
isDraging: false,
isFocused: false,
isPreviewMode: false,
headerValue: '',
isFullscreen: false,
};
this.focus = () => {
this.setState({ isFocused: true });
return this.domEditor.focus();
};
this.blur = () => {
this.setState({ isFocused: false });
return this.domEditor.blur();
};
}
@ -99,7 +102,9 @@ class Wysiwyg extends React.Component {
*/
setInitialValue = props => {
const contentState = ContentState.createFromText(props.value);
const editorState = EditorState.createWithContent(contentState);
const newEditorState = EditorState.createWithContent(contentState);
const editorState = this.state.isFocused ? EditorState.moveFocusToEnd(newEditorState) : newEditorState;
this.setState({
editorState,
hasInitialValue: true,
@ -153,6 +158,7 @@ class Wysiwyg extends React.Component {
if (getOffSets(this.getSelection()).start !== 0) {
const nextBlocks = getNextBlocksList(newEditorState, this.getSelection().getStartKey());
let liNumber = 1;
nextBlocks.map((block, index) => {
const previousContent =
@ -162,7 +168,8 @@ class Wysiwyg extends React.Component {
.getBlockForKey(this.getCurrentAnchorKey())
: newEditorState.getCurrentContent().getBlockBefore(block.getKey());
const number = previousContent ? parseInt(previousContent.getText().split('.')[0], 10) : 0;
const liNumber = isNaN(number) ? 1 : number + 1;
// const liNumber = isNaN(number) ? 1 : number + 1;
liNumber = isNaN(number) ? 1 : number + 1;
const nextBlockText = index === 0 ? `${liNumber}. ` : nextBlocks.get(index - 1).getText();
const newBlock = createNewBlock(nextBlockText, 'block-list', block.getKey());
const newContentState = this.createNewContentStateFromBlock(
@ -171,7 +178,8 @@ class Wysiwyg extends React.Component {
);
newEditorState = EditorState.push(newEditorState, newContentState);
});
const updatedSelection = updateSelection(this.getSelection(), nextBlocks, 3);
const offset = 2 + liNumber.toString().length;
const updatedSelection = updateSelection(this.getSelection(), nextBlocks, offset);
return this.setState({
editorState: EditorState.acceptSelection(newEditorState, updatedSelection),