@atlaskit/editor-core 179.1.2 → 180.1.0

package/dist/cjs/plugins/text-formatting/ui/Toolbar/dropdown-menu.js

@@ -28,6 +28,10 @@ var FormattingTextDropdownMenu = /*#__PURE__*/_react.default.memo(function (_ref
     isMenuOpen = _useMenuState2[0],
     toggleMenu = _useMenuState2[1],
     closeMenu = _useMenuState2[2];
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    isOpenedByKeyboard = _useState2[0],
+    setIsOpenedByKeyboard = _useState2[1];
   var group = (0, _react.useMemo)(function () {
     return [{
       items: items
@@ -53,13 +57,29 @@ var FormattingTextDropdownMenu = /*#__PURE__*/_react.default.memo(function (_ref
     zIndex: _editorSharedStyles.akEditorMenuZIndex,
     fitHeight: 188,
     fitWidth: 136,
-    shouldUseDefaultRole: true
+    shouldUseDefaultRole: true,
+    shouldFocusFirstItem: function shouldFocusFirstItem() {
+      if (isOpenedByKeyboard) {
+        setIsOpenedByKeyboard(false);
+      }
+      return isOpenedByKeyboard;
+    }
   }, /*#__PURE__*/_react.default.createElement(_moreButton.MoreButton, {
     isSelected: isMenuOpen || hasFormattingActive,
     label: moreButtonLabel,
     isReducedSpacing: isReducedSpacing,
     isDisabled: false,
-    onClick: toggleMenu,
+    onClick: function onClick() {
+      toggleMenu();
+      setIsOpenedByKeyboard(false);
+    },
+    onKeyDown: function onKeyDown(event) {
+      if (event.key === 'Enter' || event.key === ' ') {
+        event.preventDefault();
+        toggleMenu();
+        setIsOpenedByKeyboard(true);
+      }
+    },
     "aria-expanded": isMenuOpen
   }));
 });

package/dist/cjs/plugins/text-formatting/ui/Toolbar/index.js

@@ -26,11 +26,13 @@ var _dropdownMenu = require("./dropdown-menu");
 var _toolbarMessages = require("./toolbar-messages");
 var _utils = require("../../utils");
 var _announcer = _interopRequireDefault(require("../../../../utils/announcer/announcer"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var ToolbarFormatting = function ToolbarFormatting(_ref) {
+  var _usePreviousState;
   var shouldUseResponsiveToolbar = _ref.shouldUseResponsiveToolbar,
     popupsMountPoint = _ref.popupsMountPoint,
     popupsBoundariesElement = _ref.popupsBoundariesElement,
@@ -77,7 +79,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
   var activeItems = [].concat((0, _toConsumableArray2.default)(dropdownItems), (0, _toConsumableArray2.default)(singleItems)).filter(function (item) {
     return item.isActive;
   });
-  var prevActiveItems = (0, _utils.usePreviousObjectState)(activeItems);
+  var prevActiveItems = (_usePreviousState = (0, _hooks.usePreviousState)(activeItems)) !== null && _usePreviousState !== void 0 ? _usePreviousState : [];
   var fromSuperscriptToSubscript = (0, _utils.isArrayContainsContent)(activeItems, 'Subscript') && (0, _utils.isArrayContainsContent)(prevActiveItems, 'Superscript');
   var fromSubscriptToSuperscript = (0, _utils.isArrayContainsContent)(activeItems, 'Superscript') && (0, _utils.isArrayContainsContent)(prevActiveItems, 'Subscript');
   var comparedItems;

package/dist/cjs/plugins/text-formatting/ui/Toolbar/more-button.js

@@ -18,11 +18,13 @@ var MoreButton = /*#__PURE__*/_react.default.memo(function (_ref) {
     isReducedSpacing = _ref.isReducedSpacing,
     isSelected = _ref.isSelected,
     isDisabled = _ref.isDisabled,
-    onClick = _ref.onClick;
+    onClick = _ref.onClick,
+    onKeyDown = _ref.onKeyDown;
   return (0, _react2.jsx)(_ToolbarButton.default, {
     disabled: isDisabled,
     selected: isSelected,
     onClick: onClick,
+    onKeyDown: onKeyDown,
     spacing: isReducedSpacing ? 'none' : 'default',
     title: label,
     iconBefore: (0, _react2.jsx)("div", {

package/dist/cjs/plugins/text-formatting/utils.js

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.usePreviousObjectState = exports.nodeLen = exports.markActive = exports.isIgnorable = exports.isBlockNode = exports.isArrayContainsContent = exports.hasCode = exports.domIndex = exports.compareItemsArrays = exports.checkFormattingIsPresent = exports.anyMarkActive = void 0;
-var _react = require("react");
+exports.nodeLen = exports.markActive = exports.isIgnorable = exports.isBlockNode = exports.isArrayContainsContent = exports.hasCode = exports.domIndex = exports.compareItemsArrays = exports.checkFormattingIsPresent = exports.anyMarkActive = void 0;
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _clearFormatting = require("./commands/clear-formatting");
 var nodeLen = function nodeLen(node) {
@@ -126,14 +125,6 @@ var checkFormattingIsPresent = function checkFormattingIsPresent(state) {
   return marksArePresent(state) || blockStylingIsPresent(state);
 };
 exports.checkFormattingIsPresent = checkFormattingIsPresent;
-var usePreviousObjectState = function usePreviousObjectState(value) {
-  var ref = (0, _react.useRef)([]);
-  (0, _react.useEffect)(function () {
-    ref.current = value;
-  });
-  return ref.current;
-};
-exports.usePreviousObjectState = usePreviousObjectState;
 var compareItemsArrays = function compareItemsArrays(items, prevItems) {
   return items && items.filter(function (item) {
     return !prevItems.includes(item);

package/dist/cjs/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -34,6 +34,10 @@ function ToolbarDropdown(props) {
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     isDropdownOpen = _React$useState2[0],
     setIsDropdownOpen = _React$useState2[1];
+  var _React$useState3 = _react2.default.useState(false),
+    _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
+    isOpenedByKeyboard = _React$useState4[0],
+    setOpenedByKeyboard = _React$useState4[1];
   var labelLists = formatMessage(_messages.messages.lists);
   var onOpenChange = function onOpenChange(attrs) {
     setIsDropdownOpen(attrs.isDropdownOpen);
@@ -43,6 +47,13 @@ function ToolbarDropdown(props) {
       isDropdownOpen: !isDropdownOpen
     });
   };
+  var handleOnKeyDown = function handleOnKeyDown(event) {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault();
+      setIsDropdownOpen(!isDropdownOpen);
+      setOpenedByKeyboard(true);
+    }
+  };
   var items = useItems(props);
   var handleOnItemActivated = function handleOnItemActivated(_ref) {
     var item = _ref.item,
@@ -66,7 +77,13 @@ function ToolbarDropdown(props) {
     onOpenChange: onOpenChange,
     fitHeight: 188,
     fitWidth: 175,
-    shouldUseDefaultRole: true
+    shouldUseDefaultRole: true,
+    shouldFocusFirstItem: function shouldFocusFirstItem() {
+      if (isOpenedByKeyboard) {
+        setOpenedByKeyboard(false);
+      }
+      return isOpenedByKeyboard;
+    }
   }, (0, _react.jsx)(_ToolbarButton.default, {
     spacing: isReducedSpacing ? 'none' : 'default',
     selected: bulletListActive || orderedListActive,
@@ -75,6 +92,7 @@ function ToolbarDropdown(props) {
     "aria-label": labelLists,
     disabled: disabled,
     onClick: handleTriggerClick,
+    onKeyDown: handleOnKeyDown,
     title: labelLists,
     iconBefore: (0, _react.jsx)("span", {
       css: _styles.wrapperStyle

package/dist/cjs/plugins/type-ahead/index.js

@@ -25,7 +25,7 @@ var _utils = require("./utils");
 var _useItemInsert3 = require("./ui/hooks/use-item-insert");
 var _updateSelectedIndex = require("./commands/update-selected-index");
 var _statsModifier = require("./stats-modifier");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 /**
  *
  * Revamped typeahead using decorations instead of the `typeAheadQuery` mark

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InputQuery = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
@@ -18,11 +17,25 @@ var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _AssistiveText = require("./AssistiveText");
 var _messages = require("../messages");
 var _reactIntlNext = require("react-intl-next");
-var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
 
+var querySpan = (0, _react2.css)({
+  outline: 'none',
+  '& input': {
+    width: '5px',
+    border: 'none',
+    background: 'transparent',
+    padding: 0,
+    margin: 0,
+    // ED-17022 Fixes firefox caret position
+    fontSize: '1em',
+    height: _editorSharedStyles.blockNodesVerticalMargin,
+    caretColor: "var(--ds-text-accent-blue, #0052CC)"
+  }
+});
 var isNavigationKey = function isNavigationKey(event) {
   return ['Enter', 'Tab', 'ArrowDown', 'ArrowUp'].includes(event.key);
 };
@@ -39,10 +52,6 @@ var isUndoRedoShortcut = function isUndoRedoShortcut(event) {
   }
   return false;
 };
-var isSelectAllShortcut = function isSelectAllShortcut(event) {
-  var key = (0, _w3cKeyname.keyName)(event);
-  return (event.ctrlKey || event.metaKey) && key === 'a';
-};
 var getAriaLabel = function getAriaLabel(triggerPrefix, intl) {
   switch (triggerPrefix) {
     case '@':
@@ -68,29 +77,31 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     onUndoRedo = _ref.onUndoRedo,
     editorView = _ref.editorView,
     items = _ref.items;
-  var ref = (0, _react.useRef)(document.createElement('input'));
-  var sizeSpanRef = (0, _react.useRef)(document.createElement('span'));
-  var _useState = (0, _react.useState)([]),
+  var ref = (0, _react.useRef)(document.createElement('span'));
+  var inputRef = (0, _react.useRef)(null);
+  var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    redoBuffer = _useState2[0],
-    setRedoBuffer = _useState2[1];
-  var _useState3 = (0, _react.useState)(reopenQuery),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    query = _useState4[0],
-    setQuery = _useState4[1];
-  var onChange = (0, _react.useCallback)(function (event) {
-    var text = event.currentTarget.value;
-    sizeSpanRef.current.textContent = text;
-    setQuery(text);
+    query = _useState2[0],
+    setQuery = _useState2[1];
+  var cleanedInputContent = (0, _react.useCallback)(function () {
+    var _ref$current;
+    var raw = ((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.textContent) || '';
+    return raw;
+  }, []);
+  var onKeyUp = (0, _react.useCallback)(function (event) {
+    var text = cleanedInputContent();
     onQueryChange(text);
-  }, [onQueryChange]);
-  var _useState5 = (0, _react.useState)(false),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    isInFocus = _useState6[0],
-    setInFocus = _useState6[1];
+  }, [onQueryChange, cleanedInputContent]);
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isInFocus = _useState4[0],
+    setInFocus = _useState4[1];
   var checkKeyEvent = (0, _react.useCallback)(function (event) {
+    var _ref$current2;
     var key = (0, _w3cKeyname.keyName)(event);
-    var text = ref.current.value;
+    var sel = document.getSelection();
+    var raw = ((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.textContent) || '';
+    var text = cleanedInputContent();
     var stopDefault = false;
     var _getPluginState = (0, _utils2.getPluginState)(editorView.state),
       selectedIndex = _getPluginState.selectedIndex;
@@ -121,7 +132,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         stopDefault = true;
         break;
       case 'Backspace':
-        if (text.length === 0 || ref.current.selectionStart === 0) {
+        if (raw.length === 0 || (sel === null || sel === void 0 ? void 0 : sel.anchorOffset) === 0) {
           event.stopPropagation();
           event.preventDefault();
           cancel({
@@ -160,70 +171,24 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         }
         break;
     }
-    if (isSelectAllShortcut(event)) {
-      cancel({
-        forceFocusOnEditor: true,
-        addPrefixTrigger: true,
-        text: ref.current.value,
-        setSelectionAt: _constants.CloseSelectionOptions.BEFORE_TEXT_INSERTED
-      });
-      return true;
-    }
     var undoRedoType = isUndoRedoShortcut(event);
-    var hasReopenQuery = reopenQuery && reopenQuery.length > 0;
-    if (onUndoRedo && undoRedoType) {
-      if (!hasReopenQuery && undoRedoType === 'historyUndo' && text.length > 0) {
-        setRedoBuffer(function (buffer) {
-          return [ref.current.value].concat((0, _toConsumableArray2.default)(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 (onUndoRedo && undoRedoType && onUndoRedo(undoRedoType)) {
+      stopDefault = true;
     }
     if (isNavigationKey(event) || stopDefault) {
       event.stopPropagation();
       event.preventDefault();
       return false;
     }
-  }, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, editorView.state, redoBuffer, reopenQuery]);
+  }, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state]);
   var onClick = (0, _react.useCallback)(function (event) {
-    var _ref$current;
+    var _inputRef$current;
     event.stopPropagation();
     event.preventDefault();
     onQueryFocus();
-    (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.focus();
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
     return false;
   }, [onQueryFocus]);
-  var queryStyle = (0, _react2.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("var(--ds-link, ".concat(colors.B400, ")"))
-    }
-  });
   (0, _react.useLayoutEffect)(function () {
     if (!ref.current) {
       return;
@@ -235,18 +200,18 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     var keyDown = function keyDown(event) {
       var key = (0, _w3cKeyname.keyName)(event);
       if (['ArrowLeft', 'ArrowRight'].includes(key) && document.getSelection && document.getSelection()) {
-        var _ref$current2, _ref$current3;
-        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);
+        var _ref$current3;
+        var q = ((_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.textContent) || '';
+        var sel = document.getSelection();
+        var isMovingRight = sel && 'ArrowRight' === key && sel.anchorOffset === q.length;
+        var isMovingLeft = sel && 'ArrowLeft' === key && (sel.anchorOffset === 0 || event.metaKey);
         if (!isMovingRight && !isMovingLeft) {
           return;
         }
         cancel({
           forceFocusOnEditor: true,
           addPrefixTrigger: true,
-          text: ref.current.value,
+          text: cleanedInputContent(),
           setSelectionAt: isMovingRight ? _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED : _constants.CloseSelectionOptions.BEFORE_TEXT_INSERTED
         });
         event.preventDefault();
@@ -277,8 +242,8 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       }
       cancel({
         addPrefixTrigger: true,
-        text: ref.current.value,
-        setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED,
+        text: cleanedInputContent(),
+        setSelectionAt: _constants.CloseSelectionOptions.BEFORE_TEXT_INSERTED,
         forceFocusOnEditor: false
       });
     };
@@ -294,7 +259,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       var _target$textContent;
       setInFocus(false);
       var target = e.target;
-      if (e.isComposing || !(target instanceof HTMLInputElement)) {
+      if (e.isComposing || !(target instanceof HTMLElement)) {
         return;
       }
       if (e.inputType === 'historyUndo' && ((_target$textContent = target.textContent) === null || _target$textContent === void 0 ? void 0 : _target$textContent.length) === 0) {
@@ -303,6 +268,23 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         close();
         return;
       }
+      if (e.data != null && inputRef.current === null) {
+        setQuery('');
+
+        // We need to change the content on Safari
+        // and set the cursor at the right place
+        if (_utils.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;
     if (_utils.browser.safari) {
@@ -312,7 +294,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       var _onInput = function _onInput(e) {
         var _target$textContent2;
         var target = e.target;
-        if (e.isComposing || !(target instanceof HTMLInputElement)) {
+        if (e.isComposing || !(target instanceof HTMLElement)) {
           return;
         }
         if (e.inputType === 'historyUndo' && ((_target$textContent2 = target.textContent) === null || _target$textContent2 === void 0 ? void 0 : _target$textContent2.length) === 1) {
@@ -337,12 +319,11 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         element.removeEventListener('input', onInput);
       }
     };
-  }, [triggerQueryPrefix, ref.current.value, onQueryFocus, cancel, checkKeyEvent, editorView.state]);
+  }, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state]);
   (0, _react.useLayoutEffect)(function () {
     var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
     if (ref.current && forceFocus) {
-      ref.current.value = hasReopenQuery ? reopenQuery : '';
-      sizeSpanRef.current.textContent = hasReopenQuery ? reopenQuery : '';
+      setQuery(hasReopenQuery ? reopenQuery : null);
       requestAnimationFrame(function () {
         if (!(ref !== null && ref !== void 0 && ref.current)) {
           return;
@@ -370,20 +351,10 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     Task added in https://product-fabric.atlassian.net/wiki/spaces/E/pages/3182068181/Potential+improvements#Moderate-changes.
    */
   return (0, _react2.jsx)(_react.Fragment, null, triggerQueryPrefix, (0, _react2.jsx)("span", {
-    style: {
-      position: 'relative'
-    }
-  }, (0, _react2.jsx)("span", {
-    ref: sizeSpanRef,
-    "aria-hidden": true,
-    style: {
-      marginLeft: '1px',
-      visibility: 'hidden'
-    }
-  }), (0, _react2.jsx)("input", {
-    css: queryStyle,
+    css: querySpan,
+    contentEditable: true,
     ref: ref,
-    onChange: onChange,
+    onKeyUp: onKeyUp,
     onClick: onClick,
     role: "combobox",
     "aria-controls": _constants.TYPE_AHEAD_DECORATION_ELEMENT_ID,
@@ -391,9 +362,11 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     "aria-expanded": items.length !== 0,
     "aria-labelledby": assistiveHintID,
     suppressContentEditableWarning: true,
-    "data-query-prefix": triggerQueryPrefix,
-    value: query
-  })), (0, _react2.jsx)("span", {
+    "data-query-prefix": triggerQueryPrefix
+  }, query === null ? (0, _react2.jsx)("input", {
+    ref: inputRef,
+    type: "text"
+  }) : query), (0, _react2.jsx)("span", {
     id: assistiveHintID,
     style: {
       display: 'none'

package/dist/cjs/types/get-editor-props.js

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

package/dist/cjs/ui/ChromeCollapsed/index.js

@@ -56,6 +56,7 @@ var ChromeCollapsed = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var placeholder = this.props.text || this.props.intl.formatMessage(_messages.messages.chromeCollapsedPlaceholder);
       return (0, _react2.jsx)("input", {
+        "data-testid": "chrome-collapsed",
         css: _styles.inputStyle,
         ref: this.handleInputRef,
         onFocus: this.focusHandler,

package/dist/cjs/ui/CollapsedEditor/index.js

@@ -15,6 +15,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _ui = require("@atlaskit/editor-common/ui");
 var _react = _interopRequireDefault(require("react"));
 var _editor = _interopRequireDefault(require("../../editor"));
+var _editorNext = _interopRequireDefault(require("../../editor-next"));
+var _editorMigrationComponent = _interopRequireDefault(require("../../editor-next/editor-migration-component"));
 var _EditorWithActions = _interopRequireDefault(require("../../labs/EditorWithActions"));
 var _ChromeCollapsed = _interopRequireDefault(require("../ChromeCollapsed"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -38,28 +40,20 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
     return _this;
   }
   (0, _createClass2.default)(CollapsedEditor, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (!this.props.isExpanded && nextProps.isExpanded) {
-        this.shouldTriggerExpandEvent = true;
-      }
-    }
-  }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
-      if (this.shouldTriggerExpandEvent && this.editorComponent) {
-        this.shouldTriggerExpandEvent = false;
-        if (this.props.onExpand) {
-          this.props.onExpand();
-        }
+      if (this.props.isExpanded && this.editorComponent && (!this.previouslyExpanded || this.previouslyExpanded === undefined)) {
+        var _this$props$onExpand, _this$props;
+        (_this$props$onExpand = (_this$props = this.props).onExpand) === null || _this$props$onExpand === void 0 ? void 0 : _this$props$onExpand.call(_this$props);
       }
+      this.previouslyExpanded = this.props.isExpanded;
     }
   }, {
     key: "render",
     value: function render() {
       var _this2 = this;
       var child = _react.default.Children.only(this.props.children);
-      if (child.type !== _editor.default && child.type !== _EditorWithActions.default) {
+      if (child.type !== _editor.default && child.type !== _EditorWithActions.default && child.type !== _editorNext.default && child.type !== _editorMigrationComponent.default) {
         throw new Error('Expected child to be of type `Editor`');
       }
       if (!this.props.isExpanded) {