@atlaskit/editor-core 177.0.0 → 178.0.0

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -43,8 +43,6 @@ var _ElementBrowserLoader = _interopRequireDefault(require("./components/Element
 
 var _constants = require("./constants");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _excluded = ["children"];
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
@@ -184,9 +182,9 @@ var insertMenuWrapper = function insertMenuWrapper(theme, itemCount) {
   return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n  width: 320px;\n  height: ", "px;\n  background-color: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n"])), getInsertMenuHeight({
     itemCount: itemCount
   }), (0, _components.themed)({
-    light: (0, _tokens.token)('elevation.surface.overlay', _colors.N0),
-    dark: (0, _tokens.token)('elevation.surface.overlay', _colors.DN50)
-  })(theme), (0, _theme.borderRadius)(), (0, _tokens.token)('elevation.shadow.overlay', "0 0 0 1px ".concat(_colors.N30A, ",\n    0 2px 1px ").concat(_colors.N30A, ",\n    0 0 20px -6px ").concat(_colors.N60A)));
+    light: "var(--ds-surface-overlay, ".concat(_colors.N0, ")"),
+    dark: "var(--ds-surface-overlay, ".concat(_colors.DN50, ")")
+  })(theme), (0, _theme.borderRadius)(), "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(_colors.N30A, ",\n    0 2px 1px ").concat(_colors.N30A, ",\n    0 0 20px -6px ").concat(_colors.N60A), ")"));
 };
 
 var itemBefore = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  width: 40px;\n  height: 40px;\n  box-sizing: border-box;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  margin-right: ", "px;\n"])), (0, _theme.gridSize)() / 2);

package/dist/cjs/ui/ElementBrowser/ModalElementBrowser.js

@@ -39,8 +39,6 @@ var _constants2 = require("./constants");
 
 var _messages = require("./messages");
 
-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); }
@@ -50,8 +48,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var actions = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  margin: 0 -4px;\n"])));
 var actionItem = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  flex: 1 0 auto;\n  margin: 0 4px;\n"])));
 var wrapper = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex: 1 1 auto;\n  box-sizing: border-box;\n  padding: ", "px ", "px 0 10px;\n  overflow: hidden;\n  background-color: ", ";\n  border-radius: ", "px;\n"])), _constants2.MODAL_WRAPPER_PADDING, _constants2.MODAL_WRAPPER_PADDING, (0, _components.themed)({
-  light: (0, _tokens.token)('elevation.surface.overlay', _colors.N0),
-  dark: (0, _tokens.token)('elevation.surface.overlay', _colors.DN50)
+  light: "var(--ds-surface-overlay, ".concat(_colors.N0, ")"),
+  dark: "var(--ds-surface-overlay, ".concat(_colors.DN50, ")")
 })(), (0, _constants.borderRadius)());
 var modalFooter = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  padding: ", "px;\n\n  position: relative;\n  align-items: center;\n  justify-content: space-between;\n"])), _constants2.MODAL_WRAPPER_PADDING);
 

package/dist/cjs/ui/ElementBrowser/components/CategoryList.js

@@ -35,8 +35,6 @@ var _useFocus = _interopRequireDefault(require("../hooks/use-focus"));
 
 var _analytics = require("../../../plugins/analytics");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject;
 
 var _excluded = ["categories"],
@@ -117,9 +115,9 @@ function CategoryListItem(_ref2) {
         marginLeft: '2px',
         height: '100%',
         width: '100%',
-        color: category.name !== selectedCategory ? (0, _tokens.token)('color.text', _colors.N800) : (0, _tokens.token)('color.text.selected', _colors.B400)
+        color: category.name !== selectedCategory ? "var(--ds-text, ".concat(_colors.N800, ")") : "var(--ds-text-selected, ".concat(_colors.B400, ")")
       }, category.name === selectedCategory && {
-        background: (0, _tokens.token)('color.background.selected', _colors.B50)
+        background: "var(--ds-background-selected, ".concat(_colors.B50, ")")
       })
     }, rest);
   }, [category.name, selectedCategory]);

package/dist/cjs/ui/ElementBrowser/components/ElementList/ElementList.js

@@ -34,8 +34,6 @@ var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _analyticsNext = require("@atlaskit/analytics-next");
 
 var _analytics = require("../../../../plugins/analytics");
@@ -277,7 +275,7 @@ var ItemContent = /*#__PURE__*/(0, _react.memo)(function (_ref6) {
     css: itemDescription
   }, description)));
 });
