@atlaskit/editor-core 185.16.0 → 185.16.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 185.16.3
+
+### Patch Changes
+
+- [`6e113937892`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6e113937892) - switched use of analytics plugin to new EditorAnalyticsAPI for text-formatting pluginModified file
+
+## 185.16.1
+
+### Patch Changes
+
+- [`75520758a9d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/75520758a9d) - Fix layout not persisting on edits of datasource
+
 ## 185.16.0
 
 ### Minor Changes

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

@@ -451,7 +451,7 @@ var updateExistingDatasource = function updateExistingDatasource(state, node, ne
     var isColumnChange = !(0, _isEqual.default)(oldColumnKeys, newColumnKeys);
     var isUrlChange = ((_newAdf$attrs = newAdf.attrs) === null || _newAdf$attrs === void 0 ? void 0 : _newAdf$attrs.url) !== ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url);
     if (isColumnChange || isUrlChange) {
-      tr.setNodeMarkup(from, schemaNodes.blockCard, newAdf.attrs);
+      tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, node.attrs), newAdf.attrs));
     }
   } else if (newAdf.type === 'inlineCard') {
     // datasource to inline

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

@@ -10,7 +10,6 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _prosemirrorTransform = require("prosemirror-transform");
 var _cellSelection2 = require("../../../utils/cell-selection");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _analytics2 = require("../../analytics");
 var FORMATTING_NODE_TYPES = ['heading', 'codeBlock', 'blockquote'];
 exports.FORMATTING_NODE_TYPES = FORMATTING_NODE_TYPES;
 var FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup'];
@@ -24,8 +23,8 @@ var formatTypes = {
   textColor: _analytics.ACTION_SUBJECT_ID.FORMAT_COLOR,
   subsup: 'subsup'
 };
-function clearFormattingWithAnalytics(inputMethod) {
-  return clearFormatting(inputMethod);
+function clearFormattingWithAnalytics(inputMethod, editorAnalyticsAPI) {
+  return clearFormatting(inputMethod, editorAnalyticsAPI);
 }
 function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName, formattingCleared) {
   return function (node, pos) {
@@ -51,7 +50,7 @@ function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName,
     return true;
   };
 }
-function clearFormatting(inputMethod) {
+function clearFormatting(inputMethod, editorAnalyticsAPI) {
   return function (state, dispatch) {
     var tr = state.tr;
     var formattingCleared = [];
@@ -93,7 +92,7 @@ function clearFormatting(inputMethod) {
     });
     tr.setStoredMarks([]);
     if (formattingCleared.length && inputMethod) {
-      (0, _analytics2.addAnalytics)(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         eventType: _analytics.EVENT_TYPE.TRACK,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -102,7 +101,7 @@ function clearFormatting(inputMethod) {
           inputMethod: inputMethod,
           formattingCleared: formattingCleared
         }
-      });
+      })(tr);
     }
     if (dispatch) {
       dispatch(tr);

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

@@ -18,6 +18,7 @@ var _smartInputRule = _interopRequireDefault(require("./pm-plugins/smart-input-r
 var _Toolbar = _interopRequireDefault(require("./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() {
@@ -75,7 +76,8 @@ var textFormatting = function textFormatting() {
       }, {
         name: 'textFormattingClearKeymap',
         plugin: function plugin() {
-          return (0, _clearFormattingKeymap.default)();
+          var _api$dependencies$ana;
+          return (0, _clearFormattingKeymap.default)(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',
@@ -98,6 +100,7 @@ var textFormatting = function textFormatting() {
           clearFormattingPluginState: _clearFormatting.pluginKey
         },
         render: function render() {
+          var _api$dependencies$ana2;
           return /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
             editorState: editorView.state,
             popupsMountPoint: popupsMountPoint,
@@ -106,7 +109,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/cjs/plugins/text-formatting/pm-plugins/clear-formatting-keymap.js

@@ -12,9 +12,9 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _clearFormatting = require("../commands/clear-formatting");
 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 keymapPlugin() {
+function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.clearFormatting.common, (0, _clearFormatting.clearFormattingWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT), list);
+  keymaps.bindKeymapWithCommand(keymaps.clearFormatting.common, (0, _clearFormatting.clearFormattingWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsAPI), list);
   return (0, _prosemirrorKeymap.keymap)(list);
 }
 var _default = keymapPlugin;

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

@@ -14,7 +14,6 @@ var _keymaps = require("../../../../../keymaps");
 var _enums = require("../../../../analytics/types/enums");
 /** @jsx jsx */
 
-var clearFormattingToolbar = (0, _clearFormatting.clearFormattingWithAnalytics)(_enums.INPUT_METHOD.TOOLBAR);
 var useClearFormattingPluginState = function useClearFormattingPluginState(editorState) {
   return (0, _react.useMemo)(function () {
     return _clearFormatting2.pluginKey.getState(editorState);
@@ -22,11 +21,15 @@ var useClearFormattingPluginState = function useClearFormattingPluginState(edito
 };
 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.toolbarMessages.clearFormatting);
+  var clearFormattingToolbar = (0, _react.useCallback)(function (state, dispatch) {
+    return (0, _clearFormatting.clearFormattingWithAnalytics)(_enums.INPUT_METHOD.TOOLBAR, editorAnalyticsAPI)(state, dispatch);
+  }, [editorAnalyticsAPI]);
   return (0, _react.useMemo)(function () {
     if (!isPluginAvailable) {
       return null;
@@ -45,6 +48,6 @@ var useClearIcon = function useClearIcon(_ref) {
       isDisabled: !formattingIsPresent,
       'aria-label': _keymaps.clearFormatting ? (0, _keymaps.tooltip)(_keymaps.clearFormatting, String(clearFormattingLabel)) : String(clearFormattingLabel)
     };
-  }, [clearFormattingLabel, isPluginAvailable, formattingIsPresent]);
+  }, [isPluginAvailable, clearFormattingToolbar, clearFormattingLabel, formattingIsPresent]);
 };
 exports.useClearIcon = useClearIcon;

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

@@ -41,7 +41,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 = (0, _react.useMemo)(function () {
     return editorView.state;
   }, [editorView.state]);
@@ -56,7 +57,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
   });
   var clearIcon = (0, _clearFormattingIcon.useClearIcon)({
     editorState: editorState,
-    intl: intl
+    intl: intl,
+    editorAnalyticsAPI: editorAnalyticsAPI
   });
   var menuIconTypeList = (0, _responsiveToolbarButtons.useResponsiveIconTypeMenu)({
     toolbarSize: toolbarSize,
@@ -177,7 +179,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 (0, _react2.jsx)(ToolbarFormatting, {
         popupsMountPoint: popupsMountPoint,
         popupsScrollableElement: popupsScrollableElement,
@@ -186,7 +189,8 @@ var Toolbar = /*#__PURE__*/function (_React$PureComponent) {
         editorView: editorView,
         isToolbarDisabled: isToolbarDisabled,
         shouldUseResponsiveToolbar: shouldUseResponsiveToolbar,
-        intl: intl
+        intl: intl,
+        editorAnalyticsAPI: editorAnalyticsAPI
       });
     }
   }]);

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.16.0";
+var version = "185.16.3";
 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.16.0",
+	"version": "185.16.3",
 	"sideEffects": false
 }

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

@@ -415,7 +415,10 @@ export const updateExistingDatasource = (state, node, newAdf, view) => {
     const isColumnChange = !isEqual(oldColumnKeys, newColumnKeys);
     const isUrlChange = ((_newAdf$attrs = newAdf.attrs) === null || _newAdf$attrs === void 0 ? void 0 : _newAdf$attrs.url) !== ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url);
     if (isColumnChange || isUrlChange) {
-      tr.setNodeMarkup(from, schemaNodes.blockCard, newAdf.attrs);
+      tr.setNodeMarkup(from, schemaNodes.blockCard, {
+        ...node.attrs,
+        ...newAdf.attrs
+      });
     }
   } else if (newAdf.type === 'inlineCard') {
     // datasource to inline

package/dist/es2019/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 const FORMATTING_NODE_TYPES = ['heading', 'codeBlock', 'blockquote'];
 export const FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup'];
 const formatTypes = {
@@ -14,8 +13,8 @@ const 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) {
     const {
       tr
@@ -87,7 +86,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,
@@ -96,7 +95,7 @@ export function clearFormatting(inputMethod) {
           inputMethod,
           formattingCleared
         }
-      });
+      })(tr);
     }
     if (dispatch) {
       dispatch(tr);

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

@@ -9,7 +9,7 @@ import textFormattingInputRulePlugin from './pm-plugins/input-rule';
 import keymapPlugin from './pm-plugins/keymap';
 import textFormattingSmartInputRulePlugin from './pm-plugins/smart-input-rule';
 import Toolbar from './ui/Toolbar';
-const textFormatting = (options = {}) => ({
+const textFormatting = (options = {}, api) => ({
   name: 'textFormatting',
   marks() {
     return [{
@@ -59,7 +59,10 @@ const textFormatting = (options = {}) => ({
       }) => clearFormattingPlugin(dispatch)
     }, {
       name: 'textFormattingClearKeymap',
-      plugin: () => clearFormattingKeymapPlugin()
+      plugin: () => {
+        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',
       plugin: ({
@@ -81,6 +84,7 @@ const textFormatting = (options = {}) => ({
         clearFormattingPluginState: clearFormattingPluginKey
       },
       render: () => {
+        var _api$dependencies$ana2;
         return /*#__PURE__*/React.createElement(Toolbar, {
           editorState: editorView.state,
           popupsMountPoint: popupsMountPoint,
@@ -89,7 +93,8 @@ const textFormatting = (options = {}) => ({
           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/es2019/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) {
   const 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/es2019/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,18 +7,19 @@ 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';
-const clearFormattingToolbar = clearFormattingWithAnalytics(INPUT_METHOD.TOOLBAR);
 const useClearFormattingPluginState = editorState => {
   return useMemo(() => clearFormattingPluginKey.getState(editorState), [editorState]);
 };
 export const useClearIcon = ({
   intl,
-  editorState
+  editorState,
+  editorAnalyticsAPI
 }) => {
   const pluginState = useClearFormattingPluginState(editorState);
   const isPluginAvailable = Boolean(pluginState);
   const formattingIsPresent = Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.formattingIsPresent);
   const clearFormattingLabel = intl.formatMessage(toolbarMessages.clearFormatting);
+  const clearFormattingToolbar = useCallback((state, dispatch) => clearFormattingWithAnalytics(INPUT_METHOD.TOOLBAR, editorAnalyticsAPI)(state, dispatch), [editorAnalyticsAPI]);
   return useMemo(() => {
     if (!isPluginAvailable) {
       return null;
@@ -37,5 +38,5 @@ export const useClearIcon = ({
       isDisabled: !formattingIsPresent,
       'aria-label': clearFormattingKeymap ? tooltip(clearFormattingKeymap, String(clearFormattingLabel)) : String(clearFormattingLabel)
     };
-  }, [clearFormattingLabel, isPluginAvailable, formattingIsPresent]);
+  }, [isPluginAvailable, clearFormattingToolbar, clearFormattingLabel, formattingIsPresent]);
 };

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

@@ -22,7 +22,8 @@ const ToolbarFormatting = ({
   toolbarSize,
   isReducedSpacing,
   isToolbarDisabled,
-  intl
+  intl,
+  editorAnalyticsAPI
 }) => {
   var _usePreviousState;
   const editorState = useMemo(() => editorView.state, [editorView.state]);
@@ -34,7 +35,8 @@ const ToolbarFormatting = ({
   });
   const clearIcon = useClearIcon({
     editorState,
-    intl
+    intl,
+    editorAnalyticsAPI
   });
   const menuIconTypeList = useResponsiveIconTypeMenu({
     toolbarSize,
@@ -146,7 +148,8 @@ class Toolbar extends React.PureComponent {
       editorView,
       isToolbarDisabled,
       shouldUseResponsiveToolbar,
-      intl
+      intl,
+      editorAnalyticsAPI
     } = this.props;
     return jsx(ToolbarFormatting, {
       popupsMountPoint: popupsMountPoint,
@@ -156,7 +159,8 @@ class Toolbar extends React.PureComponent {
       editorView: editorView,
       isToolbarDisabled: isToolbarDisabled,
       shouldUseResponsiveToolbar: shouldUseResponsiveToolbar,
-      intl: intl
+      intl: intl,
+      editorAnalyticsAPI: editorAnalyticsAPI
     });
   }
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.16.0";
+export const version = "185.16.3";
 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.16.0",
+	"version": "185.16.3",
 	"sideEffects": false
 }

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

@@ -435,7 +435,7 @@ export var updateExistingDatasource = function updateExistingDatasource(state, n
     var isColumnChange = !isEqual(oldColumnKeys, newColumnKeys);
     var isUrlChange = ((_newAdf$attrs = newAdf.attrs) === null || _newAdf$attrs === void 0 ? void 0 : _newAdf$attrs.url) !== ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url);
     if (isColumnChange || isUrlChange) {
-      tr.setNodeMarkup(from, schemaNodes.blockCard, newAdf.attrs);
+      tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, node.attrs), newAdf.attrs));
     }
   } else if (newAdf.type === 'inlineCard') {
     // datasource to inline

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.0";
+export var version = "185.16.3";
 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.0",
+	"version": "185.16.3",
 	"sideEffects": false
 }