@atlaskit/reactions 33.2.9 → 33.2.10

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/reactions
 
+## 33.2.10
+
+### Patch Changes
+
+- [#197800](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/197800)
+  [`af8a1e4a36047`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/af8a1e4a36047) -
+  Revert platform_editor_reactions_picker_fix FG clean up
+- Updated dependencies
+
 ## 33.2.9
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -62,6 +62,9 @@
 		{
 			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../platform/feature-flags-react/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/popper/afm-cc/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -62,6 +62,9 @@
 		{
 			"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../../platform/feature-flags-react/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/popper/afm-jira/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -62,6 +62,9 @@
 		{
 			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../../platform/feature-flags-react/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/popper/afm-post-office/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -62,6 +62,9 @@
 		{
 			"path": "../../../platform/feature-flags/afm-townsquare/tsconfig.json"
 		},
+		{
+			"path": "../../../platform/feature-flags-react/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/popper/afm-townsquare/tsconfig.json"
 		},

package/dist/cjs/analytics/index.js

@@ -11,7 +11,7 @@ var _analyticsGasTypes = require("@atlaskit/analytics-gas-types");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var packageName = "@atlaskit/reactions";
-var packageVersion = "33.2.8";
+var packageVersion = "33.2.9";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/cjs/components/ReactionPicker.js

@@ -27,7 +27,6 @@ var _Selector = require("./Selector");
 var _Trigger = require("./Trigger");
 var _RepositionOnUpdate = require("./RepositionOnUpdate");
 var _colors = require("@atlaskit/theme/colors");
-var _portal = _interopRequireDefault(require("@atlaskit/portal"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -157,6 +156,19 @@ var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(f
     settings = _useState10[0],
     setSettings = _useState10[1];
 
+  /**
+   * Custom hook triggers when user clicks outside the reactions picker
+   */
+  (0, _useCloseManager.useCloseManager)(wrapperRef, function (callbackType) {
+    close();
+    onCancel();
+    if (triggerRef && callbackType === 'ESCAPE') {
+      requestAnimationFrame(function () {
+        return triggerRef.focus();
+      });
+    }
+  }, true, isPopupTrayOpen);
+
   /**
    * Event callback when the picker is closed
    * @param _id Optional id if an emoji button was selected or undefineed if was clicked outside the picker
@@ -275,10 +287,6 @@ var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(f
     var _updatePopper$current;
     (_updatePopper$current = updatePopper.current) === null || _updatePopper$current === void 0 || _updatePopper$current.call(updatePopper);
   }, [settings]);
-  var onClose = function onClose() {
-    close();
-    onCancel();
-  };
   return /*#__PURE__*/_react.default.createElement("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: (0, _runtime.ax)(["_s7n4nkob _1pra1o8l", wrapperClassName]),
@@ -320,14 +328,9 @@ var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(f
         isListItem: isListItem
       }))
     );
-  }), isPopupTrayOpen && /*#__PURE__*/_react.default.createElement(_portal.default, {
-    zIndex: _constants.layers.layer()
-  }, /*#__PURE__*/_react.default.createElement(PopperWrapper, {
+  }), isPopupTrayOpen && /*#__PURE__*/_react.default.createElement(PopperWrapper, {
     settings: settings,
-    popperModifiers: popperModifiers,
-    isOpen: isPopupTrayOpen,
-    onClose: onClose,
-    triggerRef: triggerRef
+    popperModifiers: popperModifiers
   }, settings.showFullPicker || hoverableReactionPicker && isHoverableReactionPickerEmojiPickerOpen ? /*#__PURE__*/_react.default.createElement(_picker.EmojiPicker, {
     emojiProvider: emojiProvider,
     onSelection: onEmojiSelected,
@@ -343,13 +346,10 @@ var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(f
     onMoreClick: onSelectMoreClick,
     pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
     hoverableReactionPickerSelector: hoverableReactionPicker
-  }))))));
+  })))));
 });
 var PopperWrapper = exports.PopperWrapper = function PopperWrapper(props) {
-  var triggerRef = props.triggerRef,
-    settings = props.settings,
-    isOpen = props.isOpen,
-    onClose = props.onClose,
+  var settings = props.settings,
     children = props.children,
     popperModifiers = props.popperModifiers;
   var _useState11 = (0, _react.useState)(null),
@@ -365,21 +365,10 @@ var PopperWrapper = exports.PopperWrapper = function PopperWrapper(props) {
     initialFocusRef: null,
     targetRef: popupRef
   });
