@atlaskit/editor-core 166.0.4 → 167.0.2

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

@@ -6,40 +6,41 @@ import { css } from '@emotion/react';
 import { themed } from '@atlaskit/theme/components';
 import { gridSize } from '@atlaskit/theme/constants';
 import { R50, R300, N40A, N50A, N80A, DN50, R200 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { sharedExpandStyles } from '@atlaskit/editor-common/ui';
 import { SelectionStyle, getSelectionStyles, akLayoutGutterOffset, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { BreakoutCssClassName } from '../../breakout/constants';
 import { expandClassNames } from './class-names';
 var EXPAND_SELECTED_BACKGROUND = themed({
-  light: 'rgba(255, 255, 255, 0.6)',
-  dark: 'rgba(9, 10, 11, 0.29)'
+  light: token('color.background.neutral.subtle', 'rgba(255, 255, 255, 0.6)'),
+  dark: token('color.background.neutral.subtle', 'rgba(9, 10, 11, 0.29)')
 });
 
 var EXPAND_ICON_COLOR = function EXPAND_ICON_COLOR(props) {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: ", ";\n"])), themed({
-    light: N80A,
-    dark: '#d9dde3'
+    light: token('color.icon.subtle', N80A),
+    dark: token('color.icon.subtle', '#d9dde3')
   })(props));
 };
 
 var ACTIVE_STATE_BACKGROUND_COLOR = themed({
-  dark: "#0C294F4B"
+  dark: token('color.blanket.selected', "#0C294F4B")
 });
 var ACTIVE_STATE_BORDER = themed({
-  dark: "1px solid #4794ff4B"
+  dark: "1px solid ".concat(token('color.border.selected', "#4794ff4B"))
 });
 var ACTIVE_STATE_BORDER_RADIUS = themed({
   dark: '3px'
 });
 var DANGER_STATE_BACKGROUND_COLOR = themed({
-  light: R50,
-  dark: '#441C13'
+  light: token('color.background.danger', R50),
+  dark: token('color.background.danger', '#441C13')
 });
 var DANGER_STATE_BORDER = themed({
-  dark: "1px solid ".concat(R200)
+  dark: "1px solid ".concat(token('color.border.danger', R200))
 });
 var DANGER_STATE_BORDER_COLOR = themed({
-  light: R300
+  light: token('color.border.danger', R300)
 });
 var DANGER_STATE_BORDER_RADIUS = themed({
   dark: '3px'
@@ -52,10 +53,10 @@ export var expandStyles = function expandStyles(props) {
     expanded: false,
     focused: false
   })(props), expandClassNames.titleInput, sharedExpandStyles.titleInputStyles(props), expandClassNames.titleContainer, sharedExpandStyles.titleContainerStyles(props), expandClassNames.expanded, EXPAND_SELECTED_BACKGROUND(props), themed({
-    light: N40A,
-    dark: DN50
+    light: token('color.border', N40A),
+    dark: token('color.border', DN50)
   })(props), expandClassNames.content, gridSize(), expandClassNames.inputContainer, expandClassNames.prefix, expandClassNames.expanded, expandClassNames.prefix, expandClassNames.expanded, expandClassNames.iconContainer, EXPAND_ICON_COLOR(props), akEditorSelectedNodeClassName, themed({
-    light: N50A,
-    dark: DN50
+    light: token('color.border', N50A),
+    dark: token('color.border', DN50)
   })(props), EXPAND_SELECTED_BACKGROUND(props));
 };

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

@@ -34,11 +34,12 @@ export var clearEditingContext = createCommand({
     processParametersAfter: undefined
   }
 }, applyChange);
-export var forceAutoSave = function forceAutoSave(value) {
+export var forceAutoSave = function forceAutoSave(resolve, reject) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
-      autoSaveResolve: value
+      autoSaveResolve: resolve,
+      autoSaveReject: reject
     }
   }, applyChange);
 };

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

