@atlaskit/editor-core 166.0.4 → 167.0.0

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

@@ -33,6 +33,8 @@ var _styles = require("../../../ui/styles");
 
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -65,28 +67,28 @@ var itemTheme = (0, _defineProperty2.default)({}, _item.itemThemeNamespace, {
   hover: {
     // background: colors.transparent, transparent is not a thing
     text: _colors.text,
-    secondaryText: _colors.N200
+    secondaryText: (0, _tokens.token)('color.text.subtlest', _colors.N200)
   },
   selected: {
     background: (0, _components.themed)({
-      light: _colors.N20,
-      dark: _colors.DN70
+      light: (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N20),
+      dark: (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.DN70)
     }),
     text: (0, _components.themed)({
-      light: _colors.N800,
-      dark: _colors.DN600
+      light: (0, _tokens.token)('color.text', _colors.N800),
+      dark: (0, _tokens.token)('color.text', _colors.DN600)
     }),
     secondaryText: (0, _components.themed)({
-      light: _colors.N200,
-      dark: _colors.DN300
+      light: (0, _tokens.token)('color.text.subtlest', _colors.N200),
+      dark: (0, _tokens.token)('color.text.subtlest', _colors.DN300)
     })
   }
 });
 exports.itemTheme = itemTheme;
-var itemIcon = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: ", "px;\n  height: ", "px;\n  overflow: hidden;\n  border: 1px solid rgba(223, 225, 229, 0.5); /* N60 at 50% */\n  border-radius: ", "px;\n  box-sizing: border-box;\n\n  display: flex;\n  justify-content: center;\n  align-items: center;\n\n  div {\n    width: ", "px;\n    height: ", "px;\n  }\n"])), ICON_WIDTH, ICON_HEIGHT, (0, _constants.borderRadius)(), ICON_WIDTH, ICON_HEIGHT);
+var itemIcon = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: ", "px;\n  height: ", "px;\n  overflow: hidden;\n  border: 1px solid ", "; /* N60 at 50% */\n  border-radius: ", "px;\n  box-sizing: border-box;\n\n  display: flex;\n  justify-content: center;\n  align-items: center;\n\n  div {\n    width: ", "px;\n    height: ", "px;\n  }\n"])), ICON_WIDTH, ICON_HEIGHT, (0, _tokens.token)('color.border', 'rgba(223, 225, 229, 0.5)'), (0, _constants.borderRadius)(), ICON_WIDTH, ICON_HEIGHT);
 exports.itemIcon = itemIcon;
 var itemBody = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: row;\n  flex-wrap: nowrap;\n  justify-content: space-between;\n  line-height: 1.4;\n"])));
