@atlaskit/editor-core 171.0.0 → 172.0.1

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

@@ -0,0 +1,245 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _rafSchd = _interopRequireDefault(require("raf-schd"));
+
+var _popper = _interopRequireDefault(require("popper.js"));
+
+var _helpers = require("./internal/helpers");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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; }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+var defaultState = {
+  hasExtractedStyles: false,
+  // We set these default offsets to prevent a flash of popper content in the wrong position
+  // which can cause incorrect height calculations. Popper will calculate these values
+  offsets: {
+    popper: {
+      left: -9999,
+      top: -9999,
+      position: null
+    }
+  },
+  // fix Safari parent width: https://product-fabric.atlassian.net/browse/ED-1784
+  cssPosition: 'absolute',
+  originalHeight: null,
+  maxHeight: null
+};
+
+var Layer = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(Layer, _Component);
+
+  var _super = _createSuper(Layer);
+
+  // working with extract-react-types
+  function Layer(props) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, Layer);
+    _this = _super.call(this, props);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "targetRef", /*#__PURE__*/_react.default.createRef());
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "contentRef", /*#__PURE__*/_react.default.createRef());
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "extractStyles", function (state) {
+      if (state) {
+        var popperHeight = state.offsets.popper.height;
+        var left = Math.round(state.offsets.popper.left);
+        var top = Math.round(state.offsets.popper.top);
+        var cssPosition = 'absolute';
+        var originalHeight = _this.state.originalHeight || popperHeight;
+
+        var maxHeight = _this.calculateMaxHeight(originalHeight, popperHeight, top, cssPosition);
+
+        _this.setState({
+          // position: fixed or absolute
+          cssPosition: cssPosition,
+          hasExtractedStyles: true,
+          transform: "translate3d(".concat(left, "px, ").concat(top, "px, 0px)"),
+          originalHeight: originalHeight,
+          maxHeight: maxHeight
+        });
+      }
+    });
+    _this.state = defaultState;
+    _this.extractStyles = (0, _rafSchd.default)(_this.extractStyles.bind((0, _assertThisInitialized2.default)(_this)));
+    return _this;
+  }
+
+  (0, _createClass2.default)(Layer, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.applyPopper(this.props);
+    }
+  }, {
+    key: "UNSAFE_componentWillReceiveProps",
+    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+      this.applyPopper(nextProps);
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps, prevState) {
+      var onPositioned = this.props.onPositioned;
+      var hasExtractedStyles = this.state.hasExtractedStyles; // This flag is set the first time the position is calculated from Popper and applied to the content
+
+      if (!prevState.hasExtractedStyles && hasExtractedStyles && onPositioned) {
+        onPositioned();
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      // this.extractStyles.cancel();
+      if (this.popper) {
+        this.popper.destroy();
+      }
+    }
+    /* Calculate the max height of the popper if it's height is greater than the viewport to prevent
+     * the bottom of the popper not being viewable.
+     * Only works if the popper uses viewport as the boundary and has a fixed position ancestor.
+     */
+
+  }, {
+    key: "calculateMaxHeight",
+    value: function calculateMaxHeight(originalHeight, currentHeight, positionTop, cssPosition) {
+      var DocumentElementClientHeight = 0;
+
+      if (document.documentElement) {
+        DocumentElementClientHeight = document.documentElement.clientHeight;
+      }
+
+      if (cssPosition !== 'fixed') {
+        return null;
+      }
+
+      var viewportHeight = Math.max(DocumentElementClientHeight, window.innerHeight || 0);
+      return viewportHeight < originalHeight && currentHeight + positionTop >= viewportHeight - 50 ? // allow some spacing either side of viewport height
+      viewportHeight - 12 : null;
+    }
+  }, {
+    key: "applyPopper",
+    value: function applyPopper(props) {
+      if (!this.targetRef.current || !this.contentRef.current) {
+        return;
+      }
+
+      if (this.popper) {
+        this.popper.destroy();
+      } // "new Popper(...)" operation is very expensive when called on virtual DOM.
+      // This condition reduces the number of calls so we can run our tests faster
+      // (time was reduced from 100s to 13s).
+
+
+      if (!props.content) {
+        return;
+      } // we wrap our target in a div so that we can safely get a reference to it, but we pass the
+      // actual target to popper
+
+
+      var isAlwaysFixed = false;
+      var actualTarget = this.targetRef.current.children[0];
+      var popperOpts = {
+        placement: (0, _helpers.positionPropToPopperPosition)(props.position),
+        onCreate: this.extractStyles,
+        onUpdate: this.extractStyles,
+        modifiers: {
+          applyStyle: {
+            enabled: false
+          },
+          hide: {
+            enabled: false
+          },
+          offset: {
+            enabled: true,
+            offset: this.props.offset
+          },
+          flip: {
+            enabled: false,
+            flipVariations: true,
+            boundariesElement: 'viewport',
+            padding: 0 // leave 0 pixels between popper and the boundariesElement
+
+          },
+          preventOverflow: {
+            enabled: false,
+            escapeWithReference: true
+          }
+        },
+        positionFixed: isAlwaysFixed
+      };
+
+      if (actualTarget) {
+        this.popper = new _popper.default(actualTarget, this.contentRef.current, popperOpts);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$state = this.state,
+          transform = _this$state.transform,
+          hasExtractedStyles = _this$state.hasExtractedStyles,
+          maxHeight = _this$state.maxHeight;
+      var opacity = hasExtractedStyles ? {} : {
+        opacity: 0
+      };
+      return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
+        ref: this.targetRef
+      }, this.props.children), /*#__PURE__*/_react.default.createElement("div", {
+        ref: this.contentRef,
+        style: _objectSpread({
+          top: 0,
+          left: 0,
+          position: 'absolute',
+          transform: transform,
+          maxHeight: maxHeight ? maxHeight : 'auto'
+        }, opacity)
+      }, this.props.content));
+    }
+  }]);
+  return Layer;
+}(_react.Component);
+
+exports.default = Layer;
+(0, _defineProperty2.default)(Layer, "defaultProps", {
+  boundariesElement: 'viewport',
+  children: null,
+  content: null,
+  offset: '0, 0',
+  position: 'right middle',
+  zIndex: 400,
+  lockScroll: false,
+  isAlwaysFixed: false,
+  onPositioned: function onPositioned() {}
+});