@@ -41,6 +41,7 @@ export var getContextPanel = function getContextPanel(allowAutoSave) {
 
     var extensionState = getPluginState(state);
     var autoSaveResolve = extensionState.autoSaveResolve,
+        autoSaveReject = extensionState.autoSaveReject,
         showContextPanel = extensionState.showContextPanel,
         extensionProvider = extensionState.extensionProvider,
         processParametersBefore = extensionState.processParametersBefore,
@@ -83,6 +84,7 @@ export var getContextPanel = function getContextPanel(allowAutoSave) {
               extensionProvider: extensionProvider,
               autoSave: allowAutoSave,
               autoSaveTrigger: autoSaveResolve,
+              autoSaveReject: autoSaveReject,
               onChange: /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(updatedParameters) {
                   return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -121,24 +123,36 @@ export 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) {
-                          forceAutoSave(resolve)(editorView.state, editorView.dispatch);
+                        _context2.prev = 1;
+                        _context2.next = 4;
+                        return new Promise(function (resolve, reject) {
+                          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:
                         clearEditingContext(editorView.state, editorView.dispatch);
 
-                      case 4:
+                      case 10:
                       case "end":
                         return _context2.stop();
                     }
                   }
-                }, _callee2);
+                }, _callee2, null, [[1, 6]]);
               }))
             });
           }

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

@@ -7,6 +7,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { DN30, DN900, N30 } from '@atlaskit/theme/colors';
 import { wrapperDefault, padding } from '../styles';
+import { token } from '@atlaskit/tokens';
 var dataConsumerSelector = '[data-mark-type="dataConsumer"]';
 export var widerLayoutClassName = 'wider-layout';
 export var wrapperStyle = function wrapperStyle(theme, extensionWidth) {
@@ -15,10 +16,10 @@ export var wrapperStyle = function wrapperStyle(theme, extensionWidth) {
 export var header = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: ", "px ", "px ", "px;\n  vertical-align: middle;\n\n  &.with-children:not(.without-frame) {\n    padding: 4px 8px 8px;\n  }\n  &.without-frame {\n    padding: 0;\n  }\n"])), padding / 2, padding / 2, padding / 4);
 export var content = function content(theme) {
   return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: ", "px;\n  background: ", ";\n  color: ", ";\n  border: 1px solid ", ";\n  border-radius: ", "px;\n  cursor: initial;\n"])), padding, themed({
-    light: 'white',
-    dark: DN30
+    light: token('elevation.surface', 'white'),
+    dark: token('elevation.surface', DN30)
   })(theme), themed({
-    dark: DN900
-  })(theme), N30, borderRadius());
+    dark: token('color.text', DN900)
+  })(theme), token('color.border', N30), borderRadius());
 };
 export var contentWrapper = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  padding: 0 ", "px ", "px;\n"])), padding, padding);

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

@@ -5,6 +5,7 @@ var _templateObject;
 import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { wrapperDefault } from '../styles';
+import { token } from '@atlaskit/tokens';
 export var wrapperStyle = function wrapperStyle(theme) {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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"])), wrapperDefault(theme), borderRadius());
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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"])), wrapperDefault(theme), borderRadius(), token('color.background.neutral.subtle', 'white'));
 };

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

@@ -8,17 +8,18 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N20, DN50, DN700, B200, N20A, N70 } from '@atlaskit/theme/colors';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 export var padding = gridSize();
 export var BODIED_EXT_PADDING = padding * 2;
 export var wrapperDefault = function wrapperDefault(theme) {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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"])), themed({
-    light: N20,
-    dark: DN50
+    light: token('color.background.neutral', N20),
+    dark: token('color.background.neutral', DN50)
   })(theme), borderRadius(), themed({
-    dark: DN700
-  })(theme), relativeFontSizeToBase16(fontSize()), B200, N20A);
+    dark: token('color.text', DN700)
+  })(theme), relativeFontSizeToBase16(fontSize()), token('color.border.selected', B200), token('color.background.neutral.hovered', N20A));
 };
 export var overlay = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border-radius: ", "px;\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  opacity: 0;\n  pointer-events: none;\n  transition: opacity 0.3s;\n"])), borderRadius());
 export var placeholderFallback = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\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"])));
-export var placeholderFallbackParams = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\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"])), N70);
+export var placeholderFallbackParams = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\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"])), token('color.text.subtlest', N70));
 export var styledImage = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\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"])));

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

