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

Use a more correct test for emoji #7685

Merged
merged 1 commit into from
Feb 1, 2022
Merged

Use a more correct test for emoji #7685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/HtmlUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const MEDIA_API_MXC_REGEX = /\/_matrix\/media\/r0\/(?:download|thumbnail)\/(.+?)
* positives, but useful for fast-path testing strings to see if they
* need emojification.
*/
export function mightContainEmoji(str: string): boolean {
function mightContainEmoji(str: string): boolean {
return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
}

Expand Down Expand Up @@ -432,7 +432,7 @@ function formatEmojis(message: string, isHtmlMessage: boolean): (JSX.Element | s

// We use lodash's grapheme splitter to avoid breaking apart compound emojis
for (const char of split(message, '')) {
if (mightContainEmoji(char)) {
if (EMOJIBASE_REGEX.test(char)) {
if (text) {
result.push(text);
text = '';
Expand Down
11 changes: 6 additions & 5 deletions src/editor/parts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
*/

import { split } from "lodash";
import EMOJIBASE_REGEX from "emojibase-regex";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { Room } from "matrix-js-sdk/src/models/room";
Expand All @@ -25,7 +26,7 @@ import AutocompleteWrapperModel, {
UpdateCallback,
UpdateQuery,
} from "./autocomplete";
import { mightContainEmoji, unicodeToShortcode } from "../HtmlUtils";
import { unicodeToShortcode } from "../HtmlUtils";
import * as Avatar from "../Avatar";
import defaultDispatcher from "../dispatcher/dispatcher";
import { Action } from "../dispatcher/actions";
Expand Down Expand Up @@ -191,7 +192,7 @@ abstract class BasePart {

abstract class PlainBasePart extends BasePart {
protected acceptsInsertion(chr: string, offset: number, inputType: string): boolean {
if (chr === "\n" || mightContainEmoji(chr)) {
if (chr === "\n" || EMOJIBASE_REGEX.test(chr)) {
return false;
}
// when not pasting or dropping text, reject characters that should start a pill candidate
Expand Down Expand Up @@ -361,7 +362,7 @@ class NewlinePart extends BasePart implements IBasePart {

class EmojiPart extends BasePart implements IBasePart {
protected acceptsInsertion(chr: string, offset: number): boolean {
return mightContainEmoji(chr);
return EMOJIBASE_REGEX.test(chr);
}

protected acceptsRemoval(position: number, chr: string): boolean {
Expand Down Expand Up @@ -553,7 +554,7 @@ export class PartCreator {
case "\n":
return new NewlinePart();
default:
if (mightContainEmoji(input[0])) {
if (EMOJIBASE_REGEX.test(input[0])) {
return new EmojiPart();
}
return new PlainPart();
Expand Down Expand Up @@ -627,7 +628,7 @@ export class PartCreator {

// We use lodash's grapheme splitter to avoid breaking apart compound emojis
for (const char of split(text, "")) {
if (mightContainEmoji(char)) {
if (EMOJIBASE_REGEX.test(char)) {
if (plainText) {
parts.push(this.plain(plainText));
plainText = "";
Expand Down