@atlaskit/editor-core 180.0.0 → 181.0.0

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

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
 import React, { useRef, useCallback, Fragment, useLayoutEffect, useState } from 'react';
@@ -12,7 +11,21 @@ import { TYPE_AHEAD_DECORATION_ELEMENT_ID } from '../constants';
 import { AssistiveText } from './AssistiveText';
 import { typeAheadListMessages } from '../messages';
 import { useIntl } from 'react-intl-next';
-import * as colors from '@atlaskit/theme/colors';
+import { blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
+var querySpan = css({
+  outline: 'none',
+  '& input': {
+    width: '5px',
+    border: 'none',
+    background: 'transparent',
+    padding: 0,
+    margin: 0,
+    // ED-17022 Fixes firefox caret position
+    fontSize: '1em',
+    height: blockNodesVerticalMargin,
+    caretColor: "var(--ds-text-accent-blue, #0052CC)"
+  }
+});
 var isNavigationKey = function isNavigationKey(event) {
   return ['Enter', 'Tab', 'ArrowDown', 'ArrowUp'].includes(event.key);
 };
@@ -29,10 +42,6 @@ var isUndoRedoShortcut = function isUndoRedoShortcut(event) {
   }
   return false;
 };
-var isSelectAllShortcut = function isSelectAllShortcut(event) {
-  var key = keyNameNormalized(event);
-  return (event.ctrlKey || event.metaKey) && key === 'a';
-};
 var getAriaLabel = function getAriaLabel(triggerPrefix, intl) {
   switch (triggerPrefix) {
     case '@':
@@ -58,29 +67,31 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     onUndoRedo = _ref.onUndoRedo,
     editorView = _ref.editorView,
     items = _ref.items;
-  var ref = useRef(document.createElement('input'));
-  var sizeSpanRef = useRef(document.createElement('span'));
-  var _useState = useState([]),
+  var ref = useRef(document.createElement('span'));
+  var inputRef = useRef(null);
+  var _useState = useState(null),
     _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);
+    query = _useState2[0],
+    setQuery = _useState2[1];
+  var cleanedInputContent = 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 = useCallback(function (event) {
+    var text = cleanedInputContent();
     onQueryChange(text);
-  }, [onQueryChange]);
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isInFocus = _useState6[0],
-    setInFocus = _useState6[1];
+  }, [onQueryChange, cleanedInputContent]);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isInFocus = _useState4[0],
+    setInFocus = _useState4[1];
   var checkKeyEvent = useCallback(function (event) {
+    var _ref$current2;
     var key = keyNameNormalized(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 = getPluginState(editorView.state),
       selectedIndex = _getPluginState.selectedIndex;
@@ -111,7 +122,7 @@ export var InputQuery = /*#__PURE__*/React.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({
@@ -150,70 +161,24 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         }
         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) {
-      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 (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 = 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 = 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, ")"))
-    }
-  });
   useLayoutEffect(function () {
     if (!ref.current) {
       return;
@@ -225,18 +190,18 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     var keyDown = function keyDown(event) {
       var key = keyNameNormalized(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 ? CloseSelectionOptions.AFTER_TEXT_INSERTED : CloseSelectionOptions.BEFORE_TEXT_INSERTED
         });
         event.preventDefault();
@@ -267,8 +232,8 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
       }
       cancel({
         addPrefixTrigger: true,
-        text: ref.current.value,
-        setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
+        text: cleanedInputContent(),
+        setSelectionAt: CloseSelectionOptions.BEFORE_TEXT_INSERTED,
         forceFocusOnEditor: false
       });
     };
@@ -284,7 +249,7 @@ export var InputQuery = /*#__PURE__*/React.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) {
@@ -293,6 +258,23 @@ export var InputQuery = /*#__PURE__*/React.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 (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 (browser.safari) {
@@ -302,7 +284,7 @@ export var InputQuery = /*#__PURE__*/React.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) {
@@ -327,12 +309,11 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         element.removeEventListener('input', onInput);
       }
     };
-  }, [triggerQueryPrefix, ref.current.value, onQueryFocus, cancel, checkKeyEvent, editorView.state]);
+  }, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state]);
   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;