-var itemText = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  white-space: initial;\n  .item-description {\n    font-size: ", ";\n    color: ", ";\n    margin-top: 4px;\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(11.67), _colors.N200);
+var itemText = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  white-space: initial;\n  .item-description {\n    font-size: ", ";\n    color: ", ";\n    margin-top: 4px;\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(11.67), (0, _tokens.token)('color.text.subtlest', _colors.N200));
 var itemAfter = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  flex: 0 0 auto;\n"])));
 var hidden = {
   overflow: 'hidden'

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

@@ -9,12 +9,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TypeAheadPopup = void 0;
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@emotion/react");
 
+var _rafSchd = _interopRequireDefault(require("raf-schd"));
+
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _ui = require("@atlaskit/editor-common/ui");
@@ -29,13 +33,18 @@ var _constants2 = require("../constants");
 
 var _TypeAheadList = require("./TypeAheadList");
 
+var _TypeAheadListItem = require("./TypeAheadListItem");
+
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var typeAheadContent = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: 0 0 1px ", ", 0 4px 8px -2px ", ";\n  padding: ", "px 0;\n  width: 320px;\n  max-height: 380px; /* ~5.5 visibile items */\n  overflow-y: auto;\n  -ms-overflow-style: -ms-autohiding-scrollbar;\n  position: relative;\n"])), _colors.N0, (0, _constants.borderRadius)(), _colors.N60A, _colors.N50A, (0, _constants.gridSize)() / 2);
+var DEFAULT_TYPEAHEAD_MENU_HEIGHT = 380;
+var typeAheadContent = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  padding: ", "px 0;\n  width: 320px;\n  max-height: 380px; /* ~5.5 visibile items */\n  overflow-y: auto;\n  -ms-overflow-style: -ms-autohiding-scrollbar;\n  position: relative;\n"])), (0, _tokens.token)('elevation.surface.overlay', _colors.N0), (0, _constants.borderRadius)(), (0, _tokens.token)('elevation.shadow.overlay', "0 0 1px ".concat(_colors.N60A, ", 0 4px 8px -2px ").concat(_colors.N50A)), (0, _constants.gridSize)() / 2);
 
 var Highlight = function Highlight(_ref) {
   var state = _ref.state,
@@ -115,13 +124,73 @@ var TypeAheadPopup = /*#__PURE__*/_react.default.memo(function (props) {
   // we need to send the event again
   // eslint-disable-next-line react-hooks/exhaustive-deps
   triggerHandler]);
+
+  var _useState = (0, _react.useState)(DEFAULT_TYPEAHEAD_MENU_HEIGHT),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      fitHeight = _useState2[0],
+      setFitHeight = _useState2[1];
+
+  var getFitHeight = (0, _react.useCallback)(function () {
+    if (!anchorElement || !popupsMountPoint) {
+      return;
+    }
+
+    var target = anchorElement;
+
+    var _target$getBoundingCl = target.getBoundingClientRect(),
+        targetTop = _target$getBoundingCl.top,
+        targetHeight = _target$getBoundingCl.height;
+
+    var boundariesElement = document.body;
+
+    var _boundariesElement$ge = boundariesElement.getBoundingClientRect(),
+        boundariesHeight = _boundariesElement$ge.height,
+        boundariesTop = _boundariesElement$ge.top; // Calculating the space above and space below our decoration
+
+
+    var spaceAbove = targetTop - (boundariesTop - boundariesElement.scrollTop);
+    var 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.
+
+
+    var 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
+
+    var fitHeightWithSpace = newFitHeight - _TypeAheadListItem.ITEM_PADDING * 2; // Ensure typeahead height is max its default height
+
+    var minFitHeight = Math.min(DEFAULT_TYPEAHEAD_MENU_HEIGHT, fitHeightWithSpace);
+    return setFitHeight(minFitHeight);
+  }, [anchorElement, popupsMountPoint]);
+  var getFitHeightDebounced = (0, _rafSchd.default)(getFitHeight);
+  (0, _react.useEffect)(function () {
+    var scrollableElement = popupsScrollableElement || (0, _ui.findOverflowScrollParent)(anchorElement);
+    getFitHeight();
+    window.addEventListener('resize', getFitHeightDebounced);
+
+    if (scrollableElement) {
+      scrollableElement.addEventListener('scroll', getFitHeightDebounced);
+    }
+
+    return function () {
+      window.removeEventListener('resize', getFitHeightDebounced);
+
+      if (scrollableElement) {
+        scrollableElement.removeEventListener('scroll', getFitHeightDebounced);
+      }
+    };
+  }, [anchorElement, popupsScrollableElement, getFitHeightDebounced, getFitHeight]);
   return (0, _react2.jsx)(_ui.Popup, {
     zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
     target: anchorElement,
     mountTo: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,
     scrollableElement: popupsScrollableElement,
-    fitHeight: 300,
+    fitHeight: fitHeight,
     fitWidth: 340,
     offset: OFFSET
   }, (0, _react2.jsx)("div", {
@@ -135,7 +204,8 @@ var TypeAheadPopup = /*#__PURE__*/_react.default.memo(function (props) {
     items: items,
     selectedIndex: selectedIndex,
     onItemHover: setSelectedItem,
-    onItemClick: onItemInsert
+    onItemClick: onItemInsert,
+    fitHeight: fitHeight
   })));
 });
 

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

@@ -22,7 +22,7 @@ var UnsupportedSharedCssClassName = {
   INLINE_CONTAINER: 'unsupportedInlineView-content-wrap'
 };
 exports.UnsupportedSharedCssClassName = UnsupportedSharedCssClassName;
-var inlineUnsupportedSelector = ".".concat(UnsupportedSharedCssClassName.INLINE_CONTAINER, " > span:nth-child(2)");
+var inlineUnsupportedSelector = ".".concat(UnsupportedSharedCssClassName.INLINE_CONTAINER, " > span:nth-of-type(2)");
 var blockUnsupportedSelector = ".".concat(UnsupportedSharedCssClassName.BLOCK_CONTAINER, " > div");
 var unsupportedStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ", ", " {\n    cursor: pointer;\n  }\n\n  .", "", ",\n    .", "", " {\n    ", "\n  }\n\n  .danger {\n    .", "", ",\n      .", "", " {\n      border: ", "px solid\n        ", ";\n      background-color: ", ";\n    }\n  }\n"])), blockUnsupportedSelector, inlineUnsupportedSelector, _editorSharedStyles.akEditorSelectedNodeClassName, blockUnsupportedSelector, _editorSharedStyles.akEditorSelectedNodeClassName, inlineUnsupportedSelector, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Background, _editorSharedStyles.SelectionStyle.Border]), _editorSharedStyles.akEditorSelectedNodeClassName, blockUnsupportedSelector, _editorSharedStyles.akEditorSelectedNodeClassName, inlineUnsupportedSelector, _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), (0, _tokens.token)('color.blanket.danger', _editorSharedStyles.akEditorDeleteBackgroundWithOpacity));
 exports.unsupportedStyles = unsupportedStyles;

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

