@atlaskit/editor-core 153.1.4 → 153.1.5

package/dist/es2019/plugins/table/ui/FloatingContextualMenu/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import styled from 'styled-components';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { getPluginState, pluginKey } from '../../pm-plugins/plugin-factory';
 import { contextualMenuDropdownWidth, contextualMenuTriggerSize } from '../consts';

package/dist/es2019/plugins/table/ui/FloatingDeleteButton/index.js

@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getSelectionRect, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { createPortal } from 'react-dom';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';

package/dist/es2019/plugins/table/ui/FloatingInsertButton/InsertButton.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { tableMarginTop } from '@atlaskit/editor-common';
+import { tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import Tooltip from '@atlaskit/tooltip';
 import * as keymaps from '../../../../keymaps';

package/dist/es2019/plugins/table/ui/FloatingInsertButton/index.js

@@ -6,7 +6,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { injectIntl } from 'react-intl-next';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';

package/dist/es2019/plugins/table/ui/LayoutButton/index.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import commonMessages from '../../../../messages';

package/dist/es2019/plugins/table/ui/TableFloatingControls/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { hoverRows, selectRow } from '../../commands';
 import { isSelectionUpdated } from '../../utils';
 import CornerControls from './CornerControls';

package/dist/es2019/plugins/table/ui/common-styles.css.js

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common';
+import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles';
 import { fontSize } from '@atlaskit/theme/constants';
 import { N40A, B300, N300, N20A, N0, R500 } from '@atlaskit/theme/colors';
 import { SelectionStyle, getSelectionStyles, akEditorSmallZIndex, akEditorTableNumberColumnWidth, akEditorStickyHeaderZIndex, akEditorTableToolbarSize, akEditorUnitZIndex, akEditorSelectedNodeClassName, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';

package/dist/es2019/plugins/table/ui/consts.js

@@ -1,5 +1,5 @@
-import { B100, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
-import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common';
+import { B200, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
+import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableBorder, akEditorTableBorderDark, akEditorTableToolbar, akEditorTableToolbarDark, akEditorTableToolbarSize, akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
 import { RESIZE_HANDLE_AREA_DECORATION_GAP } from '../types';
 import { themed } from '@atlaskit/theme/components';
@@ -25,7 +25,7 @@ export const tableBorderColor = themed({
 });
 export const tableFloatingControlsColor = N20;
 export const tableCellSelectedColor = B75;
-export const tableToolbarSelectedColor = B100;
+export const tableToolbarSelectedColor = B200;
 export const tableBorderSelectedColor = B300;
 export const tableCellDeleteColor = R50;
 export const tableBorderDeleteColor = R400;

package/dist/es2019/plugins/table/ui/ui-styles.css.js

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common';
+import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorShadowZIndex, akEditorTableNumberColumnWidth, akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import { N40A, B300, N300, R300, N20A, N60A, N0, Y50, Y200 } from '@atlaskit/theme/colors';
 import { tableToolbarColor, tableBorderColor, tableToolbarSelectedColor, tableBorderSelectedColor, tableCellDeleteColor, tableBorderDeleteColor, tableToolbarDeleteColor, lineMarkerOffsetFromColumnControls, lineMarkerSize, columnControlsDecorationHeight, columnControlsZIndex, columnControlsSelectedZIndex, resizeHandlerAreaWidth, resizeLineWidth, resizeHandlerZIndex, tableToolbarSize, tableInsertColumnButtonSize, tableDeleteButtonSize, tableControlsSpacing } from './consts';

package/dist/es2019/plugins/table/utils/collapse.js

@@ -1,44 +1,84 @@
 import { NodeRange } from 'prosemirror-model';
+import { findWrapping } from 'prosemirror-transform';
 import { findTable } from '@atlaskit/editor-tables/utils';
+
+const bail = () => ({
+  tableIsCollapsible: false
+});
 /**
- * Collapses the selected table into an expand given a transaction.
- *
- * Will return undefined if it cannot determine the relevant table from a
- * selection,
- *
- * Or if wrapping it in an expand results in any errors
- *
- * @param tr
- * @returns Transaction | undefined
+ * Checks whether we can wrap the selected table into an expand via
+ * prosemirror-transform's `findWrapping` helper
  */
 
-export const collapseSelectedTable = tr => {
+
+export const isTableCollapsible = tr => {
   const selection = tr.selection;
   const schema = tr.doc.type.schema;
   const nodePos = findTable(selection);
 
   if (!nodePos) {
-    return undefined;
+    return bail();
   }
 
+  const expand = schema.nodes.expand;
   const {
     node,
     pos
   } = nodePos;
   const $pos = tr.doc.resolve(pos);
-  const expand = schema.nodes.expand;
-  const range = new NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth); // Check if result of this transaction would result in an invalid document
-
-  try {
-    // TODO: add attrs: { __expanded: false } when it is working with new collab (CEMS-1204)
-    tr.wrap(range, [{
-      type: expand
-    }]).setMeta('scrollIntoView', true);
-    tr.doc.check();
-  } catch (err) {
-    // Don't care why it failed, only that we couldn't do so without issue
+  const range = new NodeRange($pos, tr.doc.resolve(pos + node.nodeSize), $pos.depth);
+
+  if (!range) {
+    return bail();
+  }
+
+  const canWrap = findWrapping(range, expand);
+
+  if (canWrap === null) {
+    return bail();
+  }
+
+  return {
+    tableIsCollapsible: true,
+    range,
+
+    /**
+     * Do we ever want to deal with the result of `findWrapping`? Probably not,
+     * but we have it anyway.
+     */
+    findWrappingRes: canWrap
+  };
+};
+/**
+ * Collapses the selected table into an expand given a transaction via
+ * `Transform.wrap`.
+ *
+ * Will return undefined if it cannot determine the relevant table from a
+ * selection, or if the table itself isn't collapsible.
+ *
+ * @param tr
+ * @returns Transaction | undefined
+ */
+
+export const collapseSelectedTable = tr => {
+  const canCollapse = isTableCollapsible(tr);
+  const expand = tr.doc.type.schema.nodes.expand;
+
+  if (!canCollapse.range || !canCollapse.tableIsCollapsible) {
     return undefined;
   }
+  /**
+   * TODO: add attrs: { __expanded: false } when
+   * - it is working with new collab (CEMS-1204)
+   * - synchrony is no longer used
+   *
+   *   (via confluence-frontend, "this feature" referencing allowInteractiveExpand)
+   *   `we can NEVER allow this feature to be enabled for the synchrony-powered editor
+   */
+
 
+  tr.wrap(canCollapse.range, [{
+    type: expand
+  }]).setMeta('scrollIntoView', true);
   return tr;
 };

package/dist/es2019/plugins/tasks-and-decisions/commands.js

@@ -95,13 +95,14 @@ export const insertTaskDecision = (view, listType, inputMethod = INPUT_METHOD.TO
     const {
       $to
     } = state.selection;
-    const pos = $to.end($to.depth);
-    return tr.split(pos, 1, [{
+    const endPos = $to.end($to.depth);
+    const newItemParagraphPos = endPos + 2;
+    return tr.split(endPos, 1, [{
       type: item,
       attrs: {
         localId: itemLocalId
       }
-    }]).setSelection(new TextSelection(tr.doc.resolve(pos + $to.depth)));
+    }]).setSelection(new TextSelection(tr.doc.resolve(newItemParagraphPos)));
   };
 
   const tr = insertTaskDecisionWithAnalytics(state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId);

package/dist/es2019/plugins/tasks-and-decisions/pm-plugins/helpers.js

@@ -1,5 +1,5 @@
 import { liftTarget } from 'prosemirror-transform';
-import { hasParentNodeOfType } from 'prosemirror-utils';
+import { findParentNodeClosestToPos, hasParentNodeOfType } from 'prosemirror-utils';
 import { findFarthestParentNode } from '../../../utils';
 export const isInsideTaskOrDecisionItem = state => {
   const {
@@ -28,6 +28,12 @@ export const isInsideTask = state => {
   } = state.schema.nodes;
   return hasParentNodeOfType([taskItem])(state.selection);
 };
+export const isInsideDecision = state => {
+  const {
+    decisionItem
+  } = state.schema.nodes;
+  return hasParentNodeOfType([decisionItem])(state.selection);
+};
 export const isTable = node => {
   if (!node) {
     return false;
@@ -81,6 +87,18 @@ export const getCurrentIndentLevel = selection => {
 
   return $from.depth - furthestParent.depth;
 };
+/**
+ * Finds the index of the current task item in relation to the closest taskList
+ */
+
+export const getTaskItemIndex = state => {
+  const $pos = state.selection.$from;
+
+  const isTaskList = node => (node === null || node === void 0 ? void 0 : node.type.name) === 'taskList';
+
+  const itemAtPos = findParentNodeClosestToPos($pos, isTaskList);
+  return $pos.index(itemAtPos ? itemAtPos.depth : undefined);
+};
 /**
  * Walk outwards from a position until we encounter the (inside) start of
  * the next node, or reach the end of the document.

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

@@ -2,13 +2,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';
 
 const indentationAnalytics = (curIndentLevel, direction) => ({
   action: ACTION.FORMATTED,
@@ -91,7 +91,25 @@ const unindent = filter(isInsideTask, (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
+
+const shouldLetTabThroughInTable = state => {
+  const curIndentLevel = getCurrentIndentLevel(state.selection);
+  const curIndex = getTaskItemIndex(state);
+  const {
+    tableCell,
+    tableHeader
+  } = state.schema.nodes;
+  const cell = findParentNodeOfType([tableCell, tableHeader])(state.selection);
+
+  if ((curIndentLevel === 1 && curIndex === 0 || isInsideDecision(state)) && cell) {
+    return true;
+  }
+
+  return false;
+};
+
 const indent = filter(isInsideTask, (state, dispatch) => {
   // limit ui indentation to 6 levels
   const curIndentLevel = getCurrentIndentLevel(state.selection);
@@ -338,8 +356,8 @@ const enter = filter(isInsideTaskOrDecisionItem, chainCommands(filter(isEmptyTas
 }));
 export function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   const indentHandlers = {
-    'Shift-Tab': consumeTabs ? chainCommands(unindent, isInsideTaskOrDecisionItem) : unindent,
-    Tab: consumeTabs ? chainCommands(indent, isInsideTaskOrDecisionItem) : indent
+    'Shift-Tab': filter([isInsideTaskOrDecisionItem, state => !shouldLetTabThroughInTable(state)], (state, dispatch) => unindent(state, dispatch) || !!consumeTabs),
+    Tab: filter([isInsideTaskOrDecisionItem, state => !shouldLetTabThroughInTable(state)], (state, dispatch) => indent(state, dispatch) || !!consumeTabs)
   };
   const defaultHandlers = consumeTabs ? {
     'Shift-Tab': isInsideTaskOrDecisionItem,

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

@@ -1,5 +1,5 @@
 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 const taskDecisionStyles = css`
   [data-decision-wrapper] {

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
 const messages = defineMessages({
   placeholder: {

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

@@ -16,6 +16,6 @@ const textColorGlyph = props => /*#__PURE__*/React.createElement("svg", _extends
 export const EditorTextColorIcon = () => {
   return /*#__PURE__*/React.createElement(Icon, {
     glyph: textColorGlyph,
-    label: "Text color icon"
+    label: ""
   });
 };

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

@@ -191,6 +191,8 @@ export class ToolbarTextColor extends 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/es2019/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/es2019/plugins/text-formatting/styles.js

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { codeMarkSharedStyles } from '@atlaskit/editor-common';
+import { codeMarkSharedStyles } from '@atlaskit/editor-common/styles';
 export const textFormattingStyles = css`
   ${codeMarkSharedStyles}
 `;

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

@@ -33,12 +33,14 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
     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/es2019/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -6,7 +6,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';
 
@@ -20,10 +20,8 @@ const IconButtons = {
     command: withToolbarInputMethod(commands.toggleStrongWithAnalytics),
     message: toolbarMessages.bold,
     tooltipKeymap: toggleBold,
-    component: ({
-      label
-    }) => /*#__PURE__*/React.createElement(BoldIcon, {
-      label: label
+    component: () => /*#__PURE__*/React.createElement(BoldIcon, {
+      label: ""
     })
   },
   em: {
@@ -31,10 +29,8 @@ const IconButtons = {
     command: withToolbarInputMethod(commands.toggleEmWithAnalytics),
     message: toolbarMessages.italic,
     tooltipKeymap: toggleItalic,
-    component: ({
-      label
-    }) => /*#__PURE__*/React.createElement(ItalicIcon, {
-      label: label
+    component: () => /*#__PURE__*/React.createElement(ItalicIcon, {
+      label: ""
     })
   },
   underline: {
@@ -54,11 +50,13 @@ const 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
   }
 };
 
@@ -79,9 +77,7 @@ const getIcon = ({
     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

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

@@ -64,7 +64,9 @@ const ToolbarFormatting = ({
     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/es2019/plugins/text-formatting/ui/Toolbar/more-button.js

@@ -1,23 +1,26 @@
-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 const MoreButton = /*#__PURE__*/React.memo(({
   label,
+  'aria-expanded': ariaExpanded,
   isReducedSpacing,
   isSelected,
   isDisabled,
   onClick
 }) => {
-  const more = useMemo(() => /*#__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/es2019/plugins/text-formatting/ui/Toolbar/single-toolbar-buttons.js

@@ -22,6 +22,8 @@ export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
     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/es2019/plugins/type-ahead/ui/InputQuery.js

@@ -1,7 +1,7 @@
 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';
 const QuerySpan = styled.span`

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

@@ -1,7 +1,7 @@
 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/es2019/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';
 const Context = /*#__PURE__*/createContext(null);
 export const ResizeObserverContext = Context;
 export const ResizeObserverProvider = /*#__PURE__*/React.memo(({

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

@@ -67,12 +67,13 @@ export class ToolbarUndoRedo extends 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, {
@@ -85,9 +86,10 @@ export class ToolbarUndoRedo extends 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/es2019/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 const pluginKey = new PluginKey('unsupportedContentPlugin');
 

package/dist/es2019/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 let ProfiledComponentIds;
 
 (function (ProfiledComponentIds) {

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

@@ -10,7 +10,7 @@ import { clickAreaClickHandler } from '../click-area-helper';
 
 const ClickWrapper = styled.div`
   height: 100%;
-  ${props => props.persistScrollGutter !== true && `min-height: ${props.minHeight}vh`}
+  ${props => props.isExpanded && props.minHeight && `min-height: ${props.minHeight}px`}
 `;
 ClickWrapper.displayName = 'ClickWrapper';
 
@@ -63,7 +63,8 @@ export default class ClickAreaMobile extends 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/es2019/ui/Alignment/AlignmentButton/index.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { PureComponent } from 'react';
 import ToolbarButton from '../../ToolbarButton';
+import { ToolTipContent } from '../../../keymaps';
 
 class AlignmentButton extends PureComponent {
   constructor(...args) {
@@ -21,13 +22,18 @@ class AlignmentButton extends PureComponent {
     const {
       label,
       isSelected,
-      content
+      content,
+      shortcut
     } = this.props;
     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
     });