@atlaskit/editor-core 166.0.2 → 167.0.0

package/dist/cjs/plugins/code-block/styles.js

@@ -19,10 +19,10 @@ var _constants = require("@atlaskit/theme/constants");
 
 var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
 
-var _tokens = require("@atlaskit/tokens");
-
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _classNames = require("./ui/class-names");
 
 var _templateObject, _templateObject2;
@@ -32,52 +32,56 @@ 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 highlightingCodeBlockStyles = function highlightingCodeBlockStyles(props) {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .code-block {\n    position: relative;\n    background-image: ", ";\n    background-repeat: no-repeat;\n    background-color: ", ";\n\n    --ds--code--bg-color: transparent;\n\n    background-attachment: local, scroll, scroll;\n    background-size: 8px 100%, 8px 100%, 8px 100%;\n    background-position: 100% 0, 100% 0, 0 0;\n    font-family: ", ";\n    border-radius: ", "px;\n    margin: ", " 0 0 0;\n    counter-reset: line;\n    display: flex;\n    min-width: ", "px;\n    cursor: pointer;\n    overflow-x: auto;\n\n    .", " {\n      /* https://bitbucket.org/atlassian/atlassian-frontend/src/develop/packages/design-system/code/src/themes/themeBuilder.ts#packages/design-system/code/src/themes/themeBuilder.ts-19:28 */\n      flex-shrink: 0;\n      text-align: right;\n      background-color: ", ";\n      padding: ", "px;\n      color: ", ";\n\n      span {\n        display: block;\n        line-height: 0;\n        font-size: 0;\n\n        &::before {\n          display: inline-block;\n          content: counter(line);\n          counter-increment: line;\n          font-size: ", ";\n          line-height: 1.5rem;\n          color: ", ";\n        }\n      }\n    }\n\n    .", " {\n      position: absolute;\n      z-index: 2;\n      width: 100%;\n      height: 100%;\n      top: 0;\n      right: 0;\n      bottom: 0;\n      left: 0;\n      pointer-events: none;\n      overflow: hidden;\n      tab-size: 4;\n\n      & [data-ds--code--code-block] {\n        font-size: ", ";\n        line-height: 1.5rem;\n      }\n    }\n\n    .", " {\n      position: relative;\n      z-index: 1;\n      display: flex;\n      flex: 1;\n\n      > code {\n        flex-grow: 1;\n        tab-size: 4;\n        cursor: text;\n        /* https://bitbucket.org/atlassian/atlassian-frontend/src/218202daeaf527262c21841e6f88fa058d349ad4/packages/design-system/code/src/themes/themeBuilder.ts#lines-12:17 */\n        font-size: ", ";\n        line-height: 1.5rem;\n        border-radius: ", "px;\n        margin: ", "px;\n        white-space: pre;\n      }\n\n      &[data-debounce='true'] {\n        .", " {\n          display: none;\n        }\n      }\n\n      &:not([data-debounce='true']) {\n        > code:not([data-language='plaintext']):not([data-language='none']):not([data-language='']) {\n          color: transparent;\n          caret-color: ", ";\n        }\n      }\n    }\n  }\n\n  .ProseMirror li > .code-block {\n    margin: 0;\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px\n      ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: rgba(255, 143, 115, 0.5);\n      color: ", ";\n    }\n\n    .", " {\n      background-color: rgba(255, 189, 173, 0.5);\n    }\n  }\n"])), (0, _editorSharedStyles.overflowShadow)({
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .code-block {\n    position: relative;\n    background-image: ", ";\n    background-repeat: no-repeat;\n    background-color: ", ";\n\n    --ds--code--bg-color: transparent;\n\n    background-attachment: local, scroll, scroll;\n    background-size: 8px 100%, 8px 100%, 8px 100%;\n    background-position: 100% 0, 100% 0, 0 0;\n    font-family: ", ";\n    border-radius: ", "px;\n    margin: ", " 0 0 0;\n    counter-reset: line;\n    display: flex;\n    min-width: ", "px;\n    cursor: pointer;\n    overflow-x: auto;\n\n    .", " {\n      /* https://bitbucket.org/atlassian/atlassian-frontend/src/develop/packages/design-system/code/src/themes/themeBuilder.ts#packages/design-system/code/src/themes/themeBuilder.ts-19:28 */\n      flex-shrink: 0;\n      text-align: right;\n      background-color: ", ";\n      padding: ", "px;\n      color: ", ";\n\n      span {\n        display: block;\n        line-height: 0;\n        font-size: 0;\n\n        &::before {\n          display: inline-block;\n          content: counter(line);\n          counter-increment: line;\n          font-size: ", ";\n          line-height: 1.5rem;\n          color: ", ";\n        }\n      }\n    }\n\n    .", " {\n      position: absolute;\n      z-index: 2;\n      width: 100%;\n      height: 100%;\n      top: 0;\n      right: 0;\n      bottom: 0;\n      left: 0;\n      pointer-events: none;\n      overflow: hidden;\n      tab-size: 4;\n\n      & [data-ds--code--code-block] {\n        font-size: ", ";\n        line-height: 1.5rem;\n      }\n    }\n\n    .", " {\n      position: relative;\n      z-index: 1;\n      display: flex;\n      flex: 1;\n\n      > code {\n        flex-grow: 1;\n        tab-size: 4;\n        cursor: text;\n        /* https://bitbucket.org/atlassian/atlassian-frontend/src/218202daeaf527262c21841e6f88fa058d349ad4/packages/design-system/code/src/themes/themeBuilder.ts#lines-12:17 */\n        font-size: ", ";\n        line-height: 1.5rem;\n        border-radius: ", "px;\n        margin: ", "px;\n        white-space: pre;\n      }\n\n      &[data-debounce='true'] {\n        .", " {\n          display: none;\n        }\n      }\n\n      &:not([data-debounce='true']) {\n        > code:not([data-language='plaintext']):not([data-language='none']):not([data-language='']) {\n          color: transparent;\n          caret-color: ", ";\n        }\n      }\n    }\n  }\n\n  .ProseMirror li > .code-block {\n    margin: 0;\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px\n      ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), (0, _editorSharedStyles.overflowShadow)({
+    // TODO: https://product-fabric.atlassian.net/browse/DSP-4118
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
     background: (0, _components.themed)({
       light: colors.N20,
       dark: colors.DN50
     })(props),
     width: '8px'
   }), (0, _components.themed)({
-    light: colors.N20,
-    dark: colors.DN50
+    light: (0, _tokens.token)('color.background.neutral', colors.N20),
+    dark: (0, _tokens.token)('color.background.neutral', colors.DN50)
   })(props), _editorSharedStyles.akEditorCodeFontFamily, (0, _constants.borderRadius)(), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorTableCellMinWidth, _classNames.codeBlockClassNames.gutter, (0, _components.themed)({
-    light: colors.N30,
-    dark: colors.DN20
+    light: (0, _tokens.token)('color.background.neutral', colors.N30),
+    dark: (0, _tokens.token)('color.background.neutral', colors.DN20)
   })(props), (0, _constants.gridSize)(), (0, _components.themed)({
-    light: colors.N90,
-    dark: colors.DN90
+    light: (0, _tokens.token)('color.text.subtlest', colors.N90),
+    dark: (0, _tokens.token)('color.text.subtlest', colors.DN90)
   })(props), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _components.themed)({
-    light: colors.N400,
-    dark: colors.DN400
+    light: (0, _tokens.token)('color.text.subtle', colors.N400),
+    dark: (0, _tokens.token)('color.text.subtle', colors.DN400)
   })(props), _classNames.codeBlockClassNames.highlighting, (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), _classNames.codeBlockClassNames.content, (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _constants.borderRadius)(), (0, _constants.gridSize)(), _classNames.codeBlockClassNames.highlighting, (0, _components.themed)({
-    light: colors.N800,
-    dark: colors.DN500
-  })(props), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _classNames.codeBlockClassNames.gutter, colors.R75, (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content);
+    light: (0, _tokens.token)('color.text', colors.N800),
+    dark: (0, _tokens.token)('color.text', colors.DN500)
+  })(props), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', colors.R75), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', 'rgba(255, 143, 115, 0.5)'), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', 'rgba(255, 189, 173, 0.5)'));
 };
 
 exports.highlightingCodeBlockStyles = highlightingCodeBlockStyles;
 
 var codeBlockStyles = function codeBlockStyles(props) {
-  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .code-block {\n    position: relative;\n    background-image: ", ";\n\n    --ds--code--bg-color: transparent;\n\n    background-repeat: no-repeat;\n    background-color: ", ";\n    background-attachment: local, scroll, scroll;\n    background-size: 8px 100%, 8px 100%, 8px 100%;\n    background-position: 100% 0, 100% 0, 0 0;\n    font-family: ", ";\n    border-radius: ", "px;\n    margin: ", " 0 0 0;\n    counter-reset: line;\n    display: flex;\n    min-width: ", "px;\n    cursor: pointer;\n    overflow-x: auto;\n\n    .", " {\n      /* https://bitbucket.org/atlassian/atlassian-frontend/src/develop/packages/design-system/code/src/themes/themeBuilder.ts#packages/design-system/code/src/themes/themeBuilder.ts-19:28 */\n      flex-shrink: 0;\n      text-align: right;\n      background-color: ", ";\n      padding: ", "px;\n\n      span {\n        display: block;\n        line-height: 0;\n        font-size: 0;\n\n        &::before {\n          display: inline-block;\n          content: counter(line);\n          counter-increment: line;\n          font-size: ", ";\n          line-height: 1.5rem;\n          color: ", ";\n        }\n      }\n    }\n\n    .", " {\n      display: flex;\n      flex: 1;\n\n      code {\n        flex-grow: 1;\n        tab-size: 4;\n        cursor: text;\n        /* https://bitbucket.org/atlassian/atlassian-frontend/src/218202daeaf527262c21841e6f88fa058d349ad4/packages/design-system/code/src/themes/themeBuilder.ts#lines-12:17 */\n        font-size: ", ";\n        line-height: 1.5rem;\n        color: ", ";\n        border-radius: ", "px;\n        margin: ", "px;\n        white-space: pre;\n      }\n    }\n  }\n\n  .ProseMirror li > .code-block {\n    margin: 0;\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px\n      ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: rgba(255, 143, 115, 0.5);\n      color: ", ";\n    }\n\n    .", " {\n      background-color: rgba(255, 189, 173, 0.5);\n    }\n  }\n"])), (0, _editorSharedStyles.overflowShadow)({
+  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .code-block {\n    position: relative;\n    background-image: ", ";\n\n    --ds--code--bg-color: transparent;\n\n    background-repeat: no-repeat;\n    background-color: ", ";\n    background-attachment: local, scroll, scroll;\n    background-size: 8px 100%, 8px 100%, 8px 100%;\n    background-position: 100% 0, 100% 0, 0 0;\n    font-family: ", ";\n    border-radius: ", "px;\n    margin: ", " 0 0 0;\n    counter-reset: line;\n    display: flex;\n    min-width: ", "px;\n    cursor: pointer;\n    overflow-x: auto;\n\n    .", " {\n      /* https://bitbucket.org/atlassian/atlassian-frontend/src/develop/packages/design-system/code/src/themes/themeBuilder.ts#packages/design-system/code/src/themes/themeBuilder.ts-19:28 */\n      flex-shrink: 0;\n      text-align: right;\n      background-color: ", ";\n      padding: ", "px;\n\n      span {\n        display: block;\n        line-height: 0;\n        font-size: 0;\n\n        &::before {\n          display: inline-block;\n          content: counter(line);\n          counter-increment: line;\n          font-size: ", ";\n          line-height: 1.5rem;\n          color: ", ";\n        }\n      }\n    }\n\n    .", " {\n      display: flex;\n      flex: 1;\n\n      code {\n        flex-grow: 1;\n        tab-size: 4;\n        cursor: text;\n        /* https://bitbucket.org/atlassian/atlassian-frontend/src/218202daeaf527262c21841e6f88fa058d349ad4/packages/design-system/code/src/themes/themeBuilder.ts#lines-12:17 */\n        font-size: ", ";\n        line-height: 1.5rem;\n        color: ", ";\n        border-radius: ", "px;\n        margin: ", "px;\n        white-space: pre;\n      }\n    }\n  }\n\n  .ProseMirror li > .code-block {\n    margin: 0;\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), (0, _editorSharedStyles.overflowShadow)({
+    // TODO: https://product-fabric.atlassian.net/browse/DSP-4118
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
     background: (0, _components.themed)({
       light: colors.N20,
       dark: colors.DN50
     })(props),
     width: '8px'
   }), (0, _components.themed)({
-    light: colors.N20,
-    dark: colors.DN50
+    light: (0, _tokens.token)('color.background.neutral', colors.N20),
+    dark: (0, _tokens.token)('color.background.neutral', colors.DN50)
   })(props), _editorSharedStyles.akEditorCodeFontFamily, (0, _constants.borderRadius)(), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorTableCellMinWidth, _classNames.codeBlockClassNames.gutter, (0, _components.themed)({
-    light: colors.N30,
-    dark: colors.DN20
+    light: (0, _tokens.token)('color.background.neutral', colors.N30),
+    dark: (0, _tokens.token)('color.background.neutral', colors.DN20)
   })(props), (0, _constants.gridSize)(), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _components.themed)({
-    light: colors.N400,
-    dark: colors.DN400
+    light: (0, _tokens.token)('color.text', colors.N400),
+    dark: (0, _tokens.token)('color.text', colors.DN400)
   })(props), _classNames.codeBlockClassNames.content, (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _components.themed)({
-    light: colors.N800,
-    dark: colors.DN800
-  })(props), (0, _constants.borderRadius)(), (0, _constants.gridSize)(), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _classNames.codeBlockClassNames.gutter, colors.R75, (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content);
+    light: (0, _tokens.token)('color.text', colors.N800),
+    dark: (0, _tokens.token)('color.text', colors.DN800)
+  })(props), (0, _constants.borderRadius)(), (0, _constants.gridSize)(), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', colors.R75), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.blanket.danger', 'rgba(255, 143, 115, 0.5)'), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.background.danger', 'rgba(255, 189, 173, 0.5)'));
 };
 
 exports.codeBlockStyles = codeBlockStyles;

