emoji-picker-react 4.20.6 → 4.20.8

package/dist/DomUtils/focusElement.d.ts

@@ -1,5 +1,5 @@
 import { NullableElement } from './selectors';
-export declare function focusElement(element: NullableElement): void;
+export declare function focusElement(element: NullableElement, shouldFocus?: () => boolean): void;
 export declare function focusPrevElementSibling(element: NullableElement): void;
 export declare function focusNextElementSibling(element: NullableElement): void;
 export declare function focusFirstElementChild(element: NullableElement): void;

package/dist/emoji-picker-react.cjs.development.js

@@ -27363,11 +27363,16 @@ function useIsSearchMode() {
   return !!searchTerm;
 }
 
-function focusElement(element) {
+function focusElement(element, shouldFocus) {
   if (!element) {
     return;
   }
   requestAnimationFrame(function () {
+    // Rechecked here rather than at call time: focus may have moved in the
+    // meantime (e.g. hover scheduled focus, then the user tabbed out).
+    if (shouldFocus && !shouldFocus()) {
+      return;
+    }
     element.focus();
   });
 }
@@ -27866,9 +27871,20 @@ function useSetVariationPicker() {
   var setAnchoredEmojiRef = useSetAnchoredEmojiRef();
   var _useEmojiVariationPic = useEmojiVariationPickerState(),
     setEmojiVariationPicker = _useEmojiVariationPic[1];
+  // Context-aware lookup: respects the `emojiData` prop (e.g. translations).
+  // The legacy global lookup only knows the default English dataset.
+  // https://github.com/ealush/emoji-picker-react/issues/503
+  var _usePickerDataContext = usePickerDataContext(),
+    emojiByUnified = _usePickerDataContext.emojiByUnified;
   return function setVariationPicker(element) {
-    var _emojiFromElement = emojiFromElement(element),
-      emoji = _emojiFromElement[0];
+    var _allUnifiedFromEmojiE = allUnifiedFromEmojiElement(element),
+      unified = _allUnifiedFromEmojiE.unified,
+      originalUnified = _allUnifiedFromEmojiE.originalUnified;
+    var resolvedUnified = unified != null ? unified : originalUnified;
+    if (!resolvedUnified) {
+      return;
+    }
+    var emoji = emojiByUnified(resolvedUnified);
     if (emoji) {
       setAnchoredEmojiRef(element);
       setEmojiVariationPicker(emoji);
@@ -29955,18 +29971,9 @@ var styles$a = /*#__PURE__*/stylesheet.create({
   }
 });
 
-function detectEmojyPartiallyBelowFold(button, bodyRef) {
-  if (!button || !bodyRef) {
-    return 0;
-  }
-  var buttonRect = button.getBoundingClientRect();
-  var bodyRect = bodyRef.getBoundingClientRect();
-  // If the element is obscured by at least half of its size
-  return bodyRect.height - (buttonRect.y - bodyRect.y);
-}
-
 function useEmojiPreviewEvents(allow, setPreviewEmoji) {
   var BodyRef = useBodyRef();
+  var PickerMainRef = usePickerMainRef();
   var isMouseDisallowed = useIsMouseDisallowed();
   var allowMouseMove = useAllowMouseMove();
   React.useEffect(function () {
@@ -30018,15 +30025,38 @@ function useEmojiPreviewEvents(allow, setPreviewEmoji) {
         return;
       }
       var button = buttonFromTarget(e.target);
-      if (button) {
-        var belowFoldByPx = detectEmojyPartiallyBelowFold(button, bodyRef);
-        var buttonHeight = button.getBoundingClientRect().height;
-        if (belowFoldByPx < buttonHeight) {
-          return handlePartiallyVisibleElementFocus(button, setPreviewEmoji);
-        }
-        focusElement(button);
+      if (!button) {
+        return;
+      }
+      var _allUnifiedFromEmojiE2 = allUnifiedFromEmojiElement(button),
+        unified = _allUnifiedFromEmojiE2.unified,
+        originalUnified = _allUnifiedFromEmojiE2.originalUnified;
+      if (!unified || !originalUnified) {
+        return;
+      }
+      setPreviewEmoji({
+        unified: unified,
+        originalUnified: originalUnified
+      });
+      // Let arrow-key navigation continue from the hovered emoji, but only
+      // when focus is already inside the picker (or nowhere meaningful).
+      // Pulling focus out of an external element steals the caret from
+      // host-app inputs (issue #320). The guard runs again inside the
+      // deferred callback in case focus moved out after this event.
+      if (!isExternalElementFocused()) {
+        focusElement(button, function () {
+          return !isExternalElementFocused();
+        });
       }
     }
+    function isExternalElementFocused() {
+      var _PickerMainRef$curren;
+      var active = document.activeElement;
+      if (!active || active === document.body || active === document.documentElement) {
+        return false;
+      }
+      return !((_PickerMainRef$curren = PickerMainRef.current) != null && _PickerMainRef$curren.contains(active));
+    }
     return function () {
       bodyRef == null ? void 0 : bodyRef.removeEventListener('mouseover', onMouseOver);
       bodyRef == null ? void 0 : bodyRef.removeEventListener('mouseout', onLeave);
@@ -30036,20 +30066,6 @@ function useEmojiPreviewEvents(allow, setPreviewEmoji) {
     };
   }, [BodyRef, allow, setPreviewEmoji, isMouseDisallowed, allowMouseMove]);
 }
-function handlePartiallyVisibleElementFocus(button, setPreviewEmoji) {
-  var _document$activeEleme;
-  var _allUnifiedFromEmojiE2 = allUnifiedFromEmojiElement(button),
-    unified = _allUnifiedFromEmojiE2.unified,
-    originalUnified = _allUnifiedFromEmojiE2.originalUnified;
-  if (!unified || !originalUnified) {
-    return;
-  }
-  (_document$activeEleme = document.activeElement) == null ? void 0 : _document$activeEleme.blur == null ? void 0 : _document$activeEleme.blur();
-  setPreviewEmoji({
-    unified: unified,
-    originalUnified: originalUnified
-  });
-}
 
 var _stylesheet$create;
 var FlexDirection;