@@ -15,7 +15,9 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject;
 
-var dropdown = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n  background: white;\n  border-radius: ", "px;\n  box-shadow: 0 4px 8px -2px ", ", 0 0 1px ", ";\n  box-sizing: border-box;\n  padding: 4px 0;\n"])), (0, _constants.borderRadius)(), _colors.N60A, _colors.N60A);
+var dropdown = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  box-sizing: border-box;\n  padding: 4px 0;\n"])), (0, _tokens.token)('elevation.surface.overlay', 'white'), (0, _constants.borderRadius)(), (0, _tokens.token)('elevation.shadow.overlay', "0 4px 8px -2px ".concat(_colors.N60A, ", 0 0 1px ").concat(_colors.N60A)));
 exports.dropdown = dropdown;

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

@@ -13,7 +13,9 @@ var _react = require("@emotion/react");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject;
 
-var dropdownItem = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  cursor: pointer;\n  text-decoration: none;\n  padding: 8px 32px 8px 12px;\n  color: ", ";\n  > span {\n    display: flex;\n    margin-right: 8px;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n"])), _colors.N800, _colors.N20);
+var dropdownItem = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  cursor: pointer;\n  text-decoration: none;\n  padding: 8px 32px 8px 12px;\n  color: ", ";\n  > span {\n    display: flex;\n    margin-right: 8px;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n"])), (0, _tokens.token)('color.text', _colors.N800), (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N20));
 exports.dropdownItem = dropdownItem;

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

@@ -105,7 +105,8 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         popupsScrollableElement: popupsScrollableElement,
         containerElement: _this.containerElement,
         disabled: !!disabled,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        wrapperElement: _this.containerElement
       }), editorDOMElement)));
     });
     return _this;

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

@@ -35,6 +35,8 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _Toolbar = _interopRequireDefault(require("../../Toolbar"));
 
 var _PluginSlot = _interopRequireDefault(require("../../PluginSlot"));
@@ -77,7 +79,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 var CommentEditorMargin = 14;
 var CommentEditorSmallerMargin = 8;