package/dist/cjs/plugins/collab-edit/index.js

@@ -13,10 +13,10 @@ Object.defineProperty(exports, "pluginKey", {
   }
 });
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _prosemirrorCollab = require("prosemirror-collab");

package/dist/cjs/plugins/collab-edit/provider/channel.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Channel = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));

package/dist/cjs/plugins/collab-edit/styles.js

@@ -17,13 +17,15 @@ var _utils = require("./utils");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject;
 
 var telepointerColorStyle = function telepointerColorStyle(color, index) {
-  return "\n  &.color-".concat(index, " {\n    background-color: ").concat(color.selection, ";\n    &::after {\n      background-color: ").concat(color.solid, ";\n      color: #fff;\n      border-color: ").concat(color.solid, ";\n    }\n  }\n");
+  return "\n  &.color-".concat(index, " {\n    background-color: ").concat(color.selection, ";\n    &::after {\n      background-color: ").concat(color.solid, ";\n      color: ").concat((0, _tokens.token)('color.text.inverse', '#fff'), ";\n      border-color: ").concat(color.solid, ";\n    }\n  }\n");
 };
 
-var telepointerStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .telepointer {\n    position: relative;\n    transition: opacity 200ms;\n\n    &.telepointer-selection {\n      line-height: 1.2;\n      pointer-events: none;\n      user-select: none;\n    }\n\n    &.telepointer-selection-badge::after {\n      content: attr(data-initial);\n      position: absolute;\n      display: block;\n      top: -14px;\n      font-size: ", ";\n      padding: 2px;\n      color: white;\n      left: -1px;\n      border-radius: 2px 2px 2px 0;\n      line-height: initial;\n    }\n\n    &.", " {\n      opacity: 0.2;\n    }\n\n    ", ";\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(9), _pluginState.TELEPOINTER_DIM_CLASS, _utils.colors.map(function (color, index) {
+var telepointerStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .telepointer {\n    position: relative;\n    transition: opacity 200ms;\n\n    &.telepointer-selection {\n      line-height: 1.2;\n      pointer-events: none;\n      user-select: none;\n    }\n\n    &.telepointer-selection-badge::after {\n      content: attr(data-initial);\n      position: absolute;\n      display: block;\n      top: -14px;\n      font-size: ", ";\n      padding: 2px;\n      color: ", ";\n      left: -1px;\n      border-radius: 2px 2px 2px 0;\n      line-height: initial;\n    }\n\n    &.", " {\n      opacity: 0.2;\n    }\n\n    ", ";\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(9), (0, _tokens.token)('color.text.inverse', 'white'), _pluginState.TELEPOINTER_DIM_CLASS, _utils.colors.map(function (color, index) {
   return telepointerColorStyle(color, index);
 }));
 exports.telepointerStyle = telepointerStyle;

package/dist/cjs/plugins/collab-edit/ui/styles.js

@@ -17,15 +17,17 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject, _templateObject2, _templateObject3;
 
-var inviteTeamWrapper = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: 50%;\n  min-width: ", "px;\n  margin-left: -", "px;\n"])), _colors.N20, (0, _constants.gridSize)() * 4, (0, _constants.gridSize)() / 2);
+var inviteTeamWrapper = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: 50%;\n  min-width: ", "px;\n  margin-left: -", "px;\n"])), (0, _tokens.token)('color.background.neutral', _colors.N20), (0, _constants.gridSize)() * 4, (0, _constants.gridSize)() / 2);
 exports.inviteTeamWrapper = inviteTeamWrapper;
 var avatarContainer = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  margin-right: ", "px;\n  display: flex;\n  align-items: center;\n\n  // ED-13102: This is to override list styles that come from the\n  // .wiki-content class in Confluence that should not apply within\n  // the toolbar. Has to be extra specific to override.\n  && > ul {\n    list-style-type: none;\n  }\n\n  div:last-child button.invite-to-edit {\n    border-radius: 50%;\n    height: 32px;\n    width: 32px;\n    padding: 2px;\n  }\n"])), (0, _constants.gridSize)());
 exports.avatarContainer = avatarContainer;
 
 var badge = function badge(color) {
-  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: block;\n  position: absolute;\n  right: 1px;\n  bottom: 1px;\n  width: 13px;\n  height: 13px;\n  z-index: ", ";\n  border-radius: 3px;\n  background: ", ";\n  color: #fff;\n  font-size: ", ";\n  line-height: 0;\n  padding-top: 7px;\n  text-align: center;\n  box-shadow: 0 0 1px #fff;\n  box-sizing: border-box;\n"])), _editorSharedStyles.akEditorSmallZIndex, color, (0, _editorSharedStyles.relativeFontSizeToBase16)(9));
+  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: block;\n  position: absolute;\n  right: 1px;\n  bottom: 1px;\n  width: 13px;\n  height: 13px;\n  z-index: ", ";\n  border-radius: 3px;\n  background: ", ";\n  color: ", ";\n  font-size: ", ";\n  line-height: 0;\n  padding-top: 7px;\n  text-align: center;\n  box-shadow: 0 0 1px ", ";\n  box-sizing: border-box;\n"])), _editorSharedStyles.akEditorSmallZIndex, color, (0, _tokens.token)('color.text.inverse', '#fff'), (0, _editorSharedStyles.relativeFontSizeToBase16)(9), (0, _tokens.token)('color.border.inverse', '#fff'));
 };
 
 exports.badge = badge;

package/dist/cjs/plugins/collab-edit/utils.js

@@ -29,6 +29,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
 
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 var colors = [themeColors.R100, themeColors.R300, themeColors.R500, themeColors.Y100, themeColors.Y300, themeColors.Y500, themeColors.G100, themeColors.G300, themeColors.G500, themeColors.T100, themeColors.T300, themeColors.T500, themeColors.B100, themeColors.B300, themeColors.B500, themeColors.P100, themeColors.P300, themeColors.P500, themeColors.N70, themeColors.N200, themeColors.N800].map(function (solid) {
   return {
     solid: solid,

package/dist/cjs/plugins/date/ui/DatePicker/index.js

@@ -41,6 +41,8 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _withOuterListeners = _interopRequireDefault(require("../../../../ui/with-outer-listeners"));
 
 var _enums = require("../../../analytics/types/enums");
@@ -56,7 +58,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 PopupWithListeners = (0, _withOuterListeners.default)(_ui.Popup);
-var popupContentWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  padding: 2px;\n  border-radius: ", "px;\n  box-shadow: 0 4px 8px -2px ", ", 0 0 1px ", ";\n  background-color: ", ";\n"])), (0, _constants.borderRadius)(), _colors.N60A, _colors.N60A, _colors.N0);
+var popupContentWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  padding: 2px;\n  border-radius: ", "px;\n  box-shadow: ", ";\n  background-color: ", ";\n"])), (0, _constants.borderRadius)(), (0, _tokens.token)('elevation.shadow.overlay', "0 4px 8px -2px ".concat(_colors.N60A, ", 0 0 1px ").concat(_colors.N60A)), (0, _tokens.token)('elevation.surface.overlay', _colors.N0));
 
 var DatePicker = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(DatePicker, _React$Component);

package/dist/cjs/plugins/expand/ui/styles.js

@@ -17,6 +17,8 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _ui = require("@atlaskit/editor-common/ui");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -28,35 +30,35 @@ var _classNames = require("./class-names");
 var _templateObject, _templateObject2;
 
 var EXPAND_SELECTED_BACKGROUND = (0, _components.themed)({
-  light: 'rgba(255, 255, 255, 0.6)',
-  dark: 'rgba(9, 10, 11, 0.29)'
+  light: (0, _tokens.token)('color.background.neutral.subtle', 'rgba(255, 255, 255, 0.6)'),
+  dark: (0, _tokens.token)('color.background.neutral.subtle', 'rgba(9, 10, 11, 0.29)')
 });
 
 var EXPAND_ICON_COLOR = function EXPAND_ICON_COLOR(props) {
   return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n"])), (0, _components.themed)({
-    light: _colors.N80A,
-    dark: '#d9dde3'
+    light: (0, _tokens.token)('color.icon.subtle', _colors.N80A),
+    dark: (0, _tokens.token)('color.icon.subtle', '#d9dde3')
   })(props));
 };
 
 var ACTIVE_STATE_BACKGROUND_COLOR = (0, _components.themed)({
-  dark: "#0C294F4B"
+  dark: (0, _tokens.token)('color.blanket.selected', "#0C294F4B")
 });
 var ACTIVE_STATE_BORDER = (0, _components.themed)({
-  dark: "1px solid #4794ff4B"
+  dark: "1px solid ".concat((0, _tokens.token)('color.border.selected', "#4794ff4B"))
 });
 var ACTIVE_STATE_BORDER_RADIUS = (0, _components.themed)({
   dark: '3px'
 });
 var DANGER_STATE_BACKGROUND_COLOR = (0, _components.themed)({
-  light: _colors.R50,
-  dark: '#441C13'
+  light: (0, _tokens.token)('color.background.danger', _colors.R50),
+  dark: (0, _tokens.token)('color.background.danger', '#441C13')
 });
 var DANGER_STATE_BORDER = (0, _components.themed)({
-  dark: "1px solid ".concat(_colors.R200)
+  dark: "1px solid ".concat((0, _tokens.token)('color.border.danger', _colors.R200))
 });
 var DANGER_STATE_BORDER_COLOR = (0, _components.themed)({
-  light: _colors.R300
+  light: (0, _tokens.token)('color.border.danger', _colors.R300)
 });
 var DANGER_STATE_BORDER_RADIUS = (0, _components.themed)({
   dark: '3px'
@@ -70,11 +72,11 @@ var expandStyles = function expandStyles(props) {
     expanded: false,
     focused: false
   })(props), _classNames.expandClassNames.titleInput, _ui.sharedExpandStyles.titleInputStyles(props), _classNames.expandClassNames.titleContainer, _ui.sharedExpandStyles.titleContainerStyles(props), _classNames.expandClassNames.expanded, EXPAND_SELECTED_BACKGROUND(props), (0, _components.themed)({
-    light: _colors.N40A,
-    dark: _colors.DN50
+    light: (0, _tokens.token)('color.border', _colors.N40A),
+    dark: (0, _tokens.token)('color.border', _colors.DN50)
   })(props), _classNames.expandClassNames.content, (0, _constants.gridSize)(), _classNames.expandClassNames.inputContainer, _classNames.expandClassNames.prefix, _classNames.expandClassNames.expanded, _classNames.expandClassNames.prefix, _classNames.expandClassNames.expanded, _classNames.expandClassNames.iconContainer, EXPAND_ICON_COLOR(props), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _components.themed)({
-    light: _colors.N50A,
-    dark: _colors.DN50
+    light: (0, _tokens.token)('color.border', _colors.N50A),
+    dark: (0, _tokens.token)('color.border', _colors.DN50)
   })(props), EXPAND_SELECTED_BACKGROUND(props));
 };
 

package/dist/cjs/plugins/extension/commands.js

@@ -52,11 +52,12 @@ var clearEditingContext = (0, _pluginFactory.createCommand)({
 }, _transforms.applyChange);
 exports.clearEditingContext = clearEditingContext;
 
-var forceAutoSave = function forceAutoSave(value) {
+var forceAutoSave = function forceAutoSave(resolve, reject) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
-      autoSaveResolve: value
+      autoSaveResolve: resolve,
+      autoSaveReject: reject
     }
   }, _transforms.applyChange);
 };

