@atlaskit/editor-core 175.0.5 → 176.0.0

package/dist/esm/plugins/type-ahead/ui/InputQuery.js

@@ -1,13 +1,11 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-
-var _templateObject;
 
 /** @jsx jsx */
 import React, { useRef, useCallback, Fragment, useLayoutEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { keyName as keyNameNormalized } from 'w3c-keyname';
-import { browser, ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+import { browser } from '@atlaskit/editor-common/utils';
 import { getPluginState } from '../utils';
 import { CloseSelectionOptions, TYPE_AHEAD_POPUP_CONTENT_CLASS } from '../constants';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
@@ -15,7 +13,8 @@ import { TYPE_AHEAD_DECORATION_ELEMENT_ID } from '../constants';
 import { AssistiveText } from './AssistiveText';
 import { typeAheadListMessages } from '../messages';
 import { useIntl } from 'react-intl-next';
-var querySpan = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  outline: none;\n"])));
+import { token } from '@atlaskit/tokens';
+import * as colors from '@atlaskit/theme/colors';
 
 var isNavigationKey = function isNavigationKey(event) {
   return ['Enter', 'Tab', 'ArrowDown', 'ArrowUp'].includes(event.key);
@@ -39,6 +38,11 @@ var isUndoRedoShortcut = function isUndoRedoShortcut(event) {
   return false;
 };
 
+var isSelectAllShortcut = function isSelectAllShortcut(event) {
+  var key = keyNameNormalized(event);
+  return (event.ctrlKey || event.metaKey) && key === 'a';
+};
+
 export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
   var triggerQueryPrefix = _ref.triggerQueryPrefix,
       cancel = _ref.cancel,
@@ -52,30 +56,34 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
       onUndoRedo = _ref.onUndoRedo,
       editorView = _ref.editorView,
       items = _ref.items;
-  var ref = useRef(document.createElement('span'));
-  var cleanedInputContent = useCallback(function () {
-    var _ref$current;
+  var ref = useRef(document.createElement('input'));
+  var sizeSpanRef = useRef(document.createElement('span'));
 
-    var raw = ((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.textContent) || '';
-    return raw.replace(ZERO_WIDTH_SPACE, '');
-  }, []);
-  var onKeyUp = useCallback(function (event) {
-    var text = cleanedInputContent();
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      redoBuffer = _useState2[0],
+      setRedoBuffer = _useState2[1];
+
+  var _useState3 = useState(reopenQuery),
+      _useState4 = _slicedToArray(_useState3, 2),
+      query = _useState4[0],
+      setQuery = _useState4[1];
+
+  var onChange = useCallback(function (event) {
+    var text = event.currentTarget.value;
+    sizeSpanRef.current.textContent = text;
+    setQuery(text);
     onQueryChange(text);
-  }, [onQueryChange, cleanedInputContent]);
+  }, [onQueryChange]);
 
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      isInFocus = _useState2[0],
-      setInFocus = _useState2[1];
+  var _useState5 = useState(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isInFocus = _useState6[0],
+      setInFocus = _useState6[1];
 
   var checkKeyEvent = useCallback(function (event) {
-    var _ref$current2;
-
     var key = keyNameNormalized(event);
-    var sel = document.getSelection();
-    var raw = ((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.textContent) || '';
-    var text = cleanedInputContent();
+    var text = ref.current.value;
     var stopDefault = false;
 
     var _getPluginState = getPluginState(editorView.state),
@@ -99,6 +107,9 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         break;
 
       case 'Escape':
+      case 'PageUp':
+      case 'PageDown':
+      case 'Home':
         cancel({
           text: text,
           forceFocusOnEditor: true,
@@ -109,7 +120,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         break;
 
       case 'Backspace':
-        if (raw === ZERO_WIDTH_SPACE || raw.length === 0 || (sel === null || sel === void 0 ? void 0 : sel.anchorOffset) === 0) {
+        if (text.length === 0 || ref.current.selectionStart === 0) {
           event.stopPropagation();
           event.preventDefault();
           cancel({
@@ -150,12 +161,48 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         }
 
         break;
+
+      case 'ArrowUp':
+        if (selectedIndex === -1) {
+          selectPreviousItem();
+        }
+
+        break;
+    }
+
+    if (isSelectAllShortcut(event)) {
+      cancel({
+        forceFocusOnEditor: true,
+        addPrefixTrigger: true,
+        text: ref.current.value,
+        setSelectionAt: CloseSelectionOptions.BEFORE_TEXT_INSERTED
+      });
+      return true;
     }
 
     var undoRedoType = isUndoRedoShortcut(event);
+    var hasReopenQuery = reopenQuery && reopenQuery.length > 0;
 
-    if (onUndoRedo && undoRedoType && onUndoRedo(undoRedoType)) {
-      stopDefault = true;
+    if (onUndoRedo && undoRedoType) {
+      if (!hasReopenQuery && undoRedoType === 'historyUndo' && text.length > 0) {
+        setRedoBuffer(function (buffer) {
+          return [ref.current.value].concat(_toConsumableArray(buffer));
+        });
+        var undoValue = text.substring(0, text.length - 1);
+        ref.current.value = undoValue;
+        sizeSpanRef.current.textContent = undoValue;
+        stopDefault = true;
+      } else if (undoRedoType === 'historyRedo' && redoBuffer.length > 0) {
+        var redoValue = redoBuffer[0];
+        ref.current.value = redoValue;
+        sizeSpanRef.current.textContent = redoValue;
+        setRedoBuffer(function (buffer) {
+          return buffer.slice(1);
+        });
+        stopDefault = true;
+      } else {
+        stopDefault = onUndoRedo(undoRedoType);
+      }
     }
 
     if (isNavigationKey(event) || stopDefault) {
@@ -163,16 +210,34 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
       event.preventDefault();
       return false;
     }
-  }, [onUndoRedo, onItemSelect, selectNextItem, cancel, cleanedInputContent, editorView.state]);
+  }, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, editorView.state, redoBuffer, reopenQuery]);
   var onClick = useCallback(function (event) {
-    var _ref$current3;
+    var _ref$current;
 
     event.stopPropagation();
     event.preventDefault();
     onQueryFocus();
-    (_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.focus();
+    (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.focus();
     return false;
   }, [onQueryFocus]);
+  var queryStyle = css({
+    outline: 'none',
+    position: 'absolute',
+    fontFamily: 'inherit',
+    fontSize: 'inherit',
+    fontWeight: 'inherit',
+    letterSpacing: 'inherit',
+    padding: 0,
+    height: '100%',
+    width: '100%',
+    top: 0,
+    left: 0,
+    background: 'transparent',
+    border: 'none',
+    '&&': {
+      color: "".concat(token('color.link', colors.B400))
+    }
+  });
   useLayoutEffect(function () {
     if (!ref.current) {
       return;
@@ -188,12 +253,12 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
       var key = keyNameNormalized(event);
 
       if (['ArrowLeft', 'ArrowRight'].includes(key) && document.getSelection && document.getSelection()) {
-        var _ref$current4;
+        var _ref$current2, _ref$current3;
 
-        var q = ((_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.textContent) || '';
-        var sel = document.getSelection();
-        var isMovingRight = sel && 'ArrowRight' === key && sel.anchorOffset === q.length;
-        var isMovingLeft = sel && 'ArrowLeft' === key && sel.anchorOffset === 0;
+        var q = ((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.value) || '';
+        var anchorOffset = (_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.selectionStart;
+        var isMovingRight = 'ArrowRight' === key && anchorOffset === q.length;
+        var isMovingLeft = 'ArrowLeft' === key && (anchorOffset === 0 || event.metaKey);
 
         if (!isMovingRight && !isMovingLeft) {
           return;
@@ -202,7 +267,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         cancel({
           forceFocusOnEditor: true,
           addPrefixTrigger: true,
-          text: cleanedInputContent(),
+          text: ref.current.value,
           setSelectionAt: isMovingRight ? CloseSelectionOptions.AFTER_TEXT_INSERTED : CloseSelectionOptions.BEFORE_TEXT_INSERTED
         });
         event.preventDefault();
@@ -236,8 +301,8 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
 
       cancel({
         addPrefixTrigger: true,
-        text: cleanedInputContent(),
-        setSelectionAt: CloseSelectionOptions.BEFORE_TEXT_INSERTED,
+        text: ref.current.value,
+        setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
         forceFocusOnEditor: false
       });
     };
@@ -257,33 +322,16 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
       setInFocus(false);
       var target = e.target;
 
-      if (e.isComposing || !(target instanceof HTMLElement)) {
+      if (e.isComposing || !(target instanceof HTMLInputElement)) {
         return;
       }
 
-      if (e.inputType === 'historyUndo' && (((_target$textContent = target.textContent) === null || _target$textContent === void 0 ? void 0 : _target$textContent.length) === 0 || target.textContent === ZERO_WIDTH_SPACE)) {
+      if (e.inputType === 'historyUndo' && ((_target$textContent = target.textContent) === null || _target$textContent === void 0 ? void 0 : _target$textContent.length) === 0) {
         e.preventDefault();
         e.stopPropagation();
         close();
         return;
       }
-
-      if (e.data != null && target.textContent === ZERO_WIDTH_SPACE) {
-        element.textContent = ''; // We need to change the content on Safari
-        // and set the cursor at the right place
-
-        if (browser.safari) {
-          e.preventDefault();
-          var dataElement = document.createTextNode(e.data);
-          element.appendChild(dataElement);
-          var sel = window.getSelection();
-          var range = document.createRange();
-          range.setStart(dataElement, dataElement.length);
-          range.collapse(true);
-          sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();
-          sel === null || sel === void 0 ? void 0 : sel.addRange(range);
-        }
-      }
     };
 
     var onInput = null;
@@ -297,7 +345,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
 
         var target = e.target;
 
-        if (e.isComposing || !(target instanceof HTMLElement)) {
+        if (e.isComposing || !(target instanceof HTMLInputElement)) {
           return;
         }
 
@@ -326,12 +374,13 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         element.removeEventListener('input', onInput);
       }
     };
-  }, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state]);
+  }, [triggerQueryPrefix, ref.current.value, onQueryFocus, cancel, checkKeyEvent, editorView.state]);
   useLayoutEffect(function () {
     var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
 
     if (ref.current && forceFocus) {
-      ref.current.textContent = hasReopenQuery ? reopenQuery : ZERO_WIDTH_SPACE;
+      ref.current.value = hasReopenQuery ? reopenQuery : '';
+      sizeSpanRef.current.textContent = hasReopenQuery ? reopenQuery : '';
       requestAnimationFrame(function () {
         if (!(ref !== null && ref !== void 0 && ref.current)) {
           return;
@@ -362,10 +411,20 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
    */
 
   return jsx(Fragment, null, triggerQueryPrefix, jsx("span", {
-    css: querySpan,
-    contentEditable: true,
+    style: {
+      position: 'relative'
+    }
+  }, jsx("span", {
+    ref: sizeSpanRef,
+    "aria-hidden": true,
+    style: {
+      marginLeft: '1px',
+      visibility: 'hidden'
+    }
+  }), jsx("input", {
+    css: queryStyle,
     ref: ref,
-    onKeyUp: onKeyUp,
+    onChange: onChange,
     onClick: onClick,
     role: "combobox",
     "aria-controls": TYPE_AHEAD_DECORATION_ELEMENT_ID,
@@ -373,8 +432,9 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     "aria-expanded": items.length !== 0,
     "aria-labelledby": assistiveHintID,
     suppressContentEditableWarning: true,
-    "data-query-prefix": triggerQueryPrefix
-  }), jsx("span", {
+    "data-query-prefix": triggerQueryPrefix,
+    value: query
+  })), jsx("span", {
     id: assistiveHintID,
     style: {
       display: 'none'

package/dist/esm/plugins/type-ahead/ui/TypeAheadList.js

@@ -145,7 +145,16 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref2) {
     setCache(new CellMeasurerCache({
       fixedWidth: true,
       defaultHeight: LIST_ITEM_ESTIMATED_HEIGHT
-    }));
+    })); // When query is updated, sometimes the scroll position of the menu is not at the top
+    // Scrolling back to top for consistency
+
+    requestAnimationFrame(function () {
+      var _listContainerRef$cur;
+
+      if ((_listContainerRef$cur = listContainerRef.current) !== null && _listContainerRef$cur !== void 0 && _listContainerRef$cur.firstChild) {
+        listContainerRef.current.firstChild.scrollTo(0, 0);
+      }
+    });
   }, [items]);
   useLayoutEffect(function () {
     var height = Math.min(items.reduce(function (prevValue, currentValue, index) {
@@ -170,23 +179,12 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref2) {
       if (isNavigationKey(event)) {
         switch (event.key) {
           case 'ArrowDown':
-            if (selectedIndex === items.length - 1) {
-              event.stopPropagation();
-            } else {
-              selectNextItem();
-            }
-
+            selectNextItem();
             event.preventDefault();
             break;
 
           case 'ArrowUp':
-            if (selectedIndex === 0) {
-              //To set focus on target element when up arrow is pressed on first option of list
-              focusTargetElement();
-            } else {
-              selectPreviousItem();
-            }
-
+            selectPreviousItem();
             event.preventDefault();
             break;
 

package/dist/esm/plugins/type-ahead/ui/TypeAheadListItem.js

@@ -14,17 +14,19 @@ import IconFallback from '../../quick-insert/assets/fallback';
 import { shortcutStyle } from '../../../ui/styles';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 import { token } from '@atlaskit/tokens';
+import { useIntl } from 'react-intl-next';
+import { typeAheadListMessages } from '../messages';
 export var ICON_HEIGHT = 40;
 export var ICON_WIDTH = 40;
 export var ITEM_PADDING = 12;
 export var itemIcon = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: ", "px;\n  height: ", "px;\n  overflow: hidden;\n  border: 1px solid ", "; /* N60 at 50% */\n  border-radius: ", "px;\n  box-sizing: border-box;\n\n  display: flex;\n  justify-content: center;\n  align-items: center;\n\n  div {\n    width: ", "px;\n    height: ", "px;\n  }\n"])), ICON_WIDTH, ICON_HEIGHT, token('color.border', 'rgba(223, 225, 229, 0.5)'), borderRadius(), ICON_WIDTH, ICON_HEIGHT);
-var itemBody = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n  line-height: 1.4;\n"])));
+var itemBody = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n"])));
 
 var itemText = function itemText(theme) {
-  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  white-space: initial;\n  color: ", ";\n  .item-description {\n    font-size: ", ";\n    color: ", ";\n    margin-top: 4px;\n  }\n"])), themed({
+  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  white-space: initial;\n  color: ", ";\n  .item-title {\n    line-height: 1.4;\n  }\n  .item-description {\n    font-size: ", ";\n    color: ", ";\n    margin-top: 3px;\n  }\n"])), themed({
     light: token('color.text', N800),
     dark: token('color.text', DN600)
-  })(theme), relativeFontSizeToBase16(11.67), token('color.text.subtlest', N200));
+  })(theme), relativeFontSizeToBase16(12), token('color.text.subtlest', N200));
 };
 
 var itemAfter = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  flex: 0 0 auto;\n"])));
@@ -52,12 +54,24 @@ var FallbackIcon = /*#__PURE__*/React.memo(function (_ref) {
 
 var noop = function noop() {};
 
-export var TypeAheadListItem = function TypeAheadListItem(_ref2) {
-  var item = _ref2.item,
-      itemsLength = _ref2.itemsLength,
-      selectedIndex = _ref2.selectedIndex,
-      onItemClick = _ref2.onItemClick,
-      itemIndex = _ref2.itemIndex;
+var AssistiveText = function AssistiveText(_ref2) {
+  var title = _ref2.title,
+      description = _ref2.description,
+      shortcut = _ref2.shortcut;
+  var intl = useIntl();
+  var descriptionText = description ? " ".concat(intl.formatMessage(typeAheadListMessages.descriptionLabel), " ").concat(description, ".") : '';
+  var shortcutText = shortcut ? " ".concat(intl.formatMessage(typeAheadListMessages.shortcutLabel), " ").concat(shortcut, ".") : '';
+  return jsx("span", {
+    className: "assistive"
+  }, "".concat(title, ". ").concat(descriptionText, " ").concat(shortcutText));
+};
+
+export var TypeAheadListItem = function TypeAheadListItem(_ref3) {
+  var item = _ref3.item,
+      itemsLength = _ref3.itemsLength,
+      selectedIndex = _ref3.selectedIndex,
+      onItemClick = _ref3.onItemClick,
+      itemIndex = _ref3.itemIndex;
 
   /**
    * To select and highlight the first Item when no item is selected
@@ -133,17 +147,24 @@ export var TypeAheadListItem = function TypeAheadListItem(_ref2) {
     "aria-label": item.title,
     "aria-setsize": itemsLength,
     role: "option",
-    ref: buttonItemRef,
-    description: item.description
+    ref: buttonItemRef
   }, jsx("div", {
-    css: itemBody
+    "aria-hidden": true
   }, jsx("div", {
     css: itemText
+  }, jsx("div", {
+    css: itemBody
   }, jsx("div", {
     className: "item-title"
-  }, item.title)), jsx("div", {
+  }, item.title), jsx("div", {
     css: itemAfter
   }, item.keyshortcut && jsx("div", {
     css: shortcutStyle
-  }, item.keyshortcut)))));
+  }, item.keyshortcut))), jsx("div", {
+    className: "item-description"
+  }, item.description))), jsx(AssistiveText, {
+    title: item.title,
+    description: item.description,
+    shortcut: item.keyshortcut
+  })));
 };

package/dist/esm/plugins/type-ahead/ui/TypeAheadPopup.js

@@ -4,15 +4,15 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 /** @jsx jsx */
-import React, { useCallback, useEffect, useMemo, useState, useLayoutEffect } from 'react';
+import React, { useCallback, useEffect, useMemo, useState, useLayoutEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
 import rafSchedule from 'raf-schd';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { findOverflowScrollParent, Popup } from '@atlaskit/editor-common/ui';
 import { borderRadius, gridSize } from '@atlaskit/theme/constants';
 import { N0, N60A, N50A } from '@atlaskit/theme/colors';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../analytics';
-import { TYPE_AHEAD_POPUP_CONTENT_CLASS } from '../constants';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { CloseSelectionOptions, TYPE_AHEAD_DECORATION_DATA_ATTRIBUTE, TYPE_AHEAD_POPUP_CONTENT_CLASS } from '../constants';
 import { TypeAheadList } from './TypeAheadList';
 import { ITEM_PADDING } from './TypeAheadListItem';
 import { token } from '@atlaskit/tokens';
@@ -27,8 +27,7 @@ var Highlight = function Highlight(_ref) {
     return null;
   }
 
-  var highlight = triggerHandler.getHighlight(state);
-  return highlight;
+  return triggerHandler.getHighlight(state);
 };
 
 var OFFSET = [0, 8];
@@ -43,7 +42,9 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
       selectedIndex = props.selectedIndex,
       onItemInsert = props.onItemInsert,
       fireAnalyticsCallback = props.fireAnalyticsCallback,
-      isEmptyQuery = props.isEmptyQuery;
+      isEmptyQuery = props.isEmptyQuery,
+      cancel = props.cancel;
+  var ref = useRef(null);
   var startTime = useMemo(function () {
     return performance.now();
   }, // In case those props changes
@@ -155,6 +156,35 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
       }
     };
   }, [anchorElement, popupsScrollableElement, getFitHeightDebounced, getFitHeight]);
+  useLayoutEffect(function () {
+    var focusOut = function focusOut(event) {
+      var _window$getSelection;
+
+      var relatedTarget = event.relatedTarget; // Given the user is changing the focus
+      // When the target is inside the TypeAhead Popup
+      // Then the popup should stay open
+
+      if (relatedTarget instanceof HTMLElement && relatedTarget.closest && (relatedTarget.closest(".".concat(TYPE_AHEAD_POPUP_CONTENT_CLASS)) || relatedTarget.closest("[data-type-ahead=\"".concat(TYPE_AHEAD_DECORATION_DATA_ATTRIBUTE, "\"]")))) {
+        return;
+      }
+
+      if (!(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range')) {
+        return;
+      }
+
+      cancel({
+        addPrefixTrigger: true,
+        setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
+        forceFocusOnEditor: false
+      });
+    };
+
+    var element = ref.current;
+    element === null || element === void 0 ? void 0 : element.addEventListener('focusout', focusOut);
+    return function () {
+      element === null || element === void 0 ? void 0 : element.removeEventListener('focusout', focusOut);
+    };
+  }, [ref, cancel]);
   return jsx(Popup, {
     zIndex: akEditorFloatingDialogZIndex,
     target: anchorElement,
@@ -167,7 +197,8 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
   }, jsx("div", {
     css: typeAheadContent,
     tabIndex: 0,
-    className: TYPE_AHEAD_POPUP_CONTENT_CLASS
+    className: TYPE_AHEAD_POPUP_CONTENT_CLASS,
+    ref: ref
   }, jsx(Highlight, {
     state: editorView.state,
     triggerHandler: triggerHandler

package/dist/esm/plugins/type-ahead/utils.js

@@ -28,6 +28,8 @@ export var findTypeAheadDecorations = function findTypeAheadDecorations(state) {
 export var isTypeAheadHandler = function isTypeAheadHandler(handler) {
   return handler && Object.values(TypeAheadAvailableNodes).includes(handler.id) && typeof handler.trigger === 'string' && typeof handler.selectItem === 'function' && typeof handler.getItems === 'function';
 };
+/** Is a typeahead plugin open? */
+
 export var isTypeAheadOpen = function isTypeAheadOpen(editorState) {
   var _typeAheadPluginKey$g2, _typeAheadPluginKey$g3;
 
@@ -94,7 +96,7 @@ export var moveSelectedIndex = function moveSelectedIndex(_ref2) {
       nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
     } else {
       stats.increaseArrowUp();
-      nextIndex = selectedIndex === 0 ? items.length - 1 : selectedIndex - 1;
+      nextIndex = selectedIndex <= 0 ? items.length - 1 : selectedIndex - 1;
     }
 
     updateSelectedIndex(nextIndex)(editorView.state, editorView.dispatch);

package/dist/esm/ui/Alignment/index.js

@@ -16,7 +16,7 @@ import { IconMap } from '../../plugins/alignment/ui/ToolbarAlignment/icon-map';
 import AlignmentButton from './AlignmentButton';
 import { alignmentMessages } from './messages';
 import { alignmentWrapper } from './styles';
-import { alignLeft, alignRight } from '../../keymaps';
+import { alignLeft } from '../../keymaps';
 var alignmentOptions = [{
   title: alignmentMessages.alignLeft,
   shortcut: alignLeft,
@@ -26,7 +26,6 @@ var alignmentOptions = [{
   value: 'center'
 }, {
   title: alignmentMessages.alignRight,
-  shortcut: alignRight,
   value: 'end'
 }];
 

package/dist/esm/ui/Appearance/Chromeless.js

@@ -22,7 +22,7 @@ import { createEditorContentStyle } from '../ContentStyles';
 import { pluginKey as maxContentSizePluginKey } from '../../plugins/max-content-size';
 import { scrollbarStyles } from '../styles';
 import WithFlash from '../WithFlash';
-var chromelessEditor = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  line-height: 20px;\n  height: auto;\n\n  overflow-x: hidden;\n  overflow-y: auto;\n  ", ";\n  max-width: inherit;\n  box-sizing: border-box;\n  word-wrap: break-word;\n\n  div > .ProseMirror {\n    outline: none;\n    white-space: pre-wrap;\n    padding: 0;\n    margin: 0;\n  }\n"])), scrollbarStyles);
+var chromelessEditor = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  line-height: 20px;\n  height: auto;\n\n  overflow-x: hidden;\n  overflow-y: auto;\n  ", ";\n  max-width: inherit;\n  box-sizing: border-box;\n  word-wrap: break-word;\n\n  div > .ProseMirror {\n    outline: none;\n    white-space: pre-wrap;\n    padding: 0;\n    margin: 0;\n\n    & > :last-child {\n      padding-bottom: 0.5em;\n    }\n  }\n"])), scrollbarStyles);
 var ContentArea = createEditorContentStyle();
 ContentArea.displayName = 'ContentArea';
 

package/dist/esm/ui/Appearance/Comment/Toolbar.js

@@ -26,7 +26,7 @@ var StickyToolbar = function StickyToolbar(props) {
     setTop(((_props$externalToolba = props.externalToolbarRef) === null || _props$externalToolba === void 0 ? void 0 : (_props$externalToolba2 = _props$externalToolba.current) === null || _props$externalToolba2 === void 0 ? void 0 : _props$externalToolba2.clientHeight) || 0);
   }, [setTop, props.externalToolbarRef]);
   return jsx("div", {
-    css: [mainToolbarWrapperStyle, stickyToolbarWrapperStyle, css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          top: ", ";\n        "])), top)],
+    css: [mainToolbarWrapperStyle, stickyToolbarWrapperStyle, css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          top: ", "px;\n        "])), top)],
     "data-testid": "ak-editor-main-toolbar",
     className: 'show-keyline'
   }, props.children);

package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js

@@ -11,6 +11,7 @@ import Toolbar from '../../Toolbar';
 import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyle, mainToolbarSecondChildStyle, nonCustomToolbarWrapperStyle, customToolbarWrapperStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 import { ContextPanelConsumer } from '../../ContextPanel/context';
 import messages from './messages';
+import { ToolbarArrowKeyNavigationProvider } from '../../ToolbarArrowKeyNavigationProvider';
 export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
   var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
 
@@ -76,7 +77,9 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
 
     var contextPanelWidth = _ref.width;
-    return jsx("div", {
+    return jsx(ToolbarArrowKeyNavigationProvider, {
+      editorView: props.editorView
+    }, jsx("div", {
       css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
       "data-testid": "ak-editor-main-toolbar"
     }, jsx("div", {
@@ -88,7 +91,7 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
       "data-testid": 'avatar-group-outside-plugin',
       role: "region",
       "aria-label": props.intl.formatMessage(messages.pageActionsLabel)
-    }, shouldSplitToolbar ? nonCustomToolbar : customToolbar));
+    }, shouldSplitToolbar ? nonCustomToolbar : customToolbar)));
   });
 });
 export var FullPageToolbar = injectIntl(EditorToolbar);

package/dist/esm/ui/ColorPickerButton/index.js

@@ -18,8 +18,12 @@ import { editorAnalyticsChannel } from '../../plugins/analytics/consts';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../plugins/analytics/types'; // helps adjusts position of popup
 
 var colorPickerButtonWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n"]))); // Control the size of color picker buttons and preview
+// TODO: https://product-fabric.atlassian.net/browse/DSP-4134
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 
 var colorPickerWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border-radius: ", "px;\n  background-color: white;\n  box-shadow: 0 4px 8px -2px ", ", 0 0 1px ", ";\n  padding: 8px 0px;\n"])), borderRadius(), N60A, N60A);
+/* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
 var ColorPickerButton = function ColorPickerButton(props) {
   var _props$size, _props$size2;

package/dist/esm/ui/ConfigPanel/Fields/CustomSelect.js

@@ -178,14 +178,12 @@ function CustomSelect(_ref2) {
         // for isDirty
 
         onFieldChange(name, true);
-      } // @see DST-2386 & ED-12503
-      ,
-      enableAnimation: false // add type cast to avoid adding a "IsMulti" generic prop (TODO: ED-12072)
+      } // add type cast to avoid adding a "IsMulti" generic prop (TODO: ED-12072)
       ,
       isMulti: isMultiple || false,
       isClearable: true,
       isValidNewOption: function isValidNewOption(value) {
-        return isCreatable && value;
+        return !!(isCreatable && value);
       },
       validationState: error ? 'error' : 'default',
       defaultOptions: defaultOptions,