yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9223 from virgilbugnariu/master

Browse Source 
Fix WYSIWYG Reverse text
This commit is contained in:
cyril lopez 2021-02-03 11:52:23 +01:00 committed by GitHub
commit a68e7a160d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,11 @@ class Wysiwyg extends React.Component {
// Since we need to perform some operations in the reducer the loading phase stops before all the operations // Since we need to perform some operations in the reducer the loading phase stops before all the operations
// are computed which in some case causes the inputs component to be initialised with a null value. // are computed which in some case causes the inputs component to be initialised with a null value.
if (!prevProps.value && this.props.value) { if (!prevProps.value && this.props.value) {
// This is also called if the first thing you add in the editor is
// a markdown formatting block (b, i, u, etc.) which results in
// the selection being pushed to the end after the first character is added.
// Basically, setInitialValue is always called whenever
// you start typing in an empty editor (even after the initial load)
this.setInitialValue(this.props); this.setInitialValue(this.props);
} }
} }
@ -192,24 +197,31 @@ class Wysiwyg extends React.Component {
textWithEntity, textWithEntity,
'insert-character' 'insert-character'
); );
// Update the parent reducer
this.sendData(newEditorState); if (selectedText.length === 0) {
// Don't handle selection : the user has selected some text to be changed with the appropriate markdown this.setState({
if (selectedText !== '') { // Highlight the text if the selection was empty
return this.setState( editorState: EditorState.forceSelection(newEditorState, updatedSelection),
{ }, () => {
editorState: newEditorState, this.focus();
}, // Update the parent reducer
() => { this.sendData(newEditorState);
this.focus(); });
} return;
);
} }
return this.setState({ // Don't handle selection: the user has selected some text to be changed with the appropriate markdown
// Highlight the text if the selection wad empty this.setState(
editorState: EditorState.forceSelection(newEditorState, updatedSelection), {
}); editorState: newEditorState,
},
() => {
this.focus();
// Update the parent reducer
this.sendData(newEditorState);
}
);
return;
}; };
/** /**
@ -414,11 +426,14 @@ class Wysiwyg extends React.Component {
newEditorState = EditorState.acceptSelection(newEditorState, updatedSelection); newEditorState = EditorState.acceptSelection(newEditorState, updatedSelection);
// Update the parent reducer
this.sendData(newEditorState);
return this.setState({ return this.setState({
editorState: EditorState.forceSelection(newEditorState, newEditorState.getSelection()), editorState: EditorState.forceSelection(newEditorState, newEditorState.getSelection()),
}, () => {
this.focus();
// Update the parent reducer
this.sendData(newEditorState);
}); });
}; };