package/dist/cjs/plugins/extension/context-panel.js

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.getContextPanel = void 0;
 exports.onChangeAction = onChangeAction;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -64,6 +64,7 @@ var getContextPanel = function getContextPanel(allowAutoSave) {
 
     var extensionState = (0, _main.getPluginState)(state);
     var autoSaveResolve = extensionState.autoSaveResolve,
+        autoSaveReject = extensionState.autoSaveReject,
         showContextPanel = extensionState.showContextPanel,
         extensionProvider = extensionState.extensionProvider,
         processParametersBefore = extensionState.processParametersBefore,
@@ -106,6 +107,7 @@ var getContextPanel = function getContextPanel(allowAutoSave) {
               extensionProvider: extensionProvider,
               autoSave: allowAutoSave,
               autoSaveTrigger: autoSaveResolve,
+              autoSaveReject: autoSaveReject,
               onChange: /*#__PURE__*/function () {
                 var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(updatedParameters) {
                   return _regenerator.default.wrap(function _callee$(_context) {
@@ -144,24 +146,36 @@ var getContextPanel = function getContextPanel(allowAutoSave) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
                         if (!allowAutoSave) {
-                          _context2.next = 3;
+                          _context2.next = 9;
                           break;
                         }
 
-                        _context2.next = 3;
-                        return new Promise(function (resolve) {
-                          (0, _commands.forceAutoSave)(resolve)(editorView.state, editorView.dispatch);
+                        _context2.prev = 1;
+                        _context2.next = 4;
+                        return new Promise(function (resolve, reject) {
+                          (0, _commands.forceAutoSave)(resolve, reject)(editorView.state, editorView.dispatch);
                         });
 
-                      case 3:
+                      case 4:
+                        _context2.next = 9;
+                        break;
+
+                      case 6:
+                        _context2.prev = 6;
+                        _context2.t0 = _context2["catch"](1);
+                        // Even if the save failed, we should proceed with closing the panel
+                        // eslint-disable-next-line no-console
+                        console.error("Autosave failed with error", _context2.t0);
+
+                      case 9:
                         (0, _commands.clearEditingContext)(editorView.state, editorView.dispatch);
 
-                      case 4:
+                      case 10:
                       case "end":
                         return _context2.stop();
                     }
                   }
-                }, _callee2);
+                }, _callee2, null, [[1, 6]]);
               }))
             });
           }

