@atlaskit/editor-core 150.0.0 → 151.0.0

package/dist/esm/editor.js

@@ -27,6 +27,7 @@ import memoizeOne from 'memoize-one';
 import uuid from 'uuid/v4';
 import { name, version } from './version-wrapper';
 import { ProviderFactory, BaseTheme, getAnalyticsAppearance, WithCreateAnalyticsEvent, startMeasure, stopMeasure, clearMeasure, measureTTI, getTTISeverity, combineExtensionProviders, WidthProvider } from '@atlaskit/editor-common';
+import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { akEditorFullPageDefaultFontSize } from '@atlaskit/editor-shared-styles';
 import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
 import { getUiComponent } from './create-editor';
@@ -50,6 +51,8 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   var _super = _createSuper(Editor);
 
   function Editor(props, context) {
+    var _props$performanceTra, _props$performanceTra2, _props$featureFlags;
+
     var _this;
 
     _classCallCheck(this, Editor);
@@ -97,11 +100,16 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     _this.trackEditorActions(_this.editorActions, props);
 
     _this.editorSessionId = uuid();
+    _this.startTime = performance.now();
     startMeasure(measurements.EDITOR_MOUNTED);
 
-    if (props.performanceTracking && props.performanceTracking.ttiTracking && props.performanceTracking.ttiTracking.enabled) {
+    if ((_props$performanceTra = props.performanceTracking) !== null && _props$performanceTra !== void 0 && (_props$performanceTra2 = _props$performanceTra.ttiTracking) !== null && _props$performanceTra2 !== void 0 && _props$performanceTra2.enabled || (_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.ufo) {
+      var _props$performanceTra5, _props$performanceTra6, _props$performanceTra7, _props$performanceTra8;
+
       measureTTI(function (tti, ttiFromInvocation, canceled) {
-        if (_this.createAnalyticsEvent) {
+        var _props$performanceTra3, _props$performanceTra4, _props$featureFlags2;
+
+        if ((_props$performanceTra3 = props.performanceTracking) !== null && _props$performanceTra3 !== void 0 && (_props$performanceTra4 = _props$performanceTra3.ttiTracking) !== null && _props$performanceTra4 !== void 0 && _props$performanceTra4.enabled && _this.createAnalyticsEvent) {
           var _ttiTracking;
 
           var ttiEvent = {
@@ -134,7 +142,14 @@ var Editor = /*#__PURE__*/function (_React$Component) {
 
           fireAnalyticsEvent(_this.createAnalyticsEvent)(ttiEvent);
         }
-      }, props.performanceTracking.ttiTracking.ttiIdleThreshold, props.performanceTracking.ttiTracking.ttiCancelTimeout);
+
+        if ((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.ufo) {
+          var _this$experienceStore, _this$experienceStore2;
+
+          (_this$experienceStore = _this.experienceStore) === null || _this$experienceStore === void 0 ? void 0 : _this$experienceStore.mark(EditorExperience.loadEditor, ACTION.EDITOR_TTI, tti);
+          (_this$experienceStore2 = _this.experienceStore) === null || _this$experienceStore2 === void 0 ? void 0 : _this$experienceStore2.success(EditorExperience.loadEditor);
+        }
+      }, (_props$performanceTra5 = props.performanceTracking) === null || _props$performanceTra5 === void 0 ? void 0 : (_props$performanceTra6 = _props$performanceTra5.ttiTracking) === null || _props$performanceTra6 === void 0 ? void 0 : _props$performanceTra6.ttiIdleThreshold, (_props$performanceTra7 = props.performanceTracking) === null || _props$performanceTra7 === void 0 ? void 0 : (_props$performanceTra8 = _props$performanceTra7.ttiTracking) === null || _props$performanceTra8 === void 0 ? void 0 : _props$performanceTra8.ttiCancelTimeout);
     }
 
     var _extensionProvider = _this.prepareExtensionProvider(props.extensionProviders);
@@ -180,21 +195,29 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      var _this$props2, _this$props2$performa, _this$props2$performa2;
+      var _this$props2, _this$props2$performa, _this$props2$performa2, _this$props$featureFl;
 
       this.unregisterEditorFromActions();
       this.providerFactory.destroy();
       clearMeasure(measurements.EDITOR_MOUNTED);
       ((_this$props2 = this.props) === null || _this$props2 === void 0 ? void 0 : (_this$props2$performa = _this$props2.performanceTracking) === null || _this$props2$performa === void 0 ? void 0 : (_this$props2$performa2 = _this$props2$performa.onEditorReadyCallbackTracking) === null || _this$props2$performa2 === void 0 ? void 0 : _this$props2$performa2.enabled) && clearMeasure(measurements.ON_EDITOR_READY_CALLBACK);
+
+      if ((_this$props$featureFl = this.props.featureFlags) !== null && _this$props$featureFl !== void 0 && _this$props$featureFl.ufo) {
+        var _this$experienceStore3;
+
+        (_this$experienceStore3 = this.experienceStore) === null || _this$experienceStore3 === void 0 ? void 0 : _this$experienceStore3.abortAll({
+          reason: 'editor component unmounted'
+        });
+      }
     }
   }, {
     key: "trackEditorActions",
     value: function trackEditorActions(editorActions, props) {
-      var _props$performanceTra,
-          _props$performanceTra2,
+      var _props$performanceTra9,
+          _props$performanceTra10,
           _this3 = this;
 
-      if (props !== null && props !== void 0 && (_props$performanceTra = props.performanceTracking) !== null && _props$performanceTra !== void 0 && (_props$performanceTra2 = _props$performanceTra.contentRetrievalTracking) !== null && _props$performanceTra2 !== void 0 && _props$performanceTra2.enabled) {
+      if (props !== null && props !== void 0 && (_props$performanceTra9 = props.performanceTracking) !== null && _props$performanceTra9 !== void 0 && (_props$performanceTra10 = _props$performanceTra9.contentRetrievalTracking) !== null && _props$performanceTra10 !== void 0 && _props$performanceTra10.enabled) {
         var DEFAULT_SAMPLING_RATE = 100;
         var getValue = editorActions.getValue.bind(editorActions);
 
@@ -215,7 +238,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
         if (!getValueTracked) {
           var getValueWithTracking = /*#__PURE__*/function () {
             var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-              var _props$performanceTra3, _props$performanceTra4, _props$performanceTra5, value, _props$performanceTra6, _props$performanceTra7, _props$performanceTra8, _props$performanceTra9, _props$performanceTra10;
+              var _props$performanceTra11, _props$performanceTra12, _props$performanceTra13, value, _props$performanceTra14, _props$performanceTra15, _props$performanceTra16, _props$performanceTra17, _props$performanceTra18;
 
               return _regeneratorRuntime.wrap(function _callee$(_context) {
                 while (1) {
@@ -228,7 +251,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
                     case 3:
                       value = _context.sent;
 
-                      if (samplingCounters.success === ((_props$performanceTra3 = props === null || props === void 0 ? void 0 : (_props$performanceTra4 = props.performanceTracking) === null || _props$performanceTra4 === void 0 ? void 0 : (_props$performanceTra5 = _props$performanceTra4.contentRetrievalTracking) === null || _props$performanceTra5 === void 0 ? void 0 : _props$performanceTra5.successSamplingRate) !== null && _props$performanceTra3 !== void 0 ? _props$performanceTra3 : DEFAULT_SAMPLING_RATE)) {
+                      if (samplingCounters.success === ((_props$performanceTra11 = props === null || props === void 0 ? void 0 : (_props$performanceTra12 = props.performanceTracking) === null || _props$performanceTra12 === void 0 ? void 0 : (_props$performanceTra13 = _props$performanceTra12.contentRetrievalTracking) === null || _props$performanceTra13 === void 0 ? void 0 : _props$performanceTra13.successSamplingRate) !== null && _props$performanceTra11 !== void 0 ? _props$performanceTra11 : DEFAULT_SAMPLING_RATE)) {
                         _this3.handleAnalyticsEvent({
                           payload: {
                             action: ACTION.EDITOR_CONTENT_RETRIEVAL_PERFORMED,
@@ -250,7 +273,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
                       _context.prev = 9;
                       _context.t0 = _context["catch"](0);
 
-                      if (samplingCounters.failure === ((_props$performanceTra6 = props === null || props === void 0 ? void 0 : (_props$performanceTra7 = props.performanceTracking) === null || _props$performanceTra7 === void 0 ? void 0 : (_props$performanceTra8 = _props$performanceTra7.contentRetrievalTracking) === null || _props$performanceTra8 === void 0 ? void 0 : _props$performanceTra8.failureSamplingRate) !== null && _props$performanceTra6 !== void 0 ? _props$performanceTra6 : DEFAULT_SAMPLING_RATE)) {
+                      if (samplingCounters.failure === ((_props$performanceTra14 = props === null || props === void 0 ? void 0 : (_props$performanceTra15 = props.performanceTracking) === null || _props$performanceTra15 === void 0 ? void 0 : (_props$performanceTra16 = _props$performanceTra15.contentRetrievalTracking) === null || _props$performanceTra16 === void 0 ? void 0 : _props$performanceTra16.failureSamplingRate) !== null && _props$performanceTra14 !== void 0 ? _props$performanceTra14 : DEFAULT_SAMPLING_RATE)) {
                         _this3.handleAnalyticsEvent({
                           payload: {
                             action: ACTION.EDITOR_CONTENT_RETRIEVAL_PERFORMED,
@@ -258,7 +281,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
                             attributes: {
                               success: false,
                               errorInfo: _context.t0.toString(),
-                              errorStack: props !== null && props !== void 0 && (_props$performanceTra9 = props.performanceTracking) !== null && _props$performanceTra9 !== void 0 && (_props$performanceTra10 = _props$performanceTra9.contentRetrievalTracking) !== null && _props$performanceTra10 !== void 0 && _props$performanceTra10.reportErrorStack ? _context.t0.stack : undefined
+                              errorStack: props !== null && props !== void 0 && (_props$performanceTra17 = props.performanceTracking) !== null && _props$performanceTra17 !== void 0 && (_props$performanceTra18 = _props$performanceTra17.contentRetrievalTracking) !== null && _props$performanceTra18 !== void 0 && _props$performanceTra18.reportErrorStack ? _context.t0.stack : undefined
                             },
                             eventType: EVENT_TYPE.OPERATIONAL
                           }
@@ -293,14 +316,22 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "onEditorCreated",
     value: function onEditorCreated(instance) {
+      var _this$props$featureFl2;
+
       this.registerEditorForActions(instance.view, instance.eventDispatcher, instance.transformer);
 
+      if ((_this$props$featureFl2 = this.props.featureFlags) !== null && _this$props$featureFl2 !== void 0 && _this$props$featureFl2.ufo) {
+        this.experienceStore = ExperienceStore.getInstance(instance.view);
+        this.experienceStore.start(EditorExperience.loadEditor, this.startTime);
+      }
+
       if (this.props.onEditorReady) {
-        var _this$props3, _this$props3$performa, _this$props3$performa2, _this$props4, _this$props4$performa, _this$props4$performa2;
+        var _this$props3, _this$props3$performa, _this$props3$performa2, _this$props$featureFl3;
 
-        ((_this$props3 = this.props) === null || _this$props3 === void 0 ? void 0 : (_this$props3$performa = _this$props3.performanceTracking) === null || _this$props3$performa === void 0 ? void 0 : (_this$props3$performa2 = _this$props3$performa.onEditorReadyCallbackTracking) === null || _this$props3$performa2 === void 0 ? void 0 : _this$props3$performa2.enabled) && startMeasure(measurements.ON_EDITOR_READY_CALLBACK);
+        var measureEditorReady = ((_this$props3 = this.props) === null || _this$props3 === void 0 ? void 0 : (_this$props3$performa = _this$props3.performanceTracking) === null || _this$props3$performa === void 0 ? void 0 : (_this$props3$performa2 = _this$props3$performa.onEditorReadyCallbackTracking) === null || _this$props3$performa2 === void 0 ? void 0 : _this$props3$performa2.enabled) || ((_this$props$featureFl3 = this.props.featureFlags) === null || _this$props$featureFl3 === void 0 ? void 0 : _this$props$featureFl3.ufo);
+        measureEditorReady && startMeasure(measurements.ON_EDITOR_READY_CALLBACK);
         this.props.onEditorReady(this.editorActions);
-        ((_this$props4 = this.props) === null || _this$props4 === void 0 ? void 0 : (_this$props4$performa = _this$props4.performanceTracking) === null || _this$props4$performa === void 0 ? void 0 : (_this$props4$performa2 = _this$props4$performa.onEditorReadyCallbackTracking) === null || _this$props4$performa2 === void 0 ? void 0 : _this$props4$performa2.enabled) && stopMeasure(measurements.ON_EDITOR_READY_CALLBACK, this.sendDurationAnalytics(ACTION.ON_EDITOR_READY_CALLBACK));
+        measureEditorReady && stopMeasure(measurements.ON_EDITOR_READY_CALLBACK, this.sendDurationAnalytics(ACTION.ON_EDITOR_READY_CALLBACK));
       }
     }
   }, {
@@ -308,28 +339,57 @@ var Editor = /*#__PURE__*/function (_React$Component) {
     value: function sendDurationAnalytics(action) {
       var _this4 = this;
 
-      return function (duration, startTime) {
-        if (_this4.createAnalyticsEvent) {
-          var fireMounted = function fireMounted(objectId) {
-            fireAnalyticsEvent(_this4.createAnalyticsEvent)({
-              payload: {
-                action: action,
-                actionSubject: ACTION_SUBJECT.EDITOR,
-                attributes: {
-                  duration: duration,
-                  startTime: startTime,
-                  objectId: objectId
-                },
-                eventType: EVENT_TYPE.OPERATIONAL
+      return /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(duration, startTime) {
+          var _this4$props$featureF;
+
+          var contextIdentifier, objectId, _this4$experienceStor, _this4$experienceStor2;
+
+          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return _this4.props.contextIdentifierProvider;
+
+                case 2:
+                  contextIdentifier = _context2.sent;
+                  objectId = contextIdentifier === null || contextIdentifier === void 0 ? void 0 : contextIdentifier.objectId;
+
+                  if (_this4.createAnalyticsEvent) {
+                    fireAnalyticsEvent(_this4.createAnalyticsEvent)({
+                      payload: {
+                        action: action,
+                        actionSubject: ACTION_SUBJECT.EDITOR,
+                        attributes: {
+                          duration: duration,
+                          startTime: startTime,
+                          objectId: objectId
+                        },
+                        eventType: EVENT_TYPE.OPERATIONAL
+                      }
+                    });
+                  }
+
+                  if ((_this4$props$featureF = _this4.props.featureFlags) !== null && _this4$props$featureF !== void 0 && _this4$props$featureF.ufo) {
+                    (_this4$experienceStor = _this4.experienceStore) === null || _this4$experienceStor === void 0 ? void 0 : _this4$experienceStor.mark(EditorExperience.loadEditor, action, startTime + duration);
+                    (_this4$experienceStor2 = _this4.experienceStore) === null || _this4$experienceStor2 === void 0 ? void 0 : _this4$experienceStor2.addMetadata(EditorExperience.loadEditor, {
+                      objectId: objectId
+                    });
+                  }
+
+                case 6:
+                case "end":
+                  return _context2.stop();
               }
-            });
-          };
+            }
+          }, _callee2);
+        }));
 
-          Promise.resolve(_this4.props.contextIdentifierProvider).then(function (p) {
-            fireMounted(p === null || p === void 0 ? void 0 : p.objectId);
-          }, fireMounted);
-        }
-      };
+        return function (_x, _x2) {
+          return _ref2.apply(this, arguments);
+        };
+      }();
     }
   }, {
     key: "deprecationWarnings",
@@ -487,14 +547,14 @@ var Editor = /*#__PURE__*/function (_React$Component) {
                 onEditorDestroyed: _this5.onEditorDestroyed,
                 allowAnalyticsGASV3: _this5.props.allowAnalyticsGASV3,
                 disabled: _this5.props.disabled,
-                render: function render(_ref2) {
+                render: function render(_ref3) {
                   var _this5$props$featureF, _this5$props$featureF2;
 
-                  var editor = _ref2.editor,
-                      view = _ref2.view,
-                      eventDispatcher = _ref2.eventDispatcher,
-                      config = _ref2.config,
-                      dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
+                  var editor = _ref3.editor,
+                      view = _ref3.view,
+                      eventDispatcher = _ref3.eventDispatcher,
+                      config = _ref3.config,
+                      dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
                   return /*#__PURE__*/React.createElement(BaseTheme, {
                     dynamicTextSizing: _this5.props.allowDynamicTextSizing && _this5.props.appearance !== 'full-width',
                     baseFontSize: _this5.getBaseFontSize()

package/dist/esm/labs/next/presets/cxhtml.js

@@ -32,7 +32,8 @@ export function useCXHTMLPreset(_ref) {
     }
   }]);
   preset.add([panelPlugin, {
-    UNSAFE_allowCustomPanel: true
+    UNSAFE_allowCustomPanel: true,
+    UNSAFE_allowCustomPanelEdit: true
   }]);
   preset.add(listPlugin);
   preset.add(textColorPlugin);

package/dist/esm/plugins/analytics/types/enums.js

@@ -94,6 +94,7 @@ export var ACTION;
   ACTION["ON_EDITOR_READY_CALLBACK"] = "onEditorReadyCallback";
   ACTION["ON_CHANGE_CALLBACK"] = "onChangeCalled";
   ACTION["REMOVE_ICON"] = "removedIcon";
+  ACTION["UFO_SESSION_COMPLETE"] = "ufoSessionComplete";
 })(ACTION || (ACTION = {}));
 
 export var INPUT_METHOD;
@@ -234,8 +235,9 @@ export var ACTION_SUBJECT_ID;
   ACTION_SUBJECT_ID["LINK"] = "link";
   ACTION_SUBJECT_ID["LINK_PREVIEW"] = "linkPreview";
   ACTION_SUBJECT_ID["MEDIA"] = "media";
-  ACTION_SUBJECT_ID["MEDIA_SINGLE"] = "mediaSingle";
   ACTION_SUBJECT_ID["MEDIA_GROUP"] = "mediaGroup";
+  ACTION_SUBJECT_ID["MEDIA_INLINE"] = "mediaInline";
+  ACTION_SUBJECT_ID["MEDIA_SINGLE"] = "mediaSingle";
   ACTION_SUBJECT_ID["MEDIA_LINK"] = "mediaLink";
   ACTION_SUBJECT_ID["MENTION"] = "mention";
   ACTION_SUBJECT_ID["NESTED_EXPAND"] = "nestedExpand";

package/dist/esm/plugins/base/index.js

@@ -55,9 +55,10 @@ var basePlugin = function basePlugin(options) {
       }, {
         name: 'frozenEditor',
         plugin: function plugin(_ref3) {
-          var dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
-              providerFactory = _ref3.providerFactory;
-          return options && options.inputTracking && options.inputTracking.enabled ? frozenEditor(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking) : undefined;
+          var _options$inputTrackin;
+
+          var dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
+          return options !== null && options !== void 0 && (_options$inputTrackin = options.inputTracking) !== null && _options$inputTrackin !== void 0 && _options$inputTrackin.enabled || options !== null && options !== void 0 && options.ufo ? frozenEditor(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking, options.ufo) : undefined;
         }
       }, {
         name: 'decorationPlugin',

package/dist/esm/plugins/base/pm-plugins/frozen-editor.js

@@ -4,14 +4,16 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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) { _defineProperty(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; }
 
-import { Plugin } from 'prosemirror-state';
+import { Plugin, PluginKey } from 'prosemirror-state';
 import { isPerformanceObserverAvailable, isPerformanceAPIAvailable, getAnalyticsEventSeverity } from '@atlaskit/editor-common';
+import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { ACTION, ACTION_SUBJECT, BROWSER_FREEZE_INTERACTION_TYPE, EVENT_TYPE } from '../../analytics';
 import { getParticipantsCount } from '../../collab-edit/get-participants-count';
 import { countNodes } from '../../../utils/count-nodes';
 import { getContextIdentifier } from './context-identifier';
 import { setInteractionType } from '../utils/frozen-editor';
 import { getTimeSince } from '../../../utils/performance/get-performance-timing';
+export var frozenEditorPluginKey = new PluginKey('frozenEditor');
 var DEFAULT_KEYSTROKE_SAMPLING_LIMIT = 100;
 var DEFAULT_SLOW_THRESHOLD = 300;
 export var DEFAULT_FREEZE_THRESHOLD = 600;
@@ -42,7 +44,7 @@ var dispatchLongTaskEvent = function dispatchLongTaskEvent(dispatchAnalyticsEven
   });
 };
 
-export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTracking) {
+export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTracking, ufo) {
   var keystrokeCount = 0;
   var interactionType;
 
@@ -58,6 +60,7 @@ export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTr
   var severityThresholdNormal = (inputTracking === null || inputTracking === void 0 ? void 0 : inputTracking.severityNormalThreshold) || DEFAULT_TRACK_SEVERITY_THRESHOLD_NORMAL;
   var severityThresholdDegraded = (inputTracking === null || inputTracking === void 0 ? void 0 : inputTracking.severityDegradedThreshold) || DEFAULT_TRACK_SEVERITY_THRESHOLD_DEGRADED;
   return new Plugin({
+    key: frozenEditorPluginKey,
     props: isPerformanceAPIAvailable() ? {
       handleTextInput: function handleTextInput(view) {
         var state = view.state;
@@ -67,51 +70,76 @@ export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTr
           interactionType = BROWSER_FREEZE_INTERACTION_TYPE.TYPING;
         }
 
+        var experienceStore = ufo ? ExperienceStore.getInstance(view) : undefined;
+        var trackTyping = samplingRate && ++keystrokeCount === samplingRate;
+
+        if (trackTyping) {
+          experienceStore === null || experienceStore === void 0 ? void 0 : experienceStore.start(EditorExperience.typing);
+        }
+
         requestAnimationFrame(function () {
           var diff = getTimeSince(now);
 
-          if (samplingRate && ++keystrokeCount === samplingRate) {
-            var _getContextIdentifier2;
-
+          if (diff > slowThreshold) {
             var nodesCount = allowCountNodes ? countNodes(view.state) : {};
-            keystrokeCount = 0;
-            var payload = {
-              action: ACTION.INPUT_PERF_SAMPLING,
-              actionSubject: ACTION_SUBJECT.EDITOR,
-              attributes: _objectSpread(_objectSpread({
-                time: diff,
-                nodeSize: state.doc.nodeSize
-              }, nodesCount), {}, {
-                participants: getParticipantsCount(state),
-                objectId: (_getContextIdentifier2 = getContextIdentifier(state)) === null || _getContextIdentifier2 === void 0 ? void 0 : _getContextIdentifier2.objectId
-              }),
-              eventType: EVENT_TYPE.OPERATIONAL
-            };
-
-            if (shouldTrackSeverity) {
-              payload.attributes.severity = getAnalyticsEventSeverity(diff, severityThresholdNormal, severityThresholdDegraded);
+
+            if (inputTracking !== null && inputTracking !== void 0 && inputTracking.enabled) {
+              var _getContextIdentifier2;
+
+              dispatchAnalyticsEvent({
+                action: ACTION.SLOW_INPUT,
+                actionSubject: ACTION_SUBJECT.EDITOR,
+                attributes: _objectSpread(_objectSpread({
+                  time: diff,
+                  nodeSize: state.doc.nodeSize
+                }, nodesCount), {}, {
+                  participants: getParticipantsCount(state),
+                  objectId: (_getContextIdentifier2 = getContextIdentifier(state)) === null || _getContextIdentifier2 === void 0 ? void 0 : _getContextIdentifier2.objectId
+                }),
+                eventType: EVENT_TYPE.OPERATIONAL
+              });
             }
 
-            dispatchAnalyticsEvent(payload);
+            experienceStore === null || experienceStore === void 0 ? void 0 : experienceStore.addMetadata(EditorExperience.typing, {
+              slowInput: true
+            });
           }
 
-          if (diff > slowThreshold) {
-            var _getContextIdentifier3;
+          if (trackTyping) {
+            var _getContextIdentifier4;
 
             var _nodesCount = allowCountNodes ? countNodes(view.state) : {};
 
-            dispatchAnalyticsEvent({
-              action: ACTION.SLOW_INPUT,
-              actionSubject: ACTION_SUBJECT.EDITOR,
-              attributes: _objectSpread(_objectSpread({
-                time: diff,
-                nodeSize: state.doc.nodeSize
-              }, _nodesCount), {}, {
-                participants: getParticipantsCount(state),
-                objectId: (_getContextIdentifier3 = getContextIdentifier(state)) === null || _getContextIdentifier3 === void 0 ? void 0 : _getContextIdentifier3.objectId
-              }),
-              eventType: EVENT_TYPE.OPERATIONAL
-            });
+            keystrokeCount = 0;
+            var severity = shouldTrackSeverity ? getAnalyticsEventSeverity(diff, severityThresholdNormal, severityThresholdDegraded) : undefined;
+
+            if (inputTracking !== null && inputTracking !== void 0 && inputTracking.enabled) {
+              var _getContextIdentifier3;
+
+              var payload = {
+                action: ACTION.INPUT_PERF_SAMPLING,
+                actionSubject: ACTION_SUBJECT.EDITOR,
+                attributes: _objectSpread(_objectSpread({
+                  time: diff,
+                  nodeSize: state.doc.nodeSize
+                }, _nodesCount), {}, {
+                  participants: getParticipantsCount(state),
+                  objectId: (_getContextIdentifier3 = getContextIdentifier(state)) === null || _getContextIdentifier3 === void 0 ? void 0 : _getContextIdentifier3.objectId,
+                  severity: severity
+                }),
+                eventType: EVENT_TYPE.OPERATIONAL
+              };
+              dispatchAnalyticsEvent(payload);
+            }
+
+            experienceStore === null || experienceStore === void 0 ? void 0 : experienceStore.success(EditorExperience.typing, _objectSpread(_objectSpread({
+              nodeSize: state.doc.nodeSize
+            }, _nodesCount), {}, {
+              participants: getParticipantsCount(state),
+              objectId: (_getContextIdentifier4 = getContextIdentifier(state)) === null || _getContextIdentifier4 === void 0 ? void 0 : _getContextIdentifier4.objectId,
+              time: diff,
+              severity: severity
+            }));
           }
         });
         return false;

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/styled.js

@@ -7,7 +7,9 @@ import styled from 'styled-components';
 import { headingsSharedStyles } from '@atlaskit/editor-common';
 import { Shortcut } from '../../../../ui/styles';
 export var BlockTypeMenuItem = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", ";\n  > {\n    h1,\n    h2,\n    h3,\n    h4,\n    h5,\n    h6 {\n      margin-top: 0;\n    }\n  }\n  ", ";\n"])), headingsSharedStyles, function (props) {
-  return props.selected ? "".concat(props.tagName, " { color: white }") : '';
+  return (// TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
+    props.selected ? "".concat(props.tagName, " { color: white !important; }") : ''
+  );
 });
 export var KeyboardShortcut = styled(Shortcut)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  margin-left: 16px;\n"])), function (props) {
   return props.selected ? "color: ".concat(N400, ";") : '';

package/dist/esm/plugins/card/index.js

@@ -1,3 +1,9 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 _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) { _defineProperty(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; }
+
 import React from 'react';
 import { inlineCard, blockCard, embedCard } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
@@ -26,13 +32,18 @@ var cardPlugin = function cardPlugin(options) {
       return nodes;
     },
     pmPlugins: function pmPlugins() {
-      var _options$allowResizin, _options$useAlternati;
+      var _options$allowBlockCa, _options$allowResizin, _options$useAlternati;
 
+      var allowBlockCards = (_options$allowBlockCa = options.allowBlockCards) !== null && _options$allowBlockCa !== void 0 ? _options$allowBlockCa : true;
       var allowResizing = (_options$allowResizin = options.allowResizing) !== null && _options$allowResizin !== void 0 ? _options$allowResizin : true;
       var useAlternativePreloader = (_options$useAlternati = options.useAlternativePreloader) !== null && _options$useAlternati !== void 0 ? _options$useAlternati : true;
       return [{
         name: 'card',
-        plugin: createPlugin(options.platform, allowResizing, useAlternativePreloader, options.fullWidthMode, options.createAnalyticsEvent)
+        plugin: createPlugin(_objectSpread(_objectSpread({}, options), {}, {
+          allowBlockCards: allowBlockCards,
+          allowResizing: allowResizing,
+          useAlternativePreloader: useAlternativePreloader
+        }))
       }];
     },
     contentComponent: function contentComponent(_ref) {

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -258,6 +258,7 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
 
           var containerWidth = isRichMediaInsideOfBlockNode(view, pos) ? lineLength : widthStateWidth;
           var smartCard = /*#__PURE__*/React.createElement(SmartCard, {
+            key: url,
             url: url,
             appearance: "embed",
             onClick: _this2.onClick,

package/dist/esm/plugins/card/pm-plugins/main.js

@@ -8,12 +8,17 @@ import { EmbedCard } from '../nodeviews/embedCard';
 import { BlockCard } from '../nodeviews/blockCard';
 import { InlineCard } from '../nodeviews/inlineCard';
 export { pluginKey } from './plugin-key';
-export var createPlugin = function createPlugin(platform, allowResizing, useAlternativePreloader, fullWidthMode, createAnalyticsEvent) {
+export var createPlugin = function createPlugin(options) {
   return function (_ref) {
     var portalProviderAPI = _ref.portalProviderAPI,
         eventDispatcher = _ref.eventDispatcher,
         providerFactory = _ref.providerFactory,
         dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+    var platform = options.platform,
+        allowResizing = options.allowResizing,
+        useAlternativePreloader = options.useAlternativePreloader,
+        fullWidthMode = options.fullWidthMode,
+        createAnalyticsEvent = options.createAnalyticsEvent;
     return new Plugin({
       state: {
         init: function init() {
@@ -71,7 +76,7 @@ export var createPlugin = function createPlugin(platform, allowResizing, useAlte
                  * other tasks as per common implementations of the JavaScript event loop in browsers.
                  */
                 var invoke = rafSchedule(function () {
-                  return resolveWithProvider(view, outstandingRequests, provider, request);
+                  return resolveWithProvider(view, outstandingRequests, provider, request, options);
                 });
                 rafCancellationCallbacks.push(invoke.cancel);
                 invoke();

package/dist/esm/plugins/card/pm-plugins/util/resolve.js

@@ -1,21 +1,28 @@
 import { setProvider } from '../actions';
-import { replaceQueuedUrlWithCard, handleFallbackWithAnalytics } from '../doc'; // ============================================================================ //
+import { replaceQueuedUrlWithCard, handleFallbackWithAnalytics } from '../doc';
+// ============================================================================ //
 // ============================== PROVIDER UTILS ============================== //
 // ============================================================================ //
 // Used for all interactions with the EditorCardProvider.
 // ============================================================================ //
-
-export var resolveWithProvider = function resolveWithProvider(view, outstandingRequests, provider, request) {
+export var resolveWithProvider = function resolveWithProvider(view, outstandingRequests, provider, request, options) {
   var handleResolve = provider.resolve(request.url, request.appearance).then(function (resolvedCard) {
     delete outstandingRequests[request.url];
     return resolvedCard;
-  }).then(handleResolved(view, request), handleRejected(view, request));
+  }).then(handleResolved(view, request, options), handleRejected(view, request));
   outstandingRequests[request.url] = handleResolve;
   return handleResolve;
 };
 
-var handleResolved = function handleResolved(view, request) {
+var updateCardType = function updateCardType(resolvedCard, options) {
+  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds) {
+    resolvedCard.type = 'inlineCard';
+  }
+};
+
+var handleResolved = function handleResolved(view, request, options) {
   return function (resolvedCard) {
+    updateCardType(resolvedCard, options);
     replaceQueuedUrlWithCard(request.url, resolvedCard, request.analyticsAction)(view.state, view.dispatch);
     return resolvedCard;
   };

package/dist/esm/plugins/code-block/toolbar.js

@@ -48,7 +48,7 @@ export var getToolbarConfig = function getToolbarConfig() {
       return option.value === language;
     }) || options.find(function (option) {
       return option.alias.includes(language);
-    }) : undefined;
+    }) : null;
     var languageSelect = {
       id: 'editor.codeBlock.languageOptions',
       type: 'select',

package/dist/esm/plugins/collab-edit/ui/to-avatar.js

@@ -15,16 +15,12 @@ var toAvatar = function toAvatar(participant) {
   };
 };
 
-var participantEquals = function participantEquals(_ref, _ref2) {
+export default memoizeOne(toAvatar, function participantEquals(_ref, _ref2) {
   var _ref3 = _slicedToArray(_ref, 1),
-      aRaw = _ref3[0];
+      a = _ref3[0];
 
   var _ref4 = _slicedToArray(_ref2, 1),
-      bRaw = _ref4[0];
+      b = _ref4[0];
 
-  var a = aRaw;
-  var b = bRaw;
   return a.name === b.name && a.avatar === b.avatar && a.sessionId === b.sessionId;
-};
-
-export default memoizeOne(toAvatar, participantEquals);
+});

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

@@ -7,7 +7,7 @@ import { N0, N20, N900 } from '@atlaskit/theme/colors';
 import { borderRadius, fontSizeSmall, gridSize } from '@atlaskit/theme/constants';
 import { EmojiSharedCssClassName } from '@atlaskit/editor-common';
 import { SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
-export var emojiStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", "\n        > span {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), EmojiSharedCssClassName.EMOJI_CONTAINER, EmojiSharedCssClassName.EMOJI_NODE, EmojiSharedCssClassName.EMOJI_IMAGE, akEditorSelectedNodeClassName, EmojiSharedCssClassName.EMOJI_SPRITE, EmojiSharedCssClassName.EMOJI_IMAGE, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.BoxShadow]));
+export var emojiStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    display: inline-block;\n\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", "\n        > span {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), EmojiSharedCssClassName.EMOJI_CONTAINER, EmojiSharedCssClassName.EMOJI_NODE, EmojiSharedCssClassName.EMOJI_IMAGE, akEditorSelectedNodeClassName, EmojiSharedCssClassName.EMOJI_SPRITE, EmojiSharedCssClassName.EMOJI_IMAGE, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.BoxShadow]));
 var grid = gridSize() / 2;
 var fontSize = fontSizeSmall();
 var lineHeight = 4 * grid / fontSize;

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

@@ -251,7 +251,6 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
   var state = createPluginState(dispatch, {
-    layout: 'default',
     showEditButton: false,
     showContextPanel: false
   });
@@ -304,14 +303,12 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
             var showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
             var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {// do nothing;
             });
-            var layout = selectedExtension ? node.attrs.layout : 'default';
             updateState({
               localId: node.attrs.localId,
               showContextPanel: false,
               element: newElement,
               showEditButton: showEditButton,
-              updateExtension: updateExtension,
-              layout: layout
+              updateExtension: updateExtension
             })(state, dispatch);
           } // New DOM element doesn't necessarily mean it's a new Node
           else if (element !== newElement) {