imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade wysiwyg editor for ctrl+backspace windows fix (#11324)

Browse source 
* Upgrade wysiwyg editor for ctrl+backspace windows fix

* upgrade lockfile

* Fix after upgrading the wysiswyg package
This commit is contained in:
Germain 2023-07-28 09:03:00 +01:00 • committed by GitHub
parent b496fe0a2b
commit c037b847da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/MessageComposer.tsx
View file

@ -371,7 +371,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
const { isRichTextEnabled, composerContent } = this.state;
const convertedContent = isRichTextEnabled
? await richToPlain(composerContent)
? await richToPlain(composerContent, false)
: await plainToRich(composerContent, false);
this.setState({

4
src/components/views/rooms/wysiwyg_composer/DynamicImportWysiwygComposer.tsx
View file

@ -45,9 +45,11 @@ export const dynamicImportConversionFunctions = async (): Promise<{
* ensure that HTML entities are correctly interpreted, and to prevent newline characters being turned into `<br>`.
*
* @param rich - html to convert
* @param inMessageFormat - `true` to format the return value for use as a message `formatted_body`.
* `false` to format it for writing to an editor element.
* @returns a string of plain text that may contain markdown
*/
richToPlain(rich: string): Promise<string>;
richToPlain(rich: string, inMessageFormat: boolean): Promise<string>;
/**
* Creates a rust model from plain text input (interpreted as markdown) and uses it to generate the rich text

2
src/components/views/rooms/wysiwyg_composer/utils/createMessageContent.ts
View file

@ -96,7 +96,7 @@ export async function createMessageContent(
// if we're editing rich text, the message content is pure html
// BUT if we're not, the message content will be plain text where we need to convert the mentions
const body = isHTML ? await richToPlain(message) : convertPlainTextToBody(message);
const body = isHTML ? await richToPlain(message, false) : convertPlainTextToBody(message);
const bodyPrefix = (isReplyAndEditing && getTextReplyFallback(editedEvent)) || "";
const formattedBodyPrefix = (isReplyAndEditing && getHtmlReplyFallback(editedEvent)) || "";