package/dist/cjs/plugins/extension/plugin-factory.js

@@ -15,8 +15,6 @@ var _reducer = _interopRequireDefault(require("./reducer"));
 
 var _pluginKey = require("./plugin-key");
 
-var _utils = require("./utils");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -39,8 +37,7 @@ var factory = (0, _pluginStateFactory.pluginFactory)(_pluginKey.pluginKey, _redu
     return _objectSpread(_objectSpread({}, state), {}, {
       positions: positions
     });
-  },
-  onSelectionChanged: _utils.onSelectionChanged
+  }
 });
 var createPluginState = factory.createPluginState;
 exports.createPluginState = createPluginState;

package/dist/cjs/plugins/extension/pm-plugins/main.js

@@ -26,10 +26,10 @@ Object.defineProperty(exports, "pluginKey", {
 });
 exports.updateEditButton = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
@@ -296,7 +296,6 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
   var state = (0, _pluginFactory.createPluginState)(dispatch, {
-    shouldRefreshEditButton: false,
     showEditButton: false,
     showContextPanel: false
   });
@@ -320,45 +319,25 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
               element = _getPluginState.element,
               localId = _getPluginState.localId,
               extensionProvider = _getPluginState.extensionProvider,
-              showContextPanel = _getPluginState.showContextPanel,
-              shouldRefreshEditButton = _getPluginState.shouldRefreshEditButton;
+              showContextPanel = _getPluginState.showContextPanel; // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
 
