@atlaskit/editor-core 166.0.4 → 167.0.2

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

@@ -76,10 +76,7 @@ export const createColumnControlsDecoration = selection => {
     element.dataset.startIndex = `${index}`;
     index += colspan;
     element.dataset.endIndex = `${index}`;
-    return Decoration.widget(cell.pos + 1, // Do not delay the rendering for this Decoration
-    // because we need to always render all controls
-    // to keep the order safe
-    element, {
+    return Decoration.widget(cell.pos + 1, () => element, {
       key: `${TableDecorations.COLUMN_CONTROLS_DECORATIONS}_${index}`,
       // this decoration should be the first one, even before gap cursor.
       side: -100

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

@@ -62,6 +62,8 @@ export const transformSliceToFixHardBreakProblemOnCopyFromCell = (slice, schema)
   return slice;
 };
 export const transformSliceToRemoveOpenTable = (slice, schema) => {
+  var _slice$content$firstC;
+
   // we're removing the table, tableRow and tableCell reducing the open depth by 3
   const depthDecrement = 3; // Case 1: A slice entirely within a single CELL
 
@@ -69,17 +71,15 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
   slice.openStart >= 4 && slice.openEnd >= 4 && // slice is a table node
   slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.table) {
     return new Slice(flatmap(slice.content, unwrapContentFromTable), slice.openStart - depthDecrement, slice.openEnd - depthDecrement);
-  } // Case 2: A slice starting inside a table and finishing outside
-  // slice.openStart can only be >= 4 if its a TextSelection. CellSelection would give openStart = 1
-
-
-  if (slice.openStart >= 4 && slice.content.firstChild.type === schema.nodes.table) {
-    return new Slice(flatmap(slice.content, removeTableFromFirstChild), slice.openStart - depthDecrement, slice.openEnd);
-  } // Case 3: A slice starting outside a table and finishing inside
+  } // Case 2: A slice starting within a CELL and ending outside the table
 
 
-  if (slice.openEnd >= 4 && slice.content.lastChild.type === schema.nodes.table) {
-    return new Slice(flatmap(slice.content, removeTableFromLastChild), slice.openStart, slice.openEnd - depthDecrement);
+  if ( // starts inside of a cell but ends outside of the starting table
+  slice.openStart >= 4 && // slice starts from a table node (and spans across more than one node)
+  slice.content.childCount > 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === schema.nodes.table) {
+    // repoint the slice's cutting depth so that cell content where the slice starts
+    // does not get lifted out of the cell on paste
+    return new Slice(slice.content, 1, slice.openEnd);
   }
 
   return slice;

package/dist/es2019/plugins/text-formatting/pm-plugins/input-rule.js

@@ -152,7 +152,7 @@ const buildRegex = char => {
   // Double X - https://regex101.com/r/pQUgjx/1/
 
   const baseRegex = '^X(?=[^X\\s]).*?[^\\sX]X(?=[\\sOBJECT_REPLACEMENT_CHARACTER]COMBINATIONS|$)'.replace('OBJECT_REPLACEMENT_CHARACTER', leafNodeReplacementCharacter).replace('COMBINATIONS', combinations ? `|${combinations}` : '');
-  const replacedRegex = baseRegex.replaceAll ? baseRegex.replaceAll('X', escapedChar) : baseRegex.replace(/X/g, escapedChar);
+  const replacedRegex = String.prototype.hasOwnProperty('replaceAll') ? baseRegex.replaceAll('X', escapedChar) : baseRegex.replace(/X/g, escapedChar);
   return new ReverseRegexExp(replacedRegex);
 };
 

package/dist/es2019/plugins/type-ahead/index.js

@@ -151,12 +151,13 @@ const typeAheadPlugin = options => {
       containerElement,
       popupsMountPoint,
       popupsBoundariesElement,
-      popupsScrollableElement
+      popupsScrollableElement,
+      wrapperElement
     }) {
       popupMountRef.current = {
-        popupsMountPoint: popupsMountPoint || containerElement || undefined,
+        popupsMountPoint: popupsMountPoint || wrapperElement || undefined,
         popupsBoundariesElement,
-        popupsScrollableElement
+        popupsScrollableElement: popupsScrollableElement || containerElement || undefined
       };
       return /*#__PURE__*/React.createElement(WithPluginState, {
         plugins: {

package/dist/es2019/plugins/type-ahead/pm-plugins/decorations.js

@@ -12,6 +12,7 @@ import { WrapperTypeAhead } from '../ui/WrapperTypeAhead';
 import { StatsModifier } from '../stats-modifier';
 import { getTypeAheadQuery } from '../utils';
 import { closeTypeAhead } from '../transforms/close-type-ahead';
+import { token } from '@atlaskit/tokens';
 export const factoryDecorations = ({
   intl,
   popupMountRef,
@@ -56,7 +57,7 @@ export const factoryDecorations = ({
 
       typeaheadComponent.dataset.editorPopup = 'true';
       typeaheadComponent.dataset.typeAhead = TYPE_AHEAD_DECORATION_DATA_ATTRIBUTE;
-      typeaheadComponent.style.color = B400;
+      typeaheadComponent.style.color = token('color.text.accent.blue', B400);
       typeaheadComponent.style.backgroundColor = 'transparent';
 
       const onUndoRedo = inputType => {

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

@@ -11,14 +11,14 @@ import { DynamicHeightListItem, SelectedIndexContext, ListItemActionsContext, Up
 import { injectIntl } from 'react-intl-next';
 import { typeAheadListMessages } from '../messages';
 const LIST_ITEM_ESTIMATED_HEIGHT = ICON_HEIGHT + ITEM_PADDING * 2;
-const LIST_MAX_HEIGHT = 380;
 const LIST_WIDTH = 320;
 const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   items,
   selectedIndex,
   onItemHover,
   onItemClick,
-  intl
+  intl,
+  fitHeight
 }) => {
   const listRef = useRef();
   const redrawListAtIndex = useCallback(index => {
@@ -41,7 +41,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
     redrawListAtIndex,
     getFirstVisibleIndex,
     listLength: items.length,
-    listMaxHeight: LIST_MAX_HEIGHT,
+    listMaxHeight: fitHeight,
     listItemEstimatedHeight: LIST_ITEM_ESTIMATED_HEIGHT
   });
   const onItemsRendered = useCallback(props => {
@@ -99,7 +99,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   }
 
   const estimatedHeight = items.length * LIST_ITEM_ESTIMATED_HEIGHT;
-  const height = Math.min(typeof renderedListHeight === 'number' ? renderedListHeight : estimatedHeight, LIST_MAX_HEIGHT);
+  const height = Math.min(typeof renderedListHeight === 'number' ? renderedListHeight : estimatedHeight, fitHeight);
   return jsx(ItemGroup, {
     role: "listbox",
     "aria-live": "polite",

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

@@ -10,6 +10,7 @@ import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import IconFallback from '../../quick-insert/assets/fallback';
 import { shortcutStyle } from '../../../ui/styles';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
+import { token } from '@atlaskit/tokens';
 export const ICON_HEIGHT = 40;
 export const ICON_WIDTH = 40;
 export const ITEM_PADDING = 12;
@@ -30,20 +31,20 @@ export const itemTheme = {
     hover: {
       // background: colors.transparent, transparent is not a thing
       text: colorsText,
-      secondaryText: N200
+      secondaryText: token('color.text.subtlest', N200)
     },
     selected: {
       background: themed({
-        light: N20,
-        dark: DN70
+        light: token('color.background.neutral.subtle.hovered', N20),
+        dark: token('color.background.neutral.subtle.hovered', DN70)
       }),
       text: themed({
-        light: N800,
-        dark: DN600
+        light: token('color.text', N800),
+        dark: token('color.text', DN600)
       }),
       secondaryText: themed({
-        light: N200,
-        dark: DN300
+        light: token('color.text.subtlest', N200),
+        dark: token('color.text.subtlest', DN300)
       })
     }
   }
@@ -52,7 +53,7 @@ export const itemIcon = css`
   width: ${ICON_WIDTH}px;
   height: ${ICON_HEIGHT}px;
   overflow: hidden;
-  border: 1px solid rgba(223, 225, 229, 0.5); /* N60 at 50% */
+  border: 1px solid ${token('color.border', 'rgba(223, 225, 229, 0.5)')}; /* N60 at 50% */
   border-radius: ${borderRadius()}px;
   box-sizing: border-box;
 
@@ -76,7 +77,7 @@ const itemText = css`
   white-space: initial;
   .item-description {
     font-size: ${relativeFontSizeToBase16(11.67)};
-    color: ${N200};
+    color: ${token('color.text.subtlest', N200)};
     margin-top: 4px;
   }
 `;

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

@@ -1,17 +1,21 @@
 /** @jsx jsx */
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
+import rafSchedule from 'raf-schd';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
-import { Popup } from '@atlaskit/editor-common/ui';
+import { findOverflowScrollParent, 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';
 import { TYPE_AHEAD_POPUP_CONTENT_CLASS } from '../constants';
 import { TypeAheadList } from './TypeAheadList';
+import { ITEM_PADDING } from './TypeAheadListItem';
+import { token } from '@atlaskit/tokens';
+const DEFAULT_TYPEAHEAD_MENU_HEIGHT = 380;
 const typeAheadContent = css`
-  background: ${N0};
+  background: ${token('elevation.surface.overlay', N0)};
   border-radius: ${borderRadius()}px;
-  box-shadow: 0 0 1px ${N60A}, 0 4px 8px -2px ${N50A};
+  box-shadow: ${token('elevation.shadow.overlay', `0 0 1px ${N60A}, 0 4px 8px -2px ${N50A}`)};
   padding: ${gridSize() / 2}px 0;
   width: 320px;
   max-height: 380px; /* ~5.5 visibile items */
@@ -97,13 +101,66 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
   // we need to send the event again
   // eslint-disable-next-line react-hooks/exhaustive-deps
   triggerHandler]);
+  const [fitHeight, setFitHeight] = useState(DEFAULT_TYPEAHEAD_MENU_HEIGHT);
+  const getFitHeight = useCallback(() => {
+    if (!anchorElement || !popupsMountPoint) {
+      return;
+    }
+
+    const target = anchorElement;
+    const {
+      top: targetTop,
+      height: targetHeight
+    } = target.getBoundingClientRect();
+    const boundariesElement = document.body;
+    const {
+      height: boundariesHeight,
+      top: boundariesTop
+    } = boundariesElement.getBoundingClientRect(); // Calculating the space above and space below our decoration
+
+    const spaceAbove = targetTop - (boundariesTop - boundariesElement.scrollTop);
+    const spaceBelow = boundariesTop + boundariesHeight - (targetTop + targetHeight); // Keep default height if more than enough space
+
+    if (spaceBelow >= DEFAULT_TYPEAHEAD_MENU_HEIGHT) {
+      return setFitHeight(DEFAULT_TYPEAHEAD_MENU_HEIGHT);
+    } // Determines whether typeahead will fit above or below decoration
+    // and return the space available.
+
+
+    const newFitHeight = spaceBelow >= spaceAbove ? spaceBelow : spaceAbove; // Each typeahead item has some padding
+    // We want to leave some space at the top so first item
+    // is not partially cropped
+
+    const fitHeightWithSpace = newFitHeight - ITEM_PADDING * 2; // Ensure typeahead height is max its default height
+
+    const minFitHeight = Math.min(DEFAULT_TYPEAHEAD_MENU_HEIGHT, fitHeightWithSpace);
+    return setFitHeight(minFitHeight);
+  }, [anchorElement, popupsMountPoint]);
+  const getFitHeightDebounced = rafSchedule(getFitHeight);
+  useEffect(() => {
+    const scrollableElement = popupsScrollableElement || findOverflowScrollParent(anchorElement);
+    getFitHeight();
+    window.addEventListener('resize', getFitHeightDebounced);
+
+    if (scrollableElement) {
+      scrollableElement.addEventListener('scroll', getFitHeightDebounced);
+    }
+
+    return () => {
+      window.removeEventListener('resize', getFitHeightDebounced);
+
+      if (scrollableElement) {
+        scrollableElement.removeEventListener('scroll', getFitHeightDebounced);
+      }
+    };
+  }, [anchorElement, popupsScrollableElement, getFitHeightDebounced, getFitHeight]);
   return jsx(Popup, {
     zIndex: akEditorFloatingDialogZIndex,
     target: anchorElement,
     mountTo: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,
     scrollableElement: popupsScrollableElement,
-    fitHeight: 300,
+    fitHeight: fitHeight,
     fitWidth: 340,
     offset: OFFSET
   }, jsx("div", {
@@ -117,7 +174,8 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
     items: items,
     selectedIndex: selectedIndex,
     onItemHover: setSelectedItem,
-    onItemClick: onItemInsert
+    onItemClick: onItemInsert,
+    fitHeight: fitHeight
   })));
 });
 TypeAheadPopup.displayName = 'TypeAheadPopup';

package/dist/es2019/plugins/unsupported-content/styles.js

@@ -5,7 +5,7 @@ export const UnsupportedSharedCssClassName = {
   BLOCK_CONTAINER: 'unsupportedBlockView-content-wrap',
   INLINE_CONTAINER: 'unsupportedInlineView-content-wrap'
 };
-const inlineUnsupportedSelector = `.${UnsupportedSharedCssClassName.INLINE_CONTAINER} > span:nth-child(2)`;
+const inlineUnsupportedSelector = `.${UnsupportedSharedCssClassName.INLINE_CONTAINER} > span:nth-of-type(2)`;
 const blockUnsupportedSelector = `.${UnsupportedSharedCssClassName.BLOCK_CONTAINER} > div`;
 export const unsupportedStyles = css`
   ${blockUnsupportedSelector}, ${inlineUnsupportedSelector} {

package/dist/es2019/ui/Addon/Dropdown/styles.js

@@ -1,12 +1,13 @@
 import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N60A } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 export const dropdown = css`
   display: flex;
   flex-direction: column;
-  background: white;
+  background: ${token('elevation.surface.overlay', 'white')};
   border-radius: ${borderRadius()}px;
-  box-shadow: 0 4px 8px -2px ${N60A}, 0 0 1px ${N60A};
+  box-shadow: ${token('elevation.shadow.overlay', `0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`)};
   box-sizing: border-box;
   padding: 4px 0;
 `;

package/dist/es2019/ui/Addon/DropdownItem/styles.js

@@ -1,17 +1,18 @@
 import { css } from '@emotion/react';
 import { N800, N20 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 export const dropdownItem = css`
   display: flex;
   align-items: center;
   cursor: pointer;
   text-decoration: none;
   padding: 8px 32px 8px 12px;
-  color: ${N800};
+  color: ${token('color.text', N800)};
   > span {
     display: flex;
     margin-right: 8px;
   }
   &:hover {
-    background-color: ${N20};
+    background-color: ${token('color.background.neutral.subtle.hovered', N20)};
   }
 `;

package/dist/es2019/ui/Appearance/Chromeless.js

@@ -79,7 +79,8 @@ export default class Editor extends React.Component {
         popupsScrollableElement: popupsScrollableElement,
         containerElement: this.containerElement,
         disabled: !!disabled,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        wrapperElement: this.containerElement
       }), editorDOMElement)));
     });
   }

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

@@ -7,6 +7,7 @@ import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/custom-theme-button';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N40 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import Toolbar from '../../Toolbar';
 import PluginSlot from '../../PluginSlot';
 import WithPluginState from '../../WithPluginState';
@@ -39,8 +40,8 @@ const commentEditorStyle = css`
   /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */
 
   height: auto;
-  background-color: white;
-  border: 1px solid ${N40};
+  background-color: ${token('color.background.input', 'white')};
+  border: 1px solid ${token('color.border', N40)};
   box-sizing: border-box;
   border-radius: ${borderRadius()}px;
 
@@ -86,6 +87,8 @@ class Editor extends React.Component {
 
     _defineProperty(this, "containerElement", null);
 
+    _defineProperty(this, "wrapperElement", null);
+
     _defineProperty(this, "handleSave", () => {
       if (this.props.editorView && this.props.onSave) {
         this.props.onSave(this.props.editorView);
@@ -133,7 +136,8 @@ class Editor extends React.Component {
         css: [commentEditorStyle, css`
               min-height: ${minHeight}px;
             `],
-        className: "akEditor"
+        className: "akEditor",
+        ref: ref => this.wrapperElement = ref
       }, jsx(MainToolbar, {
         useStickyToolbar: useStickyToolbar
       }, jsx(Toolbar, {
@@ -176,7 +180,8 @@ class Editor extends React.Component {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsScrollableElement: popupsScrollableElement,
           containerElement: this.containerElement,
-          disabled: !!disabled
+          disabled: !!disabled,
+          wrapperElement: this.wrapperElement
         }), editorDOMElement);
       })), jsx(WidthEmitter, {
         editorView: editorView

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

@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { gridSize } from '@atlaskit/theme/constants';
 import { N30 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { akEditorToolbarKeylineHeight, akEditorGridLineZIndex, akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 export const TableControlsPadding = 20;
 const mainToolbarWrapperStyle = css`
@@ -11,7 +12,7 @@ const mainToolbarWrapperStyle = css`
   padding: ${gridSize()}px ${gridSize()}px 0;
   display: flex;
   height: auto;
-  background-color: white;
+  background-color: ${token('elevation.surface', 'white')};
   box-shadow: none;
   padding-left: ${TableControlsPadding}px;
 
@@ -32,7 +33,8 @@ const stickyToolbarWrapperStyle = css`
   z-index: ${akEditorGridLineZIndex + akEditorMenuZIndex};
   transition: box-shadow ease-in-out 0.2s;
   &.show-keyline {
-    box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0 ${N30};
+    box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0
+      ${token('color.border', N30)};
   }
 `;
 

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

@@ -20,6 +20,8 @@ export class FullPageEditor extends React.Component {
 
     _defineProperty(this, "scrollContainer", null);
 
+    _defineProperty(this, "wrapperElementRef", /*#__PURE__*/React.createRef());
+
     _defineProperty(this, "contentAreaRef", contentArea => {
       this.contentArea = contentArea;
     });
@@ -84,7 +86,8 @@ export class FullPageEditor extends React.Component {
     const featureFlags = (_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.state ? getFeatureFlags(props.editorView.state) : undefined;
     return jsx(ContextPanelWidthProvider, null, jsx("div", {
       css: fullPageEditorWrapper,
-      className: "akEditor"
+      className: "akEditor",
+      ref: this.wrapperElementRef
     }, jsx(FullPageToolbar, {
       appearance: props.appearance,
       beforeIcon: props.primaryToolbarIconBefore,
@@ -123,7 +126,8 @@ export class FullPageEditor extends React.Component {
       popupsScrollableElement: props.popupsScrollableElement,
       providerFactory: props.providerFactory,
       scrollContainer: this.scrollContainer,
-      scrollContainerRef: this.scrollContainerRef
+      scrollContainerRef: this.scrollContainerRef,
+      wrapperElement: this.wrapperElementRef.current
     })));
   }
 

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

@@ -51,7 +51,8 @@ const Content = /*#__PURE__*/React.memo(props => {
     popupsScrollableElement: props.popupsScrollableElement,
     disabled: !!props.disabled,
     containerElement: props.scrollContainer,
-    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
+    wrapperElement: props.wrapperElement
   }), props.editorDOMElement)))), jsx("div", {
     css: sidebarArea
   }, props.contextPanel || jsx(ContextPanel, {

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

@@ -10,7 +10,7 @@ import { mainToolbarStyle, mainToolbarIconBeforeStyle, mainToolbarFirstChildStyl
 import { ContextPanelConsumer } from '../../ContextPanel/context';
 import messages from './messages';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags4, _props$featureFlags5;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$featureFlags4, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _props$featureFlags5, _props$featureFlags6;
 
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
   const nonCustomToolbar = jsx("div", {
@@ -30,19 +30,20 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     disabled: props.disabled,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
     containerElement: props.containerElement,
-    hasMinWidth: props.hasMinWidth
+    hasMinWidth: props.hasMinWidth,
+    twoLineEditorToolbar: !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar)
   }));
   const customToolbar = jsx("div", {
     css: customToolbarWrapperStyle
-  }, (_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
+  }, (_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(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 : jsx(AvatarsWithPluginState, {
+  }) : null, (props === null || props === void 0 ? void 0 : (_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.showAvatarGroupAsPlugin) === true && !((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.twoLineEditorToolbar) ? null : jsx(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 ? jsx(FindReplaceToolbarButtonWithState, {
+  }), (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.findReplace && (_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
@@ -51,9 +52,9 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   useEffect(() => {
-    var _props$featureFlags6;
+    var _props$featureFlags7;
 
-    if ((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar) {
+    if ((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar) {
       const updateOnResize = () => {
         setShouldSplitToolbar(window.innerWidth <= MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -66,17 +67,17 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   return jsx(ContextPanelConsumer, null, ({
     width: contextPanelWidth
   }) => {
-    var _props$featureFlags7, _props$featureFlags8, _props$featureFlags9;
+    var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
 
     return jsx("div", {
-      css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar)),
+      css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
       "data-testid": "ak-editor-main-toolbar"
     }, jsx("div", {
-      css: mainToolbarFirstChildStyle(!!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
+      css: mainToolbarFirstChildStyle(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
       role: "region",
       "aria-label": props.intl.formatMessage(messages.toolbarLabel)
     }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx("div", {
-      css: mainToolbarSecondChildStyle(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
+      css: mainToolbarSecondChildStyle(!!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.twoLineEditorToolbar)),
       "data-testid": 'avatar-group-outside-plugin',
       role: "region",
       "aria-label": props.intl.formatMessage(messages.pageActionsLabel)

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

@@ -1,11 +1,14 @@
 import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 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;
+const toolbarLineHeight = 56; // box-shadow is overriden by the mainToolbar
+
 const mainToolbarWithKeyline = css`
-  box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0 ${N30};
+  box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0
+    ${token('color.border', N30)};
 `;
 const mainToolbarTwoLineStyle = css`
   @media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
@@ -22,7 +25,8 @@ const mainToolbar = css`
   display: flex;
   height: ${toolbarLineHeight}px;
   flex-shrink: 0;
-  background-color: white;
+  // TODO: https://product-fabric.atlassian.net/browse/DSP-4456
+  background-color: ${token('elevation.surface', 'white')};
 
   & object {
     height: 0 !important;

package/dist/es2019/ui/ChromeCollapsed/styles.js

@@ -6,7 +6,7 @@ import { token } from '@atlaskit/tokens';
 export const inputStyle = css`
   /* Normal .className gets overridden by input[type=text] hence this hack to produce input.className */
   input& {
-    background-color: white;
+    background-color: ${token('color.background.input', 'white')};
     border: 1px solid ${token('color.border.input', akEditorSubtleAccent)};
     border-radius: ${borderRadius()}px;
     box-sizing: border-box;
@@ -19,10 +19,11 @@ export const inputStyle = css`
     font-weight: 400;
     line-height: 1.42857142857143;
     letter-spacing: -0.005em;
-    color: ${N300};
+    color: ${token('color.text.subtlest', N300)};
 
     &:hover {
-      border-color: ${N50};
+      background-color: ${token('color.background.input.hovered', 'white')};
+      border-color: ${token('color.border.input', N50)};
       cursor: text;
     }
   }

package/dist/es2019/ui/ConfigPanel/ConfigPanel.js

@@ -180,10 +180,17 @@ class ConfigPanel extends React.Component {
       const {
         fields,
         extensionManifest,
-        onChange
+        onChange,
+        autoSaveReject
       } = this.props;
 
       if (!extensionManifest || !fields) {
+        if (!extensionManifest) {
+          autoSaveReject === null || autoSaveReject === void 0 ? void 0 : autoSaveReject(new Error('Extension manifest not loaded'));
+        } else if (!fields) {
+          autoSaveReject === null || autoSaveReject === void 0 ? void 0 : autoSaveReject(new Error('Config fields not loaded'));
+        }
+
         return;
       }
 
@@ -191,7 +198,8 @@ class ConfigPanel extends React.Component {
         const serializedData = await serialize(extensionManifest, this.backfillTabFormData(fields, formData, this.state.currentParameters), fields);
         onChange(serializedData);
       } catch (error) {
-        // eslint-disable-next-line no-console
+        autoSaveReject === null || autoSaveReject === void 0 ? void 0 : autoSaveReject(error); // eslint-disable-next-line no-console
+
         console.error(`Error serializing parameters`, error);
       }
     });

package/dist/es2019/ui/ConfigPanel/ConfigPanelFieldsLoader.js

@@ -75,6 +75,7 @@ export default function FieldsLoader({
   parameters = defaultEmptyObject,
   autoSave,
   autoSaveTrigger,
+  autoSaveReject,
   closeOnEsc,
   showHeader,
   onChange,
@@ -94,6 +95,7 @@ export default function FieldsLoader({
     parameters: parameters,
     autoSave: autoSave,
     autoSaveTrigger: autoSaveTrigger,
+    autoSaveReject: autoSaveReject,
     closeOnEsc: closeOnEsc,
     showHeader: showHeader,
     onChange: onChange,

package/dist/es2019/ui/ConfigPanel/ErrorMessage/ErrorImage.js

@@ -1,3 +1,6 @@
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+// Quality Ticket: https://product-fabric.atlassian.net/browse/DSP-4249
+
 /** @jsx jsx */
 import React from 'react';
 import { css, jsx } from '@emotion/react';