emoji-picker-react 4.4.5 → 4.4.7

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.4.5",
+  "version": "4.4.7",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/body/EmojiVariationPicker.tsx

@@ -14,7 +14,6 @@ import {
   useEmojiStyleConfig,
   useGetEmojiUrlConfig
 } from '../../config/useConfig';
-import { asEmoji } from '../../dataUtils/asEmoji';
 import {
   emojiHasVariations,
   emojiUnified,
@@ -73,8 +72,6 @@ export function EmojiVariationPicker() {
     pointerStyle = getPointerStyle();
   }
 
-  const safeEmoji = asEmoji(emoji);
-
   return (
     <div
       ref={VariationPickerRef}
@@ -84,14 +81,14 @@ export function EmojiVariationPicker() {
       })}
       style={{ top }}
     >
-      {visible
-        ? [emojiUnified(safeEmoji)]
-            .concat(emojiVariations(safeEmoji))
+      {visible && emoji
+        ? [emojiUnified(emoji)]
+            .concat(emojiVariations(emoji))
             .slice(0, 6)
             .map(unified => (
               <ClickableEmoji
                 key={unified}
-                emoji={safeEmoji}
+                emoji={emoji}
                 unified={unified}
                 emojiStyle={emojiStyle}
                 showVariations={false}

package/src/components/context/PickerContext.tsx

@@ -40,14 +40,14 @@ export function PickerContextProvider({ children }: Props) {
         activeSkinTone,
         disallowClickRef,
         disallowMouseRef,
+        disallowedEmojisRef,
         emojiVariationPickerState,
         emojisThatFailedToLoadState,
         filterRef,
         isPastInitialLoad,
         searchTerm,
         skinToneFanOpenState,
-        suggestedUpdateState,
-        disallowedEmojisRef,
+        suggestedUpdateState
       }}
     >
       {children}
@@ -82,7 +82,7 @@ const PickerContext = React.createContext<{
   isPastInitialLoad: true,
   searchTerm: ['', () => new Promise<string>(() => undefined)],
   skinToneFanOpenState: [false, () => {}],
-  suggestedUpdateState: [Date.now(), () => {}],
+  suggestedUpdateState: [Date.now(), () => {}]
 });
 
 type Props = Readonly<{
@@ -150,7 +150,7 @@ export function useUpdateSuggested(): [number, () => void] {
     suggestedUpdated,
     function updateSuggested() {
       setsuggestedUpdate(Date.now());
-    },
+    }
   ];
 }
 

package/src/components/emoji/Emoji.tsx

@@ -3,7 +3,6 @@ import * as React from 'react';
 
 import { ClassNames } from '../../DomUtils/classNames';
 import { DataEmoji } from '../../dataUtils/DataTypes';
-import { asEmoji } from '../../dataUtils/asEmoji';
 import {
   emojiByUnified,
   emojiHasVariations,
@@ -87,6 +86,9 @@ export function ViewOnlyEmoji({
   }
 
   const emojiToRender = emoji ? emoji : emojiByUnified(unified);
+  if(!emojiToRender) {
+    return null
+  }
 
   return (
     <>
@@ -96,7 +98,7 @@ export function ViewOnlyEmoji({
         <EmojiImg
           unified={unified}
           style={style}
-          emoji={asEmoji(emojiToRender)}
+          emoji={emojiToRender}
           emojiStyle={emojiStyle}
           lazyLoad={lazyLoad}
           getEmojiUrl={getEmojiUrl}

package/src/components/footer/Preview.tsx

@@ -6,7 +6,6 @@ import {
   useGetEmojiUrlConfig,
   usePreviewConfig
 } from '../../config/useConfig';
-import { asEmoji } from '../../dataUtils/asEmoji';
 import {
   emojiByUnified,
   emojiName,
@@ -54,9 +53,10 @@ export function PreviewBody() {
   return <PreviewContent />;
 
   function PreviewContent() {
-    const defaultEmoji = asEmoji(
-      variationPickerEmoji ?? emojiByUnified(previewConfig.defaultEmoji)
-    );
+    const defaultEmoji = variationPickerEmoji ?? emojiByUnified(previewConfig.defaultEmoji)
+    if (!defaultEmoji) {
+      return null
+    }
     const defaultText = variationPickerEmoji
       ? emojiName(variationPickerEmoji)
       : previewConfig.defaultCaption;
@@ -67,7 +67,7 @@ export function PreviewBody() {
           {show ? (
             <ViewOnlyEmoji
               unified={previewEmoji?.unified as string}
-              emoji={asEmoji(emoji)}
+              emoji={emoji}
               emojiStyle={emojiStyle}
               size={45}
               getEmojiUrl={getEmojiUrl}
@@ -84,7 +84,7 @@ export function PreviewBody() {
         </div>
         {show ? (
           <div className="epr-preview-emoji-label">
-            {emojiName(asEmoji(emoji))}
+            {emojiName(emoji)}
           </div>
         ) : (
           <div className="epr-preview-emoji-label">{defaultText}</div>

package/src/dataUtils/emojiSelectors.ts

@@ -2,7 +2,7 @@ import { Categories } from '../config/categoryConfig';
 import { cdnUrl } from '../config/cdnUrls';
 import emojis from '../data/emojis';
 import skinToneVariations, {
-  skinTonesMapped,
+  skinTonesMapped
 } from '../data/skinToneVariations';
 import { EmojiStyle, SkinTones } from '../types/exposedTypes';
 
@@ -12,7 +12,7 @@ enum EmojiProperties {
   name = 'n',
   unified = 'u',
   variations = 'v',
-  added_in = 'a',
+  added_in = 'a'
 }
 
 export function emojiNames(emoji: DataEmoji): string[] {
@@ -23,7 +23,11 @@ export function addedIn(emoji: DataEmoji): number {
   return parseFloat(emoji[EmojiProperties.added_in]);
 }
 
-export function emojiName(emoji: DataEmoji): string {
+export function emojiName(emoji?: DataEmoji): string {
+  if (!emoji) {
+    return '';
+  }
+
   return emojiNames(emoji)[0];
 }
 
@@ -74,7 +78,7 @@ export function emojiVariationUnified(
   skinTone?: string
 ): string | undefined {
   return skinTone
-    ? emojiVariations(emoji).find((variation) => variation.includes(skinTone))
+    ? emojiVariations(emoji).find(variation => variation.includes(skinTone))
     : emojiUnified(emoji);
 }
 

package/src/hooks/useSetVariationPicker.ts

@@ -9,11 +9,9 @@ export default function useSetVariationPicker() {
   return function setVariationPicker(element: NullableElement) {
     const [emoji] = emojiFromElement(element);
 
-    if (!emoji) {
-      return;
+    if (emoji) {
+      setAnchoredEmojiRef(element);
+      setEmojiVariationPicker(emoji);
     }
-
-    setAnchoredEmojiRef(element);
-    setEmojiVariationPicker(emoji);
   };
 }

package/dist/dataUtils/asEmoji.d.ts

@@ -1,2 +0,0 @@
-import { DataEmoji } from './DataTypes';
-export declare function asEmoji(emoji: DataEmoji | undefined | null): DataEmoji;

package/src/dataUtils/asEmoji.ts

@@ -1,5 +0,0 @@
-import { DataEmoji } from './DataTypes';
-
-export function asEmoji(emoji: DataEmoji | undefined | null): DataEmoji {
-  return emoji as DataEmoji;
-}