package/dist/cjs/ui/Layer/internal/helpers.js

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.POSITION_ATTRIBUTE_ENUM = void 0;
+exports.positionPropToPopperPosition = positionPropToPopperPosition;
+var positionMap = {
+  'top left': {
+    position: 'top-start',
+    animation: 'top'
+  },
+  'top center': {
+    position: 'top',
+    animation: 'top'
+  },
+  'top right': {
+    position: 'top-end',
+    animation: 'top'
+  },
+  'right top': {
+    position: 'right-start',
+    animation: 'right'
+  },
+  'right middle': {
+    position: 'right',
+    animation: 'right'
+  },
+  'right bottom': {
+    position: 'right-end',
+    animation: 'right'
+  },
+  'bottom left': {
+    position: 'bottom-start',
+    animation: 'bottom'
+  },
+  'bottom center': {
+    position: 'bottom',
+    animation: 'bottom'
+  },
+  'bottom right': {
+    position: 'bottom-end',
+    animation: 'bottom'
+  },
+  'left top': {
+    position: 'left-start',
+    animation: 'left'
+  },
+  'left middle': {
+    position: 'left',
+    animation: 'left'
+  },
+  'left bottom': {
+    position: 'left-end',
+    animation: 'left'
+  }
+};
+var POSITION_ATTRIBUTE_ENUM = {
+  values: ['top left', 'top center', 'top right', 'right top', 'right middle', 'right bottom', 'bottom left', 'bottom center', 'bottom right', 'left top', 'left middle', 'left bottom'],
+  default: 'right middle'
+};
+exports.POSITION_ATTRIBUTE_ENUM = POSITION_ATTRIBUTE_ENUM;
+
+function positionToPopper(position) {
+  return position && positionMap[position] ? positionMap[position].position : null;
+}
+
+function positionPropToPopperPosition(position) {
+  return positionToPopper(position) || positionMap[POSITION_ATTRIBUTE_ENUM.default].position;
+}

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

