@atlaskit/editor-core 151.3.0 → 151.3.1

package/dist/es2019/plugins/table/nodeviews/OverflowShadowsObserver.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { tableCellBorderWidth } from '@atlaskit/editor-common';
 import { ShadowEvent, TableCssClassName as ClassName } from '../types';
 import { tableInsertColumnButtonSize } from '../ui/consts';
 import { updateShadowListForStickyStyles } from './update-overflow-shadows';
@@ -54,7 +53,7 @@ export class OverflowShadowsObserver {
         }, {
           threshold: [0, 1],
           root: this.wrapper,
-          rootMargin: `0px ${tableInsertColumnButtonSize / 2 - tableCellBorderWidth}px 0px 0px`
+          rootMargin: `0px ${tableInsertColumnButtonSize / 2}px 0px 0px`
         });
         return;
       }

package/dist/es2019/plugins/table/pm-plugins/main.js

@@ -10,7 +10,7 @@ import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plu
 import { fixTables, replaceSelectedTable } from '../transforms';
 import { TableCssClassName as ClassName } from '../types';
 import { findControlsHoverDecoration, updateResizeHandles } from '../utils';
-import { INPUT_METHOD } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
 import { defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState, pluginKey } from './plugin-factory';
 import TableCellNodeView from '../nodeviews/tableCell';
@@ -18,7 +18,7 @@ let isBreakoutEnabled;
 let isDynamicTextSizingEnabled;
 let isFullWidthModeEnabled;
 let wasFullWidthModeEnabled;
