@atlaskit/editor-core 153.1.4 → 153.1.5

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -8,13 +8,13 @@ import { autoJoin, chainCommands } from 'prosemirror-commands';
 import { keymap } from 'prosemirror-keymap';
 import { Fragment, Slice } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
-import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { uuid } from '@atlaskit/adf-schema';
 import { filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '../../../utils/commands';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, subtreeHeight, walkOut, isTable } from './helpers';
+import { getBlockRange, getCurrentIndentLevel, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideTask, isInsideTaskOrDecisionItem, liftBlock, subtreeHeight, walkOut, isTable, getTaskItemIndex, isInsideDecision } from './helpers';
 
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction) {
   return {
@@ -100,7 +100,24 @@ var unindent = filter(isInsideTask, function (state, dispatch) {
   }
 
   return withAnalytics(indentationAnalytics(curIndentLevel, INDENT_DIRECTION.OUTDENT))(autoJoin(liftSelection, ['taskList']))(state, dispatch);
-});
+}); // if selection is decision item or first action item in table cell
+// then dont consume the Tab, as table-keymap should tab to the next cell
+
+var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
+  var curIndentLevel = getCurrentIndentLevel(state.selection);
+  var curIndex = getTaskItemIndex(state);
+  var _state$schema$nodes2 = state.schema.nodes,
+      tableCell = _state$schema$nodes2.tableCell,
+      tableHeader = _state$schema$nodes2.tableHeader;
+  var cell = findParentNodeOfType([tableCell, tableHeader])(state.selection);
+
+  if ((curIndentLevel === 1 && curIndex === 0 || isInsideDecision(state)) && cell) {
+    return true;
+  }
+
+  return false;
+};
+
 var indent = filter(isInsideTask, function (state, dispatch) {
   // limit ui indentation to 6 levels
   var curIndentLevel = getCurrentIndentLevel(state.selection);
@@ -109,9 +126,9 @@ var indent = filter(isInsideTask, function (state, dispatch) {
     return true;
   }
 
-  var _state$schema$nodes2 = state.schema.nodes,
-      taskList = _state$schema$nodes2.taskList,
-      taskItem = _state$schema$nodes2.taskItem;
+  var _state$schema$nodes3 = state.schema.nodes,
+      taskList = _state$schema$nodes3.taskList,
+      taskItem = _state$schema$nodes3.taskItem;
   var _state$selection = state.selection,
       $from = _state$selection.$from,
       $to = _state$selection.$to;
@@ -134,9 +151,9 @@ var backspaceFrom = function backspaceFrom($from) {
     } // if nested, just unindent
 
 
-    var _state$schema$nodes3 = state.schema.nodes,
-        taskList = _state$schema$nodes3.taskList,
-        paragraph = _state$schema$nodes3.paragraph;
+    var _state$schema$nodes4 = state.schema.nodes,
+        taskList = _state$schema$nodes4.taskList,
+        paragraph = _state$schema$nodes4.paragraph;
 
     if ($from.node($from.depth - 2).type === taskList) {
       return unindent(state, dispatch);
@@ -167,10 +184,10 @@ var backspace = filter(isEmptySelectionAtStart, autoJoin(chainCommands(function
 var deleteHandler = filter([isInsideTaskOrDecisionItem, isEmptySelectionAtEnd], chainCommands(joinTaskDecisionFollowing, function (state, dispatch) {
   // look for the node after this current one
   var $next = walkOut(state.selection.$from);
-  var _state$schema$nodes4 = state.schema.nodes,
-      taskList = _state$schema$nodes4.taskList,
-      paragraph = _state$schema$nodes4.paragraph,
-      doc = _state$schema$nodes4.doc; // this is a top-level node it wont have $next.before()
+  var _state$schema$nodes5 = state.schema.nodes,
+      taskList = _state$schema$nodes5.taskList,
+      paragraph = _state$schema$nodes5.paragraph,
+      doc = _state$schema$nodes5.doc; // this is a top-level node it wont have $next.before()
 
   if (!$next.parent || $next.parent.type === doc) {
     return false;
@@ -333,8 +350,16 @@ var enter = filter(isInsideTaskOrDecisionItem, chainCommands(filter(isEmptyTaskD
 }));
 export function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var indentHandlers = {
-    'Shift-Tab': consumeTabs ? chainCommands(unindent, isInsideTaskOrDecisionItem) : unindent,
-    Tab: consumeTabs ? chainCommands(indent, isInsideTaskOrDecisionItem) : indent
+    'Shift-Tab': filter([isInsideTaskOrDecisionItem, function (state) {
+      return !shouldLetTabThroughInTable(state);
+    }], function (state, dispatch) {
+      return unindent(state, dispatch) || !!consumeTabs;
+    }),
+    Tab: filter([isInsideTaskOrDecisionItem, function (state) {
+      return !shouldLetTabThroughInTable(state);
+    }], function (state, dispatch) {
+      return indent(state, dispatch) || !!consumeTabs;
+    })
   };
   var defaultHandlers = consumeTabs ? {
     'Shift-Tab': isInsideTaskOrDecisionItem,

package/dist/esm/plugins/tasks-and-decisions/styles.js

@@ -3,6 +3,6 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import { css } from 'styled-components';
-import { TaskDecisionSharedCssClassName } from '@atlaskit/editor-common';
+import { TaskDecisionSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { SelectionStyle, getSelectionStyles, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 export var taskDecisionStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  [data-decision-wrapper] {\n    cursor: pointer;\n  }\n\n  .", " > [data-decision-wrapper],\n  ol[data-node-type='decisionList'].", " {\n    border-radius: 4px;\n    ", "\n  }\n\n  .danger {\n    .", ".", "\n      > div {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n      &::after {\n        content: none; /* reset the Blanket selection style */\n      }\n    }\n  }\n"])), akEditorSelectedNodeClassName, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket]), TaskDecisionSharedCssClassName.DECISION_CONTAINER, akEditorSelectedNodeClassName, akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackgroundWithOpacity);

package/dist/esm/plugins/tasks-and-decisions/ui/Task/index.js

@@ -15,7 +15,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import React, { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl-next';
-import { ProviderFactory, WithProviders } from '@atlaskit/editor-common';
+import { ProviderFactory, WithProviders } from '@atlaskit/editor-common/provider-factory';
 import TaskItemWithProviders from './task-item-with-providers';
 var messages = defineMessages({
   placeholder: {

package/dist/esm/plugins/text-color/ui/ToolbarTextColor/icon.js

@@ -18,6 +18,6 @@ var textColorGlyph = function textColorGlyph(props) {
 export var EditorTextColorIcon = function EditorTextColorIcon() {
   return /*#__PURE__*/React.createElement(Icon, {
     glyph: textColorGlyph,
-    label: "Text color icon"
+    label: ""
   });
 };

package/dist/esm/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -221,6 +221,8 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           disabled: disabled || pluginState.disabled,
           selected: isOpen,
           "aria-label": labelTextColor,
+          "aria-expanded": isOpen,
+          "aria-haspopup": true,
           title: labelTextColor,
           onClick: this.toggleOpen,
           iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(TextColorIconWrapper, null, /*#__PURE__*/React.createElement(EditorTextColorIcon, null), /*#__PURE__*/React.createElement(TextColorIconBar, {

package/dist/esm/plugins/text-formatting/pm-plugins/keymap.js

@@ -29,6 +29,18 @@ export default function keymapPlugin(schema) {
     }), list);
   }
 
+  if (schema.marks.subsup) {
+    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics({
+      inputMethod: INPUT_METHOD.SHORTCUT
+    }), list);
+  }
+
+  if (schema.marks.subsup) {
+    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics({
+      inputMethod: INPUT_METHOD.SHORTCUT
+    }), list);
+  }
+
   if (schema.marks.underline) {
     keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics({
       inputMethod: INPUT_METHOD.SHORTCUT

package/dist/esm/plugins/text-formatting/styles.js

@@ -3,5 +3,5 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import { css } from 'styled-components';
-import { codeMarkSharedStyles } from '@atlaskit/editor-common';
+import { codeMarkSharedStyles } from '@atlaskit/editor-common/styles';
 export var textFormattingStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", "\n"])), codeMarkSharedStyles);

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

@@ -40,12 +40,14 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
     items: group,
     zIndex: akEditorMenuZIndex,
     fitHeight: 188,
-    fitWidth: 136
+    fitWidth: 136,
+    shouldUseDefaultRole: true
   }, /*#__PURE__*/React.createElement(MoreButton, {
     isSelected: isMenuOpen || hasFormattingActive,
     label: moreButtonLabel,
     isReducedSpacing: isReducedSpacing,
     isDisabled: false,
-    onClick: toggleMenu
+    onClick: toggleMenu,
+    "aria-expanded": isMenuOpen
   }));
 });

package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -10,7 +10,7 @@ import { toolbarMessages } from '../toolbar-messages';
 import * as commands from '../../../commands/text-formatting';
 import { TOOLBAR_ACTION_SUBJECT_ID } from '../../../../../plugins/analytics/types/toolbar-button';
 import { pluginKey as textFormattingPluginKey } from '../../../pm-plugins/plugin-key';
-import { toggleCode, toggleStrikethrough, toggleUnderline, tooltip, toggleBold, toggleItalic, ToolTipContent } from '../../../../../keymaps';
+import { toggleCode, toggleStrikethrough, toggleUnderline, tooltip, toggleBold, toggleItalic, toggleSubscript, toggleSuperscript, ToolTipContent } from '../../../../../keymaps';
 import { INPUT_METHOD } from '../../../../analytics/types/enums';
 import { IconTypes } from '../types';
 
@@ -26,10 +26,9 @@ var IconButtons = {
     command: withToolbarInputMethod(commands.toggleStrongWithAnalytics),
     message: toolbarMessages.bold,
     tooltipKeymap: toggleBold,
-    component: function component(_ref) {
-      var label = _ref.label;
+    component: function component() {
       return /*#__PURE__*/React.createElement(BoldIcon, {
-        label: label
+        label: ""
       });
     }
   },
@@ -38,10 +37,9 @@ var IconButtons = {
     command: withToolbarInputMethod(commands.toggleEmWithAnalytics),
     message: toolbarMessages.italic,
     tooltipKeymap: toggleItalic,
-    component: function component(_ref2) {
-      var label = _ref2.label;
+    component: function component() {
       return /*#__PURE__*/React.createElement(ItalicIcon, {
-        label: label
+        label: ""
       });
     }
   },
@@ -62,19 +60,21 @@ var IconButtons = {
   },
   subscript: {
     command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics),
-    message: toolbarMessages.subscript
+    message: toolbarMessages.subscript,
+    tooltipKeymap: toggleSubscript
   },
   superscript: {
     command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics),
-    message: toolbarMessages.superscript
+    message: toolbarMessages.superscript,
+    tooltipKeymap: toggleSuperscript
   }
 };
 
-var getIcon = function getIcon(_ref3) {
-  var iconType = _ref3.iconType,
-      isDisabled = _ref3.isDisabled,
-      isActive = _ref3.isActive,
-      intl = _ref3.intl;
+var getIcon = function getIcon(_ref) {
+  var iconType = _ref.iconType,
+      isDisabled = _ref.isDisabled,
+      isActive = _ref.isActive,
+      intl = _ref.intl;
   var icon = IconButtons[iconType];
   var content = intl.formatMessage(icon.message);
   var tooltipKeymap = icon.tooltipKeymap;
@@ -84,9 +84,7 @@ var getIcon = function getIcon(_ref3) {
     iconMark: iconType,
     key: iconType,
     command: icon.command,
-    iconElement: icon.component ? icon.component({
-      label: content
-    }) : undefined,
+    iconElement: icon.component ? icon.component() : undefined,
     tooltipElement: tooltipKeymap ? /*#__PURE__*/React.createElement(ToolTipContent, {
       description: content,
       keymap: tooltipKeymap
@@ -103,9 +101,9 @@ var getIcon = function getIcon(_ref3) {
 var IconsMarkSchema = (_IconsMarkSchema = {}, _defineProperty(_IconsMarkSchema, IconTypes.strong, 'strong'), _defineProperty(_IconsMarkSchema, IconTypes.em, 'em'), _defineProperty(_IconsMarkSchema, IconTypes.strike, 'strike'), _defineProperty(_IconsMarkSchema, IconTypes.code, 'code'), _defineProperty(_IconsMarkSchema, IconTypes.underline, 'underline'), _defineProperty(_IconsMarkSchema, IconTypes.superscript, 'subsup'), _defineProperty(_IconsMarkSchema, IconTypes.subscript, 'subsup'), _IconsMarkSchema);
 
 var buildMenuIconState = function buildMenuIconState(iconMark) {
-  return function (_ref4) {
-    var schema = _ref4.schema,
-        textFormattingPluginState = _ref4.textFormattingPluginState;
+  return function (_ref2) {
+    var schema = _ref2.schema,
+        textFormattingPluginState = _ref2.textFormattingPluginState;
     var hasPluginState = Boolean(textFormattingPluginState);
     var markSchema = IconsMarkSchema[iconMark];
     var hasSchemaMark = Boolean(schema.marks[markSchema]);
@@ -133,11 +131,11 @@ var buildMenuIconState = function buildMenuIconState(iconMark) {
 
 var buildIcon = function buildIcon(iconMark) {
   var getState = buildMenuIconState(iconMark);
-  return function (_ref5) {
-    var schema = _ref5.schema,
-        textFormattingPluginState = _ref5.textFormattingPluginState,
-        intl = _ref5.intl,
-        isToolbarDisabled = _ref5.isToolbarDisabled;
+  return function (_ref3) {
+    var schema = _ref3.schema,
+        textFormattingPluginState = _ref3.textFormattingPluginState,
+        intl = _ref3.intl,
+        isToolbarDisabled = _ref3.isToolbarDisabled;
     var iconState = getState({
       schema: schema,
       textFormattingPluginState: textFormattingPluginState
@@ -175,10 +173,10 @@ var useTextFormattingPluginState = function useTextFormattingPluginState(editorS
   }, [editorState]);
 };
 
-export var useFormattingIcons = function useFormattingIcons(_ref6) {
-  var isToolbarDisabled = _ref6.isToolbarDisabled,
-      editorState = _ref6.editorState,
-      intl = _ref6.intl;
+export var useFormattingIcons = function useFormattingIcons(_ref4) {
+  var isToolbarDisabled = _ref4.isToolbarDisabled,
+      editorState = _ref4.editorState,
+      intl = _ref4.intl;
   var textFormattingPluginState = useTextFormattingPluginState(editorState);
   var schema = editorState.schema;
   var props = {
@@ -199,9 +197,9 @@ export var useFormattingIcons = function useFormattingIcons(_ref6) {
   }, [strongIcon, emIcon, underlineIcon, strikeIcon, codeIcon, subscriptIcon, superscriptIcon]);
   return result;
 };
-export var useHasFormattingActived = function useHasFormattingActived(_ref7) {
-  var editorState = _ref7.editorState,
-      iconTypeList = _ref7.iconTypeList;
+export var useHasFormattingActived = function useHasFormattingActived(_ref5) {
+  var editorState = _ref5.editorState,
+      iconTypeList = _ref5.iconTypeList;
   var textFormattingPluginState = useTextFormattingPluginState(editorState);
   var hasActiveFormatting = useMemo(function () {
     if (!textFormattingPluginState) {

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

@@ -77,7 +77,9 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     label: moreFormattingButtonLabel,
     isReducedSpacing: isReducedSpacing,
     isDisabled: true,
-    isSelected: false
+    isSelected: false,
+    "aria-expanded": undefined,
+    "aria-pressed": undefined
   })) : /*#__PURE__*/React.createElement(FormattingTextDropdownMenu, {
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

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

@@ -1,24 +1,25 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import MoreIcon from '@atlaskit/icon/glyph/editor/more';
 import { TriggerWrapper } from '../../../../ui/styles';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 export var MoreButton = /*#__PURE__*/React.memo(function (_ref) {
   var label = _ref.label,
+      ariaExpanded = _ref['aria-expanded'],
       isReducedSpacing = _ref.isReducedSpacing,
       isSelected = _ref.isSelected,
       isDisabled = _ref.isDisabled,
       onClick = _ref.onClick;
-  var more = useMemo(function () {
-    return /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(MoreIcon, {
-      label: label
-    }));
-  }, [label]);
   return /*#__PURE__*/React.createElement(ToolbarButton, {
     disabled: isDisabled,
     selected: isSelected,
     onClick: onClick,
     spacing: isReducedSpacing ? 'none' : 'default',
     title: label,
-    iconBefore: more
+    iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(MoreIcon, {
+      label: ""
+    })),
+    "aria-expanded": ariaExpanded,
+    "aria-label": label,
+    "aria-haspopup": true
   });
 });

package/dist/esm/plugins/text-formatting/ui/Toolbar/single-toolbar-buttons.js

@@ -22,7 +22,9 @@ export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
       selected: item.isActive,
       disabled: item.isDisabled,
       title: item.tooltipElement,
-      iconBefore: item.iconElement
+      iconBefore: item.iconElement,
+      "aria-pressed": item.isActive,
+      "aria-label": String(item.content)
     });
   }));
 });

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

@@ -5,7 +5,7 @@ var _templateObject;
 import React, { useRef, useEffect, useCallback } from 'react';
 import styled from 'styled-components';
 import { keyName as keyNameNormalized } from 'w3c-keyname';
-import { browser, ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
+import { browser, ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { CloseSelectionOptions } from '../constants';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 var QuerySpan = styled.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  outline: none;\n"])));

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

@@ -5,7 +5,7 @@ var _templateObject;
 import React, { useEffect, useMemo } from 'react';
 import styled from 'styled-components';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
-import { Popup } from '@atlaskit/editor-common';
+import { 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';

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

@@ -1,5 +1,5 @@
 import React, { useMemo, useEffect, useContext, useLayoutEffect, createContext } from 'react';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 var Context = /*#__PURE__*/createContext(null);
 export var ResizeObserverContext = Context;
 export var ResizeObserverProvider = /*#__PURE__*/React.memo(function (_ref) {

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

@@ -88,12 +88,13 @@ export var ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
         spacing: isReducedSpacing ? 'none' : 'default',
         onClick: handleUndo,
         disabled: !canUndo || disabled,
+        "aria-label": labelUndo,
         title: /*#__PURE__*/React.createElement(ToolTipContent, {
           description: labelUndo,
           keymap: undoKeymap
         }),
         iconBefore: /*#__PURE__*/React.createElement(UndoIcon, {
-          label: labelUndo
+          label: ""
         }),
         testId: "ak-editor-toolbar-button-undo"
       }), /*#__PURE__*/React.createElement(ToolbarButton, {
@@ -106,9 +107,10 @@ export var ToolbarUndoRedo = /*#__PURE__*/function (_PureComponent) {
           keymap: redoKeymap
         }),
         iconBefore: /*#__PURE__*/React.createElement(RedoIcon, {
-          label: labelRedo
+          label: ""
         }),
-        testId: "ak-editor-toolbar-button-redo"
+        testId: "ak-editor-toolbar-button-redo",
+        "aria-label": labelRedo
       }), /*#__PURE__*/React.createElement(Separator, null));
     }
   }]);

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

@@ -1,6 +1,6 @@
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { confluenceUnsupportedBlock, confluenceUnsupportedInline, unsupportedBlock, unsupportedInline, unsupportedMark, unsupportedNodeAttribute } from '@atlaskit/adf-schema';
-import { UnsupportedBlock, UnsupportedInline } from '@atlaskit/editor-common';
+import { UnsupportedBlock, UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { ReactNodeView } from '../../nodeviews';
 export var pluginKey = new PluginKey('unsupportedContentPlugin');
 

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

@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import uuid from 'uuid';
 import { useComponentRenderTracking } from '../utils/react-hooks/use-component-renderer-tracking';
-import { RenderCountProfiler as RenderCountProfilerClass } from '@atlaskit/editor-common';
+import { RenderCountProfiler as RenderCountProfilerClass } from '@atlaskit/editor-common/utils';
 export var ProfiledComponentIds;
 
 (function (ProfiledComponentIds) {

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

@@ -23,7 +23,7 @@ import { clickAreaClickHandler } from '../click-area-helper';
  */
 
 var ClickWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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';
 
@@ -90,7 +90,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/esm/ui/Alignment/AlignmentButton/index.js

@@ -13,6 +13,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { PureComponent } from 'react';
 import ToolbarButton from '../../ToolbarButton';
+import { ToolTipContent } from '../../../keymaps';
 
 var AlignmentButton = /*#__PURE__*/function (_PureComponent) {
   _inherits(AlignmentButton, _PureComponent);
@@ -47,12 +48,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.createElement(ToolbarButton, {
         disabled: false,
         selected: isSelected,
-        title: label,
+        title: /*#__PURE__*/React.createElement(ToolTipContent, {
+          description: label,
+          keymap: shortcut
+        }),
         "aria-label": label,
+        "aria-pressed": isSelected,
         onClick: this.onClick,
         iconBefore: content
       });

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

@@ -15,14 +15,17 @@ 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';
 var alignmentOptions = [{
   title: alignmentMessages.alignLeft,
+  shortcut: alignLeft,
   value: 'start'
 }, {
   title: alignmentMessages.alignCenter,
   value: 'center'
 }, {
   title: alignmentMessages.alignRight,
+  shortcut: alignRight,
   value: 'end'
 }];
 
@@ -52,13 +55,15 @@ 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.createElement(AlignmentButton, {
           content: iconMap[value],
           key: value,
           value: value,
           label: message,
+          shortcut: shortcut,
           onClick: onClick,
           isSelected: value === selectedAlignment
         });

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

@@ -28,7 +28,7 @@ import { stateKey as mediaPluginKey } from '../../../plugins/media/pm-plugins/pl
 import { ClickAreaBlock } from '../../Addon';
 import { tableCommentEditorStyles } from '../../../plugins/table/ui/common-styles.css';
 import WithFlash from '../../WithFlash';
-import { WidthConsumer } from '@atlaskit/editor-common';
+import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import WidthEmitter from '../../WidthEmitter';
 import { GRID_GUTTER } from '../../../plugins/grid';

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

@@ -78,7 +78,7 @@ export var FullPageEditor = /*#__PURE__*/function (_React$Component) {
     }));
 
     _defineProperty(_assertThisInitialized(_this), "handleResize", function () {
-      _this.scheduledKeylineUpdate = _this.updateToolbarKeyline();
+      _this.updateToolbarKeyline();
     });
 
     return _this;
@@ -93,10 +93,7 @@ export 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/esm/ui/Appearance/FullPage/FullPageContentArea.js

@@ -1,4 +1,4 @@
-import { WidthConsumer } from '@atlaskit/editor-common';
+import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { ContextPanelConsumer } from '../../ContextPanel/context';
 import React from 'react';
 import { ClickAreaBlock } from '../../Addon';

package/dist/esm/ui/AppearanceComponents/Mobile.js

@@ -24,11 +24,13 @@ export function MobileAppearance(_ref) {
         mobileDimensions = _ref2.mobileDimensions;
     var maxContentSizeReached = Boolean(maxContentSize === null || maxContentSize === void 0 ? void 0 : maxContentSize.maxContentSizeReached);
     var minHeight = 100;
+    var currentIsExpanded = true; // isExpanded prop should always be true for Hybrid Editor
 
     if (mobileDimensions) {
       var keyboardHeight = mobileDimensions.keyboardHeight,
           windowHeight = mobileDimensions.windowHeight,
-          mobilePaddingTop = mobileDimensions.mobilePaddingTop;
+          mobilePaddingTop = mobileDimensions.mobilePaddingTop,
+          isExpanded = mobileDimensions.isExpanded;
       /*
         We calculate the min-height based on the windowHeight - keyboardHeight - paddingTop.
         This is needed due to scrolling issues when there is no content to scroll (like, only having 1 paragraph),
@@ -36,9 +38,16 @@ export function MobileAppearance(_ref) {
         is scrolled nevertheless, and it gives the sensation that the content was lost.
       */
 
-      var keyboardHeightVh = keyboardHeight * 100 / windowHeight;
-      var paddingVh = mobilePaddingTop * 100 / windowHeight;
-      minHeight = 100 - keyboardHeightVh - paddingVh;
+      if (!persistScrollGutter) {
+        // in iOS Hybrid Editor windowHeight doesn't exclude keyboardHeight
+        // in Android keyboardHeight is always set to -1;
+        minHeight = windowHeight - keyboardHeight - 2 * mobilePaddingTop;
+      } else {
+        // in iOS Compact Editor windowHeight excludes keyboardHeight
+        minHeight = windowHeight - mobilePaddingTop; // isExpanded can be true of false for Compact editor
+
+        currentIsExpanded = isExpanded;
+      }
     }
 
     return /*#__PURE__*/React.createElement(WithFlash, {
@@ -49,7 +58,8 @@ export function MobileAppearance(_ref) {
     }, /*#__PURE__*/React.createElement(ClickArea, {
       editorView: editorView || undefined,
       minHeight: minHeight,
-      persistScrollGutter: persistScrollGutter
+      persistScrollGutter: persistScrollGutter,
+      isExpanded: currentIsExpanded
     }, /*#__PURE__*/React.createElement(ContentArea, null, /*#__PURE__*/React.createElement("div", {
       className: "ak-editor-content-area"
     }, children)))));