@atlaskit/renderer 84.1.1 → 85.0.0

package/dist/cjs/ui/Expand.js

@@ -25,7 +25,7 @@ var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron
 
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
@@ -47,23 +47,23 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var Title = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  outline: none;\n  border: none;\n  font-size: ", ";\n  line-height: ", ";\n  font-weight: normal;\n  display: flex;\n  flex: 1;\n  margin: 0;\n  padding: 0 0 0 ", "px;\n  text-align: left;\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), _editorSharedStyles.akEditorLineHeight, (0, _constants.gridSize)() / 2);
 
-var Container = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  padding: 0;\n  padding-bottom: ", "px;\n"])), _editorCommon.sharedExpandStyles.ContainerStyles, function (props) {
+var Container = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  padding: 0;\n  padding-bottom: ", "px;\n"])), _ui.sharedExpandStyles.ContainerStyles, function (props) {
   return props.expanded ? (0, _constants.gridSize)() : 0;
 });
 
-var TitleContainer = _styledComponents.default.button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  padding: ", "px;\n  padding-bottom: ", "px;\n"])), _editorCommon.sharedExpandStyles.TitleContainerStyles, (0, _constants.gridSize)(), function (props) {
+var TitleContainer = _styledComponents.default.button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  padding: ", "px;\n  padding-bottom: ", "px;\n"])), _ui.sharedExpandStyles.TitleContainerStyles, (0, _constants.gridSize)(), function (props) {
   return !props.expanded ? (0, _constants.gridSize)() : 0;
 });
 
 TitleContainer.displayName = 'TitleContainerButton';
 
-var ContentContainer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  padding-right: ", "px;\n  padding-left: ", "px;\n  visibility: ", ";\n"])), _editorCommon.sharedExpandStyles.ContentStyles, (0, _constants.gridSize)() * 2, (0, _constants.gridSize)() * 5 - (0, _constants.gridSize)() / 2, function (props) {
+var ContentContainer = _styledComponents.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  padding-right: ", "px;\n  padding-left: ", "px;\n  visibility: ", ";\n"])), _ui.sharedExpandStyles.ContentStyles, (0, _constants.gridSize)() * 2, (0, _constants.gridSize)() * 5 - (0, _constants.gridSize)() / 2, function (props) {
   return props.expanded ? 'visible' : 'hidden';
 });
 
 var ExpandLayoutWrapperWithRef = /*#__PURE__*/(0, _react.forwardRef)(function WithRef(props, ref) {
   // @ts-ignore: incorrect innerRef typing
-  return /*#__PURE__*/_react.default.createElement(_editorCommon.ExpandLayoutWrapper, (0, _extends2.default)({}, props, {
+  return /*#__PURE__*/_react.default.createElement(_ui.ExpandLayoutWrapper, (0, _extends2.default)({}, props, {
     innerRef: ref
   }));
 });
@@ -103,7 +103,7 @@ function Expand(_ref) {
       focused = _React$useState4[0],
       setFocused = _React$useState4[1];
 
-  var label = intl.formatMessage(expanded ? _editorCommon.expandMessages.collapseNode : _editorCommon.expandMessages.expandNode);
+  var label = intl.formatMessage(expanded ? _ui.expandMessages.collapseNode : _ui.expandMessages.expandNode);
 
   var _useRef = (0, _react.useRef)((0, _uniqueId2.default)('expand-title-')),
       id = _useRef.current;
@@ -144,17 +144,17 @@ function Expand(_ref) {
     content: label,
     position: "top",
     tag: ExpandLayoutWrapperWithRef
-  }, /*#__PURE__*/_react.default.createElement(_editorCommon.ExpandIconWrapper, {
+  }, /*#__PURE__*/_react.default.createElement(_ui.ExpandIconWrapper, {
     expanded: expanded
   }, /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
     label: label
   }))), /*#__PURE__*/_react.default.createElement(Title, {
     id: id
-  }, title || intl.formatMessage(_editorCommon.expandMessages.expandDefaultTitle))), /*#__PURE__*/_react.default.createElement(ContentContainer, {
+  }, title || intl.formatMessage(_ui.expandMessages.expandDefaultTitle))), /*#__PURE__*/_react.default.createElement(ContentContainer, {
     expanded: expanded
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(nodeType, "-content-wrapper")
-  }, /*#__PURE__*/_react.default.createElement(_editorCommon.WidthProvider, null, /*#__PURE__*/_react.default.createElement(_editorCommon.ClearNextSiblingMarginTop, null), children))));
+  }, /*#__PURE__*/_react.default.createElement(_ui.WidthProvider, null, /*#__PURE__*/_react.default.createElement(_ui.ClearNextSiblingMarginTop, null), children))));
 }
 
 var _default = (0, _reactIntlNext.injectIntl)(Expand);