@@ -76,37 +76,18 @@ var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
       var hasAnalyticsContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var hasIntlContext = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
-      if (this.themeMode) {
-        var childrenWithThemeProviders = function childrenWithThemeProviders() {
-          return /*#__PURE__*/_react.default.createElement(_PortalProviderThemesProvider.PortalProviderThemeProviders, {
-            mode: _this2.themeMode
-          }, children());
-        };
-
-        this.portals.set(container, {
-          children: childrenWithThemeProviders,
-          hasAnalyticsContext: hasAnalyticsContext,
-          hasIntlContext: hasIntlContext
-        });
-
-        var _wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/_react.default.createElement(AnalyticsContextWrapper, null, childrenWithThemeProviders()) : childrenWithThemeProviders();
-
-        if (hasIntlContext) {
-          _wrappedChildren = /*#__PURE__*/_react.default.createElement(_reactIntlNext.RawIntlProvider, {
-            value: this.intl
-          }, _wrappedChildren);
-        }
-
-        (0, _reactDom.unstable_renderSubtreeIntoContainer)(this.context, _wrappedChildren, container);
-        return;
-      }
+      var childrenWithThemeProviders = function childrenWithThemeProviders() {
+        return /*#__PURE__*/_react.default.createElement(_PortalProviderThemesProvider.PortalProviderThemeProviders, {
+          mode: _this2.themeMode
+        }, children());
+      };
 
       this.portals.set(container, {
-        children: children,
+        children: childrenWithThemeProviders,
         hasAnalyticsContext: hasAnalyticsContext,
         hasIntlContext: hasIntlContext
       });