@@ -10,11 +10,12 @@ import { G300, N0 } from '@atlaskit/theme/colors';
 import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
 import { FormattedMessage } from 'react-intl-next';
 import { messages } from './messages';
+import { token } from '@atlaskit/tokens';
 
 var noop = function noop() {};
 
 var saveIndicatorWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: center;\n"])));
-var saveIndicatorContent = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\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"])), N0);
+var saveIndicatorContent = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\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"])), token('elevation.surface.overlay', N0), token('elevation.shadow.overlay', "0px 8px 12px rgba(9, 30, 66, 0.15), 0px 0px 1px rgba(9, 30, 66, 0.31)"));
 var saveIndicatorText = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding-left: 6px;\n"])));
 export var SaveIndicator = function SaveIndicator(_ref) {
   var children = _ref.children,
@@ -54,7 +55,7 @@ export var SaveIndicator = function SaveIndicator(_ref) {
     "data-testid": "save-indicator-content"
   }, jsx(CheckCircleIcon, {
     label: "Saving",
-    primaryColor: G300,
+    primaryColor: token('color.icon.success', G300),
     size: "small"
   }), jsx("span", {
     css: saveIndicatorText

package/dist/esm/plugins/fake-text-cursor/styles.js

@@ -4,4 +4,5 @@ var _templateObject;
 
 import { css } from '@emotion/react';
 import { B75 } from '@atlaskit/theme/colors';
-export var fakeCursorStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .ProseMirror-fake-text-cursor {\n      display: inline;\n      pointer-events: none;\n      position: relative;\n    }\n\n    .ProseMirror-fake-text-cursor::after {\n      content: '';\n      display: inline;\n      top: 0;\n      position: absolute;\n      border-right: 1px solid rgba(0, 0, 0, 0.4);\n    }\n\n    .ProseMirror-fake-text-selection {\n      display: inline;\n      pointer-events: none;\n      position: relative;\n      background-color: ", ";\n    }\n  }\n"])), B75);
+import { token } from '@atlaskit/tokens';
+export var fakeCursorStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .ProseMirror-fake-text-cursor {\n      display: inline;\n      pointer-events: none;\n      position: relative;\n    }\n\n    .ProseMirror-fake-text-cursor::after {\n      content: '';\n      display: inline;\n      top: 0;\n      position: absolute;\n      border-right: 1px solid ", ";\n    }\n\n    .ProseMirror-fake-text-selection {\n      display: inline;\n      pointer-events: none;\n      position: relative;\n      background-color: ", ";\n    }\n  }\n"])), token('color.border', 'rgba(0, 0, 0, 0.4)'), token('color.background.selected', B75));

package/dist/esm/plugins/feature-flags-context/feature-flags-from-props.js

@@ -19,7 +19,7 @@ var safeNumberFeatureFlag = function safeNumberFeatureFlag(value) {
 
 
 export function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$featureFlags9, _props$featureFlags10, _props$allowTables5, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$collabEdit, _props$collabEdit2, _props$featureFlags34, _props$featureFlags35;
+  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$featureFlags9, _props$featureFlags10, _props$allowTables5, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$collabEdit, _props$collabEdit2, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37;
 
   var normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
@@ -56,6 +56,7 @@ export function createFeatureFlagsFromProps(props) {
     maxUnsafeChromeSpellcheckingVersion: safeNumberFeatureFlag((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.maxUnsafeChromeSpellcheckingVersion),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
     chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags34 = props.featureFlags) === null || _props$featureFlags34 === void 0 ? void 0 : _props$featureFlags34.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
-    viewChangingExperimentToolbarStyle: typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35['view-changing-experiment-toolbar-style']) === 'string' ? props.featureFlags['view-changing-experiment-toolbar-style'] || undefined : undefined
+    viewChangingExperimentToolbarStyle: typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35['view-changing-experiment-toolbar-style']) === 'string' ? props.featureFlags['view-changing-experiment-toolbar-style'] || undefined : undefined,
+    showHoverPreview: Boolean(typeof ((_props$featureFlags36 = props.featureFlags) === null || _props$featureFlags36 === void 0 ? void 0 : _props$featureFlags36.showHoverPreview) === 'boolean' ? !!((_props$featureFlags37 = props.featureFlags) !== null && _props$featureFlags37 !== void 0 && _props$featureFlags37.showHoverPreview) : false)
   });
 }

