PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -60,8 +60,8 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@matrix-org/matrix-wysiwyg": "^2.4.1",
"@matrix-org/analytics-events": "^0.6.0", "@matrix-org/analytics-events": "^0.6.0",
"@matrix-org/matrix-wysiwyg": "^2.3.1",
"@matrix-org/react-sdk-module-api": "^1.0.0", "@matrix-org/react-sdk-module-api": "^1.0.0",
"@sentry/browser": "^7.0.0", "@sentry/browser": "^7.0.0",
"@sentry/tracing": "^7.0.0", "@sentry/tracing": "^7.0.0",

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 { isRichTextEnabled, composerContent } = this.state;
const convertedContent = isRichTextEnabled const convertedContent = isRichTextEnabled
? await richToPlain(composerContent) ? await richToPlain(composerContent, false)
: await plainToRich(composerContent, false); : await plainToRich(composerContent, false);
this.setState({ 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>`. * ensure that HTML entities are correctly interpreted, and to prevent newline characters being turned into `<br>`.
* *
* @param rich - html to convert * @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 * @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 * 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 // 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 // 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 bodyPrefix = (isReplyAndEditing && getTextReplyFallback(editedEvent)) || "";
const formattedBodyPrefix = (isReplyAndEditing && getHtmlReplyFallback(editedEvent)) || ""; const formattedBodyPrefix = (isReplyAndEditing && getHtmlReplyFallback(editedEvent)) || "";

8
yarn.lock
View file

@ -1806,10 +1806,10 @@
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.0.1.tgz#21a0557a7bb3f60b37c6d412be8906c056fe79b8" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.0.1.tgz#21a0557a7bb3f60b37c6d412be8906c056fe79b8"
integrity sha512-VTwV5IowvhhLXwAsDDAv02bC5/qBQbG2YtpYAije11253sQ3MePIoSR+dS40Ih3lAlEzqQ00GU3O+i45jMzIRQ== integrity sha512-VTwV5IowvhhLXwAsDDAv02bC5/qBQbG2YtpYAije11253sQ3MePIoSR+dS40Ih3lAlEzqQ00GU3O+i45jMzIRQ==
"@matrix-org/matrix-wysiwyg@^2.3.1": "@matrix-org/matrix-wysiwyg@^2.4.1":
version "2.3.1" version "2.4.1"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.1.tgz#4b607323f3ffd8c332abeba7226010ecc031ed12" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.4.1.tgz#e1325a42366a1c891b2ba90c88e597b39187b2cb"
integrity sha512-OxJvA+pSGdP2f55foZGEDmU2qvILFLLjV53MOgPw1F6zDAp8nDL1rPPIzFv1qgDj5W7d4Rzq7FnN25vINnAu+A== integrity sha512-RyUijZXVKenE9s3LczDUhWFeOfIyLcsOrAyHqYxnizXX5nxMkHxTgLeoTvaIJ+1dOhI+H2SS9G4VcN6odZ0aNg==
"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz": "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
version "3.2.14" version "3.2.14"