-          if (!shouldRefreshEditButton) {
-            return false;
-          } // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
 
-
-          var selectedExtension = (0, _utils2.getSelectedExtension)(state, true); // If our selection isn't on an extension node, clear some state and hide the config panel
+          var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
 
           if (!selectedExtension) {
             if (showContextPanel) {
               (0, _commands.clearEditingContext)(state, dispatch);
             }
 
-            (0, _commands.updateState)({
-              shouldRefreshEditButton: false,
-              localId: undefined,
-              element: undefined,
-              showEditButton: false,
-              updateExtension: undefined
-            })(state, dispatch);
             return;
-          } // By this point we're certain we've selected an extension node.
-          // But we need to determine if the selection has changed to another
-          // extension node or remained on the same node.
-
+          }
 
           var node = selectedExtension.node;
           var newElement = (0, _utils2.getSelectedDomElement)(state.schema, domAtPos, selectedExtension); // New node is selection
 
-          var hasSelectedNodeChanged = node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
+          if (node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
           // as fallback in case we need to turn off `allowLocalIdGeneration`
-          element !== newElement;
-          var nextState = {
-            shouldRefreshEditButton: false
-          };
-
-          if (hasSelectedNodeChanged) {
+          element !== newElement) {
             if (showContextPanel) {
               (0, _commands.clearEditingContext)(state, dispatch);
             }
@@ -369,20 +348,20 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
             var showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
             var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {// do nothing;
             });
-            Object.assign(nextState, {
+            (0, _commands.updateState)({
               localId: node.attrs.localId,
+              showContextPanel: false,
               element: newElement,
               showEditButton: showEditButton,
               updateExtension: updateExtension
-            });
+            })(state, dispatch);
           } // New DOM element doesn't necessarily mean it's a new Node
           else if (element !== newElement) {
-            Object.assign(nextState, {
+            (0, _commands.updateState)({
               element: newElement
-            });
+            })(state, dispatch);
           }
 
