@atlaskit/editor-core 185.13.0 → 185.14.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 185.14.0
+
+### Minor Changes
+
+- [`91c4edcea5a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/91c4edcea5a) - The analytics plugin (`editor-plugin-analytics`) now creates the `createAnalyticsEvent` if none is supplied and shares it with other plugins internally.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 185.13.1
+
+### Patch Changes
+
+- [`202f8c2ee69`](https://bitbucket.org/atlassian/atlassian-frontend/commits/202f8c2ee69) - The changes here adds support for datasource feature flag for rollout.
+
 ## 185.13.0
 
 ### Patch Changes

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

@@ -117,8 +117,8 @@ function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent) {
  * Note: The order that presets are added determines
  * their placement in the editor toolbar
  */
-function createPluginsList(props, prevProps, createAnalyticsEvent) {
-  var preset = (0, _universal.default)(props.appearance, getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent), (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance, createAnalyticsEvent);
+function createPluginsList(props, prevProps) {
+  var preset = (0, _universal.default)(props.appearance, getDefaultPresetOptionsFromEditorProps(props), (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance);
   var excludes = new Set();
   if (!isCodeBlockAllowed({
     allowBlockType: props.allowBlockType
@@ -148,8 +148,8 @@ function withDangerouslyAppendPlugins(preset) {
     return presetWithAppendedPlugins;
   };
 }
-function createPreset(props, prevProps, createAnalyticsEvent) {
+function createPreset(props, prevProps) {
   var _props$dangerouslyApp;
-  var preset = (0, _universal.default)(props.appearance, getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent), (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance, createAnalyticsEvent);
+  var preset = (0, _universal.default)(props.appearance, getDefaultPresetOptionsFromEditorProps(props), (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(props), prevProps === null || prevProps === void 0 ? void 0 : prevProps.appearance);
   return withDangerouslyAppendPlugins(preset)((_props$dangerouslyApp = props.dangerouslyAppendPlugins) === null || _props$dangerouslyApp === void 0 ? void 0 : _props$dangerouslyApp.__plugins);
 }

package/dist/cjs/editor-next/index.js

@@ -13,9 +13,13 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ui = require("@atlaskit/editor-common/ui");
+var _utils = require("@atlaskit/editor-common/utils");
 var _react = require("@emotion/react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react2 = _interopRequireDefault(require("react"));
+var _versionWrapper = require("../version-wrapper");
+var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-context");
+var _v = _interopRequireDefault(require("uuid/v4"));
 var _actions = _interopRequireDefault(require("../actions"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorInternal = _interopRequireDefault(require("./editor-internal"));
@@ -28,15 +32,10 @@ var _plugins = require("../plugins");
 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; } } /** @jsx jsx */ // import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
-// import { name, version } from '../version-wrapper';
-// import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-// import uuid from 'uuid/v4';
+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; } } /** @jsx jsx */
 var EditorNext = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(EditorNext, _React$Component);
   var _super = _createSuper(EditorNext);
-  // private editorSessionId: string;
-
   function EditorNext(props, context) {
     var _this;
     (0, _classCallCheck2.default)(this, EditorNext);
@@ -56,7 +55,7 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     });
     (0, _deprecationWarnings.default)(props);
     _this.editorActions = (context || {}).editorActions || new _actions.default();
-    // this.editorSessionId = uuid();
+    _this.editorSessionId = (0, _v.default)();
     _this.startTime = performance.now();
     _this.onEditorCreated = _this.onEditorCreated.bind((0, _assertThisInitialized2.default)(_this));
     _this.onEditorDestroyed = _this.onEditorDestroyed.bind((0, _assertThisInitialized2.default)(_this));
@@ -99,40 +98,29 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this3 = this;
-      // TODO: https://product-fabric.atlassian.net/browse/ED-16979
-      // Move `FabricEditorAnalyticsContext` back into `EditorNext`
-      // This was moved out here to workaround the issue that the analytics
-      // context does not wrap the Preset (and therefore does not pass this context
-      // information to analytics calls within plugins). After this cleanup task ^ we will
-      // not have to generate the `createAnalyticsEvent` outside the Preset
-      // and we can move this back into `EditorNext`.
-      return (
-        // <FabricEditorAnalyticsContext
-        //   data={{
-        //     packageName: name,
-        //     packageVersion: version,
-        //     componentName: 'editorCore',
-        //     appearance: getAnalyticsAppearance(this.props.appearance),
-        //     editorSessionId: this.editorSessionId,
-        //   }}
-        // >
-        (0, _react.jsx)(_ui.WithCreateAnalyticsEvent, {
-          render: function render(createAnalyticsEvent) {
-            return (_this3.createAnalyticsEvent = createAnalyticsEvent) && (0, _react.jsx)(_editorInternal.default, {
-              props: _this3.props,
-              handleAnalyticsEvent: _this3.handleAnalyticsEvent,
-              createAnalyticsEvent: _this3.createAnalyticsEvent,
-              preset: _this3.props.preset,
-              handleSave: _this3.handleSave,
-              editorActions: _this3.editorActions,
-              getExperienceStore: _this3.getExperienceStore,
-              onEditorCreated: _this3.onEditorCreated,
-              onEditorDestroyed: _this3.onEditorDestroyed
-            });
-          }
-        })
-        // </FabricEditorAnalyticsContext>
-      );
+      return (0, _react.jsx)(_analyticsNamespacedContext.FabricEditorAnalyticsContext, {
+        data: {
+          packageName: _versionWrapper.name,
+          packageVersion: _versionWrapper.version,
+          componentName: 'editorCore',
+          appearance: (0, _utils.getAnalyticsAppearance)(this.props.appearance),
+          editorSessionId: this.editorSessionId
+        }
+      }, (0, _react.jsx)(_ui.WithCreateAnalyticsEvent, {
+        render: function render(createAnalyticsEvent) {
+          return (_this3.createAnalyticsEvent = createAnalyticsEvent) && (0, _react.jsx)(_editorInternal.default, {
+            props: _this3.props,
+            handleAnalyticsEvent: _this3.handleAnalyticsEvent,
+            createAnalyticsEvent: _this3.createAnalyticsEvent,
+            preset: _this3.props.preset,
+            handleSave: _this3.handleSave,
+            editorActions: _this3.editorActions,
+            getExperienceStore: _this3.getExperienceStore,
+            onEditorCreated: _this3.onEditorCreated,
+            onEditorDestroyed: _this3.onEditorDestroyed
+          });
+        }
+      }));
     }
   }]);
   return EditorNext;

package/dist/cjs/editor.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 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"));
@@ -18,10 +17,6 @@ var _react2 = _interopRequireDefault(require("react"));
 var _editorPropTypes = require("./editor-next/utils/editorPropTypes");
 var _editorNext = _interopRequireDefault(require("./editor-next"));
 var _useUniversalPreset = _interopRequireDefault(require("./labs/next/presets/useUniversalPreset"));
-var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-context");
-var _versionWrapper = require("./version-wrapper");
-var _utils = require("@atlaskit/editor-common/utils");
-var _v = _interopRequireDefault(require("uuid/v4"));
 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; } } /** @jsx jsx */
 var EditorNextWrapper = function EditorNextWrapper(_ref) {
@@ -37,36 +32,15 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(Editor, _React$Component);
   var _super = _createSuper(Editor);
   function Editor() {
-    var _this;
     (0, _classCallCheck2.default)(this, Editor);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "editorSessionId", (0, _v.default)());
-    return _this;
+    return _super.apply(this, arguments);
   }
   (0, _createClass2.default)(Editor, [{
     key: "render",
     value: function render() {
-      // TODO: https://product-fabric.atlassian.net/browse/ED-16979
-      // Move `FabricEditorAnalyticsContext` back into `EditorNext`
-      // This was moved out here to workaround the issue that the analytics
-      // context does not wrap the Preset (and therefore does not pass this context
-      // information to analytics calls within plugins). After this cleanup task ^ we will
-      // not have to generate the `createAnalyticsEvent` outside the Preset
-      // and we can move this back into `EditorNext`.
-      return (0, _react.jsx)(_analyticsNamespacedContext.FabricEditorAnalyticsContext, {
-        data: {
-          packageName: _versionWrapper.name,
-          packageVersion: _versionWrapper.version,
-          componentName: 'editorCore',
-          appearance: (0, _utils.getAnalyticsAppearance)(this.props.appearance),
-          editorSessionId: this.editorSessionId
-        }
-      }, (0, _react.jsx)(EditorNextWrapper, {
+      return (0, _react.jsx)(EditorNextWrapper, {
         props: this.props
-      }));
+      });
     }
   }]);
   return Editor;

package/dist/cjs/labs/next/presets/universal.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = createUniversalPreset;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _api = require("../../../selection-api/api");
 var _plugins = require("../../../plugins");
 var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
 var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
@@ -17,7 +18,6 @@ var _isFullPage = require("../../../utils/is-full-page");
 var _mediaCommon = require("@atlaskit/media-common");
 var _default = require("./default");
 var _utils = require("@atlaskit/editor-common/utils");
-var _createStubInternalApis = require("./create-stub-internal-apis");
 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; }
 /**
@@ -31,17 +31,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * @param prevAppearance The appearance of the editor in the previous render
  * @returns a full featured preset configured according to the provided props - basis for create-plugins-list
  */
-function createUniversalPreset(appearance, props, featureFlags, prevAppearance, maybeCreateAnalyticsEvent) {
+function createUniversalPreset(appearance, props, featureFlags, prevAppearance, createAnalyticsEvent) {
   var isMobile = appearance === 'mobile';
   var isComment = appearance === 'comment';
   var isFullPage = (0, _isFullPage.isFullPage)(appearance);
   var getEditorFeatureFlags = function getEditorFeatureFlags() {
     return featureFlags;
   };
-  var stubs = (0, _createStubInternalApis.createStubInternalApis)();
-  var editorSelectionAPI = stubs.editorSelectionAPI,
-    stubInternalApisPlugin = stubs.stubInternalApisPlugin;
-  var createAnalyticsEvent = maybeCreateAnalyticsEvent ? maybeCreateAnalyticsEvent : stubs.createAnalyticsEvent;
+  var editorSelectionAPI = (0, _api.createEditorSelectionAPI)();
   var defaultPreset = (0, _default.createDefaultPreset)(_objectSpread(_objectSpread({}, props), {}, {
     createAnalyticsEvent: createAnalyticsEvent
   }));
@@ -52,7 +49,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     }
     return false;
   };
-  var finalPreset = defaultPreset.add(stubInternalApisPlugin).add(_plugins.dataConsumerMarkPlugin).add(_editorPluginContentInsertion.contentInsertionPlugin).maybeAdd(_plugins.breakoutPlugin, function (plugin, builder) {
+  var finalPreset = defaultPreset.add(_plugins.dataConsumerMarkPlugin).add(_editorPluginContentInsertion.contentInsertionPlugin).maybeAdd(_plugins.breakoutPlugin, function (plugin, builder) {
     if (props.allowBreakout && isFullPage) {
       return builder.add([plugin, {
         allowBreakoutButton: appearance === 'full-page'
@@ -128,7 +125,6 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     if (props.mentionProvider) {
       var _props$mention$insert, _props$mention, _props$mention2;
       return builder.add([plugin, {
-        createAnalyticsEvent: createAnalyticsEvent,
         sanitizePrivateContent: props.sanitizePrivateContent,
         insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
         allowZeroWidthSpaceAfter: !isMobile,
@@ -138,9 +134,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     return builder;
   }).maybeAdd(_plugins.emojiPlugin, function (plugin, builder) {
     if (props.emojiProvider) {
-      return builder.add([plugin, {
-        createAnalyticsEvent: createAnalyticsEvent
-      }]);
+      return builder.add(plugin);
     }
     return builder;
   }).maybeAdd(_editorPluginTable.tablesPlugin, function (plugin, builder) {
@@ -202,8 +196,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     if (props.collabEdit || props.collabEditProvider) {
       var _collabEditOptions$EX;
       var collabEditOptions = {
-        sanitizePrivateContent: props.sanitizePrivateContent,
-        createAnalyticsEvent: createAnalyticsEvent
+        sanitizePrivateContent: props.sanitizePrivateContent
       };
       if (props.collabEdit) {
         collabEditOptions = _objectSpread(_objectSpread({}, props.collabEdit), collabEditOptions);
@@ -292,7 +285,6 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add([plugin, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props.UNSAFE_cards), props.smartLinks), (_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.smartLinks), {}, {
         platform: isMobile ? 'mobile' : 'web',
         fullWidthMode: fullWidthMode,
-        createAnalyticsEvent: createAnalyticsEvent,
         linkPicker: (_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.linkPicker,
         editorAppearance: appearance
       })]);

package/dist/cjs/labs/next/presets/useUniversalPreset.js

@@ -7,14 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = useUniversalPreset;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _analyticsNext = require("@atlaskit/analytics-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _createPluginsList = require("../../../create-editor/create-plugins-list");
 var _presetUtils = require("../../../create-editor/preset-utils");
 function useUniversalPreset(_ref) {
   var props = _ref.props;
-  var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
-    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var previousEditorProps = (0, _hooks.usePreviousState)(props);
   var _useState = (0, _react.useState)(function () {
       return (0, _createPluginsList.createPreset)(props, previousEditorProps);
@@ -30,7 +27,7 @@ function useUniversalPreset(_ref) {
     if (!recreate) {
       return;
     }
-    setPreset((0, _createPluginsList.createPreset)(props, previousEditorProps, createAnalyticsEvent));
-  }, [props, previousEditorProps, createAnalyticsEvent]);
+    setPreset((0, _createPluginsList.createPreset)(props, previousEditorProps));
+  }, [props, previousEditorProps]);
   return preset;
 }

package/dist/cjs/plugins/analytics/plugin.js

@@ -17,25 +17,32 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 createPlugin(options, featureFlags, editorAnalyticsApi) {
-  if (!options || !options.createAnalyticsEvent) {
+function createPlugin(options, featureFlags, pluginInjectionApi) {
+  if (!options) {
     return;
   }
   var hasRequiredPerformanceAPIs = (0, _utils.isPerformanceAPIAvailable)();
+  var getCreateAnalyticsEvent = function getCreateAnalyticsEvent() {
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.sharedState.currentState()) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.createAnalyticsEvent;
+  };
   return new _safePlugin.SafePlugin({
     key: _pluginKey.analyticsPluginKey,
     state: {
       init: function init() {
+        var _pluginInjectionApi$d3;
         return _objectSpread(_objectSpread({}, options), {}, {
+          createAnalyticsEvent: getCreateAnalyticsEvent(),
           fireAnalytics: (0, _analytics.fireAnalyticsEvent)(options.createAnalyticsEvent),
-          editorAnalyticsApi: editorAnalyticsApi
+          editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.actions
         });
       },
       apply: function apply(tr, pluginState, _, state) {
-        if (pluginState.createAnalyticsEvent !== options.createAnalyticsEvent) {
+        if (pluginState.createAnalyticsEvent !== getCreateAnalyticsEvent()) {
+          var _options$createAnalyt;
           // When the plugin state is reconfigured, the init function isn't called again
           return _objectSpread(_objectSpread({}, pluginState), {}, {
-            createAnalyticsEvent: options.createAnalyticsEvent
+            createAnalyticsEvent: (_options$createAnalyt = options.createAnalyticsEvent) !== null && _options$createAnalyt !== void 0 ? _options$createAnalyt : getCreateAnalyticsEvent()
           });
         }
         if (featureFlags.catchAllTracking) {
@@ -101,8 +108,7 @@ var analyticsPlugin = function analyticsPlugin(options, api) {
       return [{
         name: 'analyticsPlugin',
         plugin: function plugin() {
-          var _api$dependencies, _api$dependencies$ana;
-          return createPlugin(options, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$ana = _api$dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
+          return createPlugin(options, featureFlags, api);
         }
       }];
     }

package/dist/cjs/plugins/card/pm-plugins/doc.js

@@ -50,7 +50,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
   return $pos.node($pos.depth - 1).type.name;
 }
-var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi) {
+var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi, createAnalyticsEvent) {
   return function (editorState, dispatch) {
     var state = _pluginKey.pluginKey.getState(editorState);
     if (!state) {
@@ -86,7 +86,7 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
           _url$split2 = (0, _slicedToArray2.default)(_url$split, 3),
           domainName = _url$split2[2];
         if (state.smartLinkEvents) {
-          state.smartLinkEvents.insertSmartLink(domainName, 'inline', state.createAnalyticsEvent);
+          state.smartLinkEvents.insertSmartLink(domainName, 'inline', createAnalyticsEvent);
         }
 
         /**

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

@@ -28,6 +28,7 @@ var _datasource = require("../nodeviews/datasource");
 var _styles = require("@atlaskit/editor-common/styles");
 var _actions = require("./actions");
 var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var createPlugin = function createPlugin(options, pluginInjectionApi) {
   return function (pmPluginFactoryParams) {
     var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
@@ -37,8 +38,15 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
       allowResizing = options.allowResizing,
       useAlternativePreloader = options.useAlternativePreloader,
       fullWidthMode = options.fullWidthMode,
-      createAnalyticsEvent = options.createAnalyticsEvent,
       showServerActions = options.showServerActions;
+    var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)({
+      pmPluginFactoryParams: pmPluginFactoryParams,
+      Component: _inlineCard.InlineCardNodeView,
+      extraComponentProps: {
+        useAlternativePreloader: useAlternativePreloader,
+        showServerActions: showServerActions
+      }
+    });
     return new _safePlugin.SafePlugin({
       state: {
         init: function init() {
@@ -49,7 +57,6 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             showLinkingToolbar: false,
             smartLinkEvents: undefined,
             smartLinkEventsNext: undefined,
-            createAnalyticsEvent: createAnalyticsEvent,
             editorAppearance: editorAppearance,
             showDatasourceModal: false,
             datasourceTableRef: undefined,
@@ -131,8 +138,8 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
                  * other tasks as per common implementations of the JavaScript event loop in browsers.
                  */
                 var invoke = (0, _rafSchd.default)(function () {
-                  var _pluginInjectionApi$d;
-                  return (0, _resolve.resolveWithProvider)(view, provider, request, options, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions);
+                  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+                  return (0, _resolve.resolveWithProvider)(view, provider, request, options, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions, (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.sharedState.currentState()) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.createAnalyticsEvent) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : undefined);
                 });
                 rafCancellationCallbacks.push(invoke.cancel);
                 invoke();
@@ -151,15 +158,8 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
       },
       props: {
         nodeViews: {
-          inlineCard: (0, _reactNodeView.getInlineNodeViewProducer)({
-            pmPluginFactoryParams: pmPluginFactoryParams,
-            Component: _inlineCard.InlineCardNodeView,
-            extraComponentProps: {
-              useAlternativePreloader: useAlternativePreloader,
-              showServerActions: showServerActions
-            }
-          }),
-          blockCard: function blockCard(node, view, getPos) {
+          inlineCard: inlineCardViewProducer,
+          blockCard: function blockCard(node, view, getPos, decorations) {
             var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -170,15 +170,20 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var hasIntlContext = true;
             var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
             if (isDatasource) {
-              return new _datasource.Datasource({
-                node: node,
-                view: view,
-                getPos: getPos,
-                portalProviderAPI: portalProviderAPI,
-                eventDispatcher: eventDispatcher,
-                hasIntlContext: hasIntlContext,
-                pluginInjectionApi: pluginInjectionApi
-              }).init();
+              var _node$attrs4;
+              if ((0, _utils.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+                return new _datasource.Datasource({
+                  node: node,
+                  view: view,
+                  getPos: getPos,
+                  portalProviderAPI: portalProviderAPI,
+                  eventDispatcher: eventDispatcher,
+                  hasIntlContext: hasIntlContext,
+                  pluginInjectionApi: pluginInjectionApi
+                }).init();
+              } else {
+                return inlineCardViewProducer(node, view, getPos, decorations);
+              }
             }
             return new _blockCard.BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           },

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

@@ -11,14 +11,14 @@ var _doc = require("../doc");
 // ============================================================================ //
 // Used for all interactions with the EditorCardProvider.
 // ============================================================================ //
-var resolveWithProvider = function resolveWithProvider(view, provider, request, options, editorAnalyticsApi) {
+var resolveWithProvider = function resolveWithProvider(view, provider, request, options, editorAnalyticsApi, createAnalyticsEvent) {
   // When user manually changes appearance from blue link to smart link, we should respect that,
   var shouldForceAppearance =
   // This flag is set to true only in one place atm:
   // packages/editor/editor-core/src/plugins/card/pm-plugins/doc.ts @ convertHyperlinkToSmartCard
   // Which is used when user switching from URL to smart link appearance.
   !!request.shouldReplaceLink;
-  var handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, editorAnalyticsApi, options), handleRejected(view, request, editorAnalyticsApi));
+  var handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, editorAnalyticsApi, createAnalyticsEvent, options), handleRejected(view, request, editorAnalyticsApi));
   return handleResolve;
 };
 exports.resolveWithProvider = resolveWithProvider;
@@ -31,10 +31,10 @@ var updateCardType = function updateCardType(resolvedCard, options) {
     resolvedCard.type = 'inlineCard';
   }
 };
-var handleResolved = function handleResolved(view, request, editorAnalyticsApi, options) {
+var handleResolved = function handleResolved(view, request, editorAnalyticsApi, createAnalyticsEvent, options) {
   return function (resolvedCard) {
     updateCardType(resolvedCard, options);
-    (0, _doc.replaceQueuedUrlWithCard)(request.url, resolvedCard, request.analyticsAction, editorAnalyticsApi)(view.state, view.dispatch);
+    (0, _doc.replaceQueuedUrlWithCard)(request.url, resolvedCard, request.analyticsAction, editorAnalyticsApi, createAnalyticsEvent)(view.state, view.dispatch);
     return resolvedCard;
   };
 };

package/dist/cjs/plugins/card/toolbar.js

@@ -26,6 +26,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _LinkToolbarAppearance = require("./ui/LinkToolbarAppearance");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _SmallerEditIcon = require("./ui/SmallerEditIcon");
+var _utils2 = require("@atlaskit/editor-common/utils");
 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; }
@@ -173,7 +174,7 @@ var withToolbarMetadata = function withToolbarMetadata(command) {
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
     var _titleUrlPairFromNode2 = (0, _utils.titleUrlPairFromNode)(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.analytics) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
@@ -194,6 +195,9 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     var _ref2 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.decorations) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
+    var shouldRenderDatasourceToolbar = isDatasource &&
+    // not showing toolbar in mobile for now since not sure what our plans are for it
+    platform !== 'mobile' && (0, _utils2.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -210,8 +214,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         node: node,
         editorAnalyticsApi: editorAnalyticsApi
       })];
-      // not showing toolbar in mobile for now since not sure what our plans are for it
-    } else if (isDatasource && platform !== 'mobile') {
+    } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
@@ -325,7 +328,7 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, featureFlags
   }] : [];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) {
-  var _node$attrs2;
+  var _node$attrs3;
   var toolbarItems = [{
     id: 'editor.edit.datasource',
     type: 'button',
@@ -335,7 +338,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     title: intl.formatMessage(_messages.linkToolbarMessages.editDatasource),
     onClick: (0, _EditLinkToolbar.editDatasource)(editorAnalyticsApi)
   }];
-  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       type: 'separator'
     }, {

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addSynchronyErrorAnalytics = exports.addSynchronyEntityAnalytics = void 0;
-var _analytics = require("../analytics");
 var _documentLogger = require("../../utils/document-logger");
 var _utils = require("@atlaskit/editor-common/utils");
-var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags) {
+var _analytics = require("@atlaskit/editor-common/analytics");
+var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi) {
   return function (error) {
     var browserExtensions = (0, _utils.sniffUserBrowserExtensions)({
       extensions: ['grammarly']
@@ -26,13 +26,14 @@ var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr,
         compact: true
       });
     }
-    return (0, _analytics.addAnalytics)(state, tr, payload);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(payload)(tr);
+    return tr;
   };
 };
 exports.addSynchronyErrorAnalytics = addSynchronyErrorAnalytics;
 var addSynchronyEntityAnalytics = function addSynchronyEntityAnalytics(state, tr) {
-  return function (type) {
-    return (0, _analytics.addAnalytics)(state, tr, {
+  return function (type, editorAnalyticsApi) {
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
       action: type === 'error' ? _analytics.ACTION.SYNCHRONY_ENTITY_ERROR : _analytics.ACTION.SYNCHRONY_DISCONNECTED,
       actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
       eventType: _analytics.EVENT_TYPE.OPERATIONAL,
@@ -41,7 +42,8 @@ var addSynchronyEntityAnalytics = function addSynchronyEntityAnalytics(state, tr
         onLine: navigator.onLine,
         visibilityState: document.visibilityState
       }
-    });
+    })(tr);
+    return tr;
   };
 };
 exports.addSynchronyEntityAnalytics = addSynchronyEntityAnalytics;