@atlaskit/reactions 33.2.7 → 33.2.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/reactions
 
+## 33.2.9
+
+### Patch Changes
+
+- [`c171a86fa9ec4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c171a86fa9ec4) -
+  tidy up feature flag to ensable reactions picker with portal
+
+## 33.2.8
+
+### Patch Changes
+
+- [`43bff733f3a10`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/43bff733f3a10) -
+  Removed analytics container from example wrapper
+
 ## 33.2.7
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -62,9 +62,6 @@
 		{
 			"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,9 +62,6 @@
 		{
 			"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,9 +62,6 @@
 		{
 			"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,9 +62,6 @@
 		{
 			"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.6";
+var packageVersion = "33.2.8";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/cjs/components/ReactionPicker.js

@@ -27,6 +27,7 @@ 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; }
@@ -156,19 +157,6 @@ 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
@@ -287,6 +275,10 @@ 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]),
@@ -328,9 +320,14 @@ var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(f
         isListItem: isListItem
       }))
     );
-  }), isPopupTrayOpen && /*#__PURE__*/_react.default.createElement(PopperWrapper, {
+  }), isPopupTrayOpen && /*#__PURE__*/_react.default.createElement(_portal.default, {
+    zIndex: _constants.layers.layer()
+  }, /*#__PURE__*/_react.default.createElement(PopperWrapper, {
     settings: settings,
-    popperModifiers: popperModifiers
+    popperModifiers: popperModifiers,
+    isOpen: isPopupTrayOpen,
+    onClose: onClose,
+    triggerRef: triggerRef
   }, settings.showFullPicker || hoverableReactionPicker && isHoverableReactionPickerEmojiPickerOpen ? /*#__PURE__*/_react.default.createElement(_picker.EmojiPicker, {
     emojiProvider: emojiProvider,
     onSelection: onEmojiSelected,
@@ -346,10 +343,13 @@ var ReactionPicker = exports.ReactionPicker = /*#__PURE__*/_react.default.memo(f
     onMoreClick: onSelectMoreClick,
     pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
     hoverableReactionPickerSelector: hoverableReactionPicker
-  })))));
+  }))))));
 });
 var PopperWrapper = exports.PopperWrapper = function PopperWrapper(props) {
-  var settings = props.settings,
+  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),
@@ -365,10 +365,21 @@ 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,
-    strategy: "absolute"
+    modifiers: popperModifiers
   }, function (_ref3) {
     var _ref4 = _ref3.ref,
       style = _ref3.style,

package/dist/cjs/components/Reactions.js

@@ -26,11 +26,8 @@ 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;
@@ -387,7 +384,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, {
+  })), isViewOnly || !onlyRenderPicker && shouldShowSummaryView && allowSelectFromSummaryView ? null : /*#__PURE__*/_react.default.createElement(_ReactionPicker.ReactionPicker, {
     emojiProvider: emojiProvider,
     allowAllEmojis: allowAllEmojis,
     pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,

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

@@ -12,9 +12,6 @@ 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
  */
@@ -46,7 +43,7 @@ var ConnectedReactionPicker = exports.ConnectedReactionPicker = function Connect
   };
   return /*#__PURE__*/_react.default.createElement(_components.UfoErrorBoundary, {
     experiences: [_ufo.PickerRender]
-  }, /*#__PURE__*/_react.default.createElement(ReactionPicker, (0, _extends2.default)({}, props, {
+  }, /*#__PURE__*/_react.default.createElement(_ReactionPicker.ReactionPicker, (0, _extends2.default)({}, props, {
     onSelection: onSelection
   })));
 };

package/dist/cjs/index.js

@@ -33,7 +33,12 @@ Object.defineProperty(exports, "ReactionConsumer", {
     return _store.ReactionConsumer;
   }
 });
-exports.ReactionPicker = void 0;
+Object.defineProperty(exports, "ReactionPicker", {
+  enumerable: true,
+  get: function get() {
+    return _ReactionPicker.ReactionPicker;
+  }
+});
 Object.defineProperty(exports, "ReactionServiceClient", {
   enumerable: true,
   get: function get() {
@@ -67,18 +72,14 @@ Object.defineProperty(exports, "useCloseManager", {
 });
 var _constants = require("./shared/constants");
 var _ufo = require("./ufo");
-var _ReactionPicker = require("./components/ReactionPicker");
-var _ReactionPickerNew = require("./components/ReactionPickerNew");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _client = require("./client");
 var _Reaction = require("./components/Reaction");
+var _ReactionPicker = require("./components/ReactionPicker");
 var _Reactions = require("./components/Reactions");
 var _useCloseManager = require("./hooks/useCloseManager");
 var _containers = require("./containers");
 var _store = require("./store");
 var _types = require("./types");
-var ReactionPicker = exports.ReactionPicker = (0, _platformFeatureFlagsReact.componentWithFG)('platform_editor_reactions_picker_fix', _ReactionPickerNew.ReactionPicker, _ReactionPicker.ReactionPicker);
-
 // TODO: Convert all calls for ReactionRequest to Request, RequestClient to Client and ReactionsStore to Store
 
 var constants = exports.constants = {

package/dist/es2019/analytics/index.js

@@ -1,7 +1,7 @@
 import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { UI_EVENT_TYPE, OPERATIONAL_EVENT_TYPE } from '@atlaskit/analytics-gas-types';
 const packageName = "@atlaskit/reactions";
-const packageVersion = "33.2.6";
+const packageVersion = "33.2.8";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/es2019/components/ReactionPicker.js

@@ -8,7 +8,7 @@ import { Manager, Popper, Reference } from '@atlaskit/popper';
 import { layers } from '@atlaskit/theme/constants';
 import { Box } from '@atlaskit/primitives/compiled';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { useCloseManager } from '../hooks/useCloseManager';
+import { useCloseManagerV2 } from '../hooks/useCloseManager';
 import { useDelayedState } from '../hooks/useDelayedState';
 import { useFocusTrap } from '../hooks/useFocusTrap';
 import { messages } from '../shared/i18n';
@@ -17,6 +17,7 @@ import { Selector } from './Selector';
 import { Trigger } from './Trigger';
 import { RepositionOnUpdate } from './RepositionOnUpdate';
 import { N0, N50A, N60A } from '@atlaskit/theme/colors';
+import Portal from '@atlaskit/portal';
 const pickerStyle = null;
 const popupWrapperStyle = null;
 const popupStyle = null;
@@ -114,17 +115,6 @@ export const ReactionPicker = /*#__PURE__*/React.memo(props => {
     popperPlacement
   });
 
-  /**
-   * Custom hook triggers when user clicks outside the reactions picker
-   */
-  useCloseManager(wrapperRef, callbackType => {
-    close();
-    onCancel();
-    if (triggerRef && callbackType === 'ESCAPE') {
-      requestAnimationFrame(() => 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
@@ -244,6 +234,10 @@ export const ReactionPicker = /*#__PURE__*/React.memo(props => {
     var _updatePopper$current;
     (_updatePopper$current = updatePopper.current) === null || _updatePopper$current === void 0 ? void 0 : _updatePopper$current.call(updatePopper);
   }, [settings]);
+  const onClose = () => {
+    close();
+    onCancel();
+  };
   return /*#__PURE__*/React.createElement("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: ax(["_s7n4nkob _1pra1o8l", wrapperClassName]),
@@ -283,9 +277,14 @@ export const ReactionPicker = /*#__PURE__*/React.memo(props => {
     reactionPickerTriggerIcon: reactionPickerTriggerIcon,
     reactionPickerTriggerText: reactionPickerTriggerText,
     isListItem: isListItem
-  }))), isPopupTrayOpen && /*#__PURE__*/React.createElement(PopperWrapper, {
+  }))), isPopupTrayOpen && /*#__PURE__*/React.createElement(Portal, {
+    zIndex: layers.layer()
+  }, /*#__PURE__*/React.createElement(PopperWrapper, {
     settings: settings,
-    popperModifiers: popperModifiers
+    popperModifiers: popperModifiers,
+    isOpen: isPopupTrayOpen,
+    onClose: onClose,
+    triggerRef: triggerRef
   }, settings.showFullPicker || hoverableReactionPicker && isHoverableReactionPickerEmojiPickerOpen ? /*#__PURE__*/React.createElement(EmojiPicker, {
     emojiProvider: emojiProvider,
     onSelection: onEmojiSelected,
@@ -301,11 +300,14 @@ export const ReactionPicker = /*#__PURE__*/React.memo(props => {
     onMoreClick: onSelectMoreClick,
     pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
     hoverableReactionPickerSelector: hoverableReactionPicker
-  })))));
+  }))))));
 });
 export const PopperWrapper = props => {
   const {
+    triggerRef,
     settings,
+    isOpen,
+    onClose,
     children,
     popperModifiers
   } = props;
@@ -320,10 +322,19 @@ export const PopperWrapper = props => {
     initialFocusRef: null,
     targetRef: popupRef
   });
+
+  /**
+   * Custom hook triggers when user clicks outside the reactions picker
+   */
+  useCloseManagerV2(popupRef, triggerRef, callbackType => {
+    onClose();
+    if (popupRef && callbackType === 'ESCAPE') {
+      requestAnimationFrame(() => triggerRef === null || triggerRef === void 0 ? void 0 : triggerRef.focus());
+    }
+  }, true, isOpen);
   return /*#__PURE__*/React.createElement(Popper, {
     placement: settings.popperPlacement,
-    modifiers: popperModifiers,
-    strategy: "absolute"
+    modifiers: popperModifiers
   }, ({
     ref,
     style,

package/dist/es2019/components/Reactions.js

@@ -13,11 +13,8 @@ import { ReactionStatus } from '../types';
 import { ReactionDialogOpened, ReactionDialogSelectedReactionChanged } from '../ufo';
 import { Reaction } from './Reaction';
 import { ReactionsDialog } from './ReactionsDialog';
-import { ReactionPicker as ReactionPickerOld } from './ReactionPicker';
-import { ReactionPicker as ReactionPickerNew } from './ReactionPickerNew';
+import { ReactionPicker } from './ReactionPicker';
 import { ReactionSummaryView } from './ReactionSummaryView';
-import { componentWithFG } from '@atlaskit/platform-feature-flags-react';
-const ReactionPicker = componentWithFG('platform_editor_reactions_picker_fix', ReactionPickerNew, ReactionPickerOld);
 const wrapperStyle = null;
 const noFlexWrapStyles = null;
 const noContainerPositionStyles = null;

package/dist/es2019/containers/ConnectedReactionPicker/ConnectedReactionPicker.js

@@ -2,10 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { UfoErrorBoundary } from '../../components';
 import { PickerRender } from '../../ufo';
-import { ReactionPicker as ReactionPickerOld } from '../../components/ReactionPicker';
-import { ReactionPicker as ReactionPickerNew } from '../../components/ReactionPickerNew';
-import { componentWithFG } from '@atlaskit/platform-feature-flags-react';
-const ReactionPicker = componentWithFG('platform_editor_reactions_picker_fix', ReactionPickerNew, ReactionPickerOld);
+import { ReactionPicker } from '../../components/ReactionPicker';
 /**
  * Reaction Picker component
  */

package/dist/es2019/index.js

@@ -1,12 +1,8 @@
 import { DefaultReactions, DefaultReactionsByShortName, ExtendedReactions, ExtendedReactionsByShortName, NUMBER_OF_REACTIONS_TO_DISPLAY, SAMPLING_RATE_REACTIONS_RENDERED_EXP, TOOLTIP_USERS_LIMIT } from './shared/constants';
 import { ComponentName, ExperienceName, PickerRender, ReactionsAdd, ReactionDetailsFetch, ReactionDialogOpened, ReactionDialogSelectedReactionChanged, ReactionsRemove, ReactionsRendered, sampledReactionsRendered } from './ufo';
-import { ReactionPicker as ReactionPickerLegacy } from './components/ReactionPicker';
-import { ReactionPicker as ReactionPickerNew } from './components/ReactionPickerNew';
-import { componentWithFG } from '@atlaskit/platform-feature-flags-react';
-const ReactionPicker = componentWithFG('platform_editor_reactions_picker_fix', ReactionPickerNew, ReactionPickerLegacy);
 export { ReactionServiceClient } from './client';
 export { Reaction } from './components/Reaction';
-export { ReactionPicker };
+export { ReactionPicker } from './components/ReactionPicker';
 export { Reactions } from './components/Reactions';
 export { useCloseManager } from './hooks/useCloseManager';
 export { ConnectedReactionPicker, ConnectedReactionsView } from './containers';

package/dist/esm/analytics/index.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { createAndFireEvent } from '@atlaskit/analytics-next';
 import { UI_EVENT_TYPE, OPERATIONAL_EVENT_TYPE } from '@atlaskit/analytics-gas-types';
 var packageName = "@atlaskit/reactions";
-var packageVersion = "33.2.6";
+var packageVersion = "33.2.8";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/esm/components/ReactionPicker.js

@@ -12,7 +12,7 @@ import { Manager, Popper, Reference } from '@atlaskit/popper';
 import { layers } from '@atlaskit/theme/constants';
 import { Box } from '@atlaskit/primitives/compiled';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { useCloseManager } from '../hooks/useCloseManager';
+import { useCloseManagerV2 } from '../hooks/useCloseManager';
 import { useDelayedState } from '../hooks/useDelayedState';
 import { useFocusTrap } from '../hooks/useFocusTrap';
 import { messages } from '../shared/i18n';
@@ -21,6 +21,7 @@ import { Selector } from './Selector';
 import { Trigger } from './Trigger';
 import { RepositionOnUpdate } from './RepositionOnUpdate';
 import { N0, N50A, N60A } from '@atlaskit/theme/colors';
+import Portal from '@atlaskit/portal';
 var pickerStyle = null;
 var popupWrapperStyle = null;
 var popupStyle = null;
@@ -147,19 +148,6 @@ export var ReactionPicker = /*#__PURE__*/React.memo(function (props) {
     settings = _useState10[0],
     setSettings = _useState10[1];
 
-  /**
-   * Custom hook triggers when user clicks outside the reactions picker
-   */
-  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
@@ -278,6 +266,10 @@ export var ReactionPicker = /*#__PURE__*/React.memo(function (props) {
     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.createElement("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: ax(["_s7n4nkob _1pra1o8l", wrapperClassName]),
@@ -319,9 +311,14 @@ export var ReactionPicker = /*#__PURE__*/React.memo(function (props) {
         isListItem: isListItem
       }))
     );
-  }), isPopupTrayOpen && /*#__PURE__*/React.createElement(PopperWrapper, {
+  }), isPopupTrayOpen && /*#__PURE__*/React.createElement(Portal, {
+    zIndex: layers.layer()
+  }, /*#__PURE__*/React.createElement(PopperWrapper, {
     settings: settings,
-    popperModifiers: popperModifiers
+    popperModifiers: popperModifiers,
+    isOpen: isPopupTrayOpen,
+    onClose: onClose,
+    triggerRef: triggerRef
   }, settings.showFullPicker || hoverableReactionPicker && isHoverableReactionPickerEmojiPickerOpen ? /*#__PURE__*/React.createElement(EmojiPicker, {
     emojiProvider: emojiProvider,
     onSelection: onEmojiSelected,
@@ -337,10 +334,13 @@ export var ReactionPicker = /*#__PURE__*/React.memo(function (props) {
     onMoreClick: onSelectMoreClick,
     pickerQuickReactionEmojiIds: pickerQuickReactionEmojiIds,
     hoverableReactionPickerSelector: hoverableReactionPicker
-  })))));
+  }))))));
 });
 export var PopperWrapper = function PopperWrapper(props) {
-  var settings = props.settings,
+  var triggerRef = props.triggerRef,
+    settings = props.settings,
+    isOpen = props.isOpen,
+    onClose = props.onClose,
     children = props.children,
     popperModifiers = props.popperModifiers;
   var _useState11 = useState(null),
@@ -356,10 +356,21 @@ export var PopperWrapper = function PopperWrapper(props) {
     initialFocusRef: null,
     targetRef: popupRef
   });
+
+  /**
+   * Custom hook triggers when user clicks outside the reactions picker
+   */
+  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.createElement(Popper, {
     placement: settings.popperPlacement,
-    modifiers: popperModifiers,
-    strategy: "absolute"
+    modifiers: popperModifiers
   }, function (_ref3) {
     var _ref4 = _ref3.ref,
       style = _ref3.style,

package/dist/esm/components/Reactions.js

@@ -15,11 +15,8 @@ import { ReactionStatus } from '../types';
 import { ReactionDialogOpened, ReactionDialogSelectedReactionChanged } from '../ufo';
 import { Reaction } from './Reaction';
 import { ReactionsDialog } from './ReactionsDialog';
-import { ReactionPicker as ReactionPickerOld } from './ReactionPicker';
-import { ReactionPicker as ReactionPickerNew } from './ReactionPickerNew';
+import { ReactionPicker } from './ReactionPicker';
 import { ReactionSummaryView } from './ReactionSummaryView';
-import { componentWithFG } from '@atlaskit/platform-feature-flags-react';
-var ReactionPicker = componentWithFG('platform_editor_reactions_picker_fix', ReactionPickerNew, ReactionPickerOld);
 var wrapperStyle = null;
 var noFlexWrapStyles = null;
 var noContainerPositionStyles = null;

package/dist/esm/containers/ConnectedReactionPicker/ConnectedReactionPicker.js

@@ -4,10 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import { UfoErrorBoundary } from '../../components';
 import { PickerRender } from '../../ufo';
-import { ReactionPicker as ReactionPickerOld } from '../../components/ReactionPicker';
-import { ReactionPicker as ReactionPickerNew } from '../../components/ReactionPickerNew';
-import { componentWithFG } from '@atlaskit/platform-feature-flags-react';
-var ReactionPicker = componentWithFG('platform_editor_reactions_picker_fix', ReactionPickerNew, ReactionPickerOld);
+import { ReactionPicker } from '../../components/ReactionPicker';
 /**
  * Reaction Picker component
  */

package/dist/esm/index.js

@@ -1,12 +1,8 @@
 import { DefaultReactions, DefaultReactionsByShortName, ExtendedReactions, ExtendedReactionsByShortName, NUMBER_OF_REACTIONS_TO_DISPLAY, SAMPLING_RATE_REACTIONS_RENDERED_EXP, TOOLTIP_USERS_LIMIT } from './shared/constants';
 import { ComponentName, ExperienceName, PickerRender, ReactionsAdd, ReactionDetailsFetch, ReactionDialogOpened, ReactionDialogSelectedReactionChanged, ReactionsRemove, ReactionsRendered, sampledReactionsRendered } from './ufo';
-import { ReactionPicker as ReactionPickerLegacy } from './components/ReactionPicker';
-import { ReactionPicker as ReactionPickerNew } from './components/ReactionPickerNew';
-import { componentWithFG } from '@atlaskit/platform-feature-flags-react';
-var ReactionPicker = componentWithFG('platform_editor_reactions_picker_fix', ReactionPickerNew, ReactionPickerLegacy);
 export { ReactionServiceClient } from './client';
 export { Reaction } from './components/Reaction';
-export { ReactionPicker };
+export { ReactionPicker } from './components/ReactionPicker';
 export { Reactions } from './components/Reactions';
 export { useCloseManager } from './hooks/useCloseManager';
 export { ConnectedReactionPicker, ConnectedReactionsView } from './containers';

package/dist/types/components/ReactionPicker.d.ts

@@ -92,16 +92,23 @@ export interface ReactionPickerProps extends Pick<SelectorProps, 'pickerQuickRea
      * Optional prop to set a delay for the reaction picker when it opens/closes on hover
      */
     hoverableReactionPickerDelay?: number;
+    /**
+     * Optional prop to set the strategy of the reaction picker popup
+     */
+    reactionPickerStrategy?: PopperProps<{}>['strategy'];
 }
 /**
  * Picker component for adding reactions
  */
 export declare const ReactionPicker: React.MemoExoticComponent<(props: ReactionPickerProps) => JSX.Element>;
 export interface PopperWrapperProps {
+    triggerRef: HTMLDivElement | HTMLButtonElement | null;
     settings: {
         showFullPicker: boolean;
         popperPlacement: Placement;
     };
+    isOpen: boolean;
+    onClose: () => void;
     popperModifiers?: PopperProps<{}>['modifiers'];
 }
 export declare const PopperWrapper: (props: PropsWithChildren<PopperWrapperProps>) => JSX.Element;

package/dist/types/index.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="react" />
 import { ComponentName, ExperienceName } from './ufo';
-declare const ReactionPicker: import("react").FC<import("./components/ReactionPickerNew").ReactionPickerProps & import("./components/ReactionPicker").ReactionPickerProps>;
 export { ReactionServiceClient } from './client';
 export { Reaction } from './components/Reaction';
-export { ReactionPicker };
+export { ReactionPicker } from './components/ReactionPicker';
 export { Reactions } from './components/Reactions';
 export { useCloseManager } from './hooks/useCloseManager';
 export { ConnectedReactionPicker, ConnectedReactionsView } from './containers';

package/dist/types-ts4.5/components/ReactionPicker.d.ts

@@ -92,16 +92,23 @@ export interface ReactionPickerProps extends Pick<SelectorProps, 'pickerQuickRea
      * Optional prop to set a delay for the reaction picker when it opens/closes on hover
      */
     hoverableReactionPickerDelay?: number;
+    /**
+     * Optional prop to set the strategy of the reaction picker popup
+     */
+    reactionPickerStrategy?: PopperProps<{}>['strategy'];
 }
 /**
  * Picker component for adding reactions
  */
 export declare const ReactionPicker: React.MemoExoticComponent<(props: ReactionPickerProps) => JSX.Element>;
 export interface PopperWrapperProps {
+    triggerRef: HTMLDivElement | HTMLButtonElement | null;
     settings: {
         showFullPicker: boolean;
         popperPlacement: Placement;
     };
+    isOpen: boolean;
+    onClose: () => void;
     popperModifiers?: PopperProps<{}>['modifiers'];
 }
 export declare const PopperWrapper: (props: PropsWithChildren<PopperWrapperProps>) => JSX.Element;

package/dist/types-ts4.5/index.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="react" />
 import { ComponentName, ExperienceName } from './ufo';
-declare const ReactionPicker: import("react").FC<import("./components/ReactionPickerNew").ReactionPickerProps & import("./components/ReactionPicker").ReactionPickerProps>;
 export { ReactionServiceClient } from './client';
 export { Reaction } from './components/Reaction';
-export { ReactionPicker };
+export { ReactionPicker } from './components/ReactionPicker';
 export { Reactions } from './components/Reactions';
 export { useCloseManager } from './hooks/useCloseManager';
 export { ConnectedReactionPicker, ConnectedReactionsView } from './containers';