Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

fix rainbow breaks compound emojis #8245

Merged
merged 6 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions res/css/views/elements/_RichText.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ a.mx_Pill {
// and scale with the size of the surrounding text
font-size: calc(18 / 14 * 1em);
vertical-align: bottom;
font-family: Segoe UI Symbol;
robintown marked this conversation as resolved.
Show resolved Hide resolved
}

.mx_Markdown_BOLD {
Expand Down
4 changes: 3 additions & 1 deletion src/utils/colour.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import { split } from 'lodash';

export function textToHtmlRainbow(str: string): string {
const frequency = (2 * Math.PI) / str.length;

return Array.from(str)
return split(str, '')
.map((c, i) => {
if (c === " ") {
return c;
Expand Down
24 changes: 24 additions & 0 deletions test/utils/colour-test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
Copyright 2021 Šimon Brandner <[email protected]>
robintown marked this conversation as resolved.
Show resolved Hide resolved

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { textToHtmlRainbow } from "../../src/utils/colour";

describe("textToHtmlRainbow", () => {
it('correctly transform text to html without splitting the emoji in two', () => {
expect(textToHtmlRainbow('🐻')).toBe('<font color="#ff00be">🐻</font>');
expect(textToHtmlRainbow('🐕‍🦺')).toBe('<font color="#ff00be">🐕‍🦺</font>');
});
});