-var elementItemsWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  flex: 1;\n  flex-flow: row wrap;\n  align-items: flex-start;\n  justify-content: flex-start;\n  overflow: hidden;\n  padding: ", "px; // For Focus outline\n\n  .ReactVirtualized__Collection {\n    border-radius: 3px; // Standard border-radius across other components like Search or Item.\n    outline: none;\n\n    :focus {\n      box-shadow: 0 0 0 ", "px\n        ", ";\n    }\n  }\n  .ReactVirtualized__Collection__innerScrollContainer {\n    div[class='element-item-wrapper']:last-child {\n      padding-bottom: 4px;\n    }\n  }\n"])), _constants.ELEMENT_LIST_PADDING, _constants.ELEMENT_LIST_PADDING, (0, _tokens.token)('color.border.focused', _colors.B100));
+var elementItemsWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  flex: 1;\n  flex-flow: row wrap;\n  align-items: flex-start;\n  justify-content: flex-start;\n  overflow: hidden;\n  padding: ", "px; // For Focus outline\n\n  .ReactVirtualized__Collection {\n    border-radius: 3px; // Standard border-radius across other components like Search or Item.\n    outline: none;\n\n    :focus {\n      box-shadow: 0 0 0 ", "px\n        ", ";\n    }\n  }\n  .ReactVirtualized__Collection__innerScrollContainer {\n    div[class='element-item-wrapper']:last-child {\n      padding-bottom: 4px;\n    }\n  }\n"])), _constants.ELEMENT_LIST_PADDING, _constants.ELEMENT_LIST_PADDING, "var(--ds-border-focused, ".concat(_colors.B100, ")"));
 var elementItemWrapper = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  div {\n    button {\n      height: 75px;\n      align-items: flex-start;\n      padding: 12px 12px 11px;\n    }\n  }\n"])));
 var itemBody = (0, _react2.css)(_templateObject3 || (_templateObject3 = (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  width: 100%;\n\n  margin-top: -2px; // Fixes the Item Icon and text's alignment issue\n"])));
 /*
@@ -286,7 +284,7 @@ var itemBody = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _tag
  */
 
 var multilineStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n"])));
-var itemDescription = (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n\n  overflow: hidden;\n  font-size: ", ";\n  color: ", ";\n  margin-top: 2px;\n"])), multilineStyle, (0, _editorSharedStyles.relativeFontSizeToBase16)(11.67), (0, _tokens.token)('color.text.subtle', _colors.N200));
+var itemDescription = (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n\n  overflow: hidden;\n  font-size: ", ";\n  color: ", ";\n  margin-top: 2px;\n"])), multilineStyle, (0, _editorSharedStyles.relativeFontSizeToBase16)(11.67), "var(--ds-text-subtle, ".concat(_colors.N200, ")"));
 var itemText = (0, _react2.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  width: inherit;\n  white-space: initial;\n"])));
 var itemTitleWrapper = (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  justify-content: space-between; // Title and keyboardshortcut are rendered in the same block\n"])));
 var itemTitle = (0, _react2.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n  width: 100%;\n  overflow: hidden;\n\n  white-space: nowrap;\n  text-overflow: ellipsis;\n"])));

package/dist/cjs/ui/ElementBrowser/components/ElementList/EmptyState.js

@@ -17,8 +17,6 @@ var _button = _interopRequireDefault(require("@atlaskit/button"));
 
 var _NotFoundIllustration = _interopRequireDefault(require("./NotFoundIllustration"));
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 function EmptyState(_ref) {
@@ -51,7 +49,7 @@ function EmptyState(_ref) {
   })))));
 }
 
-var emptyStateHeading = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  font-size: 1.42857em;\n  line-height: 1.2;\n  color: ", ";\n  font-weight: 500;\n  letter-spacing: -0.008em;\n  margin-top: 28px;\n"])), (0, _tokens.token)('color.text', 'rgb(23, 43, 77)'));
+var emptyStateHeading = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  font-size: 1.42857em;\n  line-height: 1.2;\n  color: ", ";\n  font-weight: 500;\n  letter-spacing: -0.008em;\n  margin-top: 28px;\n"])), "var(--ds-text, rgb(23, 43, 77))");
 var emptyStateSubHeading = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  margin-top: 16px;\n  max-width: 400px;\n  text-align: center;\n"])));
 var emptyStateWrapper = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n  width: 100%;\n"])));
 var externalLinkWrapper = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  margin-top: 14px;\n"])));

package/dist/cjs/ui/ElementBrowser/components/ElementSearch.js

@@ -35,8 +35,6 @@ var _types = require("../types");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 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); }
@@ -102,7 +100,7 @@ var placeHolderMessage = {
 var styledShortcut = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  padding: ", "px ", "px;\n  width: ", "px;\n"])), _styles.shortcutStyle, _constants.GRID_SIZE / 2, _constants.GRID_SIZE, _constants.GRID_SIZE * 6);
 var wrapper = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  & > [data-ds--text-field--container] {\n    height: ", "px;\n    border-radius: ", "px;\n    flex: 1 1 100%;\n    overflow: visible;\n    & > [data-ds--text-field--input] {\n      margin-bottom: 3px;\n      font-size: ", ";\n      padding: ", "px 6px ", "px 0;\n    }\n  }\n"])), _constants.GRID_SIZE * 6, _constants.GRID_SIZE, (0, _editorSharedStyles.relativeFontSizeToBase16)(14), _constants.GRID_SIZE, _constants.GRID_SIZE);
 var wrapperInline = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  & > [data-ds--text-field--container] {\n    height: ", "px;\n    flex: none;\n    overflow: revert;\n  }\n"])), _constants.GRID_SIZE * 5);
-var elementBeforeInput = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  margin: 1px 6px 0 8px;\n  color: ", ";\n\n  // Custom SearchIcon style\n  span,\n  svg {\n    height: 20px;\n    width: 20px;\n  }\n"])), (0, _tokens.token)('color.icon', _colors.N200));
+var elementBeforeInput = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  margin: 1px 6px 0 8px;\n  color: ", ";\n\n  // Custom SearchIcon style\n  span,\n  svg {\n    height: 20px;\n    width: 20px;\n  }\n"])), "var(--ds-icon, ".concat(_colors.N200, ")"));
 var elementAfterInput = (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  margin: 0 8px;\n  height: ", ";\n  text-align: center;\n"])), _constants.SEARCH_ITEM_HEIGHT_WIDTH);
 var MemoizedElementSearchWithAnalytics = /*#__PURE__*/(0, _react.memo)((0, _analyticsNext.withAnalyticsContext)({
   component: 'Searchbar'

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

@@ -15,12 +15,10 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject, _templateObject2;
 
 var container = function container(height) {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-radius: ", "px;\n  box-shadow: ", ";\n  display: flex;\n  align-items: center;\n  box-sizing: border-box;\n  padding: 4px 8px;\n  background-color: ", ";\n  ", ";\n"])), (0, _constants.borderRadius)(), (0, _tokens.token)('elevation.shadow.overlay', "0 12px 24px -6px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A)), (0, _tokens.token)('color.background.input', _colors.N0), height ? (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n        height: ", "px;\n      "])), height) : '');
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-radius: ", "px;\n  box-shadow: ", ";\n  display: flex;\n  align-items: center;\n  box-sizing: border-box;\n  padding: 4px 8px;\n  background-color: ", ";\n  ", ";\n"])), (0, _constants.borderRadius)(), "var(--ds-shadow-overlay, ".concat("0 12px 24px -6px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")"), "var(--ds-background-input, ".concat(_colors.N0, ")"), height ? (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n        height: ", "px;\n      "])), height) : '');
 };
 
 exports.container = container;

package/dist/cjs/ui/LinkSearch/LinkSearchListItem.js

@@ -31,8 +31,6 @@ var _react2 = require("@emotion/react");
 
 var _theme = require("@atlaskit/theme");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _colors = require("@atlaskit/theme/colors");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -55,12 +53,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 var container = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background-color: transparent;\n  padding: 8px 12px;\n  cursor: pointer;\n  display: flex;\n  margin-top: 0;\n"])));
 exports.container = container;
-var containerSelected = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n"])), (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N20));
+var containerSelected = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n"])), "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")"));
 exports.containerSelected = containerSelected;
 var nameWrapper = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  overflow: hidden;\n"])));
-var nameStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  line-height: 20px;\n"])), (0, _tokens.token)('color.text', _colors.N800));
+var nameStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  line-height: 20px;\n"])), "var(--ds-text, ".concat(_colors.N800, ")"));
 exports.nameStyle = nameStyle;
-var containerName = (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  line-height: 14px;\n  font-size: ", ";\n"])), (0, _tokens.token)('color.text.subtlest', _colors.N300), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _theme.fontSizeSmall)()));
+var containerName = (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  line-height: 14px;\n  font-size: ", ";\n"])), "var(--ds-text-subtlest, ".concat(_colors.N300, ")"), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _theme.fontSizeSmall)()));
 exports.containerName = containerName;
 var iconStyle = (0, _react2.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  min-width: 16px;\n  margin-top: 3px;\n  margin-right: 12px;\n\n  img {\n    max-width: 16px;\n  }\n"])));
 

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

@@ -15,12 +15,10 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject, _templateObject2;
 
 // Normal .className gets overridden by input[type=text] hence this hack to produce input.className
-var panelTextInput = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  input& {\n    background: transparent;\n    border: 0;\n    border-radius: 0;\n    box-sizing: content-box;\n    color: ", ";\n    flex-grow: 1;\n    font-size: ", ";\n    line-height: 20px;\n    padding: 0;\n    min-width: 145px;\n\n    /* Hides IE10+ built-in [x] clear input button */\n    &::-ms-clear {\n      display: none;\n    }\n\n    &:focus {\n      outline: none;\n    }\n\n    &::placeholder {\n      color: ", ";\n    }\n  }\n"])), (0, _tokens.token)('color.text.subtle', _colors.N400), (0, _editorSharedStyles.relativeFontSizeToBase16)(13), (0, _tokens.token)('color.text.subtlest', _colors.N100));
+var panelTextInput = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  input& {\n    background: transparent;\n    border: 0;\n    border-radius: 0;\n    box-sizing: content-box;\n    color: ", ";\n    flex-grow: 1;\n    font-size: ", ";\n    line-height: 20px;\n    padding: 0;\n    min-width: 145px;\n\n    /* Hides IE10+ built-in [x] clear input button */\n    &::-ms-clear {\n      display: none;\n    }\n\n    &:focus {\n      outline: none;\n    }\n\n    &::placeholder {\n      color: ", ";\n    }\n  }\n"])), "var(--ds-text-subtle, ".concat(_colors.N400, ")"), (0, _editorSharedStyles.relativeFontSizeToBase16)(13), "var(--ds-text-subtlest, ".concat(_colors.N100, ")"));
 exports.panelTextInput = panelTextInput;
 
 var panelTextInputWithCustomWidth = function panelTextInputWithCustomWidth(width) {

package/dist/cjs/ui/ToolbarArrowKeyNavigationProvider/index.js

@@ -40,7 +40,8 @@ var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigationProvid
       editorView = _ref.editorView,
       childComponentSelector = _ref.childComponentSelector,
       handleEscape = _ref.handleEscape,
-      disableArrowKeyNavigation = _ref.disableArrowKeyNavigation;
+      disableArrowKeyNavigation = _ref.disableArrowKeyNavigation,
+      isShortcutToFocusToolbar = _ref.isShortcutToFocusToolbar;
   var wrapperRef = (0, _react.useRef)(null);
   var selectedItemIndex = (0, _react.useRef)(0);
   var incrementIndex = (0, _react.useCallback)(function (list) {
@@ -156,11 +157,35 @@ var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigationProvid
       }
     };
 
+    var globalKeyDownHandler = function globalKeyDownHandler(event) {
+      //To focus the first element in the toolbar
+      if (isShortcutToFocusToolbar(event)) {
+        var _filteredFocusableEle4, _filteredFocusableEle5;
+
+        var filteredFocusableElements = getFilteredFocusableElements(wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current);
+        (_filteredFocusableEle4 = filteredFocusableElements[0]) === null || _filteredFocusableEle4 === void 0 ? void 0 : _filteredFocusableEle4.focus();
+        (_filteredFocusableEle5 = filteredFocusableElements[0]) === null || _filteredFocusableEle5 === void 0 ? void 0 : _filteredFocusableEle5.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+          inline: 'nearest'
+        });
+      }
+    };
+
     element === null || element === void 0 ? void 0 : element.addEventListener('keydown', handleKeyDown);
+
+    if (isShortcutToFocusToolbar) {
+      document.addEventListener('keydown', globalKeyDownHandler);
+    }
+
     return function () {
       element === null || element === void 0 ? void 0 : element.removeEventListener('keydown', handleKeyDown);
+
+      if (isShortcutToFocusToolbar) {
+        document.removeEventListener('keydown', globalKeyDownHandler);
+      }
     };
-  }, [selectedItemIndex, wrapperRef, editorView, disableArrowKeyNavigation, handleEscape, childComponentSelector, incrementIndex, decrementIndex]);
+  }, [selectedItemIndex, wrapperRef, editorView, disableArrowKeyNavigation, handleEscape, childComponentSelector, incrementIndex, decrementIndex, isShortcutToFocusToolbar]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "custom-key-handler-wrapper",
     ref: wrapperRef

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

@@ -15,8 +15,6 @@ 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, _templateObject5, _templateObject6;
@@ -25,11 +23,11 @@ var buttonContent = (0, _react.css)(_templateObject || (_templateObject = (0, _t
 exports.buttonContent = buttonContent;
 var wrapper = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  margin-right: 0;\n"])));
 exports.wrapper = wrapper;
-var confirmationPopup = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  overflow: auto;\n  max-height: none;\n  height: 410px;\n  width: 280px;\n"])), (0, _tokens.token)('elevation.surface.overlay', '#fff'), (0, _constants.borderRadius)(), (0, _tokens.token)('elevation.shadow.overlay', "0 4px 8px -2px ".concat(_colors.N60A, ", 0 0 1px ").concat(_colors.N60A)));
+var confirmationPopup = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  overflow: auto;\n  max-height: none;\n  height: 410px;\n  width: 280px;\n"])), "var(--ds-surface-overlay, #fff)", (0, _constants.borderRadius)(), "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N60A, ", 0 0 1px ").concat(_colors.N60A), ")"));
 exports.confirmationPopup = confirmationPopup;
-var confirmationText = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  font-size: ", ";\n  word-spacing: 4px;\n  line-height: 22px;\n  color: ", ";\n  margin-top: 30px;\n  padding: 20px;\n  & > div {\n    width: 240px;\n  }\n  & > div:first-of-type {\n    margin-bottom: 12px;\n  }\n  & > div:nth-of-type(2) {\n    margin-bottom: 20px;\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(14), (0, _tokens.token)('color.text.subtle', _colors.N400));
+var confirmationText = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  font-size: ", ";\n  word-spacing: 4px;\n  line-height: 22px;\n  color: ", ";\n  margin-top: 30px;\n  padding: 20px;\n  & > div {\n    width: 240px;\n  }\n  & > div:first-of-type {\n    margin-bottom: 12px;\n  }\n  & > div:nth-of-type(2) {\n    margin-bottom: 20px;\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(14), "var(--ds-text-subtle, ".concat(_colors.N400, ")"));
 exports.confirmationText = confirmationText;
-var confirmationHeader = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  height: 100px;\n  width: 100%;\n  display: inline-block;\n"])), (0, _tokens.token)('color.background.discovery.bold', _colors.P400));
+var confirmationHeader = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  height: 100px;\n  width: 100%;\n  display: inline-block;\n"])), "var(--ds-background-discovery-bold, ".concat(_colors.P400, ")"));
 exports.confirmationHeader = confirmationHeader;
 var confirmationImg = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  width: 100px;\n  display: block;\n  margin: 25px auto 0 auto;\n"])));
 exports.confirmationImg = confirmationImg;

package/dist/cjs/ui/WithFlash/index.js

@@ -29,16 +29,14 @@ var _react2 = require("@emotion/react");
 
 var _colors = require("@atlaskit/theme/colors");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 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 pulseBackground = (0, _react2.keyframes)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  50% {\n    background-color: ", ";\n  }\n"])), (0, _tokens.token)('color.blanket.danger', _colors.R100));
-var pulseBackgroundReverse = (0, _react2.keyframes)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  0% {\n    background-color: ", ";\n  }\n  50% {\n    background-color: auto;\n  }\n  100% {\n    background-color: ", ";\n  }\n"])), (0, _tokens.token)('color.blanket.danger', _colors.R100), (0, _tokens.token)('color.blanket.danger', _colors.R100));
+var pulseBackground = (0, _react2.keyframes)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  50% {\n    background-color: ", ";\n  }\n"])), "var(--ds-blanket-danger, ".concat(_colors.R100, ")"));
+var pulseBackgroundReverse = (0, _react2.keyframes)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  0% {\n    background-color: ", ";\n  }\n  50% {\n    background-color: auto;\n  }\n  100% {\n    background-color: ", ";\n  }\n"])), "var(--ds-blanket-danger, ".concat(_colors.R100, ")"), "var(--ds-blanket-danger, ".concat(_colors.R100, ")"));
 var flashWrapper = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  &.-flash > div {\n    animation: 0.25s ease-in-out ", ";\n  }\n\n  & > div {\n    animation: 'none';\n  }\n"])), pulseBackgroundReverse);
 var flashWrapperAnimated = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n\n  & > div {\n    animation: 0.25s ease-in-out ", ";\n  }\n"])), flashWrapper, pulseBackground);
 

package/dist/cjs/ui/styles.js

@@ -27,8 +27,6 @@ var _react = require("@emotion/react");
 
 var _colors = require("@atlaskit/theme/colors");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
 
 var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
@@ -37,7 +35,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 
 var buttonGroupStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n\n  & > div {\n    display: flex;\n  }\n"])));
 exports.buttonGroupStyle = buttonGroupStyle;
-var separatorStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), (0, _tokens.token)('color.border', _colors.N30));
+var separatorStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), "var(--ds-border, ".concat(_colors.N30, ")"));
 exports.separatorStyles = separatorStyles;
 var wrapperStyle = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n\n  > div,\n  > span {\n    display: flex;\n  }\n\n  > div > div {\n    display: flex;\n  }\n\n  margin-left: 0;\n  min-width: auto;\n"])));
 exports.wrapperStyle = wrapperStyle;
@@ -52,7 +50,7 @@ exports.buttonContentStyle = buttonContentStyle;
 var buttonContentReducedSpacingStyle = (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n  padding: 8px;\n"]))); // Taken from the style of inline dialog components
 
 exports.buttonContentReducedSpacingStyle = buttonContentReducedSpacingStyle;
-var dropShadow = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n  box-shadow: ", ";\n"])), (0, _tokens.token)('elevation.shadow.overlay', "0 0 1px rgba(9, 30, 66, 0.31),\n    0 4px 8px -2px rgba(9, 30, 66, 0.25)"));
+var dropShadow = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n  box-shadow: ", ";\n"])), "var(--ds-shadow-overlay, ".concat("0 0 1px rgba(9, 30, 66, 0.31),\n    0 4px 8px -2px rgba(9, 30, 66, 0.25)", ")"));
 exports.dropShadow = dropShadow;
 var clickSelectWrapperStyle = (0, _react.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n  user-select: all;\n"])));
 exports.clickSelectWrapperStyle = clickSelectWrapperStyle;

package/dist/cjs/utils/performance/instrumented-plugin.js

@@ -50,17 +50,20 @@ var InstrumentedPlugin = /*#__PURE__*/function (_SafePlugin) {
     } : _options$uiTracking,
         _options$saferDispatc = options.saferDispatchedTransactions,
         saferDispatchedTransactions = _options$saferDispatc === void 0 ? false : _options$saferDispatc,
+        _options$saferDispatc2 = options.saferDispatchedTransactionsAnalyticsOnly,
+        saferDispatchedTransactionsAnalyticsOnly = _options$saferDispatc2 === void 0 ? false : _options$saferDispatc2,
         dispatchAnalyticsEvent = options.dispatchAnalyticsEvent;
-    var shouldOverrideApply = transactionTracking.enabled && transactionTracker || saferDispatchedTransactions;
+    var shouldOverrideApply = transactionTracking.enabled && transactionTracker || saferDispatchedTransactions || saferDispatchedTransactionsAnalyticsOnly;
 
     if (shouldOverrideApply && spec.state) {
       var originalApply = spec.state.apply.bind(spec.state);
 
       spec.state.apply = function (aTr, value, oldState, newState) {
         var self = (0, _assertThisInitialized2.default)(_this);
-        var tr = saferDispatchedTransactions ? new Proxy(aTr, (0, _saferTransactions.freezeUnsafeTransactionProperties)({
+        var tr = saferDispatchedTransactions || saferDispatchedTransactionsAnalyticsOnly ? new Proxy(aTr, (0, _saferTransactions.freezeUnsafeTransactionProperties)({
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          pluginKey: self.key
+          pluginKey: self.key,
+          analyticsOnly: saferDispatchedTransactionsAnalyticsOnly
         })) : aTr;
         var shouldTrackTransactions = transactionTracker === null || transactionTracker === void 0 ? void 0 : transactionTracker.shouldTrackTransaction(transactionTracking);
 

package/dist/cjs/utils/performance/safer-transactions.js

@@ -21,7 +21,8 @@ var isReadOnlyProperty = function isReadOnlyProperty(prop) {
 
 var freezeUnsafeTransactionProperties = function freezeUnsafeTransactionProperties(_ref) {
   var dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
-      pluginKey = _ref.pluginKey;
+      pluginKey = _ref.pluginKey,
+      analyticsOnly = _ref.analyticsOnly;
 
   var isUnsafe = function isUnsafe() {
     if (dispatchAnalyticsEvent) {
@@ -31,11 +32,16 @@ var freezeUnsafeTransactionProperties = function freezeUnsafeTransactionProperti
         eventType: _analytics.EVENT_TYPE.OPERATIONAL,
         attributes: {
           pluginKey: pluginKey || 'unknown'
+        },
+        nonPrivacySafeAttributes: {
+          stack: new Error().stack
         }
       });
     }
 
-    throw new Error(UNSAFE_PROPERTY_SET_ERROR);
+    if (!analyticsOnly) {
+      throw new Error(UNSAFE_PROPERTY_SET_ERROR);
+    }
   };
 
   return {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "177.0.0";
+var version = "178.0.0";
 exports.version = version;
 
 var nextMajorVersion = function nextMajorVersion() {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "177.0.0",
+	"version": "178.0.0",
 	"sideEffects": false
 }

package/dist/es2019/create-editor/ErrorBoundary.js

@@ -68,8 +68,10 @@ export class ErrorBoundaryWithEditorView extends React.Component {
         actionSubject: ACTION_SUBJECT.EDITOR,
         eventType: EVENT_TYPE.OPERATIONAL,
         attributes: {
-          errorStack,
           errorId: sharedId
+        },
+        nonPrivacySafeAttributes: {
+          errorStack
         }
       });
 

package/dist/es2019/create-editor/ReactEditorView.js

@@ -331,9 +331,10 @@ export class ReactEditorView extends React.Component {
 
       const nodes = findChangedNodesFromTransaction(unsafeTransaction);
       const changedNodesValid = validateNodes(nodes);
-      const transaction = this.featureFlags.saferDispatchedTransactions ? new Proxy(unsafeTransaction, freezeUnsafeTransactionProperties({
+      const transaction = this.featureFlags.saferDispatchedTransactions || this.featureFlags.saferDispatchedTransactionsAnalyticsOnly ? new Proxy(unsafeTransaction, freezeUnsafeTransactionProperties({
         dispatchAnalyticsEvent: this.dispatchAnalyticsEvent,
-        pluginKey: 'unknown-reacteditorview'
+        pluginKey: 'unknown-reacteditorview',
+        analyticsOnly: this.featureFlags.saferDispatchedTransactionsAnalyticsOnly
       })) : unsafeTransaction;
 
       if (changedNodesValid) {

package/dist/es2019/create-editor/create-editor.js

@@ -96,7 +96,8 @@ export function createPMPlugins(config) {
     transactionTracking = TRACKING_DEFAULT
   } = performanceTracking;
   const saferDispatchedTransactions = featureFlags.saferDispatchedTransactions;
-  const useInstrumentedPlugin = uiTracking.enabled || transactionTracking.enabled || saferDispatchedTransactions;
+  const saferDispatchedTransactionsAnalyticsOnly = featureFlags.saferDispatchedTransactionsAnalyticsOnly;
+  const useInstrumentedPlugin = uiTracking.enabled || transactionTracking.enabled || saferDispatchedTransactions || saferDispatchedTransactionsAnalyticsOnly;
 
   if (process.env.NODE_ENV === 'development' && transactionTracking.enabled && !transactionTracker) {
     // eslint-disable-next-line no-console
@@ -107,6 +108,7 @@ export function createPMPlugins(config) {
     uiTracking,
     transactionTracking,
     saferDispatchedTransactions,
+    saferDispatchedTransactionsAnalyticsOnly,
     dispatchAnalyticsEvent
   }, transactionTracker) : plugin => plugin;
   return editorConfig.pmPlugins.sort(sortByOrder('plugins')).map(({

package/dist/es2019/editor.js

@@ -312,6 +312,8 @@ export default class Editor extends React.Component {
   }
 
   deprecationWarnings(props) {
+    var _props$allowTextColor;
+
     if (process.env.NODE_ENV === 'production') {
       return;
     }
@@ -344,6 +346,11 @@ export default class Editor extends React.Component {
       // eslint-disable-next-line no-console
       console.warn(`Advanced table options are deprecated (except isHeaderRowRequired) to continue using advanced table features use - <Editor allowTables={{ advanced: true }} /> [Will be changed in editor-core@${nextVersion}]`);
     }
+
+    if (props.hasOwnProperty('allowTextColor') && typeof props.allowTextColor !== 'boolean' && (props === null || props === void 0 ? void 0 : (_props$allowTextColor = props.allowTextColor) === null || _props$allowTextColor === void 0 ? void 0 : _props$allowTextColor.allowMoreTextColors) !== undefined) {
+      // eslint-disable-next-line no-console
+      console.warn(`"allowMoreTextColors" field of "allowTextColor" property is deprecated. It will be removedin editor-core@${nextVersion}. The color palette now shows more colors by default.`);
+    }
   }
 
   onEditorDestroyed(_instance) {

package/dist/es2019/labs/next/full-page.js

@@ -5,7 +5,6 @@ import rafSchedule from 'raf-schd';
 import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { BaseTheme } from '@atlaskit/editor-common/ui';
 import { akEditorMenuZIndex, akEditorToolbarKeylineHeight } from '@atlaskit/editor-shared-styles';
@@ -93,7 +92,7 @@ const mainToolbar = css`
   display: flex;
   height: 80px;
   flex-shrink: 0;
-  background-color: ${token('elevation.surface', 'white')};
+  background-color: ${"var(--ds-surface, white)"};
 
   & object {
     height: 0 !important;
@@ -101,7 +100,7 @@ const mainToolbar = css`
 `;
 const mainToolbarWithKeyline = css`
   ${mainToolbar}
-  box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0 ${token('color.border', N30)}
+  box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0 ${`var(--ds-border, ${N30})`}
 `;
 const mainToolbarCustomComponentsSlot = css`
   display: flex;

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/styles.js

@@ -1,11 +1,10 @@
 import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 export const triggerWrapper = css`
   display: flex;
 `;
 export const separator = css`
-  background: ${token('color.border', N30)};
+  background: ${`var(--ds-border, ${N30})`};
   width: 1px;
   height: 24px;
   display: inline-block;

package/dist/es2019/plugins/block-type/commands/delete-and-move-cursor.js

@@ -0,0 +1,63 @@
+import { Selection, TextSelection } from 'prosemirror-state';
+
+// We should override default behaviour when selection spans node depths or
+// ends at a node junction
+const shouldMoveCursorAfterDelete = state => {
+  const {
+    selection: {
+      $from,
+      $to
+    }
+  } = state;
+  const nodeRange = $from.blockRange($to);
+
+  if (!nodeRange) {
+    return false;
+  }
+
+  const hasSameAncestor = $from.depth === $to.depth && $from.depth - 1 === nodeRange.depth;
+  const toPositionHasNodeAfter = !!$to.nodeAfter;
+
+  if (hasSameAncestor || toPositionHasNodeAfter) {
+    return false;
+  }
+
+  return true;
+};
+/**
+ * Fixes cursor position after delete for list/task in panel and table
+ *
+ * ED-13873 fixes a bug where after deleting a list the cursor would move
+ * to the cell to the right. Uses setSelection to position the cursor as expected after deleting.
+ *
+ * @param state EditorState<any>
+ * @param dispatch CommandDispatch
+ * @returns boolean
+ */
+
+
+export const deleteAndMoveCursor = (state, dispatch) => {
+  if (state.selection.empty || !(state.selection instanceof TextSelection)) {
+    return false;
+  }
+
+  if (!shouldMoveCursorAfterDelete(state)) {
+    return false;
+  }
+
+  const {
+    tr
+  } = state;
+  tr.deleteSelection(); // Make sure the next position is not out of boundaries
+
+  const previousPosition = Math.min(Math.max(state.selection.$from.pos, 0), tr.doc.content.size); // Override default delete behaviour that moves the cursor to first suitable position after selection (postive bias).
+  // See. selectionToInsertionEnd. We will override behavior with negative bias (search for suitable cursor position backwards).
+
+  tr.setSelection(Selection.near(tr.doc.resolve(previousPosition), -1));
+
+  if (dispatch) {
+    dispatch(tr.scrollIntoView());
+  }
+
+  return true;
+};

package/dist/es2019/plugins/block-type/commands/index.js

@@ -1,3 +1,4 @@
 export { cleanUpAtTheStartOfDocument, insertBlockType, insertBlockTypesWithAnalytics, setBlockType, setBlockTypeWithAnalytics, setHeading, setHeadingWithAnalytics, setNormalText, setNormalTextWithAnalytics } from './block-type';
 export { insertBlock } from './insert-block';
-export { isConvertableToCodeBlock, transformToCodeBlockAction } from './transform-to-code-block';
+export { isConvertableToCodeBlock, transformToCodeBlockAction } from './transform-to-code-block';
+export { deleteAndMoveCursor } from './delete-and-move-cursor';

package/dist/es2019/plugins/block-type/pm-plugins/keymap.js

@@ -1,12 +1,15 @@
 import { redo, undo } from 'prosemirror-history';
+import { chainCommands } from 'prosemirror-commands';
 import * as keymaps from '../../../keymaps';
 import * as commands from '../../../commands';
 import * as blockTypes from '../types';
 import { keymap } from '../../../utils/keymap';
-import { cleanUpAtTheStartOfDocument, insertBlockTypesWithAnalytics } from '../commands';
+import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, insertBlockTypesWithAnalytics } from '../commands';
 import { deleteEmptyParagraphAndMoveBlockUp } from '../../../utils/commands';
 import { INPUT_METHOD } from '../../analytics';
 import { isNodeAWrappingBlockNode } from '../utils';
+const backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteAndMoveCursor);
+const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 export default function keymapPlugin(schema, featureFlags) {
   const list = {};
   keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);
@@ -14,9 +17,9 @@ export default function keymapPlugin(schema, featureFlags) {
   keymaps.bindKeymapWithCommand(keymaps.moveDown.common, commands.createNewParagraphBelow, list);
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), redo, list);
   keymaps.bindKeymapWithCommand(keymaps.undo.common, undo, list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, cleanUpAtTheStartOfDocument, list);
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), list);
-  keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), list);
+  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspace, list);
+  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, del, list);
+  keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, del, list);
 
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
     keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD), list);