-          (0, _commands.updateState)(nextState)(state, dispatch);
           return true;
         },
         destroy: function destroy() {
@@ -399,9 +378,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         inlineExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions)
       },
       handleClickOn: (0, _utils.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
-        // Clicked on anything around the extension content
-        // or specifically on the content border of a bodied extension
-        return !target.closest('.extension-content') || target.classList.contains('extension-content');
+        return !target.closest('.extension-content');
       }, {
         useLongPressSelection: useLongPressSelection
       })

package/dist/cjs/plugins/extension/ui/Extension/Extension/styles.js

@@ -19,6 +19,8 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _styles = require("../styles");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 var dataConsumerSelector = '[data-mark-type="dataConsumer"]';
@@ -35,11 +37,11 @@ exports.header = header;
 
 var content = function content(theme) {
   return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  padding: ", "px;\n  background: ", ";\n  color: ", ";\n  border: 1px solid ", ";\n  border-radius: ", "px;\n  cursor: initial;\n"])), _styles.padding, (0, _components.themed)({
-    light: 'white',
-    dark: _colors.DN30
+    light: (0, _tokens.token)('elevation.surface', 'white'),
+    dark: (0, _tokens.token)('elevation.surface', _colors.DN30)
   })(theme), (0, _components.themed)({
-    dark: _colors.DN900
-  })(theme), _colors.N30, (0, _constants.borderRadius)());
+    dark: (0, _tokens.token)('color.text', _colors.DN900)
+  })(theme), (0, _tokens.token)('color.border', _colors.N30), (0, _constants.borderRadius)());
 };
 
 exports.content = content;

