Skip to content

Commit

Permalink
fix: fix emoji picker
Browse files Browse the repository at this point in the history
  • Loading branch information
jakerenzella committed Sep 7, 2022
1 parent 8e7790f commit 2d4b37d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 25 deletions.
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@angular/common": "^14.2.0",
"@angular/compiler": "^14.2.0",
"@angular/core": "^14.2.0",
"@angular/flex-layout": "^13.0.0-beta.38",
"@angular/flex-layout": "^14.0.0-beta.40",
"@angular/forms": "^14.2.0",
"@angular/material": "^14.2.0",
"@angular/material-moment-adapter": "^14.2.0",
Expand Down
9 changes: 6 additions & 3 deletions src/app/common/services/emoji.service.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-inferrable-types */
import { Injectable } from '@angular/core';
import { EmojiSearch } from '@ctrl/ngx-emoji-mart';
import { EmojiData } from '@ctrl/ngx-emoji-mart/ngx-emoji';
Expand All @@ -6,9 +7,11 @@ import { EmojiData } from '@ctrl/ngx-emoji-mart/ngx-emoji';
providedIn: 'root',
})
export class EmojiService {
emojiMatch =
/(?:[\u2700\-\u27bf]|(?:\ud83c[\udde6\-\uddff]){2}|[\ud800\-\udbff][\udc00\-\udfff]|[\u0023\-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e\-\udd7f]|\ud83c\udd8e|\ud83c[\udd91\-\udd9a]|\ud83c[\udde6\-\uddff]|[\ud83c\ude01\-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c\ude32\-\ude3a]|[\ud83c\ude50\-\ude51]|\u203c|\u2049|[\u25aa\-\u25ab]|\u25b6|\u25c0|[\u25fb\-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600\-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9\-\u23f3]|[\u23f8\-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190\-\u21ff])/u;
colonPairMatch = /(\:)(\w|\+|\-)+(\:)/;
// DO NOT CHANGE THIS LINE EVEN WITH AN ESLINT RULE
// eslint-disable-next-line max-len, prettier/prettier
emojiMatch: RegExp = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c\ude32-\ude3a]|[\ud83c\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/;
// eslint-disable-next-line no-useless-escape
colonPairMatch: RegExp = /(\:)(\w|\+|\-)+(\:)/;

constructor(private emojiSearch: EmojiSearch) {}

Expand Down
10 changes: 0 additions & 10 deletions src/styles/common/doubtfire-cards.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
@use '../../../node_modules/@angular/material' as mat;
@import '../../../node_modules/@angular/material/theming';

$app-primary: mat.define-palette(mat.$grey-palette);
$app-accent: mat.define-palette(mat.$light-blue-palette);
$app-warn: mat.define-palette(mat.$red-palette);

$primary: mat.get-color-from-palette($app-primary);
$accent: mat.get-color-from-palette($app-accent);
$warn: mat.get-color-from-palette($app-warn);

@mixin doubtfire-card {
border-radius: 10px;
Expand Down

0 comments on commit 2d4b37d

Please sign in to comment.