@atlaskit/editor-core 185.2.5 → 185.2.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 185.2.7
+
+### Patch Changes
+
+- [`1259df9a9ef`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1259df9a9ef) - converted some of block-type's analytics to use new EditorAnalyticsAPI
+
 ## 185.2.5
 
 ### Patch Changes

package/dist/cjs/plugins/block-type/index.js

@@ -21,14 +21,14 @@ var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _ToolbarBlockType = _interopRequireDefault(require("./ui/ToolbarBlockType"));
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 var _commands = require("./commands");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var keymaps = _interopRequireWildcard(require("../../keymaps"));
 var _assets = require("../quick-insert/assets");
 var _messages = require("./messages");
 var _types = require("../../ui/Toolbar/types");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
-var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
+var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
     return [];
@@ -56,7 +56,7 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
         var tr = insert(state.schema.nodes.heading.createChecked({
           level: level
         }));
-        return (0, _analytics.addAnalytics)(state, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: _analytics.ACTION.FORMATTED,
           actionSubject: _analytics.ACTION_SUBJECT.TEXT,
           eventType: _analytics.EVENT_TYPE.TRACK,
@@ -65,12 +65,13 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
             inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT,
             newHeadingLevel: level
           }
-        });
+        })(tr);
+        return tr;
       }
     };
   });
 };
-var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed) {
+var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref2.formatMessage;
   if (!isAllowed) {
     return [];
@@ -86,7 +87,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
     },
     action: function action(insert, state) {
       var tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
-      return (0, _analytics.addAnalytics)(state, tr, {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
         eventType: _analytics.EVENT_TYPE.TRACK,
@@ -94,11 +95,12 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
         attributes: {
           inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
         }
-      });
+      })(tr);
+      return tr;
     }
   }];
 };
-var blockTypePlugin = function blockTypePlugin(options) {
+var blockTypePlugin = function blockTypePlugin(options, api) {
   return {
     name: 'blockType',
     nodes: function nodes() {
@@ -182,8 +184,9 @@ var blockTypePlugin = function blockTypePlugin(options) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
+        var _api$dependencies$ana, _api$dependencies$ana2;
         var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-        return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1)));
+        return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions)));
       }
     }
   };

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 = "185.2.5";
+var version = "185.2.7";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/plugins/block-type/index.js

@@ -6,14 +6,14 @@ import inputRulePlugin from './pm-plugins/input-rule';
 import ToolbarBlockType from './ui/ToolbarBlockType';
 import WithPluginState from '../../ui/WithPluginState';
 import { setBlockTypeWithAnalytics } from './commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import * as keymaps from '../../keymaps';
 import { IconHeading, IconQuote } from '../quick-insert/assets';
 import { messages } from './messages';
 import { ToolbarSize } from '../../ui/Toolbar/types';
 const headingPluginOptions = ({
   formatMessage
-}, isAllowed) => {
+}, isAllowed, editorAnalyticsApi) => {
   if (!isAllowed) {
     return [];
   }
@@ -38,7 +38,7 @@ const headingPluginOptions = ({
         const tr = insert(state.schema.nodes.heading.createChecked({
           level
         }));
-        return addAnalytics(state, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: ACTION.FORMATTED,
           actionSubject: ACTION_SUBJECT.TEXT,
           eventType: EVENT_TYPE.TRACK,
@@ -47,14 +47,15 @@ const headingPluginOptions = ({
             inputMethod: INPUT_METHOD.QUICK_INSERT,
             newHeadingLevel: level
           }
-        });
+        })(tr);
+        return tr;
       }
     };
   });
 };
 const blockquotePluginOptions = ({
   formatMessage
-}, isAllowed) => {
+}, isAllowed, editorAnalyticsApi) => {
   if (!isAllowed) {
     return [];
   }
@@ -67,7 +68,7 @@ const blockquotePluginOptions = ({
     icon: () => /*#__PURE__*/React.createElement(IconQuote, null),
     action(insert, state) {
       const tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
-      return addAnalytics(state, tr, {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
         eventType: EVENT_TYPE.TRACK,
@@ -75,11 +76,12 @@ const blockquotePluginOptions = ({
         attributes: {
           inputMethod: INPUT_METHOD.QUICK_INSERT
         }
-      });
+      })(tr);
+      return tr;
     }
   }];
 };