@@ -360,20 +341,10 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     Task added in https://product-fabric.atlassian.net/wiki/spaces/E/pages/3182068181/Potential+improvements#Moderate-changes.
    */
   return jsx(Fragment, null, triggerQueryPrefix, jsx("span", {
-    style: {
-      position: 'relative'
-    }
-  }, jsx("span", {
-    ref: sizeSpanRef,
-    "aria-hidden": true,
-    style: {
-      marginLeft: '1px',
-      visibility: 'hidden'
-    }
-  }), jsx("input", {
-    css: queryStyle,
+    css: querySpan,
+    contentEditable: true,
     ref: ref,
-    onChange: onChange,
+    onKeyUp: onKeyUp,
     onClick: onClick,
     role: "combobox",
     "aria-controls": TYPE_AHEAD_DECORATION_ELEMENT_ID,
@@ -381,9 +352,11 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     "aria-expanded": items.length !== 0,
     "aria-labelledby": assistiveHintID,
     suppressContentEditableWarning: true,
-    "data-query-prefix": triggerQueryPrefix,
-    value: query
-  })), jsx("span", {
+    "data-query-prefix": triggerQueryPrefix
+  }, query === null ? jsx("input", {
+    ref: inputRef,
+    type: "text"
+  }) : query), jsx("span", {
     id: assistiveHintID,
     style: {
       display: 'none'

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

@@ -1,34 +1,16 @@
-import { TextSelection } from 'prosemirror-state';
-import { DecorationSet } from 'prosemirror-view';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { pluginKey as typeAheadPluginKey } from './pm-plugins/key';
 import { updateSelectedIndex } from './commands/update-selected-index';
 import { StatsModifier } from './stats-modifier';
 import { typeAheadListMessages } from './messages';
-export var findTypeAheadDecorations = function findTypeAheadDecorations(state) {
-  var selection = state.selection;
-  var _typeAheadPluginKey$g = typeAheadPluginKey.getState(state),
-    decorationSet = _typeAheadPluginKey$g.decorationSet;
-  if (!decorationSet || decorationSet === DecorationSet.empty || !(selection instanceof TextSelection) || !selection.$cursor) {
-    return null;
-  }
-  var pos = selection.$cursor.pos;
-  var decoration = decorationSet.find(pos, pos, function (spec) {
-    return spec === null || spec === void 0 ? void 0 : spec.isTypeAheadDecoration;
-  });
-  if (!decoration || decoration.length !== 1) {
-    return null;
-  }
-  return decoration[0];
-};
 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;
-  return (typeAheadPluginKey === null || typeAheadPluginKey === void 0 ? void 0 : (_typeAheadPluginKey$g2 = typeAheadPluginKey.getState(editorState)) === null || _typeAheadPluginKey$g2 === void 0 ? void 0 : (_typeAheadPluginKey$g3 = _typeAheadPluginKey$g2.decorationSet) === null || _typeAheadPluginKey$g3 === void 0 ? void 0 : _typeAheadPluginKey$g3.find().length) > 0;
+  var _typeAheadPluginKey$g, _typeAheadPluginKey$g2;
+  return (typeAheadPluginKey === null || typeAheadPluginKey === void 0 ? void 0 : (_typeAheadPluginKey$g = typeAheadPluginKey.getState(editorState)) === null || _typeAheadPluginKey$g === void 0 ? void 0 : (_typeAheadPluginKey$g2 = _typeAheadPluginKey$g.decorationSet) === null || _typeAheadPluginKey$g2 === void 0 ? void 0 : _typeAheadPluginKey$g2.find().length) > 0;
 };
 export var getPluginState = function getPluginState(editorState) {
   return typeAheadPluginKey.getState(editorState);

package/dist/esm/test-utils.js

@@ -4,12 +4,11 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { TextSelection } from 'prosemirror-state';
 import { sortByOrder } from './create-editor/sort-by-order';
-import { Preset } from './labs/next/presets/preset';
 import { createSchema } from './create-editor/create-schema';
 import basePlugin from './plugins/base';
 import { analyticsPluginKey } from './plugins/analytics/plugin-key';
 export { createTypeAheadTools } from './plugins/type-ahead/api';
-export { Preset } from './labs/next/presets/preset';
+import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 export function getFireAnalytics(editorView) {
   var _analyticsPluginKey$g;
   return analyticsPluginKey === null || analyticsPluginKey === void 0 ? void 0 : (_analyticsPluginKey$g = analyticsPluginKey.getState(editorView.state)) === null || _analyticsPluginKey$g === void 0 ? void 0 : _analyticsPluginKey$g.fireAnalytics;
@@ -58,13 +57,11 @@ function lightProcessPluginsList(editorPlugins) {
   });
 }
 export var createPMSchemaAndPlugins = function createPMSchemaAndPlugins() {
-  var preset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Preset();
+  var inputPreset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new EditorPresetBuilder();
   return function (pluginFactoryParams) {
     var editorPlugins = [];
-    if (!preset.has(basePlugin)) {
-      preset.add(basePlugin);
-    }
-    editorPlugins = preset.getEditorPlugins();
+    var preset = inputPreset.has(basePlugin) ? inputPreset : inputPreset.add(basePlugin);
+    editorPlugins = preset.build();
     var editorConfig = lightProcessPluginsList(editorPlugins);
     var schema = createSchema(editorConfig);
     var plugins = editorConfig.plugins.sort(sortByOrder('plugins')).map(function (_ref) {

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

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
@@ -15,10 +16,18 @@ var StickyToolbar = function StickyToolbar(props) {
     _useState2 = _slicedToArray(_useState, 2),
     top = _useState2[0],
     setTop = _useState2[1];
+
+  // ED-15802: if externalToolbarRef is passed in, set top to externalToolbarRef?.current?.clientHeight
+  // else if offsetTop is a number set top to offsetTop
+  // otherwise top is 0 as initial state
   useEffect(function () {
     var _props$externalToolba, _props$externalToolba2;
-    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]);
+    if ((_props$externalToolba = props.externalToolbarRef) !== null && _props$externalToolba !== void 0 && (_props$externalToolba2 = _props$externalToolba.current) !== null && _props$externalToolba2 !== void 0 && _props$externalToolba2.clientHeight) {
+      setTop(props.externalToolbarRef.current.clientHeight);
+    } else {
+      setTop(props.offsetTop || 0);
+    }
+  }, [props.externalToolbarRef, props.offsetTop]);
   return jsx("div", {
     css: [mainToolbarWrapperStyle, stickyToolbarWrapperStyle, css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          top: ", "px;\n        "])), top)],
     "data-testid": "ak-editor-main-toolbar",
@@ -31,13 +40,39 @@ var FixedToolbar = function FixedToolbar(props) {
     "data-testid": "ak-editor-main-toolbar"
   }, props.children);
 };
+
+/**
+ * ED-15802: Scenarios when a sticky bar is used:
+ * 1. useStickyToolbar is true
+ * 2. useStickyToolbar is a DOM element
+ * 3. useStickyToolbar is an object and has offsetTop key;
+ */
+var getStickyParameters = function getStickyParameters(configuration) {
+  // const isUsingStickyOffset, isHTMLElement is used so TS can properly infer types.
+  var isHTMLElement = _typeof(configuration) === 'object' && !('offsetTop' in configuration);
+  var isUsingStickyOffset = _typeof(configuration) === 'object' && 'offsetTop' in configuration;
+  if (_typeof(configuration) !== 'object') {
+    return {
+      externalToolbarRef: undefined,
+      offsetTop: undefined
+    };
+  }
+  if (isUsingStickyOffset) {
+    return {
+      offsetTop: configuration.offsetTop
+    };
+  }
+  if (isHTMLElement) {
+    return {
+      externalToolbarRef: configuration
+    };
+  }
+};
 export var MainToolbar = function MainToolbar(_ref) {
   var useStickyToolbar = _ref.useStickyToolbar,
     children = _ref.children;
-  if (!!useStickyToolbar) {
-    return jsx(StickyToolbar, {
-      externalToolbarRef: typeof useStickyToolbar === 'boolean' ? undefined : useStickyToolbar
-    }, children);
+  if (useStickyToolbar) {
+    return jsx(StickyToolbar, getStickyParameters(useStickyToolbar), children);
   }
   return jsx(FixedToolbar, null, children);
 };

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

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

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

@@ -10,6 +10,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
 import React from 'react';
 import Editor from '../../editor';
+import EditorNext from '../../editor-next';
+import EditorMigrationComponent from '../../editor-next/editor-migration-component';
 import EditorWithActions from '../../labs/EditorWithActions';
 import ChromeCollapsed from '../ChromeCollapsed';
 var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
@@ -31,28 +33,20 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
     return _this;
   }
   _createClass(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.Children.only(this.props.children);
-      if (child.type !== Editor && child.type !== EditorWithActions) {
+      if (child.type !== Editor && child.type !== EditorWithActions && child.type !== EditorNext && child.type !== EditorMigrationComponent) {
         throw new Error('Expected child to be of type `Editor`');
       }
       if (!this.props.isExpanded) {

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

@@ -1,2 +1,3 @@
-import { ColorPalette } from '@atlaskit/editor-common/ui-color';
+import { ColorPalette, backgroundPaletteTooltipMessages, textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
+export { ColorPalette, backgroundPaletteTooltipMessages, textPaletteTooltipMessages };
 export default ColorPalette;

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

@@ -5,9 +5,12 @@ var _templateObject, _templateObject2, _templateObject3;
 import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
+import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
+import { getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color';
 import Button from '@atlaskit/button';
 import Tooltip from '@atlaskit/tooltip';
-import { N60A } from '@atlaskit/theme/colors';
+import { DN50, N0, N60A } from '@atlaskit/theme/colors';
+import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import ColorPalette from '../ColorPalette';
 import { DEFAULT_BORDER_COLOR } from '../ColorPalette/Palettes/common';
@@ -20,7 +23,12 @@ var colorPickerButtonWrapper = css(_templateObject || (_templateObject = _tagged
 // 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);
+var colorPickerWrapper = function colorPickerWrapper(theme) {
+  return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border-radius: ", "px;\n  background-color: ", ";\n  box-shadow: 0 4px 8px -2px ", ", 0 0 1px ", ";\n  padding: 8px 0px;\n"])), borderRadius(), themed({
+    light: "var(--ds-surface-overlay, ".concat(N0, ")"),
+    dark: "var(--ds-surface-overlay, ".concat(DN50, ")")
+  })(theme), N60A, N60A);
+};
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
 var ColorPickerButton = function ColorPickerButton(props) {
@@ -30,8 +38,20 @@ var ColorPickerButton = function ColorPickerButton(props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     isPopupOpen = _React$useState2[0],
     setIsPopupOpen = _React$useState2[1];
+  var _React$useState3 = React.useState(false),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    isPopupPositioned = _React$useState4[0],
+    setIsPopupPositioned = _React$useState4[1];
+  var _React$useState5 = React.useState(false),
+    _React$useState6 = _slicedToArray(_React$useState5, 2),
+    isOpenedByKeyboard = _React$useState6[0],
+    setIsOpenedByKeyboard = _React$useState6[1];
   var togglePopup = function togglePopup() {
     setIsPopupOpen(!isPopupOpen);
+    if (!isPopupOpen) {
+      setIsOpenedByKeyboard(false);
+      setIsPopupPositioned(false);
+    }
   };
   React.useEffect(function () {
     if (props.setDisableParentScroll) {
@@ -39,9 +59,25 @@ var ColorPickerButton = function ColorPickerButton(props) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isPopupOpen]);
+  var focusButton = function focusButton() {
+    var _buttonRef$current;
+    (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+  };
+  var handleEsc = React.useCallback(function () {
+    setIsOpenedByKeyboard(false);
+    setIsPopupPositioned(false);
+    setIsPopupOpen(false);
+    focusButton();
+  }, []);
+  var onPositionCalculated = React.useCallback(function (position) {
+    setIsPopupPositioned(true);
+    return position;
+  }, []);
   var ColorPaletteWithListeners = withOuterListeners(ColorPalette);
   var onColorSelected = function onColorSelected(color, label) {
+    setIsOpenedByKeyboard(false);
     setIsPopupOpen(false);
+    setIsPopupPositioned(false);
     if (props.onChange) {
       if (props.createAnalyticsEvent) {
         // fire analytics
@@ -63,11 +99,16 @@ var ColorPickerButton = function ColorPickerButton(props) {
       });
       newPalette && props.onChange(newPalette);
     }
+    focusButton();
   };
   var renderPopup = function renderPopup() {
     if (!isPopupOpen || !buttonRef.current) {
       return;
     }
+    var selectedColor = props.currentColor || null;
+    var _getSelectedRowAndCol = getSelectedRowAndColumnFromPalette(props.colorPalette, selectedColor, props.cols),
+      selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
+      selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
     return jsx(Popup, {
       target: buttonRef.current,
       fitHeight: 350,
@@ -80,20 +121,38 @@ var ColorPickerButton = function ColorPickerButton(props) {
       // we need an index of > 500 to display over it
       ,
       zIndex: props.setDisableParentScroll ? 600 : undefined,
-      ariaLabel: "Color picker popup"
+      ariaLabel: "Color picker popup",
+      onPositionCalculated: onPositionCalculated
     }, jsx("div", {
       css: colorPickerWrapper,
       "data-test-id": "color-picker-menu"
+    }, jsx(ArrowKeyNavigationProvider, {
+      type: ArrowKeyNavigationType.COLOR,
+      selectedRowIndex: selectedRowIndex,
+      selectedColumnIndex: selectedColumnIndex,
+      closeOnTab: true,
+      handleClose: function handleClose() {
+        return setIsPopupOpen(false);
+      },
+      isOpenedByKeyboard: isOpenedByKeyboard,
+      isPopupPositioned: isPopupPositioned
     }, jsx(ColorPaletteWithListeners, {
-      palette: props.colorPalette,
       cols: props.cols,
-      selectedColor: props.currentColor || null,
+      selectedColor: selectedColor,
       onClick: onColorSelected,
-      handleClickOutside: togglePopup
-    })));
+      handleClickOutside: togglePopup,
+      handleEscapeKeydown: handleEsc,
+      paletteOptions: {
+        palette: props.colorPalette,
+        hexToPaletteColor: props.hexToPaletteColor,
+        showSomewhatSemanticTooltips: props.showSomewhatSemanticTooltips,
+        paletteColorTooltipMessages: props.paletteColorTooltipMessages
+      }
+    }))));
   };
   var title = props.title || '';
-  var buttonStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    padding: 6px;\n    background-color: ", ";\n    &:before {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      align-self: center;\n      content: '';\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      background-color: ", ";\n      width: ", "px;\n      height: ", "px;\n      padding: 0;\n    }\n  "])), "var(--ds-background-neutral, transparent)", DEFAULT_BORDER_COLOR, borderRadius(), props.currentColor || 'transparent', ((_props$size = props.size) === null || _props$size === void 0 ? void 0 : _props$size.width) || 14, ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.height) || 14);
+  var currentColor = props.currentColor && props.hexToPaletteColor ? props.hexToPaletteColor(props.currentColor) : props.currentColor;
+  var buttonStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    padding: 6px;\n    background-color: ", ";\n    &:before {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      align-self: center;\n      content: '';\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      background-color: ", ";\n      width: ", "px;\n      height: ", "px;\n      padding: 0;\n    }\n  "])), "var(--ds-background-neutral, transparent)", DEFAULT_BORDER_COLOR, borderRadius(), currentColor || 'transparent', ((_props$size = props.size) === null || _props$size === void 0 ? void 0 : _props$size.width) || 14, ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.height) || 14);
   return jsx("div", {
     css: colorPickerButtonWrapper
   }, jsx(Tooltip, {
@@ -104,6 +163,13 @@ var ColorPickerButton = function ColorPickerButton(props) {
     "aria-label": title,
     spacing: "compact",
     onClick: togglePopup,
+    onKeyDown: function onKeyDown(event) {
+      if (event.key === 'Enter' || event.key === ' ') {
+        event.preventDefault();
+        togglePopup();
+        setIsOpenedByKeyboard(true);
+      }
+    },
     css: buttonStyle
   })), renderPopup());
 };