@ckeditor/ckeditor5-emoji 44.2.0-alpha.8 → 44.2.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-emoji",
-  "version": "44.2.0-alpha.8",
+  "version": "44.2.0-alpha.9",
   "description": "Emoji feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,12 +13,12 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "44.2.0-alpha.8",
-    "@ckeditor/ckeditor5-mention": "44.2.0-alpha.8",
-    "@ckeditor/ckeditor5-typing": "44.2.0-alpha.8",
-    "@ckeditor/ckeditor5-ui": "44.2.0-alpha.8",
-    "@ckeditor/ckeditor5-utils": "44.2.0-alpha.8",
-    "ckeditor5": "44.2.0-alpha.8",
+    "@ckeditor/ckeditor5-core": "44.2.0-alpha.9",
+    "@ckeditor/ckeditor5-mention": "44.2.0-alpha.9",
+    "@ckeditor/ckeditor5-typing": "44.2.0-alpha.9",
+    "@ckeditor/ckeditor5-ui": "44.2.0-alpha.9",
+    "@ckeditor/ckeditor5-utils": "44.2.0-alpha.9",
+    "ckeditor5": "44.2.0-alpha.9",
     "fuse.js": "7.0.0",
     "lodash-es": "4.17.21"
   },

package/src/emojiconfig.d.ts

@@ -75,6 +75,7 @@ export interface EmojiConfig {
      *
      * @default 16
      */
-    version?: 15 | 16;
+    version?: EmojiVersion;
 }
 export type SkinToneId = 'default' | 'light' | 'medium-light' | 'medium' | 'medium-dark' | 'dark';
+export type EmojiVersion = 15 | 16;

package/src/emojirepository.d.ts

