@atlaskit/editor-plugin-type-ahead 1.10.4 → 1.10.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 1.10.6
+
+### Patch Changes
+
+- [#164952](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/164952)
+  [`0faf43580a9d8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0faf43580a9d8) -
+  ED-25612: moves typeahead from reactdom render to portalprovider
+- Updated dependencies
+
+## 1.10.5
+
+### Patch Changes
+
+- [#159777](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159777)
+  [`e708d0a9e4b36`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e708d0a9e4b36) -
+  Refactoring plugins to meet folder standards.
+- Updated dependencies
+
 ## 1.10.4
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "typeAheadPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.typeAheadPlugin;
+    return _typeAheadPlugin.typeAheadPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _typeAheadPlugin = require("./typeAheadPlugin");

package/dist/cjs/{api.js → pm-plugins/api.js}

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.createTypeAheadTools = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
+var _closeTypeAhead = require("./commands/close-type-ahead");
 var _insertTypeAheadItem = require("./commands/insert-type-ahead-item");
+var _openTypeaheadAtCursor = require("./commands/open-typeahead-at-cursor");
 var _updateQuery = require("./commands/update-query");
-var _closeTypeAhead = require("./transforms/close-type-ahead");
-var _openTypeaheadAtCursor = require("./transforms/open-typeahead-at-cursor");
 var _utils = require("./utils");
 var open = function open(_ref) {
   var editorView = _ref.editorView;

package/dist/cjs/{transforms → pm-plugins/commands}/close-type-ahead.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.closeTypeAhead = void 0;
-var _actions = require("../pm-plugins/actions");
-var _key = require("../pm-plugins/key");
+var _actions = require("../actions");
+var _key = require("../key");
 var closeTypeAhead = exports.closeTypeAhead = function closeTypeAhead(tr) {
   return tr.setMeta(_key.pluginKey, {
     action: _actions.ACTIONS.CLOSE_TYPE_AHEAD

package/dist/cjs/{commands → pm-plugins/commands}/insert-type-ahead-item.js

@@ -11,12 +11,12 @@ var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _insertUtils = require("../insert-utils");
-var _actions = require("../pm-plugins/actions");
-var _key = require("../pm-plugins/key");
+var _actions = require("../actions");
+var _key = require("../key");
 var _statsModifier = require("../stats-modifier");
-var _closeTypeAhead = require("../transforms/close-type-ahead");
 var _utils2 = require("../utils");
+var _closeTypeAhead = require("./close-type-ahead");
+var _insertUtils = require("./insert-utils");
 var validateNode = function validateNode(_ref) {
   var schema = _ref.schema,
     maybeNode = _ref.maybeNode;

package/dist/cjs/{transforms → pm-plugins/commands}/open-typeahead-at-cursor.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.openTypeAheadAtCursor = exports.openTypeAhead = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _actions = require("../pm-plugins/actions");
-var _key = require("../pm-plugins/key");
+var _actions = require("../actions");
+var _key = require("../key");
 var openTypeAhead = exports.openTypeAhead = function openTypeAhead(props) {
   return function (tr) {
     var triggerHandler = props.triggerHandler,

package/dist/cjs/{commands → pm-plugins/commands}/update-list-items.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateListItem = void 0;
-var _actions = require("../pm-plugins/actions");
-var _key = require("../pm-plugins/key");
+var _actions = require("../actions");
+var _key = require("../key");
 var updateListItem = exports.updateListItem = function updateListItem(items) {
   return function (state, dispatch) {
     var tr = state.tr;

package/dist/cjs/{commands → pm-plugins/commands}/update-query.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateQuery = void 0;
-var _actions = require("../pm-plugins/actions");
-var _key = require("../pm-plugins/key");
+var _actions = require("../actions");
+var _key = require("../key");
 var updateQuery = exports.updateQuery = function updateQuery(query) {
   return function (state, dispatch) {
     var pluginState = _key.pluginKey.getState(state);

package/dist/cjs/{commands → pm-plugins/commands}/update-selected-index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateSelectedIndex = void 0;
-var _actions = require("../pm-plugins/actions");
-var _key = require("../pm-plugins/key");
+var _actions = require("../actions");
+var _key = require("../key");
 var updateSelectedIndex = exports.updateSelectedIndex = function updateSelectedIndex(selectedIndex) {
   return function (state, dispatch) {
     var pluginState = _key.pluginKey.getState(state);

package/dist/cjs/pm-plugins/decorations.js

@@ -13,15 +13,17 @@ var _w3cKeyname = require("w3c-keyname");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
-var _constants = require("../constants");
-var _statsModifier = require("../stats-modifier");
-var _closeTypeAhead = require("../transforms/close-type-ahead");
 var _WrapperTypeAhead = require("../ui/WrapperTypeAhead");
-var _utils = require("../utils");
+var _closeTypeAhead = require("./commands/close-type-ahead");
+var _constants = require("./constants");
+var _statsModifier = require("./stats-modifier");
+var _utils = require("./utils");
 var factoryDecorations = exports.factoryDecorations = function factoryDecorations(_ref) {
   var intl = _ref.intl,
-    popupMountRef = _ref.popupMountRef;
+    popupMountRef = _ref.popupMountRef,
+    nodeViewPortalProviderAPI = _ref.nodeViewPortalProviderAPI;
   var createDecorations = function createDecorations(tr, _ref2) {
     var triggerHandler = _ref2.triggerHandler,
       inputMethod = _ref2.inputMethod,
@@ -40,7 +42,6 @@ var factoryDecorations = exports.factoryDecorations = function factoryDecoration
     var stats = new _statsModifier.StatsModifier();
     var shouldFocusCursorInsideQuery = true;
     var deco = _view.Decoration.widget($cursor.pos, function (editorView, getDecorationPosition) {
-      var _popupMountRef$curren, _popupMountRef$curren2, _popupMountRef$curren3;
       typeaheadComponent.setAttribute('id', decorationId);
       typeaheadComponent.setAttribute('role', 'search');
       typeaheadComponent.dataset.typeAheadQuery = 'true';
@@ -77,23 +78,47 @@ var factoryDecorations = exports.factoryDecorations = function factoryDecoration
         }
         return false;
       };
-      _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_reactIntlNext.IntlProvider, {
-        locale: intl.locale || 'en',
-        messages: intl.messages,
-        formats: intl.formats
-      }, /*#__PURE__*/_react.default.createElement(_WrapperTypeAhead.WrapperTypeAhead, {
-        triggerHandler: triggerHandler,
-        editorView: editorView,
-        anchorElement: typeaheadComponent,
-        inputMethod: inputMethod,
-        getDecorationPosition: getDecorationPosition,
-        shouldFocusCursorInsideQuery: shouldFocusCursorInsideQuery,
-        popupsMountPoint: (_popupMountRef$curren = popupMountRef.current) === null || _popupMountRef$curren === void 0 ? void 0 : _popupMountRef$curren.popupsMountPoint,
-        popupsBoundariesElement: (_popupMountRef$curren2 = popupMountRef.current) === null || _popupMountRef$curren2 === void 0 ? void 0 : _popupMountRef$curren2.popupsBoundariesElement,
-        popupsScrollableElement: (_popupMountRef$curren3 = popupMountRef.current) === null || _popupMountRef$curren3 === void 0 ? void 0 : _popupMountRef$curren3.popupsScrollableElement,
-        onUndoRedo: onUndoRedo,
-        reopenQuery: reopenQuery
-      })), typeaheadComponent);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
+        nodeViewPortalProviderAPI.render(function () {
+          var _popupMountRef$curren, _popupMountRef$curren2, _popupMountRef$curren3;
+          return /*#__PURE__*/_react.default.createElement(_reactIntlNext.IntlProvider, {
+            locale: intl.locale || 'en',
+            messages: intl.messages,
+            formats: intl.formats
+          }, /*#__PURE__*/_react.default.createElement(_WrapperTypeAhead.WrapperTypeAhead, {
+            triggerHandler: triggerHandler,
+            editorView: editorView,
+            anchorElement: typeaheadComponent,
+            inputMethod: inputMethod,
+            getDecorationPosition: getDecorationPosition,
+            shouldFocusCursorInsideQuery: shouldFocusCursorInsideQuery,
+            popupsMountPoint: (_popupMountRef$curren = popupMountRef.current) === null || _popupMountRef$curren === void 0 ? void 0 : _popupMountRef$curren.popupsMountPoint,
+            popupsBoundariesElement: (_popupMountRef$curren2 = popupMountRef.current) === null || _popupMountRef$curren2 === void 0 ? void 0 : _popupMountRef$curren2.popupsBoundariesElement,
+            popupsScrollableElement: (_popupMountRef$curren3 = popupMountRef.current) === null || _popupMountRef$curren3 === void 0 ? void 0 : _popupMountRef$curren3.popupsScrollableElement,
+            onUndoRedo: onUndoRedo,
+            reopenQuery: reopenQuery
+          }));
+        }, typeaheadComponent, decorationId);
+      } else {
+        var _popupMountRef$curren4, _popupMountRef$curren5, _popupMountRef$curren6;
+        _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_reactIntlNext.IntlProvider, {
+          locale: intl.locale || 'en',
+          messages: intl.messages,
+          formats: intl.formats
+        }, /*#__PURE__*/_react.default.createElement(_WrapperTypeAhead.WrapperTypeAhead, {
+          triggerHandler: triggerHandler,
+          editorView: editorView,
+          anchorElement: typeaheadComponent,
+          inputMethod: inputMethod,
+          getDecorationPosition: getDecorationPosition,
+          shouldFocusCursorInsideQuery: shouldFocusCursorInsideQuery,
+          popupsMountPoint: (_popupMountRef$curren4 = popupMountRef.current) === null || _popupMountRef$curren4 === void 0 ? void 0 : _popupMountRef$curren4.popupsMountPoint,
+          popupsBoundariesElement: (_popupMountRef$curren5 = popupMountRef.current) === null || _popupMountRef$curren5 === void 0 ? void 0 : _popupMountRef$curren5.popupsBoundariesElement,
+          popupsScrollableElement: (_popupMountRef$curren6 = popupMountRef.current) === null || _popupMountRef$curren6 === void 0 ? void 0 : _popupMountRef$curren6.popupsScrollableElement,
+          onUndoRedo: onUndoRedo,
+          reopenQuery: reopenQuery
+        })), typeaheadComponent);
+      }
       shouldFocusCursorInsideQuery = false;
       return typeaheadComponent;
     }, {
@@ -135,7 +160,11 @@ var factoryDecorations = exports.factoryDecorations = function factoryDecoration
       if (!decoElement) {
         return;
       }
-      _reactDom.default.unmountComponentAtNode(decoElement);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
+        nodeViewPortalProviderAPI.remove(spec.key);
+      } else {
+        _reactDom.default.unmountComponentAtNode(decoElement);
+      }
     });
     return true;
   };

package/dist/cjs/pm-plugins/input-rules.js

@@ -9,7 +9,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
-var _openTypeaheadAtCursor = require("../transforms/open-typeahead-at-cursor");
+var _openTypeaheadAtCursor = require("../pm-plugins/commands/open-typeahead-at-cursor");
 function inputRulePlugin(schema, typeAheads, featureFlags) {
   if (!typeAheads || typeAheads.length === 0) {
     return;

package/dist/cjs/pm-plugins/insert-item-plugin.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = createPlugin;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _actions = require("./actions");
-var _utils = require("./utils");
+var _isInsertionTransaction = require("./isInsertionTransaction");
 function createPlugin() {
   return new _safePlugin.SafePlugin({
     appendTransaction: function appendTransaction(transactions, _oldState, newState) {
-      var insertItemCallback = (0, _utils.isInsertionTransaction)(transactions, _actions.ACTIONS.INSERT_ITEM);
+      var insertItemCallback = (0, _isInsertionTransaction.isInsertionTransaction)(transactions, _actions.ACTIONS.INSERT_ITEM);
       if (insertItemCallback) {
         var tr = insertItemCallback(newState);
         if (tr) {

package/dist/cjs/pm-plugins/isInsertionTransaction.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isInsertionTransaction = void 0;
+var _key = require("./key");
+var isInsertionTransaction = exports.isInsertionTransaction = function isInsertionTransaction(transactions, action) {
+  var _tr$getMeta2;
+  var tr = transactions.find(function (tr) {
+    var _tr$getMeta;
+    return ((_tr$getMeta = tr.getMeta(_key.pluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.action) === action;
+  });
+  if (!tr) {
+    return null;
+  }
+  return (_tr$getMeta2 = tr.getMeta(_key.pluginKey)) === null || _tr$getMeta2 === void 0 ? void 0 : _tr$getMeta2.params;
+};

package/dist/cjs/pm-plugins/main.js

@@ -8,12 +8,12 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _constants = require("../constants");
 var _actions = require("./actions");
+var _constants = require("./constants");
 var _decorations = require("./decorations");
+var _isInsertionTransaction = require("./isInsertionTransaction");
 var _key = require("./key");
 var _reducer = require("./reducer");
-var _utils2 = require("./utils");
 var hasValidTypeAheadStep = function hasValidTypeAheadStep(tr) {
   var steps = tr.steps.filter(function (step) {
     return step instanceof _steps.InsertTypeAheadStep;
@@ -30,10 +30,12 @@ function createPlugin(_ref) {
   var reactDispatch = _ref.reactDispatch,
     popupMountRef = _ref.popupMountRef,
     typeAheadHandlers = _ref.typeAheadHandlers,
-    getIntl = _ref.getIntl;
+    getIntl = _ref.getIntl,
+    nodeViewPortalProviderAPI = _ref.nodeViewPortalProviderAPI;
   var intl = getIntl();
   var _factoryDecorations = (0, _decorations.factoryDecorations)({
       intl: intl,
+      nodeViewPortalProviderAPI: nodeViewPortalProviderAPI,
       popupMountRef: popupMountRef
     }),
     createDecorations = _factoryDecorations.createDecorations,
@@ -69,7 +71,7 @@ function createPlugin(_ref) {
       }
     },
     appendTransaction: function appendTransaction(transactions, _oldState, newState) {
-      var insertItemCallback = (0, _utils2.isInsertionTransaction)(transactions, _actions.ACTIONS.INSERT_RAW_QUERY);
+      var insertItemCallback = (0, _isInsertionTransaction.isInsertionTransaction)(transactions, _actions.ACTIONS.INSERT_RAW_QUERY);
       if (insertItemCallback) {
         var tr = insertItemCallback(newState);
         if (tr) {

package/dist/cjs/pm-plugins/reducer.js

@@ -9,9 +9,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _utils = require("../utils");
 var _actions = require("./actions");
 var _key = require("./key");
+var _utils = require("./utils");
 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 shouldForceOpen = function shouldForceOpen(step) {

package/dist/cjs/pm-plugins/utils.js

@@ -3,16 +3,127 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isInsertionTransaction = void 0;
+exports.moveSelectedIndex = exports.isTypeAheadOpen = exports.isTypeAheadHandler = exports.isTypeAheadAllowed = exports.getTypeAheadQuery = exports.getTypeAheadListAriaLabels = exports.getTypeAheadHandler = exports.getPluginState = exports.findHandlerByTrigger = exports.findHandler = void 0;
+var _typeAhead = require("@atlaskit/editor-common/type-ahead");
+var _updateSelectedIndex = require("./commands/update-selected-index");
 var _key = require("./key");
-var isInsertionTransaction = exports.isInsertionTransaction = function isInsertionTransaction(transactions, action) {
-  var _tr$getMeta2;
-  var tr = transactions.find(function (tr) {
-    var _tr$getMeta;
-    return ((_tr$getMeta = tr.getMeta(_key.pluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.action) === action;
-  });
-  if (!tr) {
+var _statsModifier = require("./stats-modifier");
+var isTypeAheadHandler = exports.isTypeAheadHandler = function isTypeAheadHandler(handler) {
+  return handler && Object.values(_typeAhead.TypeAheadAvailableNodes).includes(handler.id) && typeof handler.trigger === 'string' && typeof handler.selectItem === 'function' && typeof handler.getItems === 'function';
+};
+
+/** Is a typeahead plugin open? */
+var isTypeAheadOpen = exports.isTypeAheadOpen = function isTypeAheadOpen(editorState) {
+  var _typeAheadPluginKey$g;
+  return !!(_key.pluginKey !== null && _key.pluginKey !== void 0 && (_typeAheadPluginKey$g = _key.pluginKey.getState(editorState)) !== null && _typeAheadPluginKey$g !== void 0 && (_typeAheadPluginKey$g = _typeAheadPluginKey$g.decorationSet) !== null && _typeAheadPluginKey$g !== void 0 && _typeAheadPluginKey$g.find().length);
+};
+var getPluginState = exports.getPluginState = function getPluginState(editorState) {
+  return _key.pluginKey.getState(editorState);
+};
+var getTypeAheadHandler = exports.getTypeAheadHandler = function getTypeAheadHandler(editorState) {
+  var _typeAheadPluginKey$g2;
+  return (_typeAheadPluginKey$g2 = _key.pluginKey.getState(editorState)) === null || _typeAheadPluginKey$g2 === void 0 ? void 0 : _typeAheadPluginKey$g2.triggerHandler;
+};
+var getTypeAheadQuery = exports.getTypeAheadQuery = function getTypeAheadQuery(editorState) {
+  var _typeAheadPluginKey$g3;
+  return (_typeAheadPluginKey$g3 = _key.pluginKey.getState(editorState)) === null || _typeAheadPluginKey$g3 === void 0 ? void 0 : _typeAheadPluginKey$g3.query;
+};
+var isTypeAheadAllowed = exports.isTypeAheadAllowed = function isTypeAheadAllowed(state) {
+  var isOpen = isTypeAheadOpen(state);
+  // if the TypeAhead is open
+  // we should not allow it
+  return !isOpen;
+};
+var findHandler = exports.findHandler = function findHandler(id, state) {
+  var pluginState = _key.pluginKey.getState(state);
+  if (!pluginState || !pluginState.typeAheadHandlers || pluginState.typeAheadHandlers.length === 0) {
+    return null;
+  }
+  var typeAheadHandlers = pluginState.typeAheadHandlers;
+  return typeAheadHandlers.find(function (h) {
+    return h.id === id;
+  }) || null;
+};
+var findHandlerByTrigger = exports.findHandlerByTrigger = function findHandlerByTrigger(_ref) {
+  var trigger = _ref.trigger,
+    editorState = _ref.editorState;
+  var pluginState = _key.pluginKey.getState(editorState);
+  if (!pluginState || !pluginState.typeAheadHandlers || pluginState.typeAheadHandlers.length === 0) {
     return null;
   }
-  return (_tr$getMeta2 = tr.getMeta(_key.pluginKey)) === null || _tr$getMeta2 === void 0 ? void 0 : _tr$getMeta2.params;
+  var typeAheadHandlers = pluginState.typeAheadHandlers;
+  return typeAheadHandlers.find(function (h) {
+    return h.trigger === trigger;
+  }) || null;
+};
+var moveSelectedIndex = exports.moveSelectedIndex = function moveSelectedIndex(_ref2) {
+  var editorView = _ref2.editorView,
+    direction = _ref2.direction;
+  return function () {
+    var typeAheadState = getPluginState(editorView.state);
+    if (!typeAheadState) {
+      return;
+    }
+    var selectedIndex = typeAheadState.selectedIndex,
+      items = typeAheadState.items;
+    var stats = typeAheadState.stats instanceof _statsModifier.StatsModifier ? typeAheadState.stats : new _statsModifier.StatsModifier();
+    var nextIndex;
+    if (direction === 'next') {
+      stats.increaseArrowDown();
+
+      /**
+       * See: https://product-fabric.atlassian.net/browse/ED-17200
+       * `selectedIndex` is forced to -1 now to not immediately focus the typeahead
+       * and only do so when there is explicit logic to focus into the typeahead
+       * options.
+       *
+       * This check for "set index to 1 when -1"
+       * - is a temporary workaround to get back the previous behaviour without
+       *    entirely reverting the a11y improvements
+       *
+       */
+      if (selectedIndex === -1 && items.length > 1) {
+        nextIndex = 1;
+      } else {
+        nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
+      }
+    } else {
+      stats.increaseArrowUp();
+      nextIndex = selectedIndex <= 0 ? items.length - 1 : selectedIndex - 1;
+    }
+    (0, _updateSelectedIndex.updateSelectedIndex)(nextIndex)(editorView.state, editorView.dispatch);
+  };
+};
+var getTypeAheadListAriaLabels = exports.getTypeAheadListAriaLabels = function getTypeAheadListAriaLabels(trigger, intl, item) {
+  var _item$mention, _item$mention2, _item$emoji, _item$emoji2, _item$emoji3;
+  switch (trigger) {
+    case '@':
+      return {
+        popupAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.mentionPopupLabel),
+        listItemAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.metionListItemLabel, {
+          name: (item === null || item === void 0 || (_item$mention = item.mention) === null || _item$mention === void 0 ? void 0 : _item$mention.name) || '',
+          shortName: (item === null || item === void 0 || (_item$mention2 = item.mention) === null || _item$mention2 === void 0 ? void 0 : _item$mention2.mentionName) || ''
+        })
+      };
+    case '/':
+      return {
+        popupAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.quickInsertPopupLabel),
+        listItemAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.emojiListItemLabel, {
+          name: (item === null || item === void 0 ? void 0 : item.title) || '',
+          shortcut: (item === null || item === void 0 || (_item$emoji = item.emoji) === null || _item$emoji === void 0 ? void 0 : _item$emoji.shortName) || ''
+        })
+      };
+    case ':':
+      return {
+        popupAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.emojiPopupLabel),
+        listItemAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.emojiListItemLabel, {
+          name: (item === null || item === void 0 || (_item$emoji2 = item.emoji) === null || _item$emoji2 === void 0 ? void 0 : _item$emoji2.name) || '',
+          shortcut: (item === null || item === void 0 || (_item$emoji3 = item.emoji) === null || _item$emoji3 === void 0 ? void 0 : _item$emoji3.shortName) || ''
+        })
+      };
+    default:
+      return {
+        popupAriaLabel: intl.formatMessage(_typeAhead.typeAheadListMessages.typeAheadPopupLabel)
+      };
+  }
 };

package/dist/cjs/{plugin.js → typeAheadPlugin.js}

@@ -11,16 +11,16 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
-var _insertTypeAheadItem = require("./commands/insert-type-ahead-item");
+var _closeTypeAhead = require("./pm-plugins/commands/close-type-ahead");
+var _insertTypeAheadItem = require("./pm-plugins/commands/insert-type-ahead-item");
+var _openTypeaheadAtCursor = require("./pm-plugins/commands/open-typeahead-at-cursor");
 var _inputRules = require("./pm-plugins/input-rules");
 var _insertItemPlugin = require("./pm-plugins/insert-item-plugin");
 var _key = require("./pm-plugins/key");
 var _main = require("./pm-plugins/main");
-var _statsModifier = require("./stats-modifier");
-var _closeTypeAhead = require("./transforms/close-type-ahead");
-var _openTypeaheadAtCursor = require("./transforms/open-typeahead-at-cursor");
+var _statsModifier = require("./pm-plugins/stats-modifier");
+var _utils = require("./pm-plugins/utils");
 var _ContentComponent = require("./ui/ContentComponent");
-var _utils = require("./utils");
 /**
  *
  * Revamped typeahead using decorations instead of the `typeAheadQuery` mark
@@ -163,12 +163,14 @@ var typeAheadPlugin = exports.typeAheadPlugin = function typeAheadPlugin(_ref) {
         name: 'typeAhead',
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch,
-            getIntl = _ref2.getIntl;
+            getIntl = _ref2.getIntl,
+            nodeViewPortalProviderAPI = _ref2.nodeViewPortalProviderAPI;
           return (0, _main.createPlugin)({
             getIntl: getIntl,
             popupMountRef: popupMountRef,
             reactDispatch: dispatch,
-            typeAheadHandlers: typeAhead
+            typeAheadHandlers: typeAhead,
+            nodeViewPortalProviderAPI: nodeViewPortalProviderAPI
           });
         }
       }, {

package/dist/cjs/types/index.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/ui/AssistiveText.js

@@ -192,7 +192,7 @@ var AssistiveTextNew = exports.AssistiveTextNew = function AssistiveTextNew(_ref
   }, !silenced && debounced && !bump ? assistiveText : ''));
 };
 var AssistiveText = exports.AssistiveText = function AssistiveText(props) {
-  if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2')) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2')) {
     return (0, _react2.jsx)(AssistiveTextNew, props);
   } else {
     return (0, _react2.jsx)(AssistveTextOld, props);

package/dist/cjs/ui/InputQuery.js

@@ -14,8 +14,8 @@ var _w3cKeyname = require("w3c-keyname");
 var _browser = require("@atlaskit/editor-common/browser");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _constants = require("../constants");
-var _utils = require("../utils");
+var _constants = require("../pm-plugins/constants");
+var _utils = require("../pm-plugins/utils");
 var _AssistiveText = require("./AssistiveText");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/dist/cjs/ui/TypeAheadList.js

@@ -14,9 +14,9 @@ var _CellMeasurer = require("react-virtualized/dist/commonjs/CellMeasurer");
 var _List = require("react-virtualized/dist/commonjs/List");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _menu = require("@atlaskit/menu");
-var _updateSelectedIndex = require("../commands/update-selected-index");
-var _constants = require("../constants");
-var _utils = require("../utils");
+var _updateSelectedIndex = require("../pm-plugins/commands/update-selected-index");
+var _constants = require("../pm-plugins/constants");
+var _utils = require("../pm-plugins/utils");
 var _AssistiveText = require("./AssistiveText");
 var _TypeAheadListItem = require("./TypeAheadListItem");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }

package/dist/cjs/ui/TypeAheadMenu.js

@@ -8,7 +8,7 @@ exports.TypeAheadMenu = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
-var _updateSelectedIndex = require("../commands/update-selected-index");
+var _updateSelectedIndex = require("../pm-plugins/commands/update-selected-index");
 var _useItemInsert3 = require("./hooks/use-item-insert");
 var _TypeAheadPopup = require("./TypeAheadPopup");
 var TypeAheadMenu = exports.TypeAheadMenu = /*#__PURE__*/_react.default.memo(function (_ref) {

package/dist/cjs/ui/TypeAheadPopup.js

@@ -16,7 +16,7 @@ var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _colors = require("@atlaskit/theme/colors");
-var _constants = require("../constants");
+var _constants = require("../pm-plugins/constants");
 var _TypeAheadList = require("./TypeAheadList");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/dist/cjs/ui/WrapperTypeAhead.js

@@ -9,8 +9,8 @@ exports.WrapperTypeAhead = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
-var _updateQuery = require("../commands/update-query");
-var _utils = require("../utils");
+var _updateQuery = require("../pm-plugins/commands/update-query");
+var _utils = require("../pm-plugins/utils");
 var _useItemInsert3 = require("./hooks/use-item-insert");
 var _useLoadItems = require("./hooks/use-load-items");
 var _useOnForceSelect = require("./hooks/use-on-force-select");

package/dist/cjs/ui/hooks/use-item-insert.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.useItemInsert = void 0;
 var _react = require("react");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
-var _insertTypeAheadItem = require("../../commands/insert-type-ahead-item");
-var _constants = require("../../constants");
-var _closeTypeAhead = require("../../transforms/close-type-ahead");
-var _setSelectionBeforeQuery = require("../../transforms/set-selection-before-query");
+var _closeTypeAhead = require("../../pm-plugins/commands/close-type-ahead");
+var _insertTypeAheadItem = require("../../pm-plugins/commands/insert-type-ahead-item");
+var _setSelectionBeforeQuery = require("../../pm-plugins/commands/set-selection-before-query");
+var _constants = require("../../pm-plugins/constants");
 var insertRawQuery = function insertRawQuery(_ref) {
   var view = _ref.view,
     setSelectionAt = _ref.setSelectionAt,

package/dist/cjs/ui/hooks/use-load-items.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useLoadItems = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _updateListItems = require("../../commands/update-list-items");
+var _updateListItems = require("../../pm-plugins/commands/update-list-items");
 var EMPTY_LIST_ITEM = [];
 var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler, editorView, query) {
   var _useState = (0, _react.useState)(EMPTY_LIST_ITEM),

package/dist/cjs/ui/hooks/use-on-force-select.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useOnForceSelect = void 0;
 var _react = require("react");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
-var _insertTypeAheadItem = require("../../commands/insert-type-ahead-item");
+var _insertTypeAheadItem = require("../../pm-plugins/commands/insert-type-ahead-item");
 var useOnForceSelect = exports.useOnForceSelect = function useOnForceSelect(_ref) {
   var triggerHandler = _ref.triggerHandler,
     items = _ref.items,