package/dist/cjs/ui/ExtensionRenderer.js

@@ -25,7 +25,11 @@ var _react = _interopRequireDefault(require("react"));
 
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _extensions = require("@atlaskit/editor-common/extensions");
+
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
@@ -57,7 +61,7 @@ var ExtensionRenderer = /*#__PURE__*/function (_React$Component) {
         }
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getNodeRenderer", (0, _memoizeOne.default)(_editorCommon.getNodeRenderer));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getNodeRenderer", (0, _memoizeOne.default)(_extensions.getNodeRenderer));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderExtensionNode", function (extensionProvider) {
       var _this$props = _this.props,
           extensionHandlers = _this$props.extensionHandlers,
@@ -81,7 +85,7 @@ var ExtensionRenderer = /*#__PURE__*/function (_React$Component) {
 
       try {
         if (extensionHandlers && extensionHandlers[extensionType]) {
-          var render = (0, _editorCommon.getExtensionRenderer)(extensionHandlers[extensionType]);
+          var render = (0, _utils.getExtensionRenderer)(extensionHandlers[extensionType]);
           result = render(node, rendererContext.adDoc);
         }
 
@@ -133,7 +137,7 @@ var ExtensionRenderer = /*#__PURE__*/function (_React$Component) {
         return this.setupAndRenderExtensionNode({});
       }
 
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
         providers: ['extensionProvider'],
         providerFactory: providers,
         renderNode: this.setupAndRenderExtensionNode

package/dist/cjs/ui/MediaCard.js

@@ -37,7 +37,7 @@ var _mediaCard = require("@atlaskit/media-card");
 
 var _mediaClient = require("@atlaskit/media-client");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
@@ -47,9 +47,9 @@ 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
@@ -459,5 +459,5 @@ var getClipboardAttrs = function getClipboardAttrs(_ref2) {
 };
 
 exports.getClipboardAttrs = getClipboardAttrs;
-var MediaCard = (0, _editorCommon.withImageLoader)(MediaCardInternal);
+var MediaCard = (0, _utils.withImageLoader)(MediaCardInternal);
 exports.MediaCard = MediaCard;

package/dist/cjs/ui/Renderer/breakout-ssr.js

@@ -11,7 +11,7 @@ exports.createBreakoutInlineScript = createBreakoutInlineScript;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 /**
  * Inline Script that updates breakout node width on client side,
@@ -44,7 +44,7 @@ function createBreakoutInlineScript(id, allowDynamicTextSizing) {
   return "\n  (function(window){\n    ".concat(breakoutInlineScriptContext, ";\n    (").concat(applyBreakoutAfterSSR.toString(), ")(\"").concat(id, "\", ").concat(allowDynamicTextSizing, ", breakoutConsts);\n  })(window);\n");
 }
 
-var breakoutInlineScriptContext = "\n  var breakoutConsts = ".concat(JSON.stringify(_editorCommon.breakoutConsts), ";\n  breakoutConsts.mapBreakpointToLayoutMaxWidth = ").concat(_editorCommon.breakoutConsts.mapBreakpointToLayoutMaxWidth.toString(), ";\n  breakoutConsts.getBreakpoint = ").concat(_editorCommon.breakoutConsts.getBreakpoint.toString(), ";\n  breakoutConsts.calcBreakoutWidth = ").concat(_editorCommon.breakoutConsts.calcBreakoutWidth.toString(), ";\n  breakoutConsts.calcLineLength = ").concat(_editorCommon.breakoutConsts.calcLineLength.toString(), ";\n  breakoutConsts.calcWideWidth = ").concat(_editorCommon.breakoutConsts.calcWideWidth.toString(), ";\n");
+var breakoutInlineScriptContext = "\n  var breakoutConsts = ".concat(JSON.stringify(_utils.breakoutConsts), ";\n  breakoutConsts.mapBreakpointToLayoutMaxWidth = ").concat(_utils.breakoutConsts.mapBreakpointToLayoutMaxWidth.toString(), ";\n  breakoutConsts.getBreakpoint = ").concat(_utils.breakoutConsts.getBreakpoint.toString(), ";\n  breakoutConsts.calcBreakoutWidth = ").concat(_utils.breakoutConsts.calcBreakoutWidth.toString(), ";\n  breakoutConsts.calcLineLength = ").concat(_utils.breakoutConsts.calcLineLength.toString(), ";\n  breakoutConsts.calcWideWidth = ").concat(_utils.breakoutConsts.calcWideWidth.toString(), ";\n");
 exports.breakoutInlineScriptContext = breakoutInlineScriptContext;
 
 function applyBreakoutAfterSSR(id, allowDynamicTextSizing, breakoutConsts) {
@@ -128,5 +128,5 @@ function applyBreakoutAfterSSR(id, allowDynamicTextSizing, breakoutConsts) {
   window.addEventListener('load', disconnect);
 }
 
-var calcLineLength = _editorCommon.breakoutConsts.calcLineLength;
+var calcLineLength = _utils.breakoutConsts.calcLineLength;
 exports.calcLineLength = calcLineLength;

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

@@ -33,7 +33,11 @@ var _adfSchema = require("@atlaskit/adf-schema");
 
 var _adfUtils = require("@atlaskit/adf-utils");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
+
+var _ui = require("@atlaskit/editor-common/ui");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _normalizeFeatureFlags = require("@atlaskit/editor-common/normalize-feature-flags");
 
@@ -75,7 +79,7 @@ var _annotations = require("../annotations");
 
 var _links = require("../../react/utils/links");
 
-var _utils = require("../../utils");
+var _utils2 = require("../../utils");
 
 var _clickToEdit = require("./click-to-edit");
 
@@ -89,9 +93,9 @@ 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
@@ -144,11 +148,11 @@ var Renderer = /*#__PURE__*/function (_PureComponent) {
       var windowSelection = window.getSelection();
       _this.mouseDownSelection = windowSelection !== null ? windowSelection.toString() : undefined;
     });
-    _this.providerFactory = props.dataProviders || new _editorCommon.ProviderFactory();
+    _this.providerFactory = props.dataProviders || new _providerFactory.ProviderFactory();
     _this.serializer = new _.ReactSerializer(_this.deriveSerializerProps(props));
     _this.editorRef = props.innerRef || /*#__PURE__*/_react.default.createRef();
     _this.id = (0, _v.default)();
-    (0, _editorCommon.startMeasure)("Renderer Render Time: ".concat(_this.id));
+    (0, _utils.startMeasure)("Renderer Render Time: ".concat(_this.id));
     return _this;
   }
 