-      var wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/_react.default.createElement(AnalyticsContextWrapper, null, children()) : children();
+      var wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/_react.default.createElement(AnalyticsContextWrapper, null, childrenWithThemeProviders()) : childrenWithThemeProviders();
 
       if (hasIntlContext) {
         wrappedChildren = /*#__PURE__*/_react.default.createElement(_reactIntlNext.RawIntlProvider, {

package/dist/cjs/version-wrapper.js

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

package/dist/cjs/version.json

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

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

@@ -440,7 +440,11 @@ export class ReactEditorView extends React.Component {
     });
 
     _defineProperty(this, "createEditorView", node => {
-      measureRender(measurements.PROSEMIRROR_RENDERED, (duration, startTime) => {
+      measureRender(measurements.PROSEMIRROR_RENDERED, ({
+        duration,
+        startTime,
+        distortedDuration
+      }) => {
         var _this$props$editorPro7, _this$props$editorPro8, _proseMirrorRenderedT, _proseMirrorRenderedT2;
 
         const proseMirrorRenderedTracking = (_this$props$editorPro7 = this.props.editorProps) === null || _this$props$editorPro7 === void 0 ? void 0 : (_this$props$editorPro8 = _this$props$editorPro7.performanceTracking) === null || _this$props$editorPro8 === void 0 ? void 0 : _this$props$editorPro8.proseMirrorRenderedTracking;
@@ -448,7 +452,7 @@ export class ReactEditorView extends React.Component {
         this.proseMirrorRenderedSeverity = !!forceSeverityTracking || proseMirrorRenderedTracking !== null && proseMirrorRenderedTracking !== void 0 && proseMirrorRenderedTracking.trackSeverity ? getAnalyticsEventSeverity(duration, (_proseMirrorRenderedT = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityNormalThreshold) !== null && _proseMirrorRenderedT !== void 0 ? _proseMirrorRenderedT : PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, (_proseMirrorRenderedT2 = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityDegradedThreshold) !== null && _proseMirrorRenderedT2 !== void 0 ? _proseMirrorRenderedT2 : PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD) : undefined;
 
         if (this.view) {
-          var _getContextIdentifier, _this$experienceStore9, _this$experienceStore10;
+          var _getContextIdentifier, _this$experienceStore10;
 
           const nodes = getNodesCount(this.view.state.doc);
           const ttfb = getResponseEndTime();
@@ -461,11 +465,18 @@ export class ReactEditorView extends React.Component {
               nodes,
               ttfb,
               severity: this.proseMirrorRenderedSeverity,
-              objectId: (_getContextIdentifier = getContextIdentifier(this.editorState)) === null || _getContextIdentifier === void 0 ? void 0 : _getContextIdentifier.objectId
+              objectId: (_getContextIdentifier = getContextIdentifier(this.editorState)) === null || _getContextIdentifier === void 0 ? void 0 : _getContextIdentifier.objectId,
+              distortedDuration
             },
             eventType: EVENT_TYPE.OPERATIONAL
           });
-          (_this$experienceStore9 = this.experienceStore) === null || _this$experienceStore9 === void 0 ? void 0 : _this$experienceStore9.mark(EditorExperience.loadEditor, ACTION.PROSEMIRROR_RENDERED, startTime + duration);
+
+          if (!distortedDuration) {
+            var _this$experienceStore9;
+
+            (_this$experienceStore9 = this.experienceStore) === null || _this$experienceStore9 === void 0 ? void 0 : _this$experienceStore9.mark(EditorExperience.loadEditor, ACTION.PROSEMIRROR_RENDERED, startTime + duration);
+          }
+
           (_this$experienceStore10 = this.experienceStore) === null || _this$experienceStore10 === void 0 ? void 0 : _this$experienceStore10.addMetadata(EditorExperience.loadEditor, {
             nodes,
             ttfb

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

@@ -37,11 +37,12 @@ export function getScrollGutterOptions(props) {
   return undefined;
 }
 export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent) {
-  var _props$performanceTra, _props$featureFlags, _props$performanceTra2, _props$textFormatting;
+  var _props$performanceTra, _props$linking, _props$featureFlags, _props$performanceTra2, _props$textFormatting, _props$linking2;
 
   const appearance = props.appearance;
   const isMobile = appearance === 'mobile';
   const inputTracking = (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : _props$performanceTra.inputTracking;
+  const cardOptions = ((_props$linking = props.linking) === null || _props$linking === void 0 ? void 0 : _props$linking.smartLinks) || props.smartLinks || props.UNSAFE_cards;
   return {
     createAnalyticsEvent,
     typeAhead: {
@@ -50,7 +51,7 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     },
     featureFlags: createFeatureFlagsFromProps(props),
     paste: {
-      cardOptions: props.smartLinks || props.UNSAFE_cards,
+      cardOptions,
       sanitizePrivateContent: props.sanitizePrivateContent,
       plainTextPasteLinkification: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.plainTextPasteLinkification) === true
     },
@@ -86,7 +87,11 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     selection: {
       useLongPressSelection: false
     },
-    cardOptions: props.smartLinks || props.UNSAFE_cards,
+    cardOptions,
+    hyperlinkOptions: {
+      linkPicker: (_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.linkPicker,
+      cardOptions
+    },
     codeBlock: { ...props.codeBlock,
       useLongPressSelection: false,
       appearance: props.appearance,
@@ -102,6 +107,8 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
  */
 
 export default function createPluginsList(props, prevProps, createAnalyticsEvent) {
+  var _props$linking3;
+
   const appearance = props.appearance;
   const isMobile = appearance === 'mobile';
   const isComment = appearance === 'comment';
@@ -313,13 +320,17 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     }]);
   }
 
-  if (props.smartLinks || props.UNSAFE_cards) {
+  if ((_props$linking3 = props.linking) !== null && _props$linking3 !== void 0 && _props$linking3.smartLinks || props.smartLinks || props.UNSAFE_cards) {
+    var _props$linking4, _props$linking5;
+
     const fullWidthMode = props.appearance === 'full-width';
     preset.add([cardPlugin, { ...props.UNSAFE_cards,
       ...props.smartLinks,
+      ...((_props$linking4 = props.linking) === null || _props$linking4 === void 0 ? void 0 : _props$linking4.smartLinks),
       platform: isMobile ? 'mobile' : 'web',
       fullWidthMode,
-      createAnalyticsEvent
+      createAnalyticsEvent,
+      linkPicker: (_props$linking5 = props.linking) === null || _props$linking5 === void 0 ? void 0 : _props$linking5.linkPicker
     }]);
   }
 
@@ -360,7 +371,8 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
 
 
   preset.add([toolbarListsIndentationPlugin, {
-    showIndentationButtons: !!featureFlags.indentationButtonsInTheToolbar
+    showIndentationButtons: !!featureFlags.indentationButtonsInTheToolbar,
+    allowHeadingAndParagraphIndentation: !!props.allowIndentation
   }]);
   preset.add([insertBlockPlugin, {
     allowTables: !!props.allowTables,
@@ -408,11 +420,9 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     preset.add([viewUpdateSubscriptionPlugin]);
   }
 
-  if (featureFlags.codeBidiWarnings) {
-    preset.add([codeBidiWarningPlugin, {
-      appearance: props.appearance
-    }]);
-  }
+  preset.add([codeBidiWarningPlugin, {
+    appearance: props.appearance
+  }]);
 
   if (featureFlags.floatingToolbarCopyButton) {
     preset.add(copyButtonPlugin);

package/dist/es2019/editor.js

@@ -18,7 +18,7 @@ import { getUiComponent } from './create-editor';
 import EditorActions from './actions';
 import { ReactEditorView } from './create-editor';
 import EditorContext from './ui/EditorContext';
-import { PortalProvider, PortalProviderWithThemeProviders, PortalRenderer } from './ui/PortalProvider';
+import { PortalProviderWithThemeProviders, PortalRenderer } from './ui/PortalProvider';
 import { nextMajorVersion } from './version-wrapper';
 import { ContextAdapter } from './nodeviews/context-adapter';
 import measurements from './utils/performance/measure-enum';
@@ -27,7 +27,6 @@ import { fireAnalyticsEvent, EVENT_TYPE, ACTION_SUBJECT, ACTION } from './plugin
 import ErrorBoundary from './create-editor/ErrorBoundary';
 import { createFeatureFlagsFromProps } from './plugins/feature-flags-context/feature-flags-from-props';
 import { RenderTracking } from './utils/performance/components/RenderTracking';
-import { checkIfMobileBridge } from './utils/check-if-mobile-bridge';
 const fullHeight = css`
   height: 100%;
 `;
@@ -323,8 +322,8 @@ export default class Editor extends React.Component {
         message: 'To integrate inline comments use experimental annotationProvider – <Editor annotationProviders={{ provider }} />',
         type: 'removed'
       },
-      allowDynamicTextSizing: {
-        message: 'Dynamic text sizing has been unshipped since 2020. The prop is no longer needed.',
+      smartLinks: {
+        message: 'To use smartLinks, pass the same object into the smartlinks key of linking - <Editor linking={{ smartLinks: {existing object} }}.',
         type: 'removed'
       }
     };
@@ -362,6 +361,8 @@ export default class Editor extends React.Component {
   }
 
   handleProviders(props) {
+    var _linking$smartLinks;
+
     const {
       emojiProvider,
       mentionProvider,
@@ -377,7 +378,8 @@ export default class Editor extends React.Component {
       autoformattingProvider,
       searchProvider,
       UNSAFE_cards,
-      smartLinks
+      smartLinks,
+      linking
     } = props;
     const {
       extensionProvider,
@@ -394,7 +396,7 @@ export default class Editor extends React.Component {
     this.providerFactory.setProvider('searchProvider', searchProvider);
     this.providerFactory.setProvider('presenceProvider', presenceProvider);
     this.providerFactory.setProvider('macroProvider', macroProvider);
-    const cardProvider = smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider;
+    const cardProvider = (linking === null || linking === void 0 ? void 0 : (_linking$smartLinks = linking.smartLinks) === null || _linking$smartLinks === void 0 ? void 0 : _linking$smartLinks.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider;
 
     if (cardProvider) {
       this.providerFactory.setProvider('cardProvider', cardProvider);
@@ -428,22 +430,6 @@ export default class Editor extends React.Component {
     const renderTracking = (_this$props$performan3 = this.props.performanceTracking) === null || _this$props$performan3 === void 0 ? void 0 : (_this$props$performan4 = _this$props$performan3.renderTracking) === null || _this$props$performan4 === void 0 ? void 0 : _this$props$performan4.editor;
     const renderTrackingEnabled = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.enabled;
     const useShallow = renderTracking === null || renderTracking === void 0 ? void 0 : renderTracking.useShallow;
-    /**
-     * The PortalProviderWithThemeProviders renders portals with atlaskit
-     * and the deprecated styled components theme providers.
-     *
-     * Without this the node views react trees;
-     * - do not have access to the atlaskit theme via the `useGlobalTheme` hook
-     * - do not have access to the theme when using the `styled`${({theme}) => theme.}` api.
-     *
-     * Added for a mobile regression, which needed to be fixed on master.
-     * Once this makes it's way to develop, we should consider making it the default
-     * behaviour.
-     *
-     * https://product-fabric.atlassian.net/browse/ED-14204
-     */
-
-    const EnvironmentDrivenPortalProvider = checkIfMobileBridge() ? PortalProviderWithThemeProviders : PortalProvider;
     return jsx(FabricEditorAnalyticsContext, {
       data: {
         packageName: name,
@@ -467,7 +453,7 @@ export default class Editor extends React.Component {
         css: fullHeight
       }, jsx(EditorContext, {
         editorActions: this.editorActions
-      }, jsx(ContextAdapter, null, jsx(EnvironmentDrivenPortalProvider, {
+      }, jsx(ContextAdapter, null, jsx(PortalProviderWithThemeProviders, {
         onAnalyticsEvent: this.handleAnalyticsEvent,
         useAnalyticsContext: this.props.UNSAFE_useAnalyticsContext,
         render: portalProviderAPI => jsx(Fragment, null, jsx(ReactEditorView, {

package/dist/es2019/labs/next/internal/hooks/use-editor/index.js

@@ -40,7 +40,11 @@ function useCreateEditor(config) {
 
     setEditorSharedConfig(editorSharedConfig => {
       if (!editorSharedConfig) {
-        measureRender(measurements.PROSEMIRROR_RENDERED, (duration, startTime) => {
+        measureRender(measurements.PROSEMIRROR_RENDERED, ({
+          duration,
+          startTime,
+          distortedDuration
+        }) => {
           if (sharedConfig && sharedConfig.dispatch) {
             sharedConfig.dispatch(analyticsEventKey, {
               payload: {
@@ -48,6 +52,7 @@ function useCreateEditor(config) {
                 actionSubject: ACTION_SUBJECT.EDITOR,
                 attributes: {
                   duration,
+                  distortedDuration,
                   startTime,
                   nodes: getNodesCount(sharedConfig.editorView.state.doc),
                   ttfb: getResponseEndTime()

package/dist/es2019/labs/next/presets/default.js

@@ -48,7 +48,7 @@ export function createDefaultPreset(options) {
     preset.add([annotationPlugin, options.annotationProviders]);
   }
 
-  preset.add([hyperlinkPlugin, options.cardOptions]);
+  preset.add([hyperlinkPlugin, options.hyperlinkOptions]);
   preset.add([textFormattingPlugin, options.textFormatting]);
   preset.add(widthPlugin);
   preset.add([quickInsertPlugin, options.quickInsert]);

package/dist/es2019/nodeviews/context-adapter.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Context as CardContext } from '@atlaskit/smart-card';
+import { SmartCardContext } from '@atlaskit/link-provider';
 import { default as AnalyticsReactContext } from '@atlaskit/analytics-next-stable-react-context';
 
 function useContextMemoized(reactContext) {
@@ -20,7 +20,7 @@ function useContextMemoized(reactContext) {
 export const ContextAdapter = ({
   children
 }) => {
-  const card = useContextMemoized(CardContext);
+  const card = useContextMemoized(SmartCardContext);
   const analytics = useContextMemoized(AnalyticsReactContext);
   return /*#__PURE__*/React.createElement(LegacyContextAdapter, {
     card: card,