-
-  /**
-   * Custom hook triggers when user clicks outside the reactions picker
-   */
-  (0, _useCloseManager.useCloseManagerV2)(popupRef, triggerRef, function (callbackType) {
-    onClose();
-    if (popupRef && callbackType === 'ESCAPE') {
-      requestAnimationFrame(function () {
-        return triggerRef === null || triggerRef === void 0 ? void 0 : triggerRef.focus();
-      });
-    }
-  }, true, isOpen);
   return /*#__PURE__*/_react.default.createElement(_popper.Popper, {
     placement: settings.popperPlacement,
-    modifiers: popperModifiers
+    modifiers: popperModifiers,
+    strategy: "absolute"
   }, function (_ref3) {
     var _ref4 = _ref3.ref,
       style = _ref3.style,

package/dist/cjs/components/ReactionPickerNew.compiled.css

@@ -0,0 +1,11 @@
+
+._2rko1sit{border-radius:var(--ds-border-radius,3px)}._16qs1a23{box-shadow:var(--_3t1odq)}
+._1bch1b66>div{margin-top:var(--ds-space-050,4px)}
+._1e0c1txw{display:flex}
+._1pra1o8l.miniMode{display:inline-block}
+._79pa1b66>div{margin-bottom:var(--ds-space-050,4px)}
+._bfhk13b4{background-color:var(--_1f6rtr1)}
+._s7n4nkob{vertical-align:middle}
+._1hvw1o36:focus{outline-width:medium}
+._49pcglyw:focus{outline-style:none}
+._nt751r31:focus{outline-color:currentColor}

package/dist/cjs/components/ReactionPickerNew.js

@@ -0,0 +1,421 @@
+/* ReactionPickerNew.tsx generated by @compiled/babel-plugin v0.36.1 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ReactionPicker = exports.RENDER_REACTIONPICKER_TESTID = exports.RENDER_REACTIONPICKERPANEL_TESTID = exports.PopperWrapper = void 0;
+require("./ReactionPickerNew.compiled.css");
+var _runtime = require("@compiled/react/runtime");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _picker = require("@atlaskit/emoji/picker");
+var _popper = require("@atlaskit/popper");
+var _constants = require("@atlaskit/theme/constants");
+var _compiled = require("@atlaskit/primitives/compiled");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _useCloseManager = require("../hooks/useCloseManager");
+var _useDelayedState3 = require("../hooks/useDelayedState");
+var _useFocusTrap = require("../hooks/useFocusTrap");
+var _i18n = require("../shared/i18n");
+var _ufo = require("../ufo");
+var _Selector = require("./Selector");
+var _Trigger = require("./Trigger");
+var _RepositionOnUpdate = require("./RepositionOnUpdate");
+var _colors = require("@atlaskit/theme/colors");
+var _portal = _interopRequireDefault(require("@atlaskit/portal"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var pickerStyle = null;
+var popupWrapperStyle = null;
+var popupStyle = null;
+var popupStyleWithMarginTop = null;
+var additionalStyles = {
+  selectorContainer: "_1e0c1txw"
+};
+
+/**
+ * Test id for wrapper ReactionPicker div
+ */
+var RENDER_REACTIONPICKER_TESTID = exports.RENDER_REACTIONPICKER_TESTID = 'reactionPicker-testid';
+
+/**
+ * Test id for ReactionPicker panel div
+ */
+var RENDER_REACTIONPICKERPANEL_TESTID = exports.RENDER_REACTIONPICKERPANEL_TESTID = 'reactionPickerPanel-testid';
+
+/**
+ * Emoji Picker Controller Id for Accessibility Labels
+ */
+var PICKER_CONTROL_ID = 'emoji-picker';
+/**
+ * Picker component for adding reactions
+ */
+var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(function (props) {
+  var miniMode = props.miniMode,
+    className = props.className,
+    emojiProvider = props.emojiProvider,
+    onSelection = props.onSelection,
+    allowAllEmojis = props.allowAllEmojis,
+    disabled = props.disabled,
+    pickerQuickReactionEmojiIds = props.pickerQuickReactionEmojiIds,
+    _props$onShowMore = props.onShowMore,
+    onShowMore = _props$onShowMore === void 0 ? function () {} : _props$onShowMore,
+    _props$onOpen = props.onOpen,
+    onOpen = _props$onOpen === void 0 ? function () {} : _props$onOpen,
+    _props$onCancel = props.onCancel,
+    onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
+    _props$tooltipContent = props.tooltipContent,
+    tooltipContent = _props$tooltipContent === void 0 ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.addReaction) : _props$tooltipContent,
+    emojiPickerSize = props.emojiPickerSize,
+    _props$showOpaqueBack = props.showOpaqueBackground,
+    showOpaqueBackground = _props$showOpaqueBack === void 0 ? false : _props$showOpaqueBack,
+    _props$subtleReaction = props.subtleReactionsSummaryAndPicker,
+    subtleReactionsSummaryAndPicker = _props$subtleReaction === void 0 ? false : _props$subtleReaction,
+    _props$showAddReactio = props.showAddReactionText,
+    showAddReactionText = _props$showAddReactio === void 0 ? false : _props$showAddReactio,
+    reactionPickerTriggerIcon = props.reactionPickerTriggerIcon,
+    reactionPickerTriggerText = props.reactionPickerTriggerText,
+    reactionPickerPlacement = props.reactionPickerPlacement,
+    _props$isListItem = props.isListItem,
+    isListItem = _props$isListItem === void 0 ? false : _props$isListItem,
+    _props$hoverableReact = props.hoverableReactionPicker,
+    hoverableReactionPicker = _props$hoverableReact === void 0 ? false : _props$hoverableReact,
+    _props$hoverableReact2 = props.hoverableReactionPickerDelay,
+    hoverableReactionPickerDelay = _props$hoverableReact2 === void 0 ? 0 : _props$hoverableReact2;
+  var _useState = (0, _react.useState)(null),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    triggerRef = _useState2[0],
+    setTriggerRef = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isHoverableReactionPickerEmojiPickerOpen = _useState4[0],
+    setIsHoverableReactionPickerEmojiPickerOpen = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    isHoveringTrigger = _useState6[0],
+    setIsHoveringTrigger = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    isHoveringPopup = _useState8[0],
+    setIsHoveringPopup = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
+    _useState0 = (0, _slicedToArray2.default)(_useState9, 2),
+    isTriggerClicked = _useState0[0],
+    setIsTriggerClicked = _useState0[1];
+  var _useDelayedState = (0, _useDelayedState3.useDelayedState)(false, hoverableReactionPickerDelay),
+    _useDelayedState2 = (0, _slicedToArray2.default)(_useDelayedState, 2),
+    isPopupTrayOpen = _useDelayedState2[0],
+    setIsPopupTrayOpen = _useDelayedState2[1];
+
+  /**
+   * Container <div /> reference (used by custom hook to detect click outside)
+   */
+  var wrapperRef = (0, _react.useRef)(null);
+  var updatePopper = (0, _react.useRef)();
+  var popperPlacement = reactionPickerPlacement || 'bottom-start';
+  var popperModifiers = [
+  /**
+    Removing this applyStyle modifier as it throws client errors ref:
+   https://popper.js.org/docs/v1/#modifiers
+   https://popper.js.org/docs/v1/#modifiers..applyStyle
+   { name: 'applyStyle', enabled: false },
+    */
+  {
+    name: 'hide',
+    enabled: false
+  }, {
+    name: 'offset',
+    enabled: true,
+    options: {
+      offset: [0, (0, _platformFeatureFlags.fg)('platform-reactions-offset-based-popper') ? 4 : 0]
+    }
+  }, {
+    name: 'flip',
+    enabled: true,
+    options: {
+      flipVariations: true,
+      boundariesElement: 'scrollParent'
+    }
+  }];
+  var _useState1 = (0, _react.useState)({
+      /**
+       * Show the full custom emoji list picker or the default list of emojis
+       */
+      showFullPicker: !!allowAllEmojis && Array.isArray(pickerQuickReactionEmojiIds) && pickerQuickReactionEmojiIds.length === 0,
+      /**
+       * Use placement for popper based on reactionPickerPlacement prop
+       */
+      popperPlacement: popperPlacement
+    }),
+    _useState10 = (0, _slicedToArray2.default)(_useState1, 2),
+    settings = _useState10[0],
+    setSettings = _useState10[1];
+
+  /**
+   * Event callback when the picker is closed
+   * @param _id Optional id if an emoji button was selected or undefineed if was clicked outside the picker
+   */
+  var close = (0, _react.useCallback)(function (_id) {
+    setIsPopupTrayOpen(false, true);
+    // ufo abort reaction experience
+    _ufo.PickerRender.abort({
+      metadata: {
+        emojiId: _id,
+        source: 'ReactionPicker',
+        reason: 'close dialog'
+      }
+    });
+    if (hoverableReactionPicker) {
+      setIsHoverableReactionPickerEmojiPickerOpen(false);
+      setIsTriggerClicked(false);
+      setIsHoveringTrigger(false);
+      setIsHoveringPopup(false);
+    }
+  }, [setIsPopupTrayOpen, setIsHoverableReactionPickerEmojiPickerOpen, hoverableReactionPicker, setIsTriggerClicked, setIsHoveringTrigger, setIsHoveringPopup]);
+
+  /**
+   * Event handle rwhen selecting to show the custom emoji icons picker
+   * @param e event param
+   */
+  var onSelectMoreClick = (0, _react.useCallback)(function (e) {
+    e.preventDefault();
+    setSettings({
+      showFullPicker: hoverableReactionPicker ? settings.showFullPicker : true,
+      popperPlacement: popperPlacement
+    });
+    setIsPopupTrayOpen(true);
+    if (hoverableReactionPicker) {
+      setIsHoverableReactionPickerEmojiPickerOpen(!isHoverableReactionPickerEmojiPickerOpen);
+      setIsTriggerClicked(false);
+    }
+    onShowMore();
+  }, [settings.showFullPicker, setIsPopupTrayOpen, onShowMore, popperPlacement, hoverableReactionPicker, setIsHoverableReactionPickerEmojiPickerOpen, isHoverableReactionPickerEmojiPickerOpen]);
+
+  /**
+   * Event callback when an emoji icon is selected
+   * @param item selected item
+   */
+  var onEmojiSelected = (0, _react.useCallback)(function (item) {
+    // no emoji was selected
+    if (!item.id) {
+      return;
+    }
+    onSelection(item.id, settings.showFullPicker || hoverableReactionPicker && isHoverableReactionPickerEmojiPickerOpen ? 'emojiPicker' : 'quickSelector');
+    close(item.id);
+  }, [close, onSelection, settings.showFullPicker, hoverableReactionPicker, isHoverableReactionPickerEmojiPickerOpen]);
+
+  /**
+   * Event handler when the emoji icon to open the custom picker is selected
+   */
+  var onTriggerClick = (0, _react.useCallback)(function () {
+    // ufo start reactions picker open experience
+    _ufo.PickerRender.start();
+    setSettings(_objectSpread(_objectSpread({}, settings), {}, {
+      popperPlacement: popperPlacement
+    }));
+    if (hoverableReactionPicker) {
+      if (isHoverableReactionPickerEmojiPickerOpen || isTriggerClicked) {
+        // if either the emoji picker is open or the trigger was clicked, close the popup and reset the state
+        setIsTriggerClicked(false);
+        setIsPopupTrayOpen(false, true);
+      } else {
+        // if neither condition is true, open the popup and set the state
+        setIsTriggerClicked(true);
+        setIsPopupTrayOpen(true, true);
+      }
+      // close the emoji picker
+      setIsHoverableReactionPickerEmojiPickerOpen(false);
+    } else {
+      setIsPopupTrayOpen(!isPopupTrayOpen);
+    }
+    onOpen();
+    // ufo reactions picker opened success
+    _ufo.PickerRender.success();
+  }, [hoverableReactionPicker, isPopupTrayOpen, setIsPopupTrayOpen, isTriggerClicked, setIsTriggerClicked, isHoverableReactionPickerEmojiPickerOpen, onOpen, settings, popperPlacement]);
+  var handleTriggerMouseEnter = (0, _react.useCallback)(function () {
+    if (hoverableReactionPicker) {
+      setIsHoveringTrigger(true);
+      if (!isHoverableReactionPickerEmojiPickerOpen) {
+        setIsPopupTrayOpen(true);
+      }
+    }
+  }, [hoverableReactionPicker, isHoverableReactionPickerEmojiPickerOpen, setIsPopupTrayOpen]);
+  var handleTriggerMouseLeave = (0, _react.useCallback)(function () {
+    if (hoverableReactionPicker) {
+      setIsHoveringTrigger(false);
+      if (!isHoveringPopup && !isHoverableReactionPickerEmojiPickerOpen && !isTriggerClicked) {
+        setIsPopupTrayOpen(false);
+      }
+    }
+  }, [hoverableReactionPicker, isHoveringPopup, isHoverableReactionPickerEmojiPickerOpen, setIsPopupTrayOpen, isTriggerClicked]);
+  var handlePopupMouseEnter = (0, _react.useCallback)(function () {
+    if (hoverableReactionPicker) {
+      setIsHoveringPopup(true);
+      if (!isHoverableReactionPickerEmojiPickerOpen) {
+        setIsPopupTrayOpen(true);
+      }
+    }
+  }, [hoverableReactionPicker, isHoverableReactionPickerEmojiPickerOpen, setIsPopupTrayOpen]);
+  var handlePopupMouseLeave = (0, _react.useCallback)(function () {
+    if (hoverableReactionPicker) {
+      setIsHoveringPopup(false);
+      if (!isHoveringTrigger && !isHoverableReactionPickerEmojiPickerOpen && !isTriggerClicked) {
+        setIsPopupTrayOpen(false);
+      }
+    }
+  }, [hoverableReactionPicker, isHoveringTrigger, isHoverableReactionPickerEmojiPickerOpen, setIsPopupTrayOpen, isTriggerClicked]);
+  var wrapperClassName = " ".concat(isPopupTrayOpen ? 'isOpen' : '', " ").concat(miniMode ? 'miniMode' : '', " ").concat(className);
+  (0, _react.useLayoutEffect)(function () {
+    var _updatePopper$current;
+    (_updatePopper$current = updatePopper.current) === null || _updatePopper$current === void 0 || _updatePopper$current.call(updatePopper);
+  }, [settings]);
+  var onClose = function onClose() {
+    close();
+    onCancel();
+  };
+  return /*#__PURE__*/_react.default.createElement("div", {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    className: (0, _runtime.ax)(["_s7n4nkob _1pra1o8l", wrapperClassName]),
+    "data-testid": RENDER_REACTIONPICKER_TESTID,
+    ref: wrapperRef
+  }, /*#__PURE__*/_react.default.createElement(_popper.Manager, null, /*#__PURE__*/_react.default.createElement(_popper.Reference, null, function (_ref) {
+    var _ref2 = _ref.ref;
+    return (
+      /*#__PURE__*/
+      // Render a button to open the <Selector /> panel
+      _react.default.createElement(_compiled.Box, {
+        onMouseEnter: handleTriggerMouseEnter,
+        onMouseLeave: handleTriggerMouseLeave
+      }, /*#__PURE__*/_react.default.createElement(_Trigger.Trigger, {
+        ariaAttributes: {
+          'aria-expanded': isPopupTrayOpen,
+          'aria-controls': PICKER_CONTROL_ID
+        },
+        ref: function ref(node) {
+          if (node && isPopupTrayOpen) {
+            if (typeof _ref2 === 'function') {
+              _ref2(node);
+            } else {
+              _ref2.current = node;
+            }
+            setTriggerRef(node);
+          }
+        },
+        isSelected: isPopupTrayOpen,
+        onClick: onTriggerClick,
+        miniMode: miniMode,
+        disabled: disabled,
+        tooltipContent: isPopupTrayOpen ? null : tooltipContent,
+        showOpaqueBackground: showOpaqueBackground,
+        showAddReactionText: showAddReactionText,
+        subtleReactionsSummaryAndPicker: subtleReactionsSummaryAndPicker,
+        reactionPickerTriggerIcon: reactionPickerTriggerIcon,
+        reactionPickerTriggerText: reactionPickerTriggerText,
+        isListItem: isListItem
+      }))
+    );
+  }), isPopupTrayOpen && /*#__PURE__*/_react.default.createElement(_portal.default, {
+    zIndex: _constants.layers.layer()
+  }, /*#__PURE__*/_react.default.createElement(PopperWrapper, {
+    settings: settings,
+    popperModifiers: popperModifiers,
+    isOpen: isPopupTrayOpen,
+    onClose: onClose,
+    triggerRef: triggerRef
+  }, settings.showFullPicker || hoverableReactionPicker && isHoverableReactionPickerEmojiPickerOpen ? /*#__PURE__*/_react.default.createElement(_picker.EmojiPicker, {
+    emojiProvider: emojiProvider,
+    onSelection: onEmojiSelected,
+    size: emojiPickerSize
+  }) : /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+    xcss: additionalStyles.selectorContainer,
+    onMouseEnter: handlePopupMouseEnter,
+    onMouseLeave: handlePopupMouseLeave
+  }, /*#__PURE__*/_react.default.createElement(_Selector.Selector, {
+    emojiProvider: emojiProvider,
+    onSelection: onEmojiSelected,
+    showMore: allowAllEmojis,
+    onMoreClick: onSelectMoreClick,
+    pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
+    hoverableReactionPickerSelector: hoverableReactionPicker
+  }))))));
+});
+var PopperWrapper = exports.PopperWrapper = function PopperWrapper(props) {
+  var triggerRef = props.triggerRef,
+    settings = props.settings,
+    isOpen = props.isOpen,
+    onClose = props.onClose,
+    children = props.children,
+    popperModifiers = props.popperModifiers;
+  var _useState11 = (0, _react.useState)(null),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    popupRef = _useState12[0],
+    setPopupRef = _useState12[1];
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  /**
+   * add focus lock to popup
+   */
+  (0, _useFocusTrap.useFocusTrap)({
+    initialFocusRef: null,
+    targetRef: popupRef
+  });
+
+  /**
+   * Custom hook triggers when user clicks outside the reactions picker
+   */
+  (0, _useCloseManager.useCloseManagerV2)(popupRef, triggerRef, function (callbackType) {
+    onClose();
+    if (popupRef && callbackType === 'ESCAPE') {
+      requestAnimationFrame(function () {
+        return triggerRef === null || triggerRef === void 0 ? void 0 : triggerRef.focus();
+      });
+    }
+  }, true, isOpen);
+  return /*#__PURE__*/_react.default.createElement(_popper.Popper, {
+    placement: settings.popperPlacement,
+    modifiers: popperModifiers
+  }, function (_ref3) {
+    var _ref4 = _ref3.ref,
+      style = _ref3.style,
+      update = _ref3.update;
+    return /*#__PURE__*/_react.default.createElement("div", {
+      role: "group",
+      "aria-label": formatMessage(_i18n.messages.popperWrapperLabel),
+      id: PICKER_CONTROL_ID,
+      "data-testid": RENDER_REACTIONPICKERPANEL_TESTID
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+      ,
+      style: _objectSpread({
+        zIndex: _constants.layers.layer()
+      }, style),
+      ref: function ref(node) {
+        if (node) {
+          if (typeof _ref4 === 'function') {
+            _ref4(node);
+          } else {
+            _ref4.current = node;
+          }
+          setPopupRef(node);
+        }
+      },
+      // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+      tabIndex: 0,
+      className: (0, _runtime.ax)(["_nt751r31 _49pcglyw _1hvw1o36"])
+    }, /*#__PURE__*/_react.default.createElement(_RepositionOnUpdate.RepositionOnUpdate, {
+      update: update,
+      settings: settings
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _runtime.ax)(["_2rko1sit _bfhk13b4 _16qs1a23 _79pa1b66", !(0, _platformFeatureFlags.fg)('platform-reactions-offset-based-popper') && "_1bch1b66"]),
+      style: {
+        "--_1f6rtr1": (0, _runtime.ix)("var(--ds-surface-overlay, ".concat(_colors.N0, ")")),
+        "--_3t1odq": (0, _runtime.ix)("var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")"))
+      }
+    }, children)));
+  });
+};