package/dist/cjs/plugins/extension/ui/Extension/InlineExtension/styles.js

@@ -15,10 +15,12 @@ var _constants = require("@atlaskit/theme/constants");
 
 var _styles = require("../styles");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject;
 
 var wrapperStyle = function wrapperStyle(theme) {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n\n  cursor: pointer;\n  display: inline-flex;\n  margin: 1px;\n\n  > img {\n    border-radius: ", "px;\n  }\n\n  &::after,\n  &::before {\n    vertical-align: text-top;\n    display: inline-block;\n    width: 1px;\n    content: '';\n  }\n\n  &.with-children {\n    padding: 0;\n    background: white;\n  }\n"])), (0, _styles.wrapperDefault)(theme), (0, _constants.borderRadius)());
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n\n  cursor: pointer;\n  display: inline-flex;\n  margin: 1px;\n\n  > img {\n    border-radius: ", "px;\n  }\n\n  &::after,\n  &::before {\n    vertical-align: text-top;\n    display: inline-block;\n    width: 1px;\n    content: '';\n  }\n\n  &.with-children {\n    padding: 0;\n    background: ", ";\n  }\n"])), (0, _styles.wrapperDefault)(theme), (0, _constants.borderRadius)(), (0, _tokens.token)('color.background.neutral.subtle', 'white'));
 };
 
 exports.wrapperStyle = wrapperStyle;

