@fibery/ui-kit 1.11.0 → 1.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/ui-kit",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "main": "index.ts",
   "private": false,
   "files": [
@@ -59,8 +59,9 @@
     "react-windowed-select": "5.0.0",
     "screenfull": "6.0.1",
     "ua-parser-js": "0.7.24",
-    "@fibery/helpers": "1.0.4",
-    "@fibery/react": "1.0.2"
+    "@fibery/emoji-data": "1.1.1",
+    "@fibery/react": "1.0.2",
+    "@fibery/helpers": "1.0.4"
   },
   "peerDependencies": {
     "react": "^18.2.0",
@@ -93,8 +94,8 @@
     "svgo": "2.8.0",
     "typescript": "5.0.3",
     "unist-util-reduce": "0.2.2",
-    "@fibery/eslint-config": "8.3.0",
-    "@fibery/babel-preset": "7.2.0"
+    "@fibery/babel-preset": "7.2.0",
+    "@fibery/eslint-config": "8.3.0"
   },
   "jest": {
     "testEnvironment": "jsdom",

package/src/emoji-mart/data/get-data.tsx

@@ -1,5 +1,5 @@
-import type {Data} from "emoji-mart";
 import {detectEmojiSupportLevel} from "../emoji-support";
+import type {Data} from "emoji-mart";
 
 export type EmojiDataProps = {
   native: boolean;
@@ -15,12 +15,18 @@ let promise: Promise<EmojiDataProps>;
 const backgroundImageFn = (set: string) =>
   `https://fibery-ui-public-assets.s3.eu-central-1.amazonaws.com/images/emoji-datasource-${set}-15_0_1-64.png`;
 
+export const loadEmojiData = async () => {
+  const data = await import("@fibery/emoji-data/data/all.json");
+  return data.default;
+};
+
 const getAppleDataProps = async (): Promise<EmojiDataProps> => {
-  const [level, data] = await Promise.all([detectEmojiSupportLevel(), import("./all.json")]);
+  const [level, data] = await Promise.all([detectEmojiSupportLevel(), loadEmojiData()]);
 
   return {
-    native: level >= 14, // until twemoji supports v15 our all.json represents data for v14
-    data: data.default,
+    native: level >= 14,
+    // type declarations between @fibery/emoji-data and emoji-mart conflict a bit but they are compatible
+    data: data as unknown as Data,
     backgroundImageFn,
     set: "apple",
     sheetColumns: 61,
@@ -28,11 +34,12 @@ const getAppleDataProps = async (): Promise<EmojiDataProps> => {
   };
 };
 const getTwitterDataProps = async (): Promise<EmojiDataProps> => {
-  const data = await import("./all.json");
+  const data = await loadEmojiData();
 
   return {
     native: false,
-    data: data.default,
+    // type declarations between @fibery/emoji-data and emoji-mart conflict a bit but they are compatible
+    data: data as unknown as Data,
     backgroundImageFn,
     set: "twitter",
     sheetColumns: 61,

package/src/emoji-mart/emoji-index.ts

@@ -1,5 +1,5 @@
-import {NimbleEmojiIndex} from "emoji-mart";
+import {NimbleEmojiIndex} from "@fibery/emoji-data";
 
-import data from "./data/all.json";
+import data from "@fibery/emoji-data/data/all.json";
 
 export const emojiIndex = new NimbleEmojiIndex(data);

package/src/emoji-mart/data.tsx

@@ -1,4 +0,0 @@
-export const loadEmojiData = async () => {
-  const data = await import("emoji-mart/data/all.json");
-  return data;
-};