@@ -189,12 +193,12 @@ var Renderer = /*#__PURE__*/function (_PureComponent) {
         eventType: _enums.EVENT_TYPE.UI
       });
       this.rafID = requestAnimationFrame(function () {
-        (0, _editorCommon.stopMeasure)("Renderer Render Time: ".concat(_this2.id), function (duration) {
+        (0, _utils.stopMeasure)("Renderer Render Time: ".concat(_this2.id), function (duration) {
           var _analyticsEventSeveri, _analyticsEventSeveri2;
 
           var analyticsEventSeverityTracking = _this2.props.analyticsEventSeverityTracking;
-          var forceSeverityTracking = typeof analyticsEventSeverityTracking === 'undefined' && (0, _editorCommon.shouldForceTracking)();
-          var severity = !!forceSeverityTracking || analyticsEventSeverityTracking !== null && analyticsEventSeverityTracking !== void 0 && analyticsEventSeverityTracking.enabled ? (0, _editorCommon.getAnalyticsEventSeverity)(duration, (_analyticsEventSeveri = analyticsEventSeverityTracking === null || analyticsEventSeverityTracking === void 0 ? void 0 : analyticsEventSeverityTracking.severityNormalThreshold) !== null && _analyticsEventSeveri !== void 0 ? _analyticsEventSeveri : NORMAL_SEVERITY_THRESHOLD, (_analyticsEventSeveri2 = analyticsEventSeverityTracking === null || analyticsEventSeverityTracking === void 0 ? void 0 : analyticsEventSeverityTracking.severityDegradedThreshold) !== null && _analyticsEventSeveri2 !== void 0 ? _analyticsEventSeveri2 : DEGRADED_SEVERITY_THRESHOLD) : undefined;
+          var forceSeverityTracking = typeof analyticsEventSeverityTracking === 'undefined' && (0, _utils.shouldForceTracking)();
+          var severity = !!forceSeverityTracking || analyticsEventSeverityTracking !== null && analyticsEventSeverityTracking !== void 0 && analyticsEventSeverityTracking.enabled ? (0, _utils.getAnalyticsEventSeverity)(duration, (_analyticsEventSeveri = analyticsEventSeverityTracking === null || analyticsEventSeverityTracking === void 0 ? void 0 : analyticsEventSeverityTracking.severityNormalThreshold) !== null && _analyticsEventSeveri !== void 0 ? _analyticsEventSeveri : NORMAL_SEVERITY_THRESHOLD, (_analyticsEventSeveri2 = analyticsEventSeverityTracking === null || analyticsEventSeverityTracking === void 0 ? void 0 : analyticsEventSeverityTracking.severityDegradedThreshold) !== null && _analyticsEventSeveri2 !== void 0 ? _analyticsEventSeveri2 : DEGRADED_SEVERITY_THRESHOLD) : undefined;
 
           _this2.fireAnalyticsEvent({
             action: _enums.ACTION.RENDERED,
@@ -202,7 +206,7 @@ var Renderer = /*#__PURE__*/function (_PureComponent) {
             attributes: {
               platform: _events.PLATFORM.WEB,
               duration: duration,
-              ttfb: (0, _editorCommon.getResponseEndTime)(),
+              ttfb: (0, _utils.getResponseEndTime)(),
               nodes: (0, _adfUtils.reduce)(_this2.props.document, function (acc, node) {
                 acc[node.type] = (acc[node.type] || 0) + 1;
                 return acc;
@@ -306,7 +310,7 @@ var Renderer = /*#__PURE__*/function (_PureComponent) {
 
         var rendererWrapper = event.currentTarget; // Check if the click was on an interactive element
 
-        var isInteractiveElementInTree = (0, _utils.findInTree)(targetElement, rendererWrapper, _clickToEdit.isInteractiveElement);
+        var isInteractiveElementInTree = (0, _utils2.findInTree)(targetElement, rendererWrapper, _clickToEdit.isInteractiveElement);
 
         if (isInteractiveElementInTree) {
           return;
@@ -345,7 +349,7 @@ var Renderer = /*#__PURE__*/function (_PureComponent) {
           value: this.featureFlags(this.props.featureFlags)
         }, /*#__PURE__*/_react.default.createElement(_copyTextProvider.CopyTextProvider, null, /*#__PURE__*/_react.default.createElement(_activeHeaderIdProvider.ActiveHeaderIdProvider, {
           value: (0, _links.getActiveHeadingId)(allowHeadingAnchorLinks)
-        }, /*#__PURE__*/_react.default.createElement(_editorCommon.LegacyToNextIntlProvider, null, /*#__PURE__*/_react.default.createElement(_editorCommon.IntlLegacyFallbackProvider, null, /*#__PURE__*/_react.default.createElement(_analyticsContext.default.Provider, {
+        }, /*#__PURE__*/_react.default.createElement(_ui.LegacyToNextIntlProvider, null, /*#__PURE__*/_react.default.createElement(_ui.IntlLegacyFallbackProvider, null, /*#__PURE__*/_react.default.createElement(_analyticsContext.default.Provider, {
           value: {
             fireAnalyticsEvent: function fireAnalyticsEvent(event) {
               return _this3.fireAnalyticsEvent(event);
@@ -387,7 +391,7 @@ var Renderer = /*#__PURE__*/function (_PureComponent) {
           allowColumnSorting: allowColumnSorting,
           allowNestedHeaderLinks: allowNestedHeaderLinks,
           onClick: handleWrapperOnClick
-        }, /*#__PURE__*/_react.default.createElement(_editorCommon.UnsupportedBlock, null));
+        }, /*#__PURE__*/_react.default.createElement(_ui.UnsupportedBlock, null));
       }
     }
   }, {
@@ -414,13 +418,13 @@ exports.Renderer = Renderer;
 var RendererWithAnalytics = /*#__PURE__*/_react.default.memo(function (props) {
   return /*#__PURE__*/_react.default.createElement(_analyticsNamespacedContext.FabricEditorAnalyticsContext, {
     data: {
-      appearance: (0, _editorCommon.getAnalyticsAppearance)(props.appearance),
+      appearance: (0, _utils.getAnalyticsAppearance)(props.appearance),
       packageName: _version.name,
       packageVersion: _version.version,
       componentName: 'renderer',
       editorSessionId: (0, _v.default)()
     }
-  }, /*#__PURE__*/_react.default.createElement(_editorCommon.WithCreateAnalyticsEvent, {
+  }, /*#__PURE__*/_react.default.createElement(_ui.WithCreateAnalyticsEvent, {
     render: function render(createAnalyticsEvent) {
       // `IntlNextErrorBoundary` only captures Internationalisation errors, leaving others for `ErrorBoundary`.
       return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.ErrorBoundary, {
@@ -428,7 +432,7 @@ var RendererWithAnalytics = /*#__PURE__*/_react.default.memo(function (props) {
         rethrowError: true,
         fallbackComponent: null,
         createAnalyticsEvent: createAnalyticsEvent
-      }, /*#__PURE__*/_react.default.createElement(_editorCommon.IntlNextErrorBoundary, null, /*#__PURE__*/_react.default.createElement(Renderer, (0, _extends2.default)({}, props, {
+      }, /*#__PURE__*/_react.default.createElement(_ui.IntlNextErrorBoundary, null, /*#__PURE__*/_react.default.createElement(Renderer, (0, _extends2.default)({}, props, {
         createAnalyticsEvent: createAnalyticsEvent
       }))));
     }
@@ -446,9 +450,9 @@ var RendererWithIframeFallbackWrapper = /*#__PURE__*/_react.default.memo(functio
       onClick = props.onClick,
       onMouseDown = props.onMouseDown;
 
-  var renderer = /*#__PURE__*/_react.default.createElement(_editorCommon.WidthProvider, {
+  var renderer = /*#__PURE__*/_react.default.createElement(_ui.WidthProvider, {
     className: "ak-renderer-wrapper"
-  }, /*#__PURE__*/_react.default.createElement(_editorCommon.BaseTheme, {
+  }, /*#__PURE__*/_react.default.createElement(_ui.BaseTheme, {
     dynamicTextSizing: dynamicTextSizing,
     baseFontSize: !dynamicTextSizing && appearance && appearance !== 'comment' ? _editorSharedStyles.akEditorFullPageDefaultFontSize : undefined
   }, /*#__PURE__*/_react.default.createElement(_style.Wrapper, {

package/dist/cjs/ui/SortingIcon.js

@@ -13,14 +13,14 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _editorCommon = require("@atlaskit/editor-common");
-
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 
 var _constants = require("@atlaskit/theme/constants");
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _types = require("@atlaskit/editor-common/types");
+
 var _templateObject, _templateObject2;
 
 // We use data url here because of this issue:
@@ -45,10 +45,10 @@ var TableSortingIcon = _styledComponents.default.div(_templateObject2 || (_templ
 
 var getClassName = function getClassName(status) {
   switch (status) {
-    case _editorCommon.SortOrder.ASC:
+    case _types.SortOrder.ASC:
       return StatusClassNames.ASC;
 
-    case _editorCommon.SortOrder.DESC:
+    case _types.SortOrder.DESC:
       return StatusClassNames.DESC;
 
     default:
@@ -58,13 +58,13 @@ var getClassName = function getClassName(status) {
 
 var getTooltipTitle = function getTooltipTitle(status) {
   switch (status) {
-    case _editorCommon.SortOrder.NO_ORDER:
+    case _types.SortOrder.NO_ORDER:
       return 'Sort column A to Z';
 
-    case _editorCommon.SortOrder.ASC:
+    case _types.SortOrder.ASC:
       return 'Sort column Z to A';
 
-    case _editorCommon.SortOrder.DESC:
+    case _types.SortOrder.DESC:
       return 'Clear sorting';
   }
 
@@ -76,7 +76,7 @@ var notAllowedTooltip = "\u26A0\uFE0F  You can't sort a table with merged cell";
 var SortingIcon = function SortingIcon(_ref) {
   var isSortingAllowed = _ref.isSortingAllowed,
       sortOrdered = _ref.sortOrdered;
-  var activated = sortOrdered !== _editorCommon.SortOrder.NO_ORDER;
+  var activated = sortOrdered !== _types.SortOrder.NO_ORDER;
   var wrapperClassName = !isSortingAllowed ? StatusClassNames.SORTING_NOT_ALLOWED : '';
   var content = isSortingAllowed ? getTooltipTitle(sortOrdered) : notAllowedTooltip;
   return /*#__PURE__*/_react.default.createElement(_tooltip.default, {

package/dist/cjs/ui/annotations/draft/component.js

@@ -25,11 +25,11 @@ var _dom = require("./dom");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _templateObject;
 
-var DraftAnnotation = _styledComponents.default.mark(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: inherit;\n  background-color: unset;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n  ", ";\n"])), _editorCommon.AnnotationSharedCSSByState.focus);
+var DraftAnnotation = _styledComponents.default.mark(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: inherit;\n  background-color: unset;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n  ", ";\n"])), _styles.AnnotationSharedCSSByState.focus);
 
 var AnnotationDraft = function AnnotationDraft(_ref) {
   var draftPosition = _ref.draftPosition,

package/dist/cjs/ui/annotations/element/index.js

@@ -17,7 +17,7 @@ var _hooks = require("../hooks");
 
 var _context = require("../context");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _types = require("@atlaskit/editor-common/types");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -44,7 +44,7 @@ var MarkElement = function MarkElement(_ref) {
 
     var eventTarget = props.eventTarget,
         annotationIds = props.annotationIds;
-    updateSubscriber.emit(_editorCommon.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
+    updateSubscriber.emit(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
       annotationIds: annotationIds,
       eventTarget: eventTarget
     });

package/dist/cjs/ui/annotations/element/mark.js

@@ -19,7 +19,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
@@ -31,11 +31,11 @@ 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
-var MarkStyled = _styledComponents.default.mark(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: inherit;\n  background-color: unset;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n  &[data-mark-annotation-state='", "'] {\n    ", ";\n\n    &:focus,\n    &[data-has-focus='true'] {\n      ", ";\n    }\n  }\n"])), _adfSchema.AnnotationMarkStates.ACTIVE, _editorCommon.AnnotationSharedCSSByState.blur, _editorCommon.AnnotationSharedCSSByState.focus);
+var MarkStyled = _styledComponents.default.mark(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: inherit;\n  background-color: unset;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n  &[data-mark-annotation-state='", "'] {\n    ", ";\n\n    &:focus,\n    &[data-has-focus='true'] {\n      ", ";\n    }\n  }\n"])), _adfSchema.AnnotationMarkStates.ACTIVE, _styles.AnnotationSharedCSSByState.blur, _styles.AnnotationSharedCSSByState.focus);
 
 var MarkComponent = function MarkComponent(_ref) {
   var annotationParentIds = _ref.annotationParentIds,

package/dist/cjs/ui/annotations/hooks/use-events.js

@@ -13,7 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = require("react");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _types = require("@atlaskit/editor-common/types");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
@@ -21,9 +21,9 @@ var _enums = require("../../../analytics/enums");
 
 var _analyticsListeners = require("@atlaskit/analytics-listeners");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var useAnnotationStateByTypeEvent = function useAnnotationStateByTypeEvent(_ref) {
   var type = _ref.type,
@@ -56,9 +56,9 @@ var useAnnotationStateByTypeEvent = function useAnnotationStateByTypeEvent(_ref)
       setStates(_objectSpread(_objectSpread({}, states), nextStates));
     };
 
-    updateSubscriber.on(_editorCommon.AnnotationUpdateEvent.SET_ANNOTATION_STATE, cb);
+    updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, cb);
     return function () {
-      updateSubscriber.off(_editorCommon.AnnotationUpdateEvent.SET_ANNOTATION_STATE, cb);
+      updateSubscriber.off(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, cb);
     };
   }, [states, type, updateSubscriber]);
   return states;
@@ -88,11 +88,11 @@ var useHasFocusEvent = function useHasFocusEvent(_ref2) {
       setHasFocus(false);
     };
 
-    updateSubscriber.on(_editorCommon.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
-    updateSubscriber.on(_editorCommon.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
+    updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
+    updateSubscriber.on(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
     return function () {
-      updateSubscriber.off(_editorCommon.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
-      updateSubscriber.off(_editorCommon.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
+      updateSubscriber.off(_types.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
+      updateSubscriber.off(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
     };
   }, [id, updateSubscriber]);
   return hasFocus;
@@ -141,9 +141,9 @@ var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
       });
     };
 
-    updateSubscriber.on(_editorCommon.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, cb);
+    updateSubscriber.on(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, cb);
     return function () {
-      updateSubscriber.off(_editorCommon.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, cb);
+      updateSubscriber.off(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, cb);
     };
   }, [updateSubscriber, createAnalyticsEvent]);
   return annotationClickEvent;

package/dist/cjs/ui/annotations/hooks/use-load-annotations.js

@@ -11,15 +11,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = require("react");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _types = require("@atlaskit/editor-common/types");
 
 var _context = require("../context");
 
 var _RendererActionsContext = require("../../RendererActionsContext");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var useLoadAnnotations = function useLoadAnnotations(_ref) {
   var adfDocument = _ref.adfDocument;
@@ -51,7 +51,7 @@ var useLoadAnnotations = function useLoadAnnotations(_ref) {
       var payload = data.reduce(function (acc, value) {
         return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, value.id, value));
       }, {});
-      updateSubscriberInlineComment.emit(_editorCommon.AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
+      updateSubscriberInlineComment.emit(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
     };
 
     inlineCommentGetState(ids).then(cb);

package/dist/cjs/utils.js

@@ -10,6 +10,8 @@ exports.findHorizontalOverflowScrollParent = findHorizontalOverflowScrollParent;
 exports.findInTree = findInTree;
 exports.getText = exports.getPlatform = exports.getEventHandler = void 0;
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -22,12 +24,11 @@ function createEncoder(parser, encoder) {
   };
 }
 
-var ADFEncoder = function ADFEncoder(createTransformerWithSchema) {
+var ADFEncoder = /*#__PURE__*/(0, _createClass2.default)(function ADFEncoder(createTransformerWithSchema) {
   (0, _classCallCheck2.default)(this, ADFEncoder);
   var transformer = createTransformerWithSchema(_adfSchema.defaultSchema);
   this.encode = createEncoder(transformer, new _editorJsonTransformer.JSONTransformer());
-};
-
+});
 exports.ADFEncoder = ADFEncoder;
 
 var getText = function getText(node) {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "84.1.1",
+	"version": "85.0.0",
 	"sideEffects": false
 }

package/dist/es2019/actions/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
-import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common/utils';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RemoveMarkStep } from 'prosemirror-transform';
 import { createAnnotationStep, getPosFromRange } from '../steps';

package/dist/es2019/analytics/unsupported-content.js

@@ -1,4 +1,4 @@
-import { getUnsupportedContentLevelData, getAnalyticsAppearance } from '@atlaskit/editor-common';
+import { getUnsupportedContentLevelData, getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from './enums';
 import { PLATFORM } from './events';
 let rendersMap = {};

package/dist/es2019/react/index.js

@@ -6,7 +6,8 @@ import { isNestedHeaderLinksEnabled } from './utils/links';
 import { Doc, DocWithSelectAllTrap, mergeTextNodes, isTextWrapper, isTextNode, toReact } from './nodes';
 import TextWrapperComponent from './nodes/text-wrapper';
 import { toReact as markToReact, isAnnotationMark } from './marks';
-import { getMarksByOrder, isSameMark, calcTableColumnWidths } from '@atlaskit/editor-common';
+import { getMarksByOrder, isSameMark } from '@atlaskit/editor-common/validator';
+import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
 import { getText } from '../utils';
 import { findChildrenByType } from 'prosemirror-utils';
 import { insideBreakoutLayout } from './renderer-node';

package/dist/es2019/react/marks/breakout.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import { calcBreakoutWidth, WidthConsumer } from '@atlaskit/editor-common';
+import { WidthConsumer } from '@atlaskit/editor-common/ui';
+import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
 export const Wrapper = styled.div`
   margin: ${blockNodesVerticalMargin} 0;

package/dist/es2019/react/nodes/blockCard.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useMemo } from 'react';
 import { Card } from '@atlaskit/smart-card';
-import { UnsupportedBlock } from '@atlaskit/editor-common';
+import { UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { getPlatform } from '../../utils';
 import { CardErrorBoundary } from './fallback';
 import { getCardClickHandler } from '../utils/getCardClickHandler';

package/dist/es2019/react/nodes/caption.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Caption } from '@atlaskit/editor-common';
+import { Caption } from '@atlaskit/editor-common/ui';
 
 const RenderCaption = ({
   children,

package/dist/es2019/react/nodes/date.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { PureComponent } from 'react';
-import { isPastDate, timestampToString, timestampToTaskContext, DateSharedCssClassName } from '@atlaskit/editor-common';
+import { DateSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { isPastDate, timestampToString, timestampToTaskContext } from '@atlaskit/editor-common/utils';
 import { injectIntl } from 'react-intl-next';
 
 class Date extends PureComponent {