package/dist/cjs/plugins/extension/ui/Extension/styles.js

@@ -19,6 +19,8 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 var padding = (0, _constants.gridSize)();
@@ -28,11 +30,11 @@ exports.BODIED_EXT_PADDING = BODIED_EXT_PADDING;
 
 var wrapperDefault = function wrapperDefault(theme) {
   return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", "px;\n  color: ", ";\n  position: relative;\n  vertical-align: middle;\n  font-size: ", ";\n\n  .ProseMirror-selectednode > span > & > .extension-overlay {\n    box-shadow: inset 0px 0px 0px 2px ", ";\n    opacity: 1;\n  }\n\n  &.with-overlay {\n    .extension-overlay {\n      background: ", ";\n      color: transparent;\n    }\n\n    &:hover .extension-overlay {\n      opacity: 1;\n    }\n  }\n"])), (0, _components.themed)({
-    light: _colors.N20,
-    dark: _colors.DN50
+    light: (0, _tokens.token)('color.background.neutral', _colors.N20),
+    dark: (0, _tokens.token)('color.background.neutral', _colors.DN50)
   })(theme), (0, _constants.borderRadius)(), (0, _components.themed)({
-    dark: _colors.DN700
-  })(theme), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), _colors.B200, _colors.N20A);
+    dark: (0, _tokens.token)('color.text', _colors.DN700)
+  })(theme), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _tokens.token)('color.border.selected', _colors.B200), (0, _tokens.token)('color.background.neutral.hovered', _colors.N20A));
 };
 
 exports.wrapperDefault = wrapperDefault;
@@ -40,7 +42,7 @@ var overlay = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _tagge
 exports.overlay = overlay;
 var placeholderFallback = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n\n  & > img {\n    margin: 0 4px;\n  }\n  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n  /* stylelint-disable-next-line */\n  label: placeholder-fallback;\n"])));
 exports.placeholderFallback = placeholderFallback;
-var placeholderFallbackParams = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-block;\n  max-width: 200px;\n  margin-left: 5px;\n  color: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), _colors.N70);
+var placeholderFallbackParams = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-block;\n  max-width: 200px;\n  margin-left: 5px;\n  color: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), (0, _tokens.token)('color.text.subtlest', _colors.N70));
 exports.placeholderFallbackParams = placeholderFallbackParams;
 var styledImage = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  max-height: 16px;\n  max-width: 16px;\n  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n  /* stylelint-disable-next-line */\n  label: lozenge-image;\n"])));
 exports.styledImage = styledImage;

package/dist/cjs/plugins/extension/ui/SaveIndicator/SaveIndicator.js

@@ -23,12 +23,14 @@ var _reactIntlNext = require("react-intl-next");
 
 var _messages = require("./messages");
 
+var _tokens = require("@atlaskit/tokens");
+
 var _templateObject, _templateObject2, _templateObject3;
 
 var noop = function noop() {};
 
 var saveIndicatorWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  justify-content: center;\n"])));
-var saveIndicatorContent = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: fixed;\n  width: 256px;\n  bottom: 20px;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  padding: 6px 12px;\n\n  background: ", ";\n\n  /* E300 */\n  box-shadow: 0px 8px 12px rgba(9, 30, 66, 0.15),\n    0px 0px 1px rgba(9, 30, 66, 0.31);\n  border-radius: 16px;\n"])), _colors.N0);
+var saveIndicatorContent = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: fixed;\n  width: 256px;\n  bottom: 20px;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  padding: 6px 12px;\n\n  background: ", ";\n\n  /* E300 */\n  box-shadow: ", ";\n  border-radius: 16px;\n"])), (0, _tokens.token)('elevation.surface.overlay', _colors.N0), (0, _tokens.token)('elevation.shadow.overlay', "0px 8px 12px rgba(9, 30, 66, 0.15), 0px 0px 1px rgba(9, 30, 66, 0.31)"));
 var saveIndicatorText = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  padding-left: 6px;\n"])));
 
 var SaveIndicator = function SaveIndicator(_ref) {
@@ -69,7 +71,7 @@ var SaveIndicator = function SaveIndicator(_ref) {
     "data-testid": "save-indicator-content"
   }, (0, _react2.jsx)(_checkCircle.default, {
     label: "Saving",
-    primaryColor: _colors.G300,
+    primaryColor: (0, _tokens.token)('color.icon.success', _colors.G300),
     size: "small"
   }), (0, _react2.jsx)("span", {
     css: saveIndicatorText