package/dist/esm/plugins/find-replace/styles.js

@@ -2,10 +2,10 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject;
 
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+// TODO: https://product-fabric.atlassian.net/browse/DSP-4290
 import { css } from '@emotion/react';
 import { B75, B200 } from '@atlaskit/theme/colors';
-export var searchMatchBgColour = B75;
-export var selectedSearchMatchBgColour = B200;
 export var searchMatchClass = 'search-match';
 export var selectedSearchMatchClass = 'selected-search-match';
-export var findReplaceStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    background-color: ", ";\n  }\n\n  .", " {\n    background-color: ", ";\n    color: white;\n  }\n"])), searchMatchClass, searchMatchBgColour, selectedSearchMatchClass, selectedSearchMatchBgColour);
+export var findReplaceStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    background-color: ", ";\n  }\n\n  .", " {\n    background-color: ", ";\n    color: white;\n  }\n"])), searchMatchClass, B75, selectedSearchMatchClass, B200);

package/dist/esm/plugins/find-replace/ui/styles.js

@@ -5,6 +5,7 @@ var _templateObject;
 /** @jsx jsx */
 import { css } from '@emotion/react';
 import { N60, N30A } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 export var replaceSectionButtonStyles = css({
   marginLeft: '4px'
@@ -12,7 +13,7 @@ export var replaceSectionButtonStyles = css({
 export var ruleStyles = css({
   width: '100%',
   border: 'none',
-  backgroundColor: "".concat(N30A),
+  backgroundColor: "".concat(token('color.border', N30A)),
   margin: '4px 0px',
   height: '1px',
   borderRadius: '1px'
@@ -26,7 +27,7 @@ export var wrapperStyles = css({
 });
 export var sectionWrapperStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n\n  & > * {\n    display: inline-flex;\n    height: 32px;\n    flex: 0 0 auto;\n  }\n\n  & > [data-ds--text-field--container] {\n    display: flex;\n    flex: 1 1 auto;\n  }\n"])));
 export var countStyles = css({
-  color: "".concat(N60),
+  color: "".concat(token('color.text.subtlest', N60)),
   fontSize: "".concat(relativeFontSizeToBase16(12)),
   flex: '0 0 auto',
   justifyContent: 'center',

package/dist/esm/plugins/floating-toolbar/ui/DropdownMenu.js

@@ -23,6 +23,7 @@ import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import Tooltip from '@atlaskit/tooltip';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
+import { token } from '@atlaskit/tokens';
 export var menuItemDimensions = {
   width: 175,
   height: 32
@@ -111,7 +112,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
 
       if (selected !== undefined) {
         return selected ? jsx(EditorDoneIcon, {
-          primaryColor: B400,
+          primaryColor: token('color.icon.selected', B400),
           size: "small",
           label: intl.formatMessage(messages.confirmModalOK)
         }) : jsx("span", {

package/dist/esm/plugins/floating-toolbar/ui/EditorEmojiAddIcon.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { token } from '@atlaskit/tokens';
 export default function EditorEmojiAddIcon() {
   return /*#__PURE__*/React.createElement("svg", {
     width: 24,
@@ -9,7 +10,7 @@ export default function EditorEmojiAddIcon() {
   }, /*#__PURE__*/React.createElement("rect", {
     width: 24,
     height: 24,
-    fill: "white",
+    fill: token('color.background.neutral.subtle', 'white'),
     fillOpacity: "0.01"
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",

package/dist/esm/plugins/floating-toolbar/ui/Separator.js

@@ -5,7 +5,8 @@ var _templateObject;
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-var separator = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 20px;\n  margin: 0 4px;\n  align-self: center;\n"])), N30);
+import { token } from '@atlaskit/tokens';
+var separator = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 20px;\n  margin: 0 4px;\n  align-self: center;\n"])), token('color.border', N30));
 export default (function () {
   return jsx("div", {
     css: separator,

package/dist/esm/plugins/floating-toolbar/ui/Toolbar.js

@@ -33,13 +33,14 @@ import { EmojiPickerButton } from './EmojiPickerButton';
 import Announcer from '../../../utils/announcer/announcer';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
+import { token } from '@atlaskit/tokens';
 var akGridSize = gridSize();
 
 var toolbarContainer = function toolbarContainer(theme) {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  box-shadow: 0 0 1px rgba(9, 30, 66, 0.31),\n    0 4px 8px -2px rgba(9, 30, 66, 0.25);\n  padding: ", "px ", "px;\n  display: flex;\n  line-height: 1;\n  box-sizing: border-box;\n\n  & > div {\n    align-items: center;\n  }\n"])), themed({
-    light: 'white',
-    dark: DN70
-  })(theme), borderRadius(), akGridSize / 2, akGridSize);
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  padding: ", "px ", "px;\n  display: flex;\n  line-height: 1;\n  box-sizing: border-box;\n\n  & > div {\n    align-items: center;\n  }\n"])), themed({
+    light: token('elevation.surface.overlay', 'white'),
+    dark: token('elevation.surface.overlay', DN70)
+  })(theme), borderRadius(), token('elevation.shadow.overlay', "0 0 1px rgba(9, 30, 66, 0.31), 0 4px 8px -2px rgba(9, 30, 66, 0.25)"), akGridSize / 2, akGridSize);
 };
 
 var toolbarContainerLeftPadding = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding-left: ", "px;\n"])), akGridSize / 2);

package/dist/esm/plugins/floating-toolbar/ui/styles.js

@@ -1,5 +1,6 @@
 import * as colors from '@atlaskit/theme/colors';
 import { hexToRgba } from '@atlaskit/adf-schema';
+import { token } from '@atlaskit/tokens';
 var background = {
   danger: {
     default: {
@@ -7,28 +8,28 @@ var background = {
       dark: 'inherit'
     },
     hover: {
-      light: colors.N30A,
-      dark: colors.N30A
+      light: token('color.background.neutral.subtle.hovered', colors.N30A),
+      dark: token('color.background.neutral.subtle.hovered', colors.N30A)
     },
     active: {
-      light: hexToRgba(colors.B75, 0.6),
-      dark: hexToRgba(colors.B75, 0.6)
+      light: token('color.background.neutral.pressed', "".concat(hexToRgba(colors.B75, 0.6))),
+      dark: token('color.background.neutral.pressed', "".concat(hexToRgba(colors.B75, 0.6)))
     }
   }
 };
 var color = {
   danger: {
     default: {
-      light: colors.N400,
-      dark: colors.DN400
+      light: token('color.icon', colors.N400),
+      dark: token('color.icon', colors.DN400)
     },
     hover: {
-      light: colors.R400,
-      dark: colors.R400
+      light: token('color.icon.danger', colors.R400),
+      dark: token('color.icon.danger', colors.R400)
     },
     active: {
-      light: colors.R400,
-      dark: colors.R400
+      light: token('color.icon.danger', colors.R400),
+      dark: token('color.icon.danger', colors.R400)
     }
   }
 };

package/dist/esm/plugins/grid/styles.js

@@ -5,5 +5,6 @@ var _templateObject;
 import { css } from '@emotion/react';
 import { N30A, B200 } from '@atlaskit/theme/colors';
 import { akEditorGridLineZIndex } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 export var GRID_GUTTER = 12;
-export var gridStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .gridParent {\n    width: calc(100% + ", "px);\n    margin-left: -", "px;\n    margin-right: -", "px;\n    transform: scale(1);\n    z-index: ", ";\n  }\n\n  .gridContainer {\n    position: fixed;\n    height: 100vh;\n    width: 100%;\n    pointer-events: none;\n  }\n\n  .gridLine {\n    border-left: 1px solid ", ";\n    display: inline-block;\n    box-sizing: border-box;\n    height: 100%;\n    margin-left: -1px;\n\n    transition: border-color 0.15s linear;\n    z-index: 0;\n  }\n\n  .highlight {\n    border-left: 1px solid ", ";\n  }\n"])), GRID_GUTTER * 2, GRID_GUTTER, GRID_GUTTER, akEditorGridLineZIndex, N30A, B200);
+export var gridStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .gridParent {\n    width: calc(100% + ", "px);\n    margin-left: -", "px;\n    margin-right: -", "px;\n    transform: scale(1);\n    z-index: ", ";\n  }\n\n  .gridContainer {\n    position: fixed;\n    height: 100vh;\n    width: 100%;\n    pointer-events: none;\n  }\n\n  // TODO: https://product-fabric.atlassian.net/browse/DSP-4352\n  .gridLine {\n    border-left: 1px solid ", ";\n    display: inline-block;\n    box-sizing: border-box;\n    height: 100%;\n    margin-left: -1px;\n\n    transition: border-color 0.15s linear;\n    z-index: 0;\n  }\n\n  .highlight {\n    border-left: 1px solid ", ";\n  }\n"])), GRID_GUTTER * 2, GRID_GUTTER, GRID_GUTTER, akEditorGridLineZIndex, token('color.border', N30A), token('color.border.focused', B200));

package/dist/esm/plugins/help-dialog/ui/styles.js

@@ -6,15 +6,16 @@ import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
 import * as colors from '@atlaskit/theme/colors';
 import { akEditorUnitZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
-export var header = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  z-index: ", ";\n  min-height: 24px;\n  padding: 20px 40px;\n  font-size: ", ";\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  box-shadow: 'none';\n  color: ", ";\n  background-color: ", ";\n  border-radius: ", "px;\n"])), akEditorUnitZIndex, relativeFontSizeToBase16(24), colors.N400, colors.N0, borderRadius());
-export var footer = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  z-index: ", ";\n  font-size: ", ";\n  line-height: 20px;\n  color: ", ";\n  padding: 24px;\n  text-align: right;\n  box-shadow: 'none';\n"])), akEditorUnitZIndex, relativeFontSizeToBase16(14), colors.N300);
-export var contentWrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: 18px 20px;\n  border-bottom-right-radius: ", "px;\n  overflow: auto;\n  position: relative;\n  color: ", ";\n  background-color: ", ";\n"])), borderRadius(), colors.N400, colors.N0);
-export var line = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  background: #fff;\n  content: '';\n  display: block;\n  height: 2px;\n  left: 0;\n  position: absolute;\n  top: 0;\n  right: 0;\n  width: 100%;\n  min-width: 604px;\n"])));
+import { token } from '@atlaskit/tokens';
+export var header = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  z-index: ", ";\n  min-height: 24px;\n  padding: 20px 40px;\n  font-size: ", ";\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  box-shadow: 'none';\n  color: ", ";\n  background-color: ", ";\n  border-radius: ", "px;\n"])), akEditorUnitZIndex, relativeFontSizeToBase16(24), token('color.text', colors.N400), token('color.background.neutral.subtle', colors.N0), borderRadius());
+export var footer = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  z-index: ", ";\n  font-size: ", ";\n  line-height: 20px;\n  color: ", ";\n  padding: 24px;\n  text-align: right;\n  box-shadow: 'none';\n"])), akEditorUnitZIndex, relativeFontSizeToBase16(14), token('color.text.subtlest', colors.N300));
+export var contentWrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: 18px 20px;\n  border-bottom-right-radius: ", "px;\n  overflow: auto;\n  position: relative;\n  color: ", ";\n  background-color: ", ";\n"])), borderRadius(), token('color.text.subtle', colors.N400), token('color.background.neutral.subtle', colors.N0));
+export var line = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  background: ", ";\n  content: '';\n  display: block;\n  height: 2px;\n  left: 0;\n  position: absolute;\n  top: 0;\n  right: 0;\n  width: 100%;\n  min-width: 604px;\n"])), token('color.background.neutral.subtle', '#fff'));
 export var content = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  min-width: 524px;\n  width: 100%;\n  position: relative;\n  display: flex;\n  justify-content: space-between;\n"])));
 export var columnLeft = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 44%;\n"])));
 export var columnRight = css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  width: 44%;\n"])));
 export var row = css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  margin: 20px 0;\n  display: flex;\n  justify-content: space-between;\n"])));
 export var title = css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  font-size: ", ";\n  font-weight: 400;\n"])), relativeFontSizeToBase16(18));
-export var codeSm = css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  width: 24px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  text-align: center;\n"])), colors.N20, borderRadius());
-export var codeMd = css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  width: 50px;\n  text-align: center;\n"])), colors.N20, borderRadius());
-export var codeLg = css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  padding: 0 10px;\n  text-align: center;\n"])), colors.N20, borderRadius());
+export var codeSm = css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  width: 24px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  text-align: center;\n"])), token('color.background.neutral', colors.N20), borderRadius());
+export var codeMd = css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  width: 50px;\n  text-align: center;\n"])), token('color.background.neutral', colors.N20), borderRadius());
+export var codeLg = css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  border-radius: ", "px;\n  display: inline-block;\n  height: 24px;\n  line-height: 24px;\n  padding: 0 10px;\n  text-align: center;\n"])), token('color.background.neutral', colors.N20), borderRadius());

package/dist/esm/plugins/hyperlink/pm-plugins/input-rule.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { createRule, createPlugin } from '../../../utils/input-rules';
-import { LinkMatcher, normalizeUrl } from '../utils';
+import { findFilepaths, isLinkInMatches, LinkMatcher, normalizeUrl } from '../utils';
 import { INPUT_METHOD, addAnalytics } from '../../analytics';
 import { getLinkCreationAnalyticsEvent } from '../analytics';
 export function createLinkInputRule(regexp) {
@@ -18,7 +18,29 @@ export function createLinkInputRule(regexp) {
     var url = normalizeUrl(link.url);
     var markType = schema.mark('link', {
       href: url
-    });
+    }); // Need access to complete text to check if last URL is part of a filepath before linkifying
+
+    var nodeBefore = state.selection.$from.nodeBefore;
+
+    if (!nodeBefore || !nodeBefore.isText || !nodeBefore.text) {
+      return null;
+    }
+
+    var filepaths = findFilepaths(nodeBefore.text, // The position referenced by 'start' is relative to the start of the document, findFilepaths deals with index in a node only.
+    start - (nodeBefore.text.length - link.text.length) // (start of link match) - (whole node text length - link length) gets start of text node, which is used as offset
+    );
+
+    if (isLinkInMatches(start, filepaths)) {
+      var _tr = state.tr;
+
+      if (useUnpredictableInputRule) {
+        _tr.insertText(' ');
+      } // To keep consistent with original behaviour.
+
+
+      return _tr;
+    }
+
     var from = start;
     var to = Math.min(start + link.text.length, state.doc.content.size);
     var tr = state.tr.addMark(from, to, markType); // Keep old behavior that will delete the space after the link

package/dist/esm/plugins/hyperlink/pm-plugins/keymap.js

@@ -5,6 +5,7 @@ import { stateKey } from '../pm-plugins/main';
 import { showLinkToolbar, hideLinkToolbar } from '../commands';
 import { INPUT_METHOD, addAnalytics } from '../../analytics';
 import { getLinkCreationAnalyticsEvent } from '../analytics';
+import { findFilepaths, isLinkInMatches } from '../utils';
 export function createKeymapPlugin() {
   var skipAnalytics = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var list = {};
@@ -33,7 +34,7 @@ var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(skipA
   return function (state, dispatch) {
     var nodeBefore = state.selection.$from.nodeBefore;
 
-    if (!nodeBefore || !nodeBefore.isText) {
+    if (!nodeBefore || !nodeBefore.isText || !nodeBefore.text) {
       return false;
     }
 
@@ -54,6 +55,13 @@ var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(skipA
       var markType = state.schema.mark('link', {
         href: url
       });
+      var filepaths = findFilepaths(nodeBefore.text, start - (nodeBefore.text.length - hyperlinkedText.length) // The position referenced by 'start' is relative to the start of the document, findFilepaths deals with index in a node only.
+      );
+
+      if (isLinkInMatches(start, filepaths)) {
+        return false;
+      }
+
       var tr = state.tr.addMark(start, end, markType);
 
       if (dispatch) {

package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -25,6 +25,7 @@ import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorAlignLeftIcon from '@atlaskit/icon/glyph/editor/align-left';
 import LinkIcon from '@atlaskit/icon/glyph/link';
 import { N90, N80, N30 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import Page16Icon from '@atlaskit/icon-object/glyph/page/16';
 import Tooltip from '@atlaskit/tooltip';
 import { PureComponent } from 'react';
@@ -46,9 +47,9 @@ import { browser } from '@atlaskit/editor-common/utils';
 import { transformTimeStamp } from '../../../../ui/LinkSearch/transformTimeStamp';
 import Announcer from '../../../../utils/announcer/announcer';
 export var RECENT_SEARCH_LIST_SIZE = 5;
-var clearText = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  padding: 0;\n  margin-right: 8px;\n  color: ", ";\n  background: transparent;\n  border: none;\n"])), N90);
-var textInputWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", ";\n  border-top: 1px solid ", ";\n  border-bottom: 1px solid ", ";\n"])), inputWrapper, N30, N30);
-var iconWrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  color: ", ";\n  padding: 4px 8px;\n  width: 18px;\n"])), N80);
+var clearText = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  padding: 0;\n  margin-right: 8px;\n  color: ", ";\n  background: transparent;\n  border: none;\n"])), token('color.icon.subtle', N90));
+var textInputWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", ";\n  border-top: 1px solid ", ";\n  border-bottom: 1px solid ", ";\n"])), inputWrapper, token('color.border', N30), token('color.border', N30));
+var iconWrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  color: ", ";\n  padding: 4px 8px;\n  width: 18px;\n"])), token('color.icon.subtle', N80));
 export var messages = defineMessages({
   displayText: {
     id: 'fabric.editor.displayText',

package/dist/esm/plugins/hyperlink/utils.js

@@ -1,7 +1,9 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import { mapSlice } from '../../utils/slice';
-import { isSafeUrl, linkify, normalizeUrl as normaliseLinkHref } from '@atlaskit/adf-schema';
+import { isSafeUrl, linkify, normalizeUrl as normaliseLinkHref } from '@atlaskit/adf-schema'; // Regular expression for a windows filepath in the format <DRIVE LETTER>:\<folder name>\
+
+export var FILEPATH_REGEXP = /([a-zA-Z]:|\\)([^\/:*?<>"|]+\\)?([^\/:*?<>"| ]+(?=\s?))?/gim;
 /**
  * Instance of class LinkMatcher are used in autoformatting in place of Regex.
  * Hence it has been made similar to regex with an exec method.
@@ -95,7 +97,12 @@ export function linkifyContent(schema) {
         var text = node.text;
         var matches = findLinkMatches(text);
         var pos = 0;
+        var filepaths = findFilepaths(text);
         matches.forEach(function (match) {
+          if (isLinkInMatches(match.start, filepaths)) {
+            return;
+          }
+
           if (match.start > 0) {
             linkified.push(node.cut(pos, match.start));
           }
@@ -150,4 +157,39 @@ function findLinkMatches(text) {
   }
 
   return matches;
-}
+}
+
+export var findFilepaths = function findFilepaths(text) {
+  var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  // Creation of a copy of the RegExp is necessary as lastIndex is stored on it when we run .exec()
+  var localRegExp = new RegExp(FILEPATH_REGEXP);
+  var match;
+  var matchesList = [];
+  var maxFilepathSize = 260;
+
+  while ((match = localRegExp.exec(text)) !== null) {
+    var start = match.index + offset;
+    var end = localRegExp.lastIndex + offset;
+
+    if (end - start > maxFilepathSize) {
+      end = start + maxFilepathSize;
+    } // We don't care about big strings of text that are pretending to be filepaths!!
+
+
+    matchesList.push({
+      startIndex: start,
+      endIndex: end
+    });
+  }
+
+  return matchesList;
+};
+export var isLinkInMatches = function isLinkInMatches(linkStart, matchesList) {
+  for (var i = 0; i < matchesList.length; i++) {
+    if (linkStart >= matchesList[i].startIndex && linkStart < matchesList[i].endIndex) {
+      return true;
+    }
+  }
+
+  return false;
+};