-const blockTypePlugin = options => ({
+const blockTypePlugin = (options, api) => ({
   name: 'blockType',
   nodes() {
     const nodes = [{
@@ -157,8 +159,9 @@ const blockTypePlugin = options => ({
   },
   pluginsOptions: {
     quickInsert: intl => {
+      var _api$dependencies$ana, _api$dependencies$ana2;
       const exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-      return [...blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1), ...headingPluginOptions(intl, exclude.indexOf('heading') === -1)];
+      return [...blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions), ...headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions)];
     }
   }
 });

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.2.5";
+export const version = "185.2.7";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/plugins/block-type/index.js

@@ -7,12 +7,12 @@ import inputRulePlugin from './pm-plugins/input-rule';
 import ToolbarBlockType from './ui/ToolbarBlockType';
 import WithPluginState from '../../ui/WithPluginState';
 import { setBlockTypeWithAnalytics } from './commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import * as keymaps from '../../keymaps';
 import { IconHeading, IconQuote } from '../quick-insert/assets';
 import { messages } from './messages';
 import { ToolbarSize } from '../../ui/Toolbar/types';
-var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
+var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
     return [];
@@ -40,7 +40,7 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
         var tr = insert(state.schema.nodes.heading.createChecked({
           level: level
         }));
-        return addAnalytics(state, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: ACTION.FORMATTED,
           actionSubject: ACTION_SUBJECT.TEXT,
           eventType: EVENT_TYPE.TRACK,
@@ -49,12 +49,13 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed) {
             inputMethod: INPUT_METHOD.QUICK_INSERT,
             newHeadingLevel: level
           }
-        });
+        })(tr);
+        return tr;
       }
     };
   });
 };
-var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed) {
+var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref2.formatMessage;
   if (!isAllowed) {
     return [];
@@ -70,7 +71,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
     },
     action: function action(insert, state) {
       var tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
-      return addAnalytics(state, tr, {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
         eventType: EVENT_TYPE.TRACK,
@@ -78,11 +79,12 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed)
         attributes: {
           inputMethod: INPUT_METHOD.QUICK_INSERT
         }
-      });
+      })(tr);
+      return tr;
     }
   }];
 };
-var blockTypePlugin = function blockTypePlugin(options) {
+var blockTypePlugin = function blockTypePlugin(options, api) {
   return {
     name: 'blockType',
     nodes: function nodes() {
@@ -166,8 +168,9 @@ var blockTypePlugin = function blockTypePlugin(options) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
+        var _api$dependencies$ana, _api$dependencies$ana2;
         var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1)));
+        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions)));
       }
     }
   };

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.2.5";
+export var version = "185.2.7";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

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

package/dist/types/plugins/block-type/index.d.ts

@@ -1,7 +1,9 @@
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import { BlockTypePluginOptions } from './types';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 declare const blockTypePlugin: NextEditorPlugin<'blockType', {
     pluginConfiguration: BlockTypePluginOptions | undefined;
+    dependencies: [OptionalPlugin<typeof analyticsPlugin>];
 }>;
 export default blockTypePlugin;
 export { pluginKey } from './pm-plugins/main';

package/dist/types-ts4.5/plugins/block-type/index.d.ts

@@ -1,7 +1,11 @@
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import { BlockTypePluginOptions } from './types';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 declare const blockTypePlugin: NextEditorPlugin<'blockType', {
     pluginConfiguration: BlockTypePluginOptions | undefined;
+    dependencies: [
+        OptionalPlugin<typeof analyticsPlugin>
+    ];
 }>;
 export default blockTypePlugin;
 export { pluginKey } from './pm-plugins/main';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "185.2.5",
+  "version": "185.2.7",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -73,7 +73,7 @@
     "@atlaskit/locale": "^2.5.0",
     "@atlaskit/logo": "^13.14.0",
     "@atlaskit/media-card": "^76.0.0",
-    "@atlaskit/media-client": "^23.0.0",
+    "@atlaskit/media-client": "^23.1.0",
     "@atlaskit/media-common": "^7.0.0",
     "@atlaskit/media-filmstrip": "^47.0.0",
     "@atlaskit/media-picker": "^66.0.0",