-export const createPlugin = (dispatch, portalProviderAPI, eventDispatcher, pluginConfig, dynamicTextSizing, breakoutEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled) => {
+export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, dynamicTextSizing, breakoutEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled) => {
   var _window;
 
   isBreakoutEnabled = breakoutEnabled;
@@ -47,13 +47,34 @@ export const createPlugin = (dispatch, portalProviderAPI, eventDispatcher, plugi
   const tableCellNodeview = pluginConfig.tableCellOptimization ? {
     tableCell: (node, view, getPos) => new TableCellNodeView(node, view, getPos, observer),
     tableHeader: (node, view, getPos) => new TableCellNodeView(node, view, getPos, observer)
-  } : {};
+  } : {}; // Used to prevent invalid table cell spans being reported more than once per editor/document
+
+  const invalidTableIds = [];
   return new Plugin({
     state: state,
     key: pluginKey,
     appendTransaction: (transactions, oldState, newState) => {
       const tr = transactions.find(tr => tr.getMeta('uiEvent') === 'cut');
 
+      function reportInvalidTableCellSpanAttrs(invalidNodeAttr) {
+        if (invalidTableIds.find(id => id === invalidNodeAttr.tableLocalId)) {
+          return;
+        }
+
+        invalidTableIds.push(invalidNodeAttr.tableLocalId);
+        dispatchAnalyticsEvent({
+          action: ACTION.INVALID_DOCUMENT_ENCOUNTERED,
+          actionSubject: ACTION_SUBJECT.EDITOR,
+          eventType: EVENT_TYPE.OPERATIONAL,
+          attributes: {
+            nodeType: invalidNodeAttr.nodeType,
+            reason: `${invalidNodeAttr.attribute}: ${invalidNodeAttr.reason}`,
+            tableLocalId: invalidNodeAttr.tableLocalId,
+            spanValue: invalidNodeAttr.spanValue
+          }
+        });
+      }
+
       if (tr) {
         // "fixTables" removes empty rows as we don't allow that in schema
         const updatedTr = handleCut(tr, oldState, newState);
@@ -61,7 +82,7 @@ export const createPlugin = (dispatch, portalProviderAPI, eventDispatcher, plugi
       }
 
       if (transactions.find(tr => tr.docChanged)) {
-        return fixTables(newState.tr);
+        return fixTables(newState.tr, reportInvalidTableCellSpanAttrs);
       }
     },
     view: editorView => {

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/colgroup.js

@@ -9,9 +9,9 @@ export const generateColgroup = table => {
       // We slice here to guard against our colwidth array having more entries
       // Than the we actually span. We'll patch the document at a later point.
       cell.attrs.colwidth.slice(0, colspan).forEach(width => {
-        cols.push(['col', {
+        cols.push(['col', width ? {
           style: `width: ${width}px;`
-        }]);
+        } : {}]);
       });
     } else {
       // When we have merged cells on the first row (firstChild),

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/resize-state.js

@@ -25,6 +25,7 @@ export const getResizeState = ({
       cols,
       widths,
       maxSize,
+      tableWidth,
       overflow
     };
   } // Getting the resize state from DOM
@@ -42,6 +43,7 @@ export const getResizeState = ({
     cols,
     widths,
     maxSize,
+    tableWidth,
     overflow
   };
 }; // updates Colgroup DOM node with new widths

package/dist/es2019/plugins/table/transforms/column-width.js

@@ -1,4 +1,5 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { tableNewColumnMinWidth } from '@atlaskit/editor-common';
 import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
 import { setMeta } from './metadata';
 import { getResizeState, normaliseTableLayout } from '../pm-plugins/table-resizing/utils/resize-state';
@@ -105,7 +106,10 @@ export const updateColumnWidths = (resizeState, table, start) => tr => {
   return tr.setSelection(selectionBookmark.resolve(tr.doc));
 };
 /**
- * This function is called when user inserts/deletes a column in a table to rescale all columns.
+ * This function is called when user inserts/deletes a column in a table to;
+ * - rescale all columns (if the table did not overflow before the insertion)
+ * - and update column widths.
+ *
  * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
  * @param table
  * @param view
@@ -113,6 +117,8 @@ export const updateColumnWidths = (resizeState, table, start) => tr => {
  */
 
 export const rescaleColumns = (table, view) => tr => {
+  // If the table has been not been resized we skip updating the size
+  // of columns here.
   if (!view || !hasTableBeenResized(table.node)) {
     return tr;
   }
@@ -128,7 +134,8 @@ export const rescaleColumns = (table, view) => tr => {
     return tr;
   }
 
-  const layout = normaliseTableLayout(tableRef === null || tableRef === void 0 ? void 0 : tableRef.dataset.layout);
+  const layout = normaliseTableLayout(tableRef === null || tableRef === void 0 ? void 0 : tableRef.dataset.layout); // The is the width the table can reach before overflowing
+
   const maxSize = getTableMaxWidth({
     table: table.node,
     tableStart: table.start,
@@ -144,8 +151,11 @@ export const rescaleColumns = (table, view) => tr => {
     domAtPos,
     maxSize
   });
+  const previousTableWidth = resizeState.tableWidth - tableNewColumnMinWidth;
+  const tableDidntPreviouslyOverflow = previousTableWidth <= maxSize; // If the new table width will result in the table going into an overflow state
+  // we resize the cells to avoid the overflow occuring
 
-  if (resizeState.overflow) {
+  if (tableDidntPreviouslyOverflow && resizeState.overflow) {
     resizeState = scaleTableTo(resizeState, maxSize);
   }
 

package/dist/es2019/plugins/table/transforms/fix-tables.js

@@ -11,7 +11,35 @@ export const fireAnalytics = (properties = {}) => sendLogs({
     server: 'local',
     user: '-'
   }]
-}); // We attempt to patch the document when we have extra, unneeded, column widths
+});
+
+const validateTableCellNodeAttrs = ({
+  colspan,
+  rowspan,
+  tableLocalId
+}, reportInvalidTableCellSpanAttrs) => {
+  if (colspan && colspan < 0) {
+    reportInvalidTableCellSpanAttrs({
+      nodeType: 'tableCell',
+      attribute: 'colspan',
+      reason: 'negative value',
+      tableLocalId,
+      spanValue: colspan
+    });
+  }
+
+  if (rowspan && rowspan < 0) {
+    reportInvalidTableCellSpanAttrs({
+      nodeType: 'tableCell',
+      attribute: 'rowspan',
+      reason: 'negative value',
+      tableLocalId,
+      spanValue: rowspan
+    });
+  }
+
+  return;
+}; // We attempt to patch the document when we have extra, unneeded, column widths
 // Take this node for example:
 //
 //    ['td', { colwidth: [100, 100, 100], colspan: 2 }]
@@ -19,14 +47,24 @@ export const fireAnalytics = (properties = {}) => sendLogs({
 // This row only spans two columns, yet it contains widths for 3.
 // We remove the third width here, assumed duplicate content.
 
-export const removeExtraneousColumnWidths = (node, basePos, tr) => {
+
+export const removeExtraneousColumnWidths = (node, basePos, tr, reportInvalidTableCellSpanAttrs) => {
   let hasProblems = false;
   tr = replaceCells(tr, node, basePos, cell => {
     const {
       colwidth,
-      colspan
+      colspan,
+      rowspan
     } = cell.attrs;
 
+    if (reportInvalidTableCellSpanAttrs) {
+      validateTableCellNodeAttrs({
+        colspan,
+        rowspan,
+        tableLocalId: node.attrs.localId
+      }, reportInvalidTableCellSpanAttrs);
+    }
+
     if (colwidth && colwidth.length > colspan) {
       hasProblems = true;
       return cell.type.createChecked({ ...cell.attrs,
@@ -46,12 +84,12 @@ export const removeExtraneousColumnWidths = (node, basePos, tr) => {
 
   return false;
 };
-export const fixTables = tr => {
+export const fixTables = (tr, reportInvalidTableCellSpanAttrs) => {
   let hasProblems = false;
   tr.doc.descendants((node, pos) => {
     if (node.type.name === 'table') {
       // in the unlikely event of having to fix multiple tables at the same time
-      hasProblems = removeExtraneousColumnWidths(node, tr.mapping.map(pos), tr);
+      hasProblems = removeExtraneousColumnWidths(node, tr.mapping.map(pos), tr, reportInvalidTableCellSpanAttrs);
     }
   });
 

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

@@ -90,8 +90,9 @@ export class FloatingContextualButtonInner extends React.Component {
       title: labelCellOptions,
       onClick: this.handleClick,
       iconBefore: /*#__PURE__*/React.createElement(ExpandIcon, {
-        label: labelCellOptions
-      })
+        label: ""
+      }),
+      "aria-label": labelCellOptions
     }));
     const parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
 

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

@@ -443,6 +443,7 @@ class ContextualMenu extends Component {
     }
 
     return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "table-cell-contextual-menu",
       onMouseLeave: this.closeSubmenu
     }, /*#__PURE__*/React.createElement(DropdownMenu, {
       mountTo: mountPoint,

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

@@ -18,7 +18,11 @@ const sentinelStyles = `.${ClassName.TABLE_CONTAINER} {
   > .${ClassName.TABLE_STICKY_SENTINEL_TOP}, > .${ClassName.TABLE_STICKY_SENTINEL_BOTTOM} {
     position: absolute;
     width: 100%;
-    height: 0px;
+    height: 1px;
+    margin-top: -1px;
+    // need this to avoid sentinel being focused via keyboard
+    // this still allows it to be detected by intersection observer
+    visibility: hidden;
   }
   > .${ClassName.TABLE_STICKY_SENTINEL_TOP} {
     top: ${columnControlsDecorationHeight}px;

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

@@ -1,4 +1,4 @@
-import { B100, B300, B75, N0, N20, R50, R300, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
+import { B100, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
 import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common';
 import { akEditorTableBorder, akEditorTableBorderDark, akEditorTableToolbar, akEditorTableToolbarDark, akEditorTableToolbarSize, akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
 import { RESIZE_HANDLE_AREA_DECORATION_GAP } from '../types';
@@ -28,7 +28,7 @@ export const tableCellSelectedColor = B75;
 export const tableToolbarSelectedColor = B100;
 export const tableBorderSelectedColor = B300;
 export const tableCellDeleteColor = R50;
-export const tableBorderDeleteColor = R300;
+export const tableBorderDeleteColor = R400;
 export const tableToolbarDeleteColor = R75;
 export const tableBorderRadiusSize = 3;
 export const tablePadding = 8;

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

@@ -32,7 +32,7 @@ export default defineMessages({
   },
   confirmDeleteLinkedModalMessage: {
     id: 'fabric.editor.tables.confirmDeleteLinkedModalMessage',
-    defaultMessage: 'Removing this table will also remove all of the data contained in any connected charts.',
+    defaultMessage: 'Removing this table will break all the charts connected to it.',
     description: 'Message for confirm modal when deleting a table linked to an extension.'
   }
 });

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -41,7 +41,7 @@ class Decision extends ReactNodeView {
   }
 
   update(node, decorations) {
-    return super.update(node, decorations, // Toggle the placeholder based on whether user input exists.
+    return super.update(node, decorations, undefined, // Toggle the placeholder based on whether user input exists.
     (_currentNode, _newNode) => !this.isContentEmpty(_newNode));
   }
 

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -110,7 +110,7 @@ class Task extends ReactNodeView {
   }
 
   update(node, decorations) {
-    return super.update(node, decorations, (currentNode, newNode) => // Toggle the placeholder based on whether user input exists
+    return super.update(node, decorations, undefined, (currentNode, newNode) => // Toggle the placeholder based on whether user input exists
     !this.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state));
   }
 

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

@@ -1,6 +1,6 @@
 import { NodeSelection, Plugin } from 'prosemirror-state';
 import { uuid } from '@atlaskit/adf-schema';
-import { nodesBetweenChanged } from '../../../utils';
+import { nodesBetweenChanged, SetAttrsStep } from '../../../utils';
 import { createSelectionClickHandler } from '../../selection/utils';
 import { decisionItemNodeView } from '../nodeviews/decisionItem';
 import { taskItemNodeViewFactory } from '../nodeviews/taskItem';
@@ -145,10 +145,10 @@ export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory
             } = node.attrs;
 
             if (localId === undefined || localId === null || localId === '') {
-              tr.setNodeMarkup(pos, undefined, {
+              tr.step(new SetAttrsStep(pos, {
                 localId: uuid.generate(),
                 ...rest
-              });
+              }));
               modified = true;
             }
           }

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

@@ -206,7 +206,8 @@ class ToolbarTextColor extends React.Component {
     }, /*#__PURE__*/React.createElement(ColorPalette, {
       palette: palette,
       onClick: color => this.changeTextColor(color, pluginState.disabled),
-      selectedColor: pluginState.color
+      selectedColor: pluginState.color,
+      isShowingMoreColors: isShowingMoreColors
     })), showMoreColorsToggle && /*#__PURE__*/React.createElement(ShowMoreWrapper, null, /*#__PURE__*/React.createElement(Button, {
       appearance: "subtle",
       onClick: this.handleShowMoreToggle,

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { code, em, strike, strong, subsup, underline } from '@atlaskit/adf-schema';
 import WithPluginState from '../../ui/WithPluginState';
 import { plugin as textFormattingPlugin, pluginKey as textFormattingPluginKey } from './pm-plugins/main';
-import { plugin as clearFormattingPlugin } from './pm-plugins/clear-formatting';
+import { plugin as clearFormattingPlugin, pluginKey as clearFormattingPluginKey } from './pm-plugins/clear-formatting';
 import clearFormattingKeymapPlugin from './pm-plugins/clear-formatting-keymap';
 import textFormattingCursorPlugin from './pm-plugins/cursor';
 import textFormattingInputRulePlugin from './pm-plugins/input-rule';
@@ -81,7 +81,8 @@ const textFormatting = (options = {}) => ({
   }) {
     return /*#__PURE__*/React.createElement(WithPluginState, {
       plugins: {
-        textFormattingState: textFormattingPluginKey
+        textFormattingState: textFormattingPluginKey,
+        clearFormattingPluginState: clearFormattingPluginKey
       },
       render: () => {
         return /*#__PURE__*/React.createElement(Toolbar, {

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

@@ -1,5 +1,6 @@
 import React, { useMemo, useEffect, useRef, useCallback, useLayoutEffect } from 'react';
-import { text as colorsText, N200, N20, DN70, N800, DN600, DN300 } from '@atlaskit/theme/colors';
+import { text as colorsText, N200, N20, DN70, N800, DN600, DN300 } from '@atlaskit/theme/colors'; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
+
 import { ItemGroup, itemThemeNamespace } from '@atlaskit/item';
 import { themed } from '@atlaskit/theme/components';
 import { ThemeProvider } from 'styled-components';

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

@@ -1,6 +1,7 @@
 import React, { useCallback, useMemo, useRef, useLayoutEffect } from 'react';
 import { N200 } from '@atlaskit/theme/colors';
-import { borderRadius } from '@atlaskit/theme/constants';
+import { borderRadius } from '@atlaskit/theme/constants'; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
+
 import Item from '@atlaskit/item';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import styled from 'styled-components';

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -1,39 +1,72 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import AvatarsWithPluginState from '../../../plugins/collab-edit/ui';
+import FindReplaceToolbarButtonWithState from '../../../plugins/find-replace/FindReplaceToolbarButtonWithState';
+import { BeforePrimaryToolbarWrapper } from '../../../plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper';
 import Toolbar from '../../Toolbar';
-import { MainToolbar, MainToolbarIconBefore, MainToolbarCustomComponentsSlot } from './MainToolbar';
+import { MainToolbar, MainToolbarIconBefore, MainToolbarFirstChild, MainToolbarSecondChild, NonCustomToolbarWrapper, CustomToolbarWrapper, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
 import { ContextPanelConsumer } from '../../ContextPanel/context';
 export const FullPageToolbar = /*#__PURE__*/React.memo(props => {
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags4, _props$featureFlags5;
+
+  const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
+  const nonCustomToolbar = /*#__PURE__*/React.createElement(NonCustomToolbarWrapper, null, props.beforeIcon && /*#__PURE__*/React.createElement(MainToolbarIconBefore, null, props.beforeIcon), /*#__PURE__*/React.createElement(Toolbar, {
+    editorView: props.editorView,
+    editorActions: props.editorActions,
+    eventDispatcher: props.eventDispatcher,
+    providerFactory: props.providerFactory,
+    appearance: props.appearance,
+    items: props.primaryToolbarComponents,
+    popupsMountPoint: props.popupsMountPoint,
+    popupsBoundariesElement: props.popupsBoundariesElement,
+    popupsScrollableElement: props.popupsScrollableElement,
+    disabled: props.disabled,
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
+    containerElement: props.containerElement,
+    hasMinWidth: props.hasMinWidth
+  }));
+  const customToolbar = /*#__PURE__*/React.createElement(CustomToolbarWrapper, null, (_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? /*#__PURE__*/React.createElement(BeforePrimaryToolbarWrapper, {
+    beforePrimaryToolbarComponents: props.customPrimaryToolbarComponents.before
+  }) : null, (props === null || props === void 0 ? void 0 : (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null : /*#__PURE__*/React.createElement(AvatarsWithPluginState, {
+    editorView: props.editorView,
+    eventDispatcher: props.eventDispatcher,
+    inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
+    inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
+    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
+  }), (_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.findReplace && (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.twoLineEditorToolbar ? /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
+    popupsBoundariesElement: props.popupsBoundariesElement,
+    popupsMountPoint: props.popupsMountPoint,
+    popupsScrollableElement: props.popupsScrollableElement,
+    editorView: props.editorView,
+    containerElement: props.containerElement,
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
+  }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
+  useEffect(() => {
+    var _props$featureFlags6;
+
+    if ((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar) {
+      const updateOnResize = () => {
+        setShouldSplitToolbar(window.innerWidth <= MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
+      };
+
+      window.addEventListener('resize', updateOnResize);
+      updateOnResize();
+      return () => window.removeEventListener('resize', updateOnResize);
+    }
+  });
   return /*#__PURE__*/React.createElement(ContextPanelConsumer, null, ({
     width: contextPanelWidth
   }) => {
-    var _props$featureFlags;
+    var _props$featureFlags7, _props$featureFlags8, _props$featureFlags9;
 
     return /*#__PURE__*/React.createElement(MainToolbar, {
       "data-testid": "ak-editor-main-toolbar",
-      showKeyline: props.showKeyline || contextPanelWidth > 0
-    }, props.beforeIcon && /*#__PURE__*/React.createElement(MainToolbarIconBefore, null, props.beforeIcon), /*#__PURE__*/React.createElement(Toolbar, {
-      editorView: props.editorView,
-      editorActions: props.editorActions,
-      eventDispatcher: props.eventDispatcher,
-      providerFactory: props.providerFactory,
-      appearance: props.appearance,
-      items: props.primaryToolbarComponents,
-      popupsMountPoint: props.popupsMountPoint,
-      popupsBoundariesElement: props.popupsBoundariesElement,
-      popupsScrollableElement: props.popupsScrollableElement,
-      disabled: props.disabled,
-      dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
-      containerElement: props.containerElement,
-      hasMinWidth: props.hasMinWidth
-    }), /*#__PURE__*/React.createElement(MainToolbarCustomComponentsSlot, {
-      "data-testid": 'avatar-group-outside-plugin'
-    }, (props === null || props === void 0 ? void 0 : (_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.showAvatarGroupAsPlugin) === true ? null : /*#__PURE__*/React.createElement(AvatarsWithPluginState, {
-      editorView: props.editorView,
-      eventDispatcher: props.eventDispatcher,
-      inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,
-      inviteToEditHandler: props.collabEdit && props.collabEdit.inviteToEditHandler,
-      isInviteToEditButtonSelected: props.collabEdit && props.collabEdit.isInviteToEditButtonSelected
-    }), props.customPrimaryToolbarComponents));
+      showKeyline: props.showKeyline || contextPanelWidth > 0,
+      twoLineEditorToolbar: !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar)
+    }, /*#__PURE__*/React.createElement(MainToolbarFirstChild, {
+      twoLineEditorToolbar: !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)
+    }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), /*#__PURE__*/React.createElement(MainToolbarSecondChild, {
+      "data-testid": 'avatar-group-outside-plugin',
+      twoLineEditorToolbar: !!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)
+    }, shouldSplitToolbar ? nonCustomToolbar : customToolbar));
   });
 });

package/dist/es2019/ui/Appearance/FullPage/MainToolbar.js

@@ -2,6 +2,7 @@ import styled from 'styled-components';
 import { N30 } from '@atlaskit/theme/colors';
 import { gridSize } from '@atlaskit/theme/constants';
 import { akEditorMenuZIndex, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, akEditorMobileMaxWidth } from '@atlaskit/editor-shared-styles';
+export const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
 const toolbarLineHeight = 56;
 export const MainToolbar = styled.div`
   position: relative;
@@ -18,6 +19,13 @@ export const MainToolbar = styled.div`
     height: 0 !important;
   }
 
+  @media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
+    ${props => props.twoLineEditorToolbar && `
+        flex-wrap: wrap;
+        height: calc(${toolbarLineHeight}px * 2);
+      `}
+  }
+
   @media (max-width: ${akEditorMobileMaxWidth}px) {
     display: grid;
     height: calc(${toolbarLineHeight}px * 2);
@@ -34,21 +42,46 @@ export const MainToolbarIconBefore = styled.div`
   }
 `;
 MainToolbarIconBefore.displayName = 'MainToolbarIconBefore';
-export const MainToolbarCustomComponentsSlot = styled.div`
+export const MainToolbarFirstChild = styled.div`
   display: flex;
-  justify-content: flex-end;
   flex-grow: 1;
+
+  @media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
+    ${props => props.twoLineEditorToolbar && `
+        flex: 1 1 100%;
+        height: ${toolbarLineHeight}px;
+        justify-content: flex-end;
+        // ED-10241: We add fit-content to ensure that MainToolbar does not
+        // shrink more than the size of its contents. This will prevent the
+        // find/replace icon from being overlapped during a confluence
+        // publish operation
+        min-width: fit-content;
+      `}
+  }
+  @media (max-width: ${akEditorMobileMaxWidth}px) {
+    grid-column: 1;
+    grid-row: 1;
+  }
+`;
+MainToolbarFirstChild.displayName = 'MainToolbarFirstChild';
+export const MainToolbarSecondChild = styled.div`
   // ED-10241: We add fit-content to ensure that MainToolbar does not
   // shrink more than the size of its contents. This will prevent the
   // find/replace icon from being overlapped during a confluence
   // publish operation
   min-width: fit-content;
-  @media (max-width: ${akEditorMobileMaxWidth}px) {
-    grid-column: 1;
-    grid-row: 1;
+  @media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
+    ${props => props.twoLineEditorToolbar && `
+        display: flex;
+        flex-grow: 1;
+        flex: 1 1 100%;
+        margin: auto;
+        height: ${toolbarLineHeight}px;
+        min-width: 0;
+      `}
   }
 `;
-MainToolbarCustomComponentsSlot.displayName = 'MainToolbar';
+MainToolbarSecondChild.displayName = 'MainToolbarSecondChild';
 export const SecondaryToolbar = styled.div`
   box-sizing: border-box;
   justify-content: flex-end;
@@ -57,4 +90,15 @@ export const SecondaryToolbar = styled.div`
   display: flex;
   padding: 24px 0;
 `;
-SecondaryToolbar.displayName = 'SecondaryToolbar';
+SecondaryToolbar.displayName = 'SecondaryToolbar';
+export const NonCustomToolbarWrapper = styled.div`
+  align-items: center;
+  display: flex;
+  flex-grow: 1;
+`;
+NonCustomToolbarWrapper.displayName = 'NonCustomToolbar';
+export const CustomToolbarWrapper = styled.div`
+  align-items: center;
+  display: flex;
+`;
+CustomToolbarWrapper.displayName = 'CustomToolbar';

package/dist/es2019/ui/ColorPalette/Color/index.js

@@ -1,19 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { PureComponent } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import { N0 } from '@atlaskit/theme/colors';
 import { Button, ButtonWrapper } from './styles';
-import Tooltip from '@atlaskit/tooltip'; // IMO these should live inside @atlaskit/theme
-
-const messages = defineMessages({
-  selected: {
-    id: 'fabric.editor.selected',
-    defaultMessage: 'Selected',
-    description: 'If the item is selected or not.'
-  }
-});
+import Tooltip from '@atlaskit/tooltip';
 
 class Color extends PureComponent {
   constructor(...args) {
@@ -36,21 +27,20 @@ class Color extends PureComponent {
 
   render() {
     const {
+      autoFocus,
       tabIndex,
       value,
       label,
       isSelected,
       borderColor,
-      checkMarkColor = N0,
-      intl: {
-        formatMessage
-      }
+      checkMarkColor = N0
     } = this.props;
-    const ariaLabelText = isSelected ? `${label} ${formatMessage(messages.selected)}` : label;
     return /*#__PURE__*/React.createElement(Tooltip, {
       content: label
     }, /*#__PURE__*/React.createElement(ButtonWrapper, null, /*#__PURE__*/React.createElement(Button, {
-      "aria-label": ariaLabelText,
+      "aria-label": label,
+      role: "radio",
+      "aria-checked": isSelected,
       onClick: this.onClick,
       onMouseDown: this.onMouseDown,
       tabIndex: tabIndex,
@@ -58,7 +48,8 @@ class Color extends PureComponent {
       style: {
         backgroundColor: value || 'transparent',
         border: `1px solid ${borderColor}`
-      }
+      },
+      autoFocus: autoFocus
     }, isSelected && /*#__PURE__*/React.createElement(EditorDoneIcon, {
       primaryColor: checkMarkColor,
       label: ""
@@ -67,4 +58,4 @@ class Color extends PureComponent {
 
 }
 
-export default injectIntl(Color);
+export default Color;