@atlaskit/editor-core 185.16.1 → 185.16.5

package/dist/esm/i18n/zh_TW.js

@@ -17,20 +17,13 @@ export default {
   'fabric.editor.alttext.validation': '請移除替代文字中的所有特殊字元。',
   'fabric.editor.annotationToolbar': '註解工具列',
   'fabric.editor.backLink': '返回',
-  'fabric.editor.blockCardUnavailable': '內嵌連結位於 {node} 內，無法變更其檢視',
-  'fabric.editor.blockDescription': '顯示有關連結的更多資訊，包括摘要和動作',
-  'fabric.editor.blockTitle': '卡片',
   'fabric.editor.blockquote.description': '插入引述或引文',
   'fabric.editor.blockquote2': '引述',
   'fabric.editor.bold': '粗體',
-  'fabric.editor.bug': '錯誤',
   'fabric.editor.captionPlaceholder': '新增標題',
-  'fabric.editor.cardFloatingControls': '卡片選項',
   'fabric.editor.chromeCollapsedPlaceholder': '輸入一些內容...',
   'fabric.editor.clearAltTextEdit': '清除替代文字',
   'fabric.editor.clearFormatting': '清除格式設定',
-  'fabric.editor.clearLink': '清除連結',
-  'fabric.editor.clearLinkText': '清除文字',
   'fabric.editor.closeAltTextEdit': '返回',
   'fabric.editor.closeFindReplaceDialog': '關閉',
   'fabric.editor.closeHelpDialog': '關閉說明對話方塊',
@@ -60,16 +53,8 @@ export default {
   'fabric.editor.customPanel': '自訂面板',
   'fabric.editor.customPanel.description': '新增一個帶有表情符號和彩色背景的附註',
   'fabric.editor.decisionPlaceholder': '新增決定…',
-  'fabric.editor.defaultAltText': '清單項目',
   'fabric.editor.description': '描述',
-  'fabric.editor.displayBlock': '顯示卡片',
-  'fabric.editor.displayEmbed': '顯示嵌入',
-  'fabric.editor.displayInline': '顯示內嵌',
-  'fabric.editor.displayLink': '以文字顯示',
-  'fabric.editor.displayOptionUnavailableInParentNode': '{node} 內無法使用此顯示選項',
-  'fabric.editor.displayText': '要顯示的文字',
   'fabric.editor.dropPlaceholderLabel': '文件',
-  'fabric.editor.ecombedDescription': '顯示連結的互動式預覽',
   'fabric.editor.edit': '編輯',
   'fabric.editor.editAltText': '編輯替代文字',
   'fabric.editor.editDateText': '編輯日期',
@@ -95,14 +80,13 @@ export default {
   'fabric.editor.elementbrowser.search.empty-state.sub-heading': '請試著使用不同的詞彙搜尋，或探索 Atlassian 產品的新應用程式。',
   'fabric.editor.elementbrowser.search.empty-state.sub-heading.link': '探索 Atlassian Marketplace',
   'fabric.editor.elementbrowser.sidebar.heading': '瀏覽',
-  'fabric.editor.embedTitle': '嵌入',
-  'fabric.editor.epic': '大型工作',
   'fabric.editor.error': '錯誤',
   'fabric.editor.errorPanel': '錯誤面板',
   'fabric.editor.errorPanel.description': '以彩色面板呼叫錯誤',
   'fabric.editor.extension.confirmDeleteLinkedModalMessage': '刪除 {nodeName} 將中斷與其連結的任何內容。',
   'fabric.editor.extension.confirmDeleteLinkedModalOKButton': '刪除',
   'fabric.editor.extension.deleteElementTitle': '刪除元素',
+  'fabric.editor.extension.sourceNoTitledName': '這個元素',
   'fabric.editor.extensions.config-panel.save-indicator': '系統會隨時自動儲存所有變更',
   'fabric.editor.find': '尋找',
   'fabric.editor.findNext': '尋找下一個',
@@ -128,30 +112,18 @@ export default {
   'fabric.editor.heading5Description': '用於分組清單項目',
   'fabric.editor.heading6': '標題 6',
   'fabric.editor.heading6Description': '用於低層級標題',
-  'fabric.editor.headingLink.hyperlinkIconBlogLabel': '部落格',
-  'fabric.editor.headingLink.hyperlinkIconBugLabel': '錯誤',
-  'fabric.editor.headingLink.hyperlinkIconIssueLabel': '問題',
-  'fabric.editor.headingLink.hyperlinkIconPageLabel': '頁面',
-  'fabric.editor.headingLink.hyperlinkIconStoryLabel': '故事',
-  'fabric.editor.headingLink.hyperlinkIconTaskLabel': '任務',
   'fabric.editor.headingLink.toolbarHelpTitle': '開啟說明對話方塊',
   'fabric.editor.helpDialogTips': '您可以隨時按下 {keyMap} 來快速開啟此對話方塊',
-  'fabric.editor.hyperlink.linkAriaLabel': '連結標籤',
-  'fabric.editor.hyperlink.searchLinkAriaDescription': '當您在欄位中輸入內容時，建議會顯示在下方',
-  'fabric.editor.hyperlink.searchLinkResults': '{count, plural, =0 {沒有找到任何結果} other {找到 {count,number} 個結果}}',
   'fabric.editor.imageBorderBold': '粗體',
   'fabric.editor.imageBorderColor': '顏色',
   'fabric.editor.imageBorderMedium': '普通',
   'fabric.editor.imageBorderOptions': '邊框選項',
   'fabric.editor.imageBorderSize': '大小',
   'fabric.editor.imageBorderSubtle': '不明顯的',
-  'fabric.editor.improvement': '改善',
   'fabric.editor.indent': '增加縮排',
   'fabric.editor.info': '資訊',
   'fabric.editor.infoPanel': '資訊面板',
   'fabric.editor.infoPanel.description': '以彩色面板醒目提示資訊',
-  'fabric.editor.inlineDescription': '將連結顯示為內嵌文字',
-  'fabric.editor.inlineTitle': '內嵌',
   'fabric.editor.inputQueryAssistiveTxt': '自動完成結果可用時，請使用向上和向下箭頭查看，並輸入以進行選取。若您使用觸控螢幕裝置，請透過觸控或滑動手勢探索內容。',
   'fabric.editor.invalidDateError': '請輸入有效的日期',
   'fabric.editor.inviteItem.title': '{userRole, select, admin {邀請團隊成員加入 {productName}} trusted {邀請團隊成員加入 {productName}} other {將團隊成員新增至 {productName}}}',
@@ -199,9 +171,7 @@ export default {
   'fabric.editor.shortcut': '文字快顯',
   'fabric.editor.single': '單欄',
   'fabric.editor.statusPlaceholder': '設定狀態',
-  'fabric.editor.story': '故事',
   'fabric.editor.strike': '刪除線',
-  'fabric.editor.subTask': '子任務',
   'fabric.editor.subscript': '下標',
   'fabric.editor.subscript.off.superscript.on': '下標關閉，上標開啟',
   'fabric.editor.success': '成功',
@@ -210,7 +180,6 @@ export default {
   'fabric.editor.superscript': '上標',
   'fabric.editor.superscript.off.subscript.on': '上標關閉，下標開啟',
   'fabric.editor.supportAltText': '替代文字對於因為視障而使用螢幕閱讀器的人相當實用。',
-  'fabric.editor.task': '任務',
   'fabric.editor.taskPlaceholder': '輸入動作，使用「@」以指派給他人。',
   'fabric.editor.text.formatting.off': '文字格式設定關閉',
   'fabric.editor.textColor': '文字顏色',
@@ -233,9 +202,6 @@ export default {
   'fabric.editor.undo': '復原',
   'fabric.editor.unorderedList': '項目符號清單',
   'fabric.editor.unorderedList.description': '建立未排序的清單',
-  'fabric.editor.url': '顯示 URL',
-  'fabric.editor.urlDescription': '將連結顯示為 URL',
-  'fabric.editor.urlTitle': 'URL',
   'fabric.editor.warning': '警告',
   'fabric.editor.warningPanel': '警告面板',
   'fabric.editor.warningPanel.description': '以彩色面板新增注意附註',

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

@@ -6,7 +6,7 @@ import {
 useProviderFactory } from '@atlaskit/editor-common/provider-factory';
 //import analyticsPlugin from '../../../plugins/analytics';
 //import basePlugin from '../../../plugins/base';
-//import cardPlugin from '../../../plugins/card';
+//import { cardPlugin } from '@atlaskit/editor-plugin-card';
 //import datePlugin from '../../../plugins/date';
 //import emojiPlugin from '../../../plugins/emoji';
 //import extensionPlugin from '../../../plugins/extension';

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

@@ -6,7 +6,7 @@ import { createEditorSelectionAPI } from '../../../selection-api/api';
 import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
 import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import cardPlugin from '../../../plugins/card';
+import { cardPlugin } from '@atlaskit/editor-plugin-card';
 import { tablesPlugin } from '@atlaskit/editor-plugin-table';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { isFullPage as fullPageCheck } from '../../../utils/is-full-page';

package/dist/esm/plugins/deprecated-card/doc.js

@@ -0,0 +1,105 @@
+/**
+ * WARNING!!!
+ * Copied from `editor-plugin-card`.
+ *
+ * This workaround is used since we extracted the hyperlink + card plugins.
+ * It is only used in `deprecated-hyperlink`. It should not be used internally or externally.
+ *
+ */
+
+import { addLinkMetadata } from '@atlaskit/editor-common/card';
+import { nodesBetweenChanged } from '@atlaskit/editor-common/utils';
+import { normalizeUrl } from '@atlaskit/adf-schema';
+import { md } from '@atlaskit/editor-common/paste';
+
+// TODO: ED-15663
+// Please, do not copy or use this kind of code below
+// @ts-ignore
+var pluginKey = {
+  key: 'cardPlugin$',
+  getState: function getState(state) {
+    return state['cardPlugin$'];
+  }
+};
+function shouldReplaceLink(node) {
+  var compareLinkText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var compareToUrl = arguments.length > 2 ? arguments[2] : undefined;
+  var linkMark = node.marks.find(function (mark) {
+    return mark.type.name === 'link';
+  });
+  if (!linkMark) {
+    // not a link anymore
+    return false;
+  }
+
+  // ED-6041: compare normalised link text after linkfy from Markdown transformer
+  // instead, since it always decodes URL ('%20' -> ' ') on the link text
+
+  var normalisedHref = normalizeUrl(md.normalizeLinkText(linkMark.attrs.href));
+  var normalizedLinkText = normalizeUrl(md.normalizeLinkText(node.text || ''));
+  if (compareLinkText && normalisedHref !== normalizedLinkText) {
+    return false;
+  }
+  if (compareToUrl) {
+    var normalizedUrl = normalizeUrl(md.normalizeLinkText(compareToUrl));
+    if (normalizedUrl !== normalisedHref) {
+      return false;
+    }
+  }
+  return true;
+}
+var cardAction = function cardAction(tr, action) {
+  return tr.setMeta(pluginKey, action);
+};
+var queueCards = function queueCards(requests) {
+  return function (tr) {
+    return cardAction(tr, {
+      type: 'QUEUE',
+      requests: requests
+    });
+  };
+};
+
+/**
+ * @private
+ * @deprecated
+ *
+ * DO NOT USE THIS
+ * It is only used internally for `deprecated-hyperlink`.
+ */
+export var queueCardsFromChangedTr = function queueCardsFromChangedTr(state, tr, source, analyticsAction) {
+  var normalizeLinkText = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+  var sourceEvent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : undefined;
+  var schema = state.schema;
+  var link = schema.marks.link;
+  var requests = [];
+  nodesBetweenChanged(tr, function (node, pos) {
+    if (!node.isText) {
+      return true;
+    }
+    var linkMark = node.marks.find(function (mark) {
+      return mark.type === link;
+    });
+    if (linkMark) {
+      if (!shouldReplaceLink(node, normalizeLinkText)) {
+        return false;
+      }
+      requests.push({
+        url: linkMark.attrs.href,
+        pos: pos,
+        appearance: 'inline',
+        compareLinkText: normalizeLinkText,
+        source: source,
+        analyticsAction: analyticsAction,
+        sourceEvent: sourceEvent
+      });
+    }
+    return false;
+  });
+  if (analyticsAction) {
+    addLinkMetadata(state.selection, tr, {
+      action: analyticsAction
+    });
+  }
+  return queueCards(requests)(tr);
+};

package/dist/esm/plugins/deprecated-hyperlink/commands.js

@@ -8,7 +8,7 @@ import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-co
 import { Selection } from 'prosemirror-state';
 import { ACTION } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '../analytics';
-import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
+import { queueCardsFromChangedTr } from '../deprecated-card/doc';
 // TODO: ED-17836 This workaround is used since we extracted the hyperlink plugin.
 // As soon as we deprecate the plugin we can delete this code.
 /**

package/dist/esm/plugins/index.js

@@ -32,7 +32,6 @@ export { default as textColorPlugin } from './text-color';
 export { default as textFormattingPlugin } from './text-formatting';
 export { default as typeAheadPlugin } from './type-ahead';
 export { default as unsupportedContentPlugin } from './unsupported-content';
-export { default as cardPlugin } from './card';
 export { default as floatingToolbarPlugin } from './floating-toolbar';
 export { default as statusPlugin } from './status';
 export { default as breakoutPlugin } from './breakout';

package/dist/esm/plugins/media/nodeviews/mediaSingle.js

@@ -226,22 +226,11 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       }
       (_this$captionPlaceHol = _this.captionPlaceHolderRef.current) === null || _this$captionPlaceHol === void 0 ? void 0 : _this$captionPlaceHol.click();
     });
-    _defineProperty(_assertThisInitialized(_this), "displayGrid", function (visible, gridType, highlight) {
-      var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3;
-      var _this$props = _this.props,
-        pluginInjectionApi = _this$props.pluginInjectionApi,
-        view = _this$props.view;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : (_pluginInjectionApi$d3 = _pluginInjectionApi$d2.actions) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.displayGrid(view)({
-        visible: visible,
-        gridType: gridType,
-        highlight: highlight
-      });
-    });
     _defineProperty(_assertThisInitialized(_this), "clickPlaceholder", function () {
-      var _this$props2 = _this.props,
-        view = _this$props2.view,
-        getPos = _this$props2.getPos,
-        node = _this$props2.node;
+      var _this$props = _this.props,
+        view = _this$props.view,
+        getPos = _this$props.getPos,
+        node = _this$props.node;
       if (typeof getPos === 'boolean') {
         return;
       }
@@ -316,14 +305,14 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props3 = this.props,
-        selected = _this$props3.selected,
-        getPos = _this$props3.getPos,
-        node = _this$props3.node,
-        mediaOptions = _this$props3.mediaOptions,
-        fullWidthMode = _this$props3.fullWidthMode,
-        state = _this$props3.view.state,
-        view = _this$props3.view;
+      var _this$props2 = this.props,
+        selected = _this$props2.selected,
+        getPos = _this$props2.getPos,
+        node = _this$props2.node,
+        mediaOptions = _this$props2.mediaOptions,
+        fullWidthMode = _this$props2.fullWidthMode,
+        state = _this$props2.view.state,
+        view = _this$props2.view;
       var _ref4 = node.attrs,
         layout = _ref4.layout,
         mediaSingleWidth = _ref4.width;
@@ -395,12 +384,12 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         view: this.props.view,
         getPos: getPos,
         updateSize: this.updateSize,
-        displayGrid: this.displayGrid,
         gridSize: 12,
         viewMediaClientConfig: this.state.viewMediaClientConfig,
         allowBreakoutSnapPoints: mediaOptions && mediaOptions.allowBreakoutSnapPoints,
         selected: isSelected,
-        dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent
+        dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent,
+        pluginInjectionApi: this.props.pluginInjectionApi
       }), MediaChildren) : jsx(MediaSingle, mediaSingleProps, MediaChildren);
     }
   }]);

package/dist/esm/plugins/media/ui/ResizableMediaSingle/index.js

@@ -35,10 +35,21 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       // We default to true until we resolve the file type
       isVideoFile: true
     });
-    _defineProperty(_assertThisInitialized(_this), "calcNewSize", function (newWidth, stop) {
+    _defineProperty(_assertThisInitialized(_this), "displayGrid", function (visible, gridType, highlight) {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3;
       var _this$props = _this.props,
-        layout = _this$props.layout,
-        state = _this$props.view.state;
+        pluginInjectionApi = _this$props.pluginInjectionApi,
+        view = _this$props.view;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : (_pluginInjectionApi$d3 = _pluginInjectionApi$d2.actions) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.displayGrid(view)({
+        visible: visible,
+        gridType: gridType,
+        highlight: highlight
+      });
+    });
+    _defineProperty(_assertThisInitialized(_this), "calcNewSize", function (newWidth, stop) {
+      var _this$props2 = _this.props,
+        layout = _this$props2.layout,
+        state = _this$props2.view.state;
       var newPct = calcPctFromPx(newWidth, _this.props.lineLength) * 100;
       _this.setState({
         resizedPctWidth: newPct
@@ -73,17 +84,17 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       return _this.insideInlineLike ? calcColumnsFromPx(offsetLeft, _this.props.lineLength, _this.props.gridSize) : 0;
     });
     _defineProperty(_assertThisInitialized(_this), "calcPxWidth", function (useLayout) {
-      var _this$props2 = _this.props,
-        _this$props2$width = _this$props2.width,
-        origWidth = _this$props2$width === void 0 ? 0 : _this$props2$width,
-        origHeight = _this$props2.height,
-        layout = _this$props2.layout,
-        pctWidth = _this$props2.pctWidth,
-        lineLength = _this$props2.lineLength,
-        containerWidth = _this$props2.containerWidth,
-        fullWidthMode = _this$props2.fullWidthMode,
-        getPos = _this$props2.getPos,
-        state = _this$props2.view.state;
+      var _this$props3 = _this.props,
+        _this$props3$width = _this$props3.width,
+        origWidth = _this$props3$width === void 0 ? 0 : _this$props3$width,
+        origHeight = _this$props3.height,
+        layout = _this$props3.layout,
+        pctWidth = _this$props3.pctWidth,
+        lineLength = _this$props3.lineLength,
+        containerWidth = _this$props3.containerWidth,
+        fullWidthMode = _this$props3.fullWidthMode,
+        getPos = _this$props3.getPos,
+        state = _this$props3.view.state;
       var resizedPctWidth = _this.state.resizedPctWidth;
       var pos = typeof getPos === 'function' ? getPos() : undefined;
       return calcMediaPxWidth({
@@ -114,10 +125,10 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       if (snapWidth > akEditorWideLayoutWidth) {
         return ['full-width'];
       }
-      var _this$props3 = _this.props,
-        layout = _this$props3.layout,
-        lineLength = _this$props3.lineLength,
-        gridSize = _this$props3.gridSize;
+      var _this$props4 = _this.props,
+        layout = _this$props4.layout,
+        lineLength = _this$props4.lineLength,
+        gridSize = _this$props4.gridSize;
       var columns = calcColumnsFromPx(snapWidth, lineLength, gridSize);
       var columnWidth = Math.round(columns);
       var highlight = [];
@@ -312,15 +323,15 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props4 = this.props,
-        origWidth = _this$props4.width,
-        origHeight = _this$props4.height,
-        layout = _this$props4.layout,
-        pctWidth = _this$props4.pctWidth,
-        containerWidth = _this$props4.containerWidth,
-        fullWidthMode = _this$props4.fullWidthMode,
-        selected = _this$props4.selected,
-        children = _this$props4.children;
+      var _this$props5 = this.props,
+        origWidth = _this$props5.width,
+        origHeight = _this$props5.height,
+        layout = _this$props5.layout,
+        pctWidth = _this$props5.pctWidth,
+        containerWidth = _this$props5.containerWidth,
+        fullWidthMode = _this$props5.fullWidthMode,
+        selected = _this$props5.selected,
+        children = _this$props5.children;
       var initialWidth = this.calcPxWidth(); // width with padding
       var ratio;
       if (origWidth) {
@@ -357,6 +368,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
           fullWidthMode: fullWidthMode
         })
       }, jsx(Resizer, _extends({}, this.props, {
+        displayGrid: this.displayGrid,
         ratio: ratio,
         width: initialWidth,
         selected: selected,

package/dist/esm/plugins/text-formatting/commands/clear-formatting.js

@@ -2,7 +2,6 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { liftTarget } from 'prosemirror-transform';
 import { cellSelectionNodesBetween } from '../../../utils/cell-selection';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics';
 export var FORMATTING_NODE_TYPES = ['heading', 'codeBlock', 'blockquote'];
 export var FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup'];
 var formatTypes = {
@@ -14,8 +13,8 @@ var formatTypes = {
   textColor: ACTION_SUBJECT_ID.FORMAT_COLOR,
   subsup: 'subsup'
 };
-export function clearFormattingWithAnalytics(inputMethod) {
-  return clearFormatting(inputMethod);
+export function clearFormattingWithAnalytics(inputMethod, editorAnalyticsAPI) {
+  return clearFormatting(inputMethod, editorAnalyticsAPI);
 }
 function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName, formattingCleared) {
   return function (node, pos) {
@@ -41,7 +40,7 @@ function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName,
     return true;
   };
 }
-export function clearFormatting(inputMethod) {
+export function clearFormatting(inputMethod, editorAnalyticsAPI) {
   return function (state, dispatch) {
     var tr = state.tr;
     var formattingCleared = [];
@@ -83,7 +82,7 @@ export function clearFormatting(inputMethod) {
     });
     tr.setStoredMarks([]);
     if (formattingCleared.length && inputMethod) {
-      addAnalytics(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         eventType: EVENT_TYPE.TRACK,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -92,7 +91,7 @@ export function clearFormatting(inputMethod) {
           inputMethod: inputMethod,
           formattingCleared: formattingCleared
         }
-      });
+      })(tr);
     }
     if (dispatch) {
       dispatch(tr);

package/dist/esm/plugins/text-formatting/index.js

@@ -11,6 +11,7 @@ import textFormattingSmartInputRulePlugin from './pm-plugins/smart-input-rule';
 import Toolbar from './ui/Toolbar';
 var textFormatting = function textFormatting() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var api = arguments.length > 1 ? arguments[1] : undefined;
   return {
     name: 'textFormatting',
     marks: function marks() {
@@ -68,7 +69,8 @@ var textFormatting = function textFormatting() {
       }, {
         name: 'textFormattingClearKeymap',
         plugin: function plugin() {
-          return clearFormattingKeymapPlugin();
+          var _api$dependencies$ana;
+          return clearFormattingKeymapPlugin(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);
         }
       }, {
         name: 'textFormattingKeymap',
@@ -91,6 +93,7 @@ var textFormatting = function textFormatting() {
           clearFormattingPluginState: clearFormattingPluginKey
         },
         render: function render() {
+          var _api$dependencies$ana2;
           return /*#__PURE__*/React.createElement(Toolbar, {
             editorState: editorView.state,
             popupsMountPoint: popupsMountPoint,
@@ -99,7 +102,8 @@ var textFormatting = function textFormatting() {
             isReducedSpacing: isToolbarReducedSpacing,
             editorView: editorView,
             isToolbarDisabled: disabled,
-            shouldUseResponsiveToolbar: Boolean(options.responsiveToolbarMenu)
+            shouldUseResponsiveToolbar: Boolean(options.responsiveToolbarMenu),
+            editorAnalyticsAPI: 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/plugins/text-formatting/pm-plugins/clear-formatting-keymap.js

@@ -2,9 +2,9 @@ import { keymap } from 'prosemirror-keymap';
 import * as keymaps from '../../../keymaps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { clearFormattingWithAnalytics } from '../commands/clear-formatting';
-export function keymapPlugin() {
+export function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.clearFormatting.common, clearFormattingWithAnalytics(INPUT_METHOD.SHORTCUT), list);
+  keymaps.bindKeymapWithCommand(keymaps.clearFormatting.common, clearFormattingWithAnalytics(INPUT_METHOD.SHORTCUT, editorAnalyticsAPI), list);
   return keymap(list);
 }
 export default keymapPlugin;

package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { jsx } from '@emotion/react';
 import { shortcutStyle } from '../../../../../ui/styles';
 import { toolbarMessages } from '../toolbar-messages';
@@ -7,7 +7,6 @@ import { clearFormattingWithAnalytics } from '../../../commands/clear-formatting
 import { pluginKey as clearFormattingPluginKey } from '../../../pm-plugins/clear-formatting';
 import { clearFormatting as clearFormattingKeymap, tooltip } from '../../../../../keymaps';
 import { INPUT_METHOD } from '../../../../analytics/types/enums';
-var clearFormattingToolbar = clearFormattingWithAnalytics(INPUT_METHOD.TOOLBAR);
 var useClearFormattingPluginState = function useClearFormattingPluginState(editorState) {
   return useMemo(function () {
     return clearFormattingPluginKey.getState(editorState);
@@ -15,11 +14,15 @@ var useClearFormattingPluginState = function useClearFormattingPluginState(edito
 };
 export var useClearIcon = function useClearIcon(_ref) {
   var intl = _ref.intl,
-    editorState = _ref.editorState;
+    editorState = _ref.editorState,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI;
   var pluginState = useClearFormattingPluginState(editorState);
   var isPluginAvailable = Boolean(pluginState);
   var formattingIsPresent = Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.formattingIsPresent);
   var clearFormattingLabel = intl.formatMessage(toolbarMessages.clearFormatting);
+  var clearFormattingToolbar = useCallback(function (state, dispatch) {
+    return clearFormattingWithAnalytics(INPUT_METHOD.TOOLBAR, editorAnalyticsAPI)(state, dispatch);
+  }, [editorAnalyticsAPI]);
   return useMemo(function () {
     if (!isPluginAvailable) {
       return null;
@@ -38,5 +41,5 @@ export var useClearIcon = function useClearIcon(_ref) {
       isDisabled: !formattingIsPresent,
       'aria-label': clearFormattingKeymap ? tooltip(clearFormattingKeymap, String(clearFormattingLabel)) : String(clearFormattingLabel)
     };
-  }, [clearFormattingLabel, isPluginAvailable, formattingIsPresent]);
+  }, [isPluginAvailable, clearFormattingToolbar, clearFormattingLabel, formattingIsPresent]);
 };

package/dist/esm/plugins/text-formatting/ui/Toolbar/index.js

@@ -32,7 +32,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     toolbarSize = _ref.toolbarSize,
     isReducedSpacing = _ref.isReducedSpacing,
     isToolbarDisabled = _ref.isToolbarDisabled,
-    intl = _ref.intl;
+    intl = _ref.intl,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI;
   var editorState = useMemo(function () {
     return editorView.state;
   }, [editorView.state]);
@@ -47,7 +48,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
   });
   var clearIcon = useClearIcon({
     editorState: editorState,
-    intl: intl
+    intl: intl,
+    editorAnalyticsAPI: editorAnalyticsAPI
   });
   var menuIconTypeList = useResponsiveIconTypeMenu({
     toolbarSize: toolbarSize,
@@ -168,7 +170,8 @@ var Toolbar = /*#__PURE__*/function (_React$PureComponent) {
         editorView = _this$props.editorView,
         isToolbarDisabled = _this$props.isToolbarDisabled,
         shouldUseResponsiveToolbar = _this$props.shouldUseResponsiveToolbar,
-        intl = _this$props.intl;
+        intl = _this$props.intl,
+        editorAnalyticsAPI = _this$props.editorAnalyticsAPI;
       return jsx(ToolbarFormatting, {
         popupsMountPoint: popupsMountPoint,
         popupsScrollableElement: popupsScrollableElement,
@@ -177,7 +180,8 @@ var Toolbar = /*#__PURE__*/function (_React$PureComponent) {
         editorView: editorView,
         isToolbarDisabled: isToolbarDisabled,
         shouldUseResponsiveToolbar: shouldUseResponsiveToolbar,
-        intl: intl
+        intl: intl,
+        editorAnalyticsAPI: editorAnalyticsAPI
       });
     }
   }]);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.16.1";
+export var version = "185.16.5";
 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.16.1",
+	"version": "185.16.5",
 	"sideEffects": false
 }