@@ -8,26 +8,26 @@ import type { SkinToneId } from './emojiconfig.js';
 /**
  * The emoji repository plugin.
  *
- * Loads the emoji database from URL during plugin initialization and provides utility methods to search it.
+ * Loads the emoji repository from URL during plugin initialization and provides utility methods to search it.
  */
 export default class EmojiRepository extends Plugin {
     /**
-     * A callback to resolve the {@link #_databasePromise} to control the return value of this promise.
+     * A callback to resolve the {@link #_repositoryPromise} to control the return value of this promise.
      */
-    private _databasePromiseResolveCallback;
+    private _repositoryPromiseResolveCallback;
     /**
      * An instance of the [Fuse.js](https://www.fusejs.io/) library.
      */
     private _fuseSearch;
     /**
-     * Emoji database.
+     * The emoji version that is used to prepare the emoji repository.
      */
-    private _database;
+    private readonly _version;
     /**
-     * A promise resolved after downloading the emoji database.
-     * The promise resolves with `true` when the database is successfully downloaded or `false` otherwise.
+     * A promise resolved after downloading the emoji collection.
+     * The promise resolves with `true` when the repository is successfully downloaded or `false` otherwise.
      */
-    private readonly _databasePromise;
+    private readonly _repositoryPromise;
     /**
      * @inheritDoc
      */
@@ -50,7 +50,7 @@ export default class EmojiRepository extends Plugin {
     init(): Promise<void>;
     /**
      * Returns an array of emoji entries that match the search query.
-     * If the emoji database is not loaded, the [Fuse.js](https://www.fusejs.io/) instance is not created,
+     * If the emoji repository is not loaded, the [Fuse.js](https://www.fusejs.io/) instance is not created,
      * hence this method returns an empty array.
      *
      * @param searchQuery A search query to match emoji.
@@ -59,7 +59,7 @@ export default class EmojiRepository extends Plugin {
     getEmojiByQuery(searchQuery: string): Array<EmojiEntry>;
     /**
      * Groups all emojis by categories.
-     * If the emoji database is not loaded, it returns an empty array.
+     * If the emoji repository is not loaded, it returns an empty array.
      *
      * @returns An array of emoji entries grouped by categories.
      */
@@ -69,9 +69,28 @@ export default class EmojiRepository extends Plugin {
      */
     getSkinTones(): Array<SkinTone>;
     /**
-     * Indicates whether the emoji database has been successfully downloaded and the plugin is operational.
+     * Indicates whether the emoji repository has been successfully downloaded and the plugin is operational.
      */
     isReady(): Promise<boolean>;
+    /**
+     * Returns the emoji repository in a configured version if it is a non-empty array. Returns `null` otherwise.
+     */
+    private _getItems;
+    /**
+     * Makes the HTTP request to download the emoji repository in a configured version.
+     */
+    private _loadItemsFromCdn;
+    /**
+     * Normalizes the raw data fetched from CDN. By normalization, we meant:
+     *
+     *  * Filter out unsupported emoji (these that will not render correctly),
+     *  * Prepare skin tone variants if an emoji defines them.
+     */
+    private _normalizeEmoji;
+    /**
+     * Versioned emoji repository.
+     */
+    private static _results;
 }
 /**
  * Represents a single group of the emoji category, e.g., "Smileys & Expressions".

package/src/emojirepository.js

@@ -8,17 +8,17 @@
 import Fuse from 'fuse.js';
 import { groupBy } from 'lodash-es';
 import { Plugin } from 'ckeditor5/src/core.js';
-import { logWarning } from 'ckeditor5/src/utils.js';
+import { logWarning, version } from 'ckeditor5/src/utils.js';
 import EmojiUtils from './emojiutils.js';
-// An endpoint from which the emoji database will be downloaded during plugin initialization.
+// An endpoint from which the emoji data will be downloaded during plugin initialization.
 // The `{version}` placeholder is replaced with the value from editor config.
 const EMOJI_DATABASE_URL = 'https://cdn.ckeditor.com/ckeditor5/data/emoji/{version}/en.json';
 /**
  * The emoji repository plugin.
  *
- * Loads the emoji database from URL during plugin initialization and provides utility methods to search it.
+ * Loads the emoji repository from URL during plugin initialization and provides utility methods to search it.
  */
-export default class EmojiRepository extends Plugin {
+class EmojiRepository extends Plugin {
     /**
      * @inheritDoc
      */
@@ -42,13 +42,13 @@ export default class EmojiRepository extends Plugin {
      */
     constructor(editor) {
         super(editor);
-        this.editor.config.define('emoji', {
+        editor.config.define('emoji', {
             version: 16,
             skinTone: 'default'
         });
-        this._database = [];
-        this._databasePromise = new Promise(resolve => {
-            this._databasePromiseResolveCallback = resolve;
+        this._version = editor.config.get('emoji.version');
+        this._repositoryPromise = new Promise(resolve => {
+            this._repositoryPromiseResolveCallback = resolve;
         });
         this._fuseSearch = null;
     }
@@ -56,26 +56,18 @@ export default class EmojiRepository extends Plugin {
      * @inheritDoc
      */
     async init() {
-        const emojiUtils = this.editor.plugins.get('EmojiUtils');
-        const emojiVersion = this.editor.config.get('emoji.version');
-        const emojiDatabaseUrl = EMOJI_DATABASE_URL.replace('{version}', `${emojiVersion}`);
-        const emojiDatabase = await loadEmojiDatabase(emojiDatabaseUrl);
-        const emojiSupportedVersionByOs = emojiUtils.getEmojiSupportedVersionByOs();
-        // Skip the initialization if the emoji database download has failed.
-        // An empty database prevents the initialization of other dependent plugins, such as `EmojiMention` and `EmojiPicker`.
-        if (!emojiDatabase.length) {
-            return this._databasePromiseResolveCallback(false);
+        if (!(this._version in EmojiRepository._results)) {
+            const cdnResult = await this._loadItemsFromCdn();
+            EmojiRepository._results[this._version] = this._normalizeEmoji(cdnResult);
+        }
+        const items = this._getItems();
+        // Skip plugin initialization if the emoji repository is not available.
+        // The initialization of other dependent plugins, such as `EmojiMention` and `EmojiPicker`, is prevented as well.
+        if (!items) {
+            return this._repositoryPromiseResolveCallback(false);
         }
-        const container = emojiUtils.createEmojiWidthTestingContainer();
-        document.body.appendChild(container);
-        // Store the emoji database after normalizing the raw data.
-        this._database = emojiDatabase
-            .filter(item => emojiUtils.isEmojiCategoryAllowed(item))
-            .filter(item => emojiUtils.isEmojiSupported(item, emojiSupportedVersionByOs, container))
-            .map(item => emojiUtils.normalizeEmojiSkinTone(item));
-        container.remove();
         // Create instance of the Fuse.js library with configured weighted search keys and disabled fuzzy search.
-        this._fuseSearch = new Fuse(this._database, {
+        this._fuseSearch = new Fuse(items, {
             keys: [
                 { name: 'emoticon', weight: 5 },
                 { name: 'annotation', weight: 3 },
@@ -85,11 +77,11 @@ export default class EmojiRepository extends Plugin {
             threshold: 0,
             ignoreLocation: true
         });
-        return this._databasePromiseResolveCallback(true);
+        return this._repositoryPromiseResolveCallback(true);
     }
     /**
      * Returns an array of emoji entries that match the search query.
-     * If the emoji database is not loaded, the [Fuse.js](https://www.fusejs.io/) instance is not created,
+     * If the emoji repository is not loaded, the [Fuse.js](https://www.fusejs.io/) instance is not created,
      * hence this method returns an empty array.
      *
      * @param searchQuery A search query to match emoji.
@@ -123,12 +115,13 @@ export default class EmojiRepository extends Plugin {
     }
     /**
      * Groups all emojis by categories.
-     * If the emoji database is not loaded, it returns an empty array.
+     * If the emoji repository is not loaded, it returns an empty array.
      *
      * @returns An array of emoji entries grouped by categories.
      */
     getEmojiCategories() {
-        if (!this._database.length) {
+        const repository = this._getItems();
+        if (!repository) {
             return [];
         }
         const { t } = this.editor.locale;
@@ -143,7 +136,7 @@ export default class EmojiRepository extends Plugin {
             { title: t('Symbols'), icon: '🟢', groupId: 8 },
             { title: t('Flags'), icon: '🏁', groupId: 9 }
         ];
-        const groups = groupBy(this._database, 'group');
+        const groups = groupBy(repository, 'group');
         return categories.map(category => {
             return {
                 ...category,
@@ -166,37 +159,69 @@ export default class EmojiRepository extends Plugin {
         ];
     }
     /**
-     * Indicates whether the emoji database has been successfully downloaded and the plugin is operational.
+     * Indicates whether the emoji repository has been successfully downloaded and the plugin is operational.
      */
     isReady() {
-        return this._databasePromise;
+        return this._repositoryPromise;
     }
-}
-/**
- * Makes the HTTP request to download the emoji database.
- */
-async function loadEmojiDatabase(emojiDatabaseUrl) {
-    const result = await fetch(emojiDatabaseUrl)
-        .then(response => {
-        if (!response.ok) {
+    /**
+     * Returns the emoji repository in a configured version if it is a non-empty array. Returns `null` otherwise.
+     */
+    _getItems() {
+        const repository = EmojiRepository._results[this._version];
+        return repository && repository.length ? repository : null;
+    }
+    /**
+     * Makes the HTTP request to download the emoji repository in a configured version.
+     */
+    async _loadItemsFromCdn() {
+        const repositoryUrl = new URL(EMOJI_DATABASE_URL.replace('{version}', `${this._version}`));
+        repositoryUrl.searchParams.set('editorVersion', version);
+        const result = await fetch(repositoryUrl, { cache: 'force-cache' })
+            .then(response => {
+            if (!response.ok) {
+                return [];
+            }
+            return response.json();
+        })
+            .catch(() => {
             return [];
+        });
+        if (!result.length) {
+            /**
+             * Unable to load the emoji repository from CDN.
+             *
+             * If the CDN works properly and there is no disruption of communication, please check your
+             * {@glink getting-started/setup/csp Content Security Policy (CSP)} setting and make sure
+             * the CDN connection is allowed by the editor.
+             *
+             * @error emoji-repository-load-failed
+             */
+            logWarning('emoji-repository-load-failed');
         }
-        return response.json();
-    })
-        .catch(() => {
-        return [];
-    });
-    if (!result.length) {
-        /**
-         * Unable to load the emoji database from CDN.
-         *
-         * If the CDN works properly and there is no disruption of communication, please check your
-         * {@glink getting-started/setup/csp Content Security Policy (CSP)} setting and make sure
-         * the CDN connection is allowed by the editor.
-         *
-         * @error emoji-database-load-failed
-         */
-        logWarning('emoji-database-load-failed');
+        return result;
+    }
+    /**
+     * Normalizes the raw data fetched from CDN. By normalization, we meant:
+     *
+     *  * Filter out unsupported emoji (these that will not render correctly),
+     *  * Prepare skin tone variants if an emoji defines them.
+     */
+    _normalizeEmoji(data) {
+        const emojiUtils = this.editor.plugins.get('EmojiUtils');
+        const emojiSupportedVersionByOs = emojiUtils.getEmojiSupportedVersionByOs();
+        const container = emojiUtils.createEmojiWidthTestingContainer();
+        document.body.appendChild(container);
+        const results = data
+            .filter(item => emojiUtils.isEmojiCategoryAllowed(item))
+            .filter(item => emojiUtils.isEmojiSupported(item, emojiSupportedVersionByOs, container))
+            .map(item => emojiUtils.normalizeEmojiSkinTone(item));
+        container.remove();
+        return results;
     }
-    return result;
 }
+/**
+ * Versioned emoji repository.
+ */
+EmojiRepository._results = {};
+export default EmojiRepository;

package/src/utils/isemojisupported.js

@@ -59,7 +59,7 @@ export default function isEmojiSupported(unicode) {
 ;
 function getCanvas() {
     try {
-        return document.createElement('canvas').getContext('2d');
+        return document.createElement('canvas').getContext('2d', { willReadFrequently: true });
     }
     catch {
         /* istanbul ignore next -- @preserve */