-var commentEditorStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n\n  .less-margin .ProseMirror {\n    margin: 12px ", "px ", "px;\n  }\n\n  min-width: 272px;\n  /* Border + Toolbar + Footer + (Paragraph + ((Parahraph + Margin) * (DefaultLines - 1)) */\n  /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n  height: auto;\n  background-color: white;\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: ", "px;\n\n  max-width: inherit;\n  word-wrap: break-word;\n"])), CommentEditorSmallerMargin, CommentEditorSmallerMargin, _colors.N40, (0, _constants.borderRadius)());
+var commentEditorStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n\n  .less-margin .ProseMirror {\n    margin: 12px ", "px ", "px;\n  }\n\n  min-width: 272px;\n  /* Border + Toolbar + Footer + (Paragraph + ((Parahraph + Margin) * (DefaultLines - 1)) */\n  /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n  height: auto;\n  background-color: ", ";\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: ", "px;\n\n  max-width: inherit;\n  word-wrap: break-word;\n"])), CommentEditorSmallerMargin, CommentEditorSmallerMargin, (0, _tokens.token)('color.background.input', 'white'), (0, _tokens.token)('color.border', _colors.N40), (0, _constants.borderRadius)());
 var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  flex-grow: 1;\n  overflow-x: hidden;\n  overflow-y: auto;\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for tables controlls. Otherwise marging collapse and controlls are misplaced. **/\n  .ProseMirror {\n    margin: 12px ", "px ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - _grid.GRID_GUTTER, CommentEditorMargin - _grid.GRID_GUTTER, CommentEditorMargin - _grid.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
 ContentArea.displayName = 'ContentArea';
 var secondaryToolbarStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  box-sizing: border-box;\n  justify-content: flex-end;\n  align-items: center;\n  display: flex;\n  padding: 12px 1px;\n"])));
@@ -99,6 +101,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "appearance", 'comment');
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "containerElement", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "wrapperElement", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSave", function () {
       if (_this.props.editorView && _this.props.onSave) {
         _this.props.onSave(_this.props.editorView);
@@ -141,7 +144,10 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         animate: maxContentSizeReached
       }, (0, _react2.jsx)("div", {
         css: [commentEditorStyle, (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n              min-height: ", "px;\n            "])), minHeight)],
-        className: "akEditor"
+        className: "akEditor",
+        ref: function ref(_ref4) {
+          return _this.wrapperElement = _ref4;
+        }
       }, (0, _react2.jsx)(_Toolbar2.MainToolbar, {
         useStickyToolbar: useStickyToolbar
       }, (0, _react2.jsx)(_Toolbar.default, {
@@ -183,7 +189,8 @@ var Editor = /*#__PURE__*/function (_React$Component) {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsScrollableElement: popupsScrollableElement,
           containerElement: _this.containerElement,
-          disabled: !!disabled
+          disabled: !!disabled,
+          wrapperElement: _this.wrapperElement
         }), editorDOMElement);
       })), (0, _react2.jsx)(_WidthEmitter.default, {
         editorView: editorView

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

@@ -21,6 +21,8 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
@@ -31,8 +33,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var TableControlsPadding = 20;
 exports.TableControlsPadding = TableControlsPadding;
-var mainToolbarWrapperStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  align-items: center;\n  padding: ", "px ", "px 0;\n  display: flex;\n  height: auto;\n  background-color: white;\n  box-shadow: none;\n  padding-left: ", "px;\n\n  & > div > *:first-child {\n    margin-left: 0;\n  }\n\n  .block-type-btn {\n    padding-left: 0;\n  }\n"])), (0, _constants.gridSize)(), (0, _constants.gridSize)(), TableControlsPadding);
-var stickyToolbarWrapperStyle = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  /* stylelint-disable declaration-block-no-duplicate-properties */\n  position: relative;\n  position: sticky;\n  /* stylelint-enable declaration-block-no-duplicate-properties */\n  padding-bottom: ", "px;\n  z-index: ", ";\n  transition: box-shadow ease-in-out 0.2s;\n  &.show-keyline {\n    box-shadow: 0 ", "px 0 0 ", ";\n  }\n"])), (0, _constants.gridSize)(), _editorSharedStyles.akEditorGridLineZIndex + _editorSharedStyles.akEditorMenuZIndex, _editorSharedStyles.akEditorToolbarKeylineHeight, _colors.N30);
+var mainToolbarWrapperStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  align-items: center;\n  padding: ", "px ", "px 0;\n  display: flex;\n  height: auto;\n  background-color: ", ";\n  box-shadow: none;\n  padding-left: ", "px;\n\n  & > div > *:first-child {\n    margin-left: 0;\n  }\n\n  .block-type-btn {\n    padding-left: 0;\n  }\n"])), (0, _constants.gridSize)(), (0, _constants.gridSize)(), (0, _tokens.token)('elevation.surface', 'white'), TableControlsPadding);
+var stickyToolbarWrapperStyle = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  /* stylelint-disable declaration-block-no-duplicate-properties */\n  position: relative;\n  position: sticky;\n  /* stylelint-enable declaration-block-no-duplicate-properties */\n  padding-bottom: ", "px;\n  z-index: ", ";\n  transition: box-shadow ease-in-out 0.2s;\n  &.show-keyline {\n    box-shadow: 0 ", "px 0 0\n      ", ";\n  }\n"])), (0, _constants.gridSize)(), _editorSharedStyles.akEditorGridLineZIndex + _editorSharedStyles.akEditorMenuZIndex, _editorSharedStyles.akEditorToolbarKeylineHeight, (0, _tokens.token)('color.border', _colors.N30));
 
 var StickyToolbar = function StickyToolbar(props) {
   var _useState = (0, _react.useState)(0),

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

@@ -62,6 +62,7 @@ var FullPageEditor = /*#__PURE__*/function (_React$Component) {
       showKeyline: false
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scrollContainer", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "wrapperElementRef", /*#__PURE__*/_react.default.createRef());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "contentAreaRef", function (contentArea) {
       _this.contentArea = contentArea;
     });
@@ -123,7 +124,8 @@ var FullPageEditor = /*#__PURE__*/function (_React$Component) {
       var featureFlags = (_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.state ? (0, _featureFlagsContext.getFeatureFlags)(props.editorView.state) : undefined;
       return (0, _react2.jsx)(_context.ContextPanelWidthProvider, null, (0, _react2.jsx)("div", {
         css: _StyledComponents.fullPageEditorWrapper,
-        className: "akEditor"
+        className: "akEditor",
+        ref: this.wrapperElementRef
       }, (0, _react2.jsx)(_FullPageToolbar.FullPageToolbar, {
         appearance: props.appearance,
         beforeIcon: props.primaryToolbarIconBefore,
@@ -162,7 +164,8 @@ var FullPageEditor = /*#__PURE__*/function (_React$Component) {
         popupsScrollableElement: props.popupsScrollableElement,
         providerFactory: props.providerFactory,
         scrollContainer: this.scrollContainer,
-        scrollContainerRef: this.scrollContainerRef
+        scrollContainerRef: this.scrollContainerRef,
+        wrapperElement: this.wrapperElementRef.current
       })));
     }
   }]);

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

@@ -73,7 +73,8 @@ var Content = /*#__PURE__*/_react2.default.memo(function (props) {
         popupsScrollableElement: props.popupsScrollableElement,
         disabled: !!props.disabled,
         containerElement: props.scrollContainer,
-        dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
+        dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
+        wrapperElement: props.wrapperElement
       }), props.editorDOMElement)))), (0, _react.jsx)("div", {
         css: _StyledComponents.sidebarArea
       }, props.contextPanel || (0, _react.jsx)(_ContextPanel.default, {

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

@@ -37,7 +37,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 /** @jsx jsx */
 var EditorToolbar = /*#__PURE__*/_react.default.memo(function (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;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -61,19 +61,20 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (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)
   }));
   var customToolbar = (0, _react2.jsx)("div", {
     css: _MainToolbar.customToolbarWrapperStyle
-  }, (_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
+  }, (_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforePrimaryToolbarWrapper.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 : (0, _react2.jsx)(_ui.default, {
+  }) : 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 : (0, _react2.jsx)(_ui.default, {
     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 ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
+  }), (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.findReplace && (_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
@@ -82,9 +83,9 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   (0, _react.useEffect)(function () {
-    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) {
       var updateOnResize = function updateOnResize() {
         setShouldSplitToolbar(window.innerWidth <= _MainToolbar.MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT);
       };
@@ -97,18 +98,18 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
     }
   });
   return (0, _react2.jsx)(_context.ContextPanelConsumer, null, function (_ref) {
-    var _props$featureFlags7, _props$featureFlags8, _props$featureFlags9;
+    var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
 
     var contextPanelWidth = _ref.width;
     return (0, _react2.jsx)("div", {
-      css: (0, _MainToolbar.mainToolbarStyle)(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.twoLineEditorToolbar)),
+      css: (0, _MainToolbar.mainToolbarStyle)(props.showKeyline || contextPanelWidth > 0, !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
       "data-testid": "ak-editor-main-toolbar"
     }, (0, _react2.jsx)("div", {
-      css: (0, _MainToolbar.mainToolbarFirstChildStyle)(!!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.twoLineEditorToolbar)),
+      css: (0, _MainToolbar.mainToolbarFirstChildStyle)(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
       role: "region",
       "aria-label": props.intl.formatMessage(_messages.default.toolbarLabel)
     }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.jsx)("div", {
-      css: (0, _MainToolbar.mainToolbarSecondChildStyle)(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
+      css: (0, _MainToolbar.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.default.pageActionsLabel)

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

@@ -13,6 +13,8 @@ var _react = require("@emotion/react");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _constants = require("@atlaskit/theme/constants");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -21,10 +23,11 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 
 var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
 exports.MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT;
-var toolbarLineHeight = 56;
-var mainToolbarWithKeyline = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  box-shadow: 0 ", "px 0 0 ", ";\n"])), _editorSharedStyles.akEditorToolbarKeylineHeight, _colors.N30);
+var toolbarLineHeight = 56; // box-shadow is overriden by the mainToolbar
+
+var mainToolbarWithKeyline = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  box-shadow: 0 ", "px 0 0\n    ", ";\n"])), _editorSharedStyles.akEditorToolbarKeylineHeight, (0, _tokens.token)('color.border', _colors.N30));
 var mainToolbarTwoLineStyle = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  @media (max-width: ", "px) {\n    flex-wrap: wrap;\n    height: calc(", "px * 2);\n  }\n"])), MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, toolbarLineHeight);
-var mainToolbar = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  align-items: center;\n  box-shadow: none;\n  transition: box-shadow 200ms ", ";\n  z-index: ", ";\n  display: flex;\n  height: ", "px;\n  flex-shrink: 0;\n  background-color: white;\n\n  & object {\n    height: 0 !important;\n  }\n\n  @media (max-width: ", "px) {\n    display: grid;\n    height: calc(", "px * 2);\n  }\n"])), _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorMenuZIndex, toolbarLineHeight, _editorSharedStyles.akEditorMobileMaxWidth, toolbarLineHeight);
+var mainToolbar = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  align-items: center;\n  box-shadow: none;\n  transition: box-shadow 200ms ", ";\n  z-index: ", ";\n  display: flex;\n  height: ", "px;\n  flex-shrink: 0;\n  // TODO: https://product-fabric.atlassian.net/browse/DSP-4456\n  background-color: ", ";\n\n  & object {\n    height: 0 !important;\n  }\n\n  @media (max-width: ", "px) {\n    display: grid;\n    height: calc(", "px * 2);\n  }\n"])), _editorSharedStyles.akEditorSwoopCubicBezier, _editorSharedStyles.akEditorMenuZIndex, toolbarLineHeight, (0, _tokens.token)('elevation.surface', 'white'), _editorSharedStyles.akEditorMobileMaxWidth, toolbarLineHeight);
 
 var mainToolbarStyle = function mainToolbarStyle(showKeyline, twoLineEditorToolbar) {
   return [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];

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

@@ -21,5 +21,5 @@ var _tokens = require("@atlaskit/tokens");
 
 var _templateObject;
 
-var inputStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  /* Normal .className gets overridden by input[type=text] hence this hack to produce input.className */\n  input& {\n    background-color: white;\n    border: 1px solid ", ";\n    border-radius: ", "px;\n    box-sizing: border-box;\n    height: 40px;\n    padding-left: 20px;\n    padding-top: 12px;\n    padding-bottom: 12px;\n    font-size: ", ";\n    width: 100%;\n    font-weight: 400;\n    line-height: 1.42857142857143;\n    letter-spacing: -0.005em;\n    color: ", ";\n\n    &:hover {\n      border-color: ", ";\n      cursor: text;\n    }\n  }\n"])), (0, _tokens.token)('color.border.input', _editorSharedStyles.akEditorSubtleAccent), (0, _constants.borderRadius)(), (0, _editorSharedStyles.relativeFontSizeToBase16)(14), _colors.N300, _colors.N50);
+var inputStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  /* Normal .className gets overridden by input[type=text] hence this hack to produce input.className */\n  input& {\n    background-color: ", ";\n    border: 1px solid ", ";\n    border-radius: ", "px;\n    box-sizing: border-box;\n    height: 40px;\n    padding-left: 20px;\n    padding-top: 12px;\n    padding-bottom: 12px;\n    font-size: ", ";\n    width: 100%;\n    font-weight: 400;\n    line-height: 1.42857142857143;\n    letter-spacing: -0.005em;\n    color: ", ";\n\n    &:hover {\n      background-color: ", ";\n      border-color: ", ";\n      cursor: text;\n    }\n  }\n"])), (0, _tokens.token)('color.background.input', 'white'), (0, _tokens.token)('color.border.input', _editorSharedStyles.akEditorSubtleAccent), (0, _constants.borderRadius)(), (0, _editorSharedStyles.relativeFontSizeToBase16)(14), (0, _tokens.token)('color.text.subtlest', _colors.N300), (0, _tokens.token)('color.background.input.hovered', 'white'), (0, _tokens.token)('color.border.input', _colors.N50));
 exports.inputStyle = inputStyle;

package/dist/cjs/ui/ConfigPanel/ConfigPanel.js

@@ -237,44 +237,51 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSubmit", /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(formData) {
-        var _this$props, fields, extensionManifest, onChange, serializedData;
+        var _this$props, fields, extensionManifest, onChange, autoSaveReject, serializedData;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this$props = _this.props, fields = _this$props.fields, extensionManifest = _this$props.extensionManifest, onChange = _this$props.onChange;
+                _this$props = _this.props, fields = _this$props.fields, extensionManifest = _this$props.extensionManifest, onChange = _this$props.onChange, autoSaveReject = _this$props.autoSaveReject;
 
                 if (!(!extensionManifest || !fields)) {
-                  _context.next = 3;
+                  _context.next = 4;
                   break;
                 }
 
+                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 _context.abrupt("return");
 
-              case 3:
-                _context.prev = 3;
-                _context.next = 6;
+              case 4:
+                _context.prev = 4;
+                _context.next = 7;
                 return (0, _transformers.serialize)(extensionManifest, _this.backfillTabFormData(fields, formData, _this.state.currentParameters), fields);
 
-              case 6:
+              case 7:
                 serializedData = _context.sent;
                 onChange(serializedData);
-                _context.next = 13;
+                _context.next = 15;
                 break;
 
-              case 10:
-                _context.prev = 10;
-                _context.t0 = _context["catch"](3);
-                // eslint-disable-next-line no-console
+              case 11:
+                _context.prev = 11;
+                _context.t0 = _context["catch"](4);
+                autoSaveReject === null || autoSaveReject === void 0 ? void 0 : autoSaveReject(_context.t0); // eslint-disable-next-line no-console
+
                 console.error("Error serializing parameters", _context.t0);
 
-              case 13:
+              case 15:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[3, 10]]);
+        }, _callee, null, [[4, 11]]);
       }));
 
       return function (_x) {

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

@@ -99,6 +99,7 @@ function FieldsLoader(_ref) {
       parameters = _ref$parameters === void 0 ? defaultEmptyObject : _ref$parameters,
       autoSave = _ref.autoSave,
       autoSaveTrigger = _ref.autoSaveTrigger,
+      autoSaveReject = _ref.autoSaveReject,
       closeOnEsc = _ref.closeOnEsc,
       showHeader = _ref.showHeader,
       onChange = _ref.onChange,
@@ -128,6 +129,7 @@ function FieldsLoader(_ref) {
       parameters: parameters,
       autoSave: autoSave,
       autoSaveTrigger: autoSaveTrigger,
+      autoSaveReject: autoSaveReject,
       closeOnEsc: closeOnEsc,
       showHeader: showHeader,
       onChange: onChange,

package/dist/cjs/ui/ConfigPanel/Fields/CheckboxGroup.js

@@ -23,6 +23,8 @@ var _checkbox = require("@atlaskit/checkbox");
 
 var _form = require("@atlaskit/form");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _types = require("../types");
 
 var _FieldMessages = _interopRequireDefault(require("../FieldMessages"));
@@ -37,7 +39,7 @@ function _validate(value, isRequired) {
   }
 }
 
-var requiredIndicator = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: #bf2600;\n"])));
+var requiredIndicator = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n"])), (0, _tokens.token)('color.text.danger', '#bf2600'));
 
 function CheckboxGroupInner(_ref) {
   var label = _ref.label,

package/dist/cjs/ui/ConfigPanel/Fields/Expand.js

@@ -21,6 +21,8 @@ var _reactIntlNext = require("react-intl-next");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-right"));
@@ -37,7 +39,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var expandContainer = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-bottom: 1px solid ", ";\n"])), _colors.N40);
+var expandContainer = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-bottom: 1px solid ", ";\n"])), (0, _tokens.token)('color.border', _colors.N40));
 exports.expandContainer = expandContainer;
 var expandControl = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  height: ", "px;\n  justify-content: center;\n  padding-right: ", "px;\n"])), (0, _constants.gridSize)() * 6, (0, _constants.gridSize)());
 exports.expandControl = expandControl;

package/dist/cjs/ui/ConfigPanel/Fields/Fieldset.js

@@ -53,6 +53,8 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject, _templateObject2;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -67,7 +69,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-var actionsWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-top: 1px solid ", ";\n  margin-top: ", "px;\n  padding-top: ", "px;\n"])), _colors.N40A, (0, _constants.gridSize)() * 2, (0, _constants.gridSize)() * 2);
+var actionsWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-top: 1px solid ", ";\n  margin-top: ", "px;\n  padding-top: ", "px;\n"])), (0, _tokens.token)('color.border', _colors.N40A), (0, _constants.gridSize)() * 2, (0, _constants.gridSize)() * 2);
 
 var populateFromParameters = function populateFromParameters(parameters, fields) {
   if (Object.keys(parameters).length) {

package/dist/cjs/ui/ConfigPanel/Fields/common/RequiredIndicator.js

@@ -13,7 +13,9 @@ var _react = require("@emotion/react");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject;
 
-var requiredIndicator = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n"])), _colors.R500);
+var requiredIndicator = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n"])), (0, _tokens.token)('color.text.danger', _colors.R500));
 exports.requiredIndicator = requiredIndicator;