@atlaskit/editor-core 153.1.4 → 156.0.0

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

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = createPlugin;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _actions = require("./actions");
 
 var _utils = require("./utils");
 
 function createPlugin() {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     appendTransaction: function appendTransaction(transactions, _oldState, newState) {
       var insertItemCallback = (0, _utils.isInsertionTransaction)(transactions, _actions.ACTIONS.INSERT_ITEM);
 

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = createPlugin;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _prosemirrorView = require("prosemirror-view");
 
@@ -25,16 +25,17 @@ var _decorations = require("./decorations");
 
 var _utils = require("./utils");
 
-var hasTypeAheadStep = function hasTypeAheadStep(tr) {
-  var step = tr.steps.find(function (step) {
+var hasValidTypeAheadStep = function hasValidTypeAheadStep(tr) {
+  var steps = tr.steps.filter(function (step) {
     return step instanceof _steps.InsertTypeAheadStep;
-  });
+  }); // There are some cases, like collab rebase, where the steps are re-applied
+  // We should not re open the type-ahead for those cases
 
-  if (!step) {
-    return null;
+  if (steps.length === 1) {
+    return steps[0];
   }
 
-  return step;
+  return null;
 };
 
 function createPlugin(_ref) {
@@ -59,7 +60,7 @@ function createPlugin(_ref) {
     typeAheadHandlers: typeAheadHandlers,
     popupMountRef: popupMountRef
   });
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: _key.pluginKey,
     state: {
       init: function init() {
@@ -75,7 +76,7 @@ function createPlugin(_ref) {
         };
       },
       apply: function apply(tr, currentPluginState, oldEditorState, state) {
-        var customStep = hasTypeAheadStep(tr);
+        var customStep = hasValidTypeAheadStep(tr);
         var nextPluginState = reducer(tr, currentPluginState, customStep);
 
         if (currentPluginState !== nextPluginState) {

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

@@ -17,7 +17,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _w3cKeyname = require("w3c-keyname");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _constants = require("../constants");
 
@@ -66,17 +66,21 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       onUndoRedo = _ref.onUndoRedo;
   var ref = (0, _react.useRef)(document.createElement('span'));
   var cleanedInputContent = (0, _react.useCallback)(function () {
-    var raw = ref.current.textContent || '';
-    return raw.replace(_editorCommon.ZERO_WIDTH_SPACE, '');
+    var _ref$current;
+
+    var raw = ((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.textContent) || '';
+    return raw.replace(_utils.ZERO_WIDTH_SPACE, '');
   }, []);
   var onKeyUp = (0, _react.useCallback)(function (event) {
     var text = cleanedInputContent();
     onQueryChange(text);
   }, [onQueryChange, cleanedInputContent]);
   var checkKeyEvent = (0, _react.useCallback)(function (event) {
+    var _ref$current2;
+
     var key = (0, _w3cKeyname.keyName)(event);
     var sel = document.getSelection();
-    var raw = ref.current.textContent || '';
+    var raw = ((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.textContent) || '';
     var text = cleanedInputContent();
     var stopDefault = false;
 
@@ -105,7 +109,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         break;
 
       case 'Backspace':
-        if (raw === _editorCommon.ZERO_WIDTH_SPACE || raw.length === 0 || (sel === null || sel === void 0 ? void 0 : sel.anchorOffset) === 0) {
+        if (raw === _utils.ZERO_WIDTH_SPACE || raw.length === 0 || (sel === null || sel === void 0 ? void 0 : sel.anchorOffset) === 0) {
           event.stopPropagation();
           event.preventDefault();
           cancel({
@@ -148,10 +152,12 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     }
   }, [onUndoRedo, onItemSelect, selectNextItem, cancel, selectPreviousItem, cleanedInputContent]);
   var onClick = (0, _react.useCallback)(function (event) {
+    var _ref$current3;
+
     event.stopPropagation();
     event.preventDefault();
     onQueryFocus();
-    ref.current.focus();
+    (_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.focus();
     return false;
   }, [onQueryFocus]);
   (0, _react.useEffect)(function () {
@@ -169,7 +175,9 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       var key = (0, _w3cKeyname.keyName)(event);
 
       if (['ArrowLeft', 'ArrowRight'].includes(key) && document.getSelection && document.getSelection()) {
-        var q = ref.current.textContent || '';
+        var _ref$current4;
+
+        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;
@@ -219,18 +227,18 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
         return;
       }
 
-      if (e.inputType === 'historyUndo' && (((_target$textContent = target.textContent) === null || _target$textContent === void 0 ? void 0 : _target$textContent.length) === 0 || target.textContent === _editorCommon.ZERO_WIDTH_SPACE)) {
+      if (e.inputType === 'historyUndo' && (((_target$textContent = target.textContent) === null || _target$textContent === void 0 ? void 0 : _target$textContent.length) === 0 || target.textContent === _utils.ZERO_WIDTH_SPACE)) {
         e.preventDefault();
         e.stopPropagation();
         close();
         return;
       }
 
-      if (e.data != null && target.textContent === _editorCommon.ZERO_WIDTH_SPACE) {
+      if (e.data != null && target.textContent === _utils.ZERO_WIDTH_SPACE) {
         element.textContent = ''; // We need to change the content on Safari
         // and set the cursor at the right place
 
-        if (_editorCommon.browser.safari) {
+        if (_utils.browser.safari) {
           e.preventDefault();
           var dataElement = document.createTextNode(e.data);
           element.appendChild(dataElement);
@@ -246,7 +254,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
 
     var onInput = null;
 
-    if (_editorCommon.browser.safari) {
+    if (_utils.browser.safari) {
       // On Safari, for reasons beyond my understanding,
       // The undo behavior is totally different from other browsers
       // That why we need to have an specific branch only for Safari.
@@ -280,7 +288,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
       element.removeEventListener('keydown', keyDown);
       element.removeEventListener('beforeinput', beforeinput);
 
-      if (_editorCommon.browser.safari) {
+      if (_utils.browser.safari) {
         element.removeEventListener('input', onInput);
       }
     };
@@ -289,7 +297,7 @@ var InputQuery = /*#__PURE__*/_react.default.memo(function (_ref) {
     var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
 
     if (ref.current && forceFocus) {
-      ref.current.textContent = hasReopenQuery ? reopenQuery : _editorCommon.ZERO_WIDTH_SPACE;
+      ref.current.textContent = hasReopenQuery ? reopenQuery : _utils.ZERO_WIDTH_SPACE;
       requestAnimationFrame(function () {
         if (!(ref !== null && ref !== void 0 && ref.current)) {
           return;

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

@@ -31,6 +31,10 @@ var _useDynamicListHeightCalculation = require("./hooks/use-dynamic-list-height-
 
 var _DynamicHeightListItem = require("./DynamicHeightListItem");
 
+var _reactIntlNext = require("react-intl-next");
+
+var _messages = require("../messages");
+
 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; }
@@ -78,11 +82,12 @@ var itemTheme = (0, _defineProperty2.default)({}, _item.itemThemeNamespace, {
   }
 });
 
-var TypeAheadList = /*#__PURE__*/_react.default.memo(function (_ref) {
+var TypeAheadListComponent = /*#__PURE__*/_react.default.memo(function (_ref) {
   var items = _ref.items,
       selectedIndex = _ref.selectedIndex,
       onItemHover = _ref.onItemHover,
-      onItemClick = _ref.onItemClick;
+      onItemClick = _ref.onItemClick,
+      intl = _ref.intl;
   var listRef = (0, _react.useRef)();
   var redrawListAtIndex = (0, _react.useCallback)(function (index) {
     listRef.current.resetAfterIndex(index);
@@ -169,7 +174,7 @@ var TypeAheadList = /*#__PURE__*/_react.default.memo(function (_ref) {
   }, /*#__PURE__*/_react.default.createElement(_item.ItemGroup, {
     role: "listbox",
     "aria-live": "polite",
-    "aria-label": "TypeAhead results",
+    "aria-label": intl.formatMessage(_messages.typeAheadListMessages.typeAheadResultLabel),
     "aria-relevant": "additions removals"
   }, /*#__PURE__*/_react.default.createElement(_useResizeObserver.ResizeObserverProvider, null, /*#__PURE__*/_react.default.createElement(_DynamicHeightListItem.UpdateListItemHeightContext.Provider, {
     value: setListItemHeight
@@ -192,5 +197,6 @@ var TypeAheadList = /*#__PURE__*/_react.default.memo(function (_ref) {
   }, _DynamicHeightListItem.DynamicHeightListItem)))))));
 });
 
+var TypeAheadList = (0, _reactIntlNext.injectIntl)(TypeAheadListComponent);
 exports.TypeAheadList = TypeAheadList;
 TypeAheadList.displayName = 'TypeAheadList';

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

@@ -17,7 +17,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _constants = require("@atlaskit/theme/constants");
 
@@ -113,7 +113,7 @@ var TypeAheadPopup = /*#__PURE__*/_react.default.memo(function (props) {
   // we need to send the event again
   // eslint-disable-next-line react-hooks/exhaustive-deps
   triggerHandler]);
-  return /*#__PURE__*/_react.default.createElement(_editorCommon.Popup, {
+  return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
     target: anchorElement,
     mountTo: popupsMountPoint,

package/dist/cjs/plugins/type-ahead/ui/hooks/use-resize-observer.js

@@ -9,7 +9,7 @@ exports.useResizeObserver = exports.ResizeObserverProvider = exports.ResizeObser
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 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); }
 
@@ -22,7 +22,7 @@ exports.ResizeObserverContext = ResizeObserverContext;
 var ResizeObserverProvider = /*#__PURE__*/_react.default.memo(function (_ref) {
   var children = _ref.children;
   var instance = (0, _react.useMemo)(function () {
-    if (!_editorCommon.browser.supportsResizeObserver) {
+    if (!_utils.browser.supportsResizeObserver) {
       return null;
     }
 

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

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = void 0;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _pluginKey = require("./plugin-key");
 
 var createPlugin = function createPlugin(_ref) {
   var dispatch = _ref.dispatch;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey
   });
 };

package/dist/cjs/plugins/undo-redo/ui/ToolbarUndoRedo/index.js

@@ -115,12 +115,13 @@ var ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
         spacing: isReducedSpacing ? 'none' : 'default',
         onClick: handleUndo,
         disabled: !canUndo || disabled,
+        "aria-label": labelUndo,
         title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
           description: labelUndo,
           keymap: _keymaps.undo
         }),
         iconBefore: /*#__PURE__*/_react.default.createElement(_undo.default, {
-          label: labelUndo
+          label: ""
         }),
         testId: "ak-editor-toolbar-button-undo"
       }), /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
@@ -133,9 +134,10 @@ var ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
           keymap: _keymaps.redo
         }),
         iconBefore: /*#__PURE__*/_react.default.createElement(_redo.default, {
-          label: labelRedo
+          label: ""
         }),
-        testId: "ak-editor-toolbar-button-redo"
+        testId: "ak-editor-toolbar-button-redo",
+        "aria-label": labelRedo
       }), /*#__PURE__*/_react.default.createElement(_styles.Separator, null));
     }
   }]);

package/dist/cjs/plugins/unsupported-content/index.js

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.pluginKey = exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _nodeviews = require("../../nodeviews");
 
@@ -21,20 +23,20 @@ var createPlugin = function createPlugin(_ref) {
       eventDispatcher = _ref.eventDispatcher,
       dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
   var hasIntlContext = true;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: pluginKey,
     props: {
       nodeViews: {
-        confluenceUnsupportedBlock: _nodeviews.ReactNodeView.fromComponent(_editorCommon.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
+        confluenceUnsupportedBlock: _nodeviews.ReactNodeView.fromComponent(_ui.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent: dispatchAnalyticsEvent
         }, undefined, hasIntlContext),
-        confluenceUnsupportedInline: _nodeviews.ReactNodeView.fromComponent(_editorCommon.UnsupportedInline, portalProviderAPI, eventDispatcher, {
+        confluenceUnsupportedInline: _nodeviews.ReactNodeView.fromComponent(_ui.UnsupportedInline, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent: dispatchAnalyticsEvent
         }, undefined, hasIntlContext),
-        unsupportedBlock: _nodeviews.ReactNodeView.fromComponent(_editorCommon.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
+        unsupportedBlock: _nodeviews.ReactNodeView.fromComponent(_ui.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent: dispatchAnalyticsEvent
         }, undefined, hasIntlContext),
-        unsupportedInline: _nodeviews.ReactNodeView.fromComponent(_editorCommon.UnsupportedInline, portalProviderAPI, eventDispatcher, {
+        unsupportedInline: _nodeviews.ReactNodeView.fromComponent(_ui.UnsupportedInline, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent: dispatchAnalyticsEvent
         }, undefined, hasIntlContext)
       }

package/dist/cjs/plugins/view-update-subscription/index.js

@@ -15,6 +15,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var trackerStore = new WeakMap();
@@ -52,7 +54,7 @@ var createViewUpdateSubscriptionPlugin = function createViewUpdateSubscriptionPl
     name: 'viewUpdateSubscription',
     pmPlugins: function pmPlugins() {
       var createPlugin = function createPlugin() {
-        return new _prosemirrorState.Plugin({
+        return new _safePlugin.SafePlugin({
           key: pluginKey,
           view: function view(editorView) {
             tracker = trackerStore.get(editorView);

package/dist/cjs/plugins/width/index.js

@@ -10,6 +10,8 @@ exports.pluginKey = exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -20,7 +22,7 @@ var pluginKey = new _prosemirrorState.PluginKey('widthPlugin');
 exports.pluginKey = pluginKey;
 
 function createPlugin(dispatch) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: pluginKey,
     state: {
       init: function init() {

package/dist/cjs/profiler/render-count.js

@@ -15,7 +15,7 @@ var _uuid = _interopRequireDefault(require("uuid"));
 
 var _useComponentRendererTracking = require("../utils/react-hooks/use-component-renderer-tracking");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 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); }
 
@@ -42,7 +42,7 @@ var CoreRenderCountProfiler = function CoreRenderCountProfiler(_ref) {
   var onRender = function onRender(_ref2) {
     var renderCount = _ref2.renderCount;
 
-    var profiler = _editorCommon.RenderCountProfiler.getInstance({
+    var profiler = _utils.RenderCountProfiler.getInstance({
       store: window
     });
 
@@ -66,7 +66,7 @@ var CoreRenderCountProfiler = function CoreRenderCountProfiler(_ref) {
 var RenderCountProfiler = function RenderCountProfiler(_ref3) {
   var componentId = _ref3.componentId;
 
-  var profiler = _editorCommon.RenderCountProfiler.getInstance({
+  var profiler = _utils.RenderCountProfiler.getInstance({
     store: window
   });
 

package/dist/cjs/ui/Addon/ClickAreaMobile/index.js

@@ -41,7 +41,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
  * doesn't exceed the viewport, or whether it overflows it).
  */
 var ClickWrapper = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  height: 100%;\n  ", "\n"])), function (props) {
-  return props.persistScrollGutter !== true && "min-height: ".concat(props.minHeight, "vh");
+  return props.isExpanded && props.minHeight && "min-height: ".concat(props.minHeight, "px");
 });
 
 ClickWrapper.displayName = 'ClickWrapper';
@@ -106,7 +106,8 @@ var ClickAreaMobile = /*#__PURE__*/function (_React$Component) {
         minHeight: this.props.minHeight,
         persistScrollGutter: this.props.persistScrollGutter,
         onClick: this.handleClick,
-        innerRef: this.clickElementRef
+        innerRef: this.clickElementRef,
+        isExpanded: this.props.isExpanded
       }, this.props.children);
     }
   }]);

package/dist/cjs/ui/Alignment/AlignmentButton/index.js

@@ -27,6 +27,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _ToolbarButton = _interopRequireDefault(require("../../ToolbarButton"));
 
+var _keymaps = require("../../../keymaps");
+
 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; }
@@ -66,12 +68,17 @@ var AlignmentButton = /*#__PURE__*/function (_PureComponent) {
       var _this$props2 = this.props,
           label = _this$props2.label,
           isSelected = _this$props2.isSelected,
-          content = _this$props2.content;
+          content = _this$props2.content,
+          shortcut = _this$props2.shortcut;
       return /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
         disabled: false,
         selected: isSelected,
-        title: label,
+        title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+          description: label,
+          keymap: shortcut
+        }),
         "aria-label": label,
+        "aria-pressed": isSelected,
         onClick: this.onClick,
         iconBefore: content
       });

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

@@ -31,6 +31,8 @@ var _messages = require("./messages");
 
 var _styles = require("./styles");
 
+var _keymaps = require("../../keymaps");
+
 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; }
@@ -41,12 +43,14 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 var alignmentOptions = [{
   title: _messages.alignmentMessages.alignLeft,
+  shortcut: _keymaps.alignLeft,
   value: 'start'
 }, {
   title: _messages.alignmentMessages.alignCenter,
   value: 'center'
 }, {
   title: _messages.alignmentMessages.alignRight,
+  shortcut: _keymaps.alignRight,
   value: 'end'
 }];
 
@@ -75,13 +79,17 @@ var Alignment = /*#__PURE__*/function (_PureComponent) {
         }
       }, alignmentOptions.map(function (alignment) {
         var value = alignment.value,
-            title = alignment.title;
+            title = alignment.title,
+            shortcut = alignment.shortcut;
         var message = intl.formatMessage(title);
         return /*#__PURE__*/_react.default.createElement(_AlignmentButton.default, {
-          content: _iconMap.iconMap[value],
+          content: /*#__PURE__*/_react.default.createElement(_iconMap.IconMap, {
+            alignment: value
+          }),
           key: value,
           value: value,
           label: message,
+          shortcut: shortcut,
           onClick: onClick,
           isSelected: value === selectedAlignment
         });

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -53,7 +53,7 @@ var _commonStyles = require("../../../plugins/table/ui/common-styles.css");
 
 var _WithFlash = _interopRequireDefault(require("../../WithFlash"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
@@ -165,7 +165,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         containerElement: _this.containerElement
       }), /*#__PURE__*/_react.default.createElement(_Toolbar2.MainToolbarCustomComponentsSlot, null, customPrimaryToolbarComponents)), /*#__PURE__*/_react.default.createElement(_Addon.ClickAreaBlock, {
         editorView: editorView
-      }, /*#__PURE__*/_react.default.createElement(_editorCommon.WidthConsumer, null, function (_ref2) {
+      }, /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref2) {
         var width = _ref2.width;
         return /*#__PURE__*/_react.default.createElement(ContentArea, {
           innerRef: function innerRef(ref) {

package/dist/cjs/ui/Appearance/FullPage/FullPage.js

@@ -95,7 +95,7 @@ var FullPageEditor = /*#__PURE__*/function (_React$Component) {
       return false;
     }));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleResize", function () {
-      _this.scheduledKeylineUpdate = _this.updateToolbarKeyline();
+      _this.updateToolbarKeyline();
     });
     return _this;
   }
@@ -109,10 +109,7 @@ var FullPageEditor = /*#__PURE__*/function (_React$Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       window.removeEventListener('resize', this.handleResize);
-
-      if (this.scheduledKeylineUpdate) {
-        cancelAnimationFrame(this.scheduledKeylineUpdate);
-      }
+      this.updateToolbarKeyline.cancel();
     }
   }, {
     key: "render",

package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js

@@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FullPageContentArea = exports.CONTENT_AREA_TEST_ID = void 0;
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _context = require("../../ContextPanel/context");
 
 var _react = _interopRequireDefault(require("react"));
 
+var _reactIntlNext = require("react-intl-next");
+
 var _Addon = require("../../Addon");
 
 var _ContextPanel = _interopRequireDefault(require("../../ContextPanel"));
@@ -23,11 +25,13 @@ var _WidthEmitter = _interopRequireDefault(require("../../WidthEmitter"));
 
 var _StyledComponents = require("./StyledComponents");
 
+var _messages = _interopRequireDefault(require("./messages"));
+
 var CONTENT_AREA_TEST_ID = 'ak-editor-fp-content-area';
 exports.CONTENT_AREA_TEST_ID = CONTENT_AREA_TEST_ID;
 
-var FullPageContentArea = /*#__PURE__*/_react.default.memo(function (props) {
-  return /*#__PURE__*/_react.default.createElement(_editorCommon.WidthConsumer, null, function (_ref) {
+var Content = /*#__PURE__*/_react.default.memo(function (props) {
+  return /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref) {
     var width = _ref.width;
     return /*#__PURE__*/_react.default.createElement(_context.ContextPanelConsumer, null, function (_ref2) {
       var positionedOverEditor = _ref2.positionedOverEditor;
@@ -41,6 +45,8 @@ var FullPageContentArea = /*#__PURE__*/_react.default.memo(function (props) {
       }, /*#__PURE__*/_react.default.createElement(_Addon.ClickAreaBlock, {
         editorView: props.editorView
       }, /*#__PURE__*/_react.default.createElement(_StyledComponents.EditorContentArea, {
+        role: "region",
+        "aria-label": props.intl.formatMessage(_messages.default.editableContentLabel),
         fullWidthMode: props.appearance === 'full-width',
         innerRef: props.contentAreaRef,
         containerWidth: width
@@ -69,4 +75,5 @@ var FullPageContentArea = /*#__PURE__*/_react.default.memo(function (props) {
   });
 });
 
+var FullPageContentArea = (0, _reactIntlNext.injectIntl)(Content);
 exports.FullPageContentArea = FullPageContentArea;