Merge pull request #165 from GSA/feature/DIGITAL-96-ckeditor-emoji

DIGITAL-96: Implement Support Emojis
GSA · Feb 4, 2025 · 4906bdc · 4906bdc
2 parents c9848bd + f09c402
commit 4906bdc
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "drupal/auto_heading_ids": "^2.0@beta",
         "drupal/autocomplete_deluxe": "^2.1",
         "drupal/autologout": "^2.0",
+        "drupal/ckeditor_emoji": "^2.0",
         "drupal/config_ignore": "^3.3",
         "drupal/config_pages": "^2.16",
         "drupal/config_split": "^2.0",
@@ -75,6 +76,7 @@
         "drupal/views_bulk_operations": "^4.3",
         "drupal/xmlsitemap": "^1.5",
         "drush/drush": "^12.5",
+        "elvanto/litemoji": "^5.1",
         "league/commonmark": "^2.5",
         "mattsqd/drupal-env": "dev-main",
         "mattsqd/drupal-env-lando": "dev-main",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.log b/composer.log
@@ -65,3 +65,5 @@ cd50d2b2b036edaa3a002881cf1b50ce|Ray Estrada|feature/DIGITAL-283-security-module
 406c28be9e70355b9cfbbe1df58bb7ef|Ray Estrada|feature/DIGITAL-283-security-modules|Mon Jan 13 12:16:28 EST 2025|./composer.sh require drupal/database_ssl_check
 699e8eda61efbe69e1f9a75fe81a3bf4|Oscar Merida|feature/DIGITAL-299-auto-headings|Tue Jan 14 14:23:14 EST 2025|./composer.sh require drupal/auto_heading_ids:^2.0@beta
 c4f5d0dc96584bd1dc808fd112b6e516|Ray Estrada|feature/DIGITAL-252-community-review|Thu Jan 16 10:51:08 EST 2025|./composer.sh require drupal/svg_image
+ce36fc2d9e87105d1ab7eda27ea9d434|Oscar Merida|develop|Mon Feb  3 14:30:03 EST 2025|./composer.sh require drupal/ckeditor_emoji
+b2b17cbb32ac57e73928af9f52acb537|Oscar Merida|feature/DIGITAL-96-ckeditor-emoji|Mon Feb  3 15:14:17 EST 2025|./composer.sh require elvanto/litemoji
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -10,6 +10,7 @@ module:
   block: 0
   breakpoint: 0
   ckeditor5: 0
+  ckeditor_emoji: 0
   config_ignore: 0
   config_pages: 0
   config_split: 0

diff --git a/config/sync/editor.editor.html.yml b/config/sync/editor.editor.html.yml
@@ -22,6 +22,7 @@ settings:
       - drupalMedia
       - sourceEditing
       - embeddedContent__default
+      - Emoji
       - style
   plugins:
     ckeditor5_heading:

diff --git a/web/modules/custom/convert_text/src/ConvertText.php b/web/modules/custom/convert_text/src/ConvertText.php
@@ -5,6 +5,7 @@
 namespace Drupal\convert_text;
 
 use League\CommonMark\CommonMarkConverter;
+use LitEmoji\LitEmoji;
 
 /**
  * Provides methods to convert migrated text for fields.
@@ -33,8 +34,10 @@ protected static function convert(string $source_text, string $field_type): stri
         return html_entity_decode($source_text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, 'UTF-8');
 
       case 'html':
+
         $converter = new CommonMarkConverter();
-        return $converter->convert($source_text)->getContent();
+        $html = $converter->convert($source_text)->getContent();
+        return LitEmoji::encodeUnicode($html);
 
       default:
         throw new \Exception("Invalid \$field_type of $field_type given");