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

Fix avatar text issue in rte (#10559)

Browse source 
* replace - with zwsp

* improve comments

* fix broken tests

* fix typo
This commit is contained in:
alunturner 2023-04-11 09:13:48 +01:00 • committed by GitHub
parent 29780704f1
commit 96c62ea03d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/rooms/wysiwyg_composer/utils/autocomplete.ts
View file

@ -89,12 +89,14 @@ export function getMentionDisplayText(completion: ICompletion, client: MatrixCli
* *
* @param completion - the item selected from the autocomplete * @param completion - the item selected from the autocomplete
* @param client - the MatrixClient is required for us to look up the correct room mention text * @param client - the MatrixClient is required for us to look up the correct room mention text
* @returns an object of attributes containing HTMLAnchor attributes or data-* attri * @returns an object of attributes containing HTMLAnchor attributes or data-* attributes
*/ */
export function getMentionAttributes(completion: ICompletion, client: MatrixClient, room: Room): Attributes { export function getMentionAttributes(completion: ICompletion, client: MatrixClient, room: Room): Attributes {
// to ensure that we always have something set in the --avatar-letter CSS variable // To ensure that we always have something set in the --avatar-letter CSS variable
// as otherwise alignment varies depending on whether the content is empty or not // as otherwise alignment varies depending on whether the content is empty or not.
const defaultLetterContent = "-";
// Use a zero width space so that it counts as content, but does not display anything.
const defaultLetterContent = "\u200b";
if (completion.type === "user") { if (completion.type === "user") {
// logic as used in UserPillPart.setAvatar in parts.ts // logic as used in UserPillPart.setAvatar in parts.ts

4
test/components/views/rooms/wysiwyg_composer/utils/autocomplete-test.ts
View file

@ -173,7 +173,7 @@ describe("getMentionAttributes", () => {
expect(result).toEqual({ expect(result).toEqual({
"data-mention-type": "user", "data-mention-type": "user",
"style": `--avatar-background: url(${testAvatarUrlForMember}); --avatar-letter: '-'`, "style": `--avatar-background: url(${testAvatarUrlForMember}); --avatar-letter: '\u200b'`,
}); });
}); });
@ -200,7 +200,7 @@ describe("getMentionAttributes", () => {
expect(result).toEqual({ expect(result).toEqual({
"data-mention-type": "room", "data-mention-type": "room",
"style": `--avatar-background: url(${testAvatarUrlForRoom}); --avatar-letter: '-'`, "style": `--avatar-background: url(${testAvatarUrlForRoom}); --avatar-letter: '\u200b'`,
}); });
}); });