package/dist/cjs/components/Reactions.js

@@ -26,8 +26,11 @@ var _ufo = require("../ufo");
 var _Reaction = require("./Reaction");
 var _ReactionsDialog = require("./ReactionsDialog");
 var _ReactionPicker = require("./ReactionPicker");
+var _ReactionPickerNew = require("./ReactionPickerNew");
 var _ReactionSummaryView = require("./ReactionSummaryView");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var ReactionPicker = (0, _platformFeatureFlagsReact.componentWithFG)('platform_editor_reactions_picker_fix', _ReactionPickerNew.ReactionPicker, _ReactionPicker.ReactionPicker);
 var wrapperStyle = null;
 var noFlexWrapStyles = null;
 var noContainerPositionStyles = null;
@@ -384,7 +387,7 @@ var Reactions = exports.Reactions = /*#__PURE__*/_react.default.memo(function (_
       isViewOnly: isViewOnly,
       showSubtleStyle: showSubtleDefaultReactions && reactions.length === 0
     });
-  })), isViewOnly || !onlyRenderPicker && shouldShowSummaryView && allowSelectFromSummaryView ? null : /*#__PURE__*/_react.default.createElement(_ReactionPicker.ReactionPicker, {
+  })), isViewOnly || !onlyRenderPicker && shouldShowSummaryView && allowSelectFromSummaryView ? null : /*#__PURE__*/_react.default.createElement(ReactionPicker, {
     emojiProvider: emojiProvider,
     allowAllEmojis: allowAllEmojis,
     pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,

package/dist/cjs/containers/ConnectedReactionPicker/ConnectedReactionPicker.js

@@ -12,6 +12,9 @@ var _react = _interopRequireDefault(require("react"));
 var _components = require("../../components");
 var _ufo = require("../../ufo");
 var _ReactionPicker = require("../../components/ReactionPicker");
+var _ReactionPickerNew = require("../../components/ReactionPickerNew");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
+var ReactionPicker = (0, _platformFeatureFlagsReact.componentWithFG)('platform_editor_reactions_picker_fix', _ReactionPickerNew.ReactionPicker, _ReactionPicker.ReactionPicker);
 /**
  * Reaction Picker component
  */
@@ -43,7 +46,7 @@ var ConnectedReactionPicker = exports.ConnectedReactionPicker = function Connect
   };
   return /*#__PURE__*/_react.default.createElement(_components.UfoErrorBoundary, {
     experiences: [_ufo.PickerRender]
-  }, /*#__PURE__*/_react.default.createElement(_ReactionPicker.ReactionPicker, (0, _extends2.default)({}, props, {
+  }, /*#__PURE__*/_react.default.createElement(ReactionPicker, (0, _extends2.default)({}, props, {
     onSelection: onSelection
   })));
 };