@atlaskit/editor-core 188.2.4 → 188.2.6

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 188.2.6
+
+### Patch Changes
+
+- [#41212](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41212) [`db0107e09d7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/db0107e09d7) - Updates failing datasources playwright test
+
+## 188.2.5
+
+### Patch Changes
+
+- [#41103](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41103) [`e268e178096`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e268e178096) - ED-20195 Decouple Text color plugin from editor core
+- Updated dependencies
+
 ## 188.2.4
 
 ### Patch Changes

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -11,7 +11,7 @@ var _add = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/add"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _keymaps = require("../../../../keymaps");
 var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
-var _styles = require("../../../../ui/styles");
+var _styles = require("@atlaskit/editor-common/styles");
 var _styles2 = require("./styles");
 /** @jsx jsx */
 

package/dist/cjs/plugins/text-color/commands/change-color.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.changeColor = void 0;
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _main = require("../pm-plugins/main");
 var _color = require("../utils/color");
 var _removeColor = require("./remove-color");
@@ -16,7 +17,7 @@ var _toggleColor = require("./toggle-color");
  * @param palette - Current palette of colors
  * @return Higher order command with analytics logic inside.
  */
-function createWithColorAnalytics(newColor, previousColor, palette) {
+function createWithColorAnalytics(newColor, previousColor, palette, editorAnalyticsApi) {
   var newColorFromPalette = palette.find(function (_ref) {
     var value = _ref.value;
     return value === newColor;
@@ -27,7 +28,7 @@ function createWithColorAnalytics(newColor, previousColor, palette) {
   });
   var newColorLabel = newColorFromPalette ? newColorFromPalette.label : newColor;
   var previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor || '';
-  return (0, _analytics.withAnalytics)({
+  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
     action: _analytics.ACTION.FORMATTED,
     actionSubject: _analytics.ACTION_SUBJECT.TEXT,
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_COLOR,
@@ -38,13 +39,13 @@ function createWithColorAnalytics(newColor, previousColor, palette) {
     }
   });
 }
-var changeColor = exports.changeColor = function changeColor(color) {
+var changeColor = exports.changeColor = function changeColor(color, editorAnalyticsApi) {
   return function (state, dispatch) {
     var textColor = state.schema.marks.textColor;
     if (textColor) {
       var pluginState = _main.pluginKey.getState(state);
       var activeColor = (0, _color.getActiveColor)(state);
-      var withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || []);
+      var withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || [], editorAnalyticsApi);
       if (pluginState !== null && pluginState !== void 0 && pluginState.disabled) {
         return false;
       }

package/dist/cjs/plugins/text-color/commands/toggle-color.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toggleColor = void 0;
 var _mark = require("@atlaskit/editor-common/mark");
+var _preset = require("@atlaskit/editor-common/preset");
 var _main = require("../pm-plugins/main");
 var _disabled = require("../utils/disabled");
-var _preset = require("@atlaskit/editor-common/preset");
 var toggleColor = exports.toggleColor = function toggleColor(color) {
   return function (state, dispatch) {
     var textColor = state.schema.marks.textColor;

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

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "textColorPluginKey", {
 });
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
+var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
 var _main = require("./pm-plugins/main");
 var _ToolbarTextColor = _interopRequireDefault(require("./ui/ToolbarTextColor"));
 var pluginConfig = function pluginConfig(textColorConfig) {
@@ -23,7 +23,8 @@ var pluginConfig = function pluginConfig(textColorConfig) {
   return textColorConfig;
 };
 var textColorPlugin = function textColorPlugin(_ref) {
-  var textColorConfig = _ref.config;
+  var textColorConfig = _ref.config,
+    api = _ref.api;
   return {
     name: 'textColor',
     marks: function marks() {
@@ -49,7 +50,7 @@ var textColorPlugin = function textColorPlugin(_ref) {
         isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
         disabled = _ref3.disabled;
-      return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+      return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
         plugins: {
           textColor: _main.pluginKey
         },
@@ -63,7 +64,8 @@ var textColorPlugin = function textColorPlugin(_ref) {
             popupsBoundariesElement: popupsBoundariesElement,
             popupsScrollableElement: popupsScrollableElement,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            disabled: disabled
+            disabled: disabled,
+            pluginInjectionApi: api
           });
         }
       });

package/dist/cjs/plugins/text-color/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -18,19 +17,14 @@ var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _styles = require("@atlaskit/editor-common/styles");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorPalette = require("@atlaskit/editor-palette");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _ColorPalette = _interopRequireWildcard(require("../../../../ui/ColorPalette"));
-var _styles = require("../../../../ui/styles");
-var _styles2 = require("@atlaskit/editor-common/styles");
-var _ToolbarButton = _interopRequireWildcard(require("../../../../ui/ToolbarButton"));
-var _analytics = require("../../../analytics");
-var commands = _interopRequireWildcard(require("../../commands/change-color"));
+var _changeColor = require("../../commands/change-color");
 var _icon = require("./icon");
-var _styles3 = require("./styles");
-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 _styles2 = require("./styles");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }; }
@@ -59,8 +53,8 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
       isOpenedByKeyboard: false
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "toolbarItemRef", /*#__PURE__*/_react.default.createRef());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeColor", function (color) {
-      return commands.changeColor(color)(_this.props.editorView.state, _this.props.editorView.dispatch);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeColor", function (color, editorAnalyticsApi) {
+      return (0, _changeColor.changeColor)(color, editorAnalyticsApi)(_this.props.editorView.state, _this.props.editorView.dispatch);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onOpenChange", function (attrs) {
       _this.handleOpenChange({
@@ -69,7 +63,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         event: attrs.event
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeTextColor", function (color, disabled) {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeTextColor", function (color, editorAnalyticsApi, disabled) {
       var _this$toolbarItemRef;
       if (!disabled) {
         var _this$props$editorVie;
@@ -86,7 +80,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
           isOpen: false,
           logCloseEvent: false
         });
-        _this.changeColor(color);
+        _this.changeColor(color, editorAnalyticsApi);
         //To set the focus on the textcolor button when the menu is closed by 'Esc' only to meet aria guidelines
         (_this$props$editorVie = _this.props.editorView) === null || _this$props$editorVie === void 0 || _this$props$editorVie.focus();
       }
@@ -166,7 +160,8 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         isReducedSpacing = _this$props.isReducedSpacing,
         pluginState = _this$props.pluginState,
         formatMessage = _this$props.intl.formatMessage,
-        disabled = _this$props.disabled;
+        disabled = _this$props.disabled,
+        pluginInjectionApi = _this$props.pluginInjectionApi;
       var labelTextColor = formatMessage(messages.textColor);
       var palette = pluginState.palette;
       var fitWidth;
@@ -182,7 +177,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
       return (0, _react2.jsx)("span", {
-        css: _styles2.wrapperStyle
+        css: _styles.wrapperStyle
       }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
@@ -201,8 +196,8 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
           isOpenedByKeyboard: isOpenedByKeyboard,
           isPopupPositioned: true
         },
-        trigger: (0, _react2.jsx)(_ToolbarButton.default, {
-          buttonId: _ToolbarButton.TOOLBAR_BUTTON.TEXT_COLOR,
+        trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+          buttonId: _uiMenu.TOOLBAR_BUTTON.TEXT_COLOR,
           spacing: isReducedSpacing ? 'none' : 'default',
           disabled: disabled || pluginState.disabled,
           selected: isOpen,
@@ -214,11 +209,11 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
           onKeyDown: this.onKeyDown,
           ref: this.toolbarItemRef,
           iconBefore: (0, _react2.jsx)("div", {
-            css: _styles2.triggerWrapperStyles
+            css: _styles.triggerWrapperStyles
           }, (0, _react2.jsx)("div", {
-            css: _styles3.textColorIconWrapper
+            css: _styles2.textColorIconWrapper
           }, (0, _react2.jsx)(_icon.EditorTextColorIcon, null), (0, _react2.jsx)("div", {
-            css: [_styles3.textColorIconBar, selectedColor ? "background: ".concat(selectedColor, ";") : pluginState.disabled && _styles3.backgroundDisabled]
+            css: [_styles2.textColorIconBar, selectedColor ? "background: ".concat(selectedColor, ";") : pluginState.disabled && _styles2.backgroundDisabled]
           })), (0, _react2.jsx)("span", {
             css: _styles.expandIconWrapperStyle
           }, (0, _react2.jsx)(_chevronDown.default, {
@@ -227,18 +222,19 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         })
       }, (0, _react2.jsx)("div", {
         "data-testid": "text-color-palette"
-      }, (0, _react2.jsx)(_ColorPalette.default, {
+      }, (0, _react2.jsx)(_uiColor.ColorPalette, {
         onClick: function onClick(color) {
-          return _this2.changeTextColor(color, pluginState.disabled);
+          var _pluginInjectionApi$a;
+          return _this2.changeTextColor(color, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions, pluginState.disabled);
         },
         selectedColor: pluginState.color,
         paletteOptions: {
           palette: palette,
           hexToPaletteColor: _editorPalette.hexToEditorTextPaletteColor,
-          paletteColorTooltipMessages: _ColorPalette.textPaletteTooltipMessages
+          paletteColorTooltipMessages: _uiColor.textPaletteTooltipMessages
         }
       }))), (0, _react2.jsx)("span", {
-        css: _styles2.separatorStyles
+        css: _styles.separatorStyles
       }));
     }
   }, {

package/dist/cjs/plugins/text-color/utils/disabled.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDisabledState = void 0;
-var _mark = require("../../../utils/mark");
+var _mark = require("@atlaskit/editor-common/mark");
 var hasLinkMark = function hasLinkMark($pos) {
   var linkMarkType = $pos.doc.type.schema.marks.link,
     pos = $pos.pos;

package/dist/cjs/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -100,7 +100,7 @@ function ToolbarDropdown(props) {
     }, (0, _react.jsx)(_bulletList.default, {
       label: labelLists
     }), (0, _react.jsx)("span", {
-      css: _styles.expandIconWrapperStyle
+      css: _styles2.expandIconWrapperStyle
     }, (0, _react.jsx)(_chevronDown.default, {
       label: ""
     })))

package/dist/cjs/ui/styles.js

@@ -1,10 +1,8 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.expandIconWrapperStyle = void 0;
 Object.defineProperty(exports, "scrollbarStyles", {
   enumerable: true,
   get: function get() {
@@ -17,9 +15,5 @@ Object.defineProperty(exports, "shortcutStyle", {
     return _shortcut.shortcutStyle;
   }
 });
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-var _react = require("@emotion/react");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
-var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
-var _templateObject;
-var expandIconWrapperStyle = exports.expandIconWrapperStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin-left: -8px;\n"])));
+var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "188.2.4";
+var version = exports.version = "188.2.6";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -5,7 +5,7 @@ import AddIcon from '@atlaskit/icon/glyph/editor/add';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ToolTipContent } from '../../../../keymaps';
 import ToolbarButton from '../../../../ui/ToolbarButton';
-import { expandIconWrapperStyle } from '../../../../ui/styles';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { triggerWrapper } from './styles';
 const DropDownButtonIcon = /*#__PURE__*/React.memo(props => jsx("span", {
   css: triggerWrapper

package/dist/es2019/plugins/text-color/commands/change-color.js

@@ -1,4 +1,5 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, withAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { pluginKey } from '../pm-plugins/main';
 import { getActiveColor } from '../utils/color';
 import { removeColor } from './remove-color';
@@ -11,7 +12,7 @@ import { toggleColor } from './toggle-color';
  * @param palette - Current palette of colors
  * @return Higher order command with analytics logic inside.
  */
-function createWithColorAnalytics(newColor, previousColor, palette) {
+function createWithColorAnalytics(newColor, previousColor, palette, editorAnalyticsApi) {
   const newColorFromPalette = palette.find(({
     value
   }) => value === newColor);
@@ -20,7 +21,7 @@ function createWithColorAnalytics(newColor, previousColor, palette) {
   }) => value === previousColor);
   const newColorLabel = newColorFromPalette ? newColorFromPalette.label : newColor;
   const previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor || '';
-  return withAnalytics({
+  return withAnalytics(editorAnalyticsApi, {
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.FORMAT_COLOR,
@@ -31,14 +32,14 @@ function createWithColorAnalytics(newColor, previousColor, palette) {
     }
   });
 }
-export const changeColor = color => (state, dispatch) => {
+export const changeColor = (color, editorAnalyticsApi) => (state, dispatch) => {
   const {
     textColor
   } = state.schema.marks;
   if (textColor) {
     const pluginState = pluginKey.getState(state);
     const activeColor = getActiveColor(state);
-    const withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || []);
+    const withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || [], editorAnalyticsApi);
     if (pluginState !== null && pluginState !== void 0 && pluginState.disabled) {
       return false;
     }

package/dist/es2019/plugins/text-color/commands/toggle-color.js

@@ -1,7 +1,7 @@
 import { toggleMark } from '@atlaskit/editor-common/mark';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { ACTIONS, pluginKey } from '../pm-plugins/main';
 import { getDisabledState } from '../utils/disabled';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 export const toggleColor = color => (state, dispatch) => {
   const {
     textColor

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { textColor } from '@atlaskit/adf-schema';
-import WithPluginState from '../../ui/WithPluginState';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { createPlugin, pluginKey as textColorPluginKey } from './pm-plugins/main';
 import ToolbarTextColor from './ui/ToolbarTextColor';
 const pluginConfig = textColorConfig => {
@@ -10,7 +10,8 @@ const pluginConfig = textColorConfig => {
   return textColorConfig;
 };
 const textColorPlugin = ({
-  config: textColorConfig
+  config: textColorConfig,
+  api
 }) => {
   return {
     name: 'textColor',
@@ -51,7 +52,8 @@ const textColorPlugin = ({
           popupsBoundariesElement: popupsBoundariesElement,
           popupsScrollableElement: popupsScrollableElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          disabled: disabled
+          disabled: disabled,
+          pluginInjectionApi: api
         })
       });
     }

package/dist/es2019/plugins/text-color/types.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -5,16 +5,15 @@ import { jsx } from '@emotion/react';
 import { defineMessages, injectIntl } from 'react-intl-next';
 import { getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color';
 import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
+import { ColorPalette, textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
+import { wrapperStyle, separatorStyles, triggerWrapperStyles } from '@atlaskit/editor-common/styles';
+import { DropdownContainer as Dropdown, ToolbarButton, TOOLBAR_BUTTON } from '@atlaskit/editor-common/ui-menu';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import ColorPalette, { textPaletteTooltipMessages } from '../../../../ui/ColorPalette';
-import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
-import { expandIconWrapperStyle } from '../../../../ui/styles';
-import { wrapperStyle, separatorStyles, triggerWrapperStyles } from '@atlaskit/editor-common/styles';
-import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../../analytics';
-import * as commands from '../../commands/change-color';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
+import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
 import { EditorTextColorIcon } from './icon';
 import { backgroundDisabled, textColorIconBar, textColorIconWrapper } from './styles';
 const EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
@@ -34,7 +33,7 @@ export class ToolbarTextColor extends React.Component {
       isOpenedByKeyboard: false
     });
     _defineProperty(this, "toolbarItemRef", /*#__PURE__*/React.createRef());
-    _defineProperty(this, "changeColor", color => commands.changeColor(color)(this.props.editorView.state, this.props.editorView.dispatch));
+    _defineProperty(this, "changeColor", (color, editorAnalyticsApi) => changeColorWithAnalytics(color, editorAnalyticsApi)(this.props.editorView.state, this.props.editorView.dispatch));
     _defineProperty(this, "onOpenChange", attrs => {
       this.handleOpenChange({
         isOpen: attrs.isOpen,
@@ -42,7 +41,7 @@ export class ToolbarTextColor extends React.Component {
         event: attrs.event
       });
     });
-    _defineProperty(this, "changeTextColor", (color, disabled) => {
+    _defineProperty(this, "changeTextColor", (color, editorAnalyticsApi, disabled) => {
       var _this$toolbarItemRef, _this$toolbarItemRef$;
       if (!disabled) {
         var _this$props$editorVie;
@@ -61,7 +60,7 @@ export class ToolbarTextColor extends React.Component {
           isOpen: false,
           logCloseEvent: false
         });
-        this.changeColor(color);
+        this.changeColor(color, editorAnalyticsApi);
         //To set the focus on the textcolor button when the menu is closed by 'Esc' only to meet aria guidelines
         (_this$props$editorVie = this.props.editorView) === null || _this$props$editorVie === void 0 ? void 0 : _this$props$editorVie.focus();
       }
@@ -143,7 +142,8 @@ export class ToolbarTextColor extends React.Component {
       intl: {
         formatMessage
       },
-      disabled
+      disabled,
+      pluginInjectionApi
     } = this.props;
     const labelTextColor = formatMessage(messages.textColor);
     const palette = pluginState.palette;
@@ -207,7 +207,10 @@ export class ToolbarTextColor extends React.Component {
     }, jsx("div", {
       "data-testid": "text-color-palette"
     }, jsx(ColorPalette, {
-      onClick: color => this.changeTextColor(color, pluginState.disabled),
+      onClick: color => {
+        var _pluginInjectionApi$a;
+        return this.changeTextColor(color, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions, pluginState.disabled);
+      },
       selectedColor: pluginState.color,
       paletteOptions: {
         palette,

package/dist/es2019/plugins/text-color/utils/disabled.js

@@ -1,4 +1,4 @@
-import { isMarkAllowedInRange, isMarkExcluded } from '../../../utils/mark';
+import { isMarkAllowedInRange, isMarkExcluded } from '@atlaskit/editor-common/mark';
 const hasLinkMark = $pos => {
   const {
     doc: {

package/dist/es2019/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -7,7 +7,8 @@ import BulletListIcon from '@atlaskit/icon/glyph/editor/bullet-list';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, indent as toggleIndentKeymap, outdent as toggleOutdentKeymap, tooltip } from '../../../keymaps';
 import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import ToolbarButton from '../../../ui/ToolbarButton';
-import { expandIconWrapperStyle, shortcutStyle } from '../../../ui/styles';
+import { shortcutStyle } from '../../../ui/styles';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { wrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
 import { listMessages } from '@atlaskit/editor-common/messages';
 import { messages as indentationMessages } from '../../indentation/messages';

package/dist/es2019/ui/styles.js

@@ -1,6 +1,2 @@
-import { css } from '@emotion/react';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export const expandIconWrapperStyle = css`
-  margin-left: -8px;
-`;
+export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';

package/dist/es2019/version-wrapper.js

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

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -5,7 +5,7 @@ import AddIcon from '@atlaskit/icon/glyph/editor/add';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ToolTipContent } from '../../../../keymaps';
 import ToolbarButton from '../../../../ui/ToolbarButton';
-import { expandIconWrapperStyle } from '../../../../ui/styles';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { triggerWrapper } from './styles';
 var DropDownButtonIcon = /*#__PURE__*/React.memo(function (props) {
   return jsx("span", {

package/dist/esm/plugins/text-color/commands/change-color.js

@@ -1,4 +1,5 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, withAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { pluginKey } from '../pm-plugins/main';
 import { getActiveColor } from '../utils/color';
 import { removeColor } from './remove-color';
@@ -11,7 +12,7 @@ import { toggleColor } from './toggle-color';
  * @param palette - Current palette of colors
  * @return Higher order command with analytics logic inside.
  */
-function createWithColorAnalytics(newColor, previousColor, palette) {
+function createWithColorAnalytics(newColor, previousColor, palette, editorAnalyticsApi) {
   var newColorFromPalette = palette.find(function (_ref) {
     var value = _ref.value;
     return value === newColor;
@@ -22,7 +23,7 @@ function createWithColorAnalytics(newColor, previousColor, palette) {
   });
   var newColorLabel = newColorFromPalette ? newColorFromPalette.label : newColor;
   var previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor || '';
-  return withAnalytics({
+  return withAnalytics(editorAnalyticsApi, {
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.FORMAT_COLOR,
@@ -33,13 +34,13 @@ function createWithColorAnalytics(newColor, previousColor, palette) {
     }
   });
 }
-export var changeColor = function changeColor(color) {
+export var changeColor = function changeColor(color, editorAnalyticsApi) {
   return function (state, dispatch) {
     var textColor = state.schema.marks.textColor;
     if (textColor) {
       var pluginState = pluginKey.getState(state);
       var activeColor = getActiveColor(state);
-      var withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || []);
+      var withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || [], editorAnalyticsApi);
       if (pluginState !== null && pluginState !== void 0 && pluginState.disabled) {
         return false;
       }

package/dist/esm/plugins/text-color/commands/toggle-color.js

@@ -1,7 +1,7 @@
 import { toggleMark } from '@atlaskit/editor-common/mark';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { ACTIONS, pluginKey } from '../pm-plugins/main';
 import { getDisabledState } from '../utils/disabled';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 export var toggleColor = function toggleColor(color) {
   return function (state, dispatch) {
     var textColor = state.schema.marks.textColor;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { textColor } from '@atlaskit/adf-schema';
-import WithPluginState from '../../ui/WithPluginState';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { createPlugin, pluginKey as textColorPluginKey } from './pm-plugins/main';
 import ToolbarTextColor from './ui/ToolbarTextColor';
 var pluginConfig = function pluginConfig(textColorConfig) {
@@ -10,7 +10,8 @@ var pluginConfig = function pluginConfig(textColorConfig) {
   return textColorConfig;
 };
 var textColorPlugin = function textColorPlugin(_ref) {
-  var textColorConfig = _ref.config;
+  var textColorConfig = _ref.config,
+    api = _ref.api;
   return {
     name: 'textColor',
     marks: function marks() {
@@ -50,7 +51,8 @@ var textColorPlugin = function textColorPlugin(_ref) {
             popupsBoundariesElement: popupsBoundariesElement,
             popupsScrollableElement: popupsScrollableElement,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            disabled: disabled
+            disabled: disabled,
+            pluginInjectionApi: api
           });
         }
       });

package/dist/esm/plugins/text-color/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -15,16 +15,15 @@ import { jsx } from '@emotion/react';
 import { defineMessages, injectIntl } from 'react-intl-next';
 import { getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color';
 import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
+import { ColorPalette, textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
+import { wrapperStyle, separatorStyles, triggerWrapperStyles } from '@atlaskit/editor-common/styles';
+import { DropdownContainer as Dropdown, ToolbarButton, TOOLBAR_BUTTON } from '@atlaskit/editor-common/ui-menu';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import ColorPalette, { textPaletteTooltipMessages } from '../../../../ui/ColorPalette';
-import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
-import { expandIconWrapperStyle } from '../../../../ui/styles';
-import { wrapperStyle, separatorStyles, triggerWrapperStyles } from '@atlaskit/editor-common/styles';
-import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../../analytics';
-import * as commands from '../../commands/change-color';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
+import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
 import { EditorTextColorIcon } from './icon';
 import { backgroundDisabled, textColorIconBar, textColorIconWrapper } from './styles';
 var EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
@@ -51,8 +50,8 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
       isOpenedByKeyboard: false
     });
     _defineProperty(_assertThisInitialized(_this), "toolbarItemRef", /*#__PURE__*/React.createRef());
-    _defineProperty(_assertThisInitialized(_this), "changeColor", function (color) {
-      return commands.changeColor(color)(_this.props.editorView.state, _this.props.editorView.dispatch);
+    _defineProperty(_assertThisInitialized(_this), "changeColor", function (color, editorAnalyticsApi) {
+      return changeColorWithAnalytics(color, editorAnalyticsApi)(_this.props.editorView.state, _this.props.editorView.dispatch);
     });
     _defineProperty(_assertThisInitialized(_this), "onOpenChange", function (attrs) {
       _this.handleOpenChange({
@@ -61,7 +60,7 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         event: attrs.event
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "changeTextColor", function (color, disabled) {
+    _defineProperty(_assertThisInitialized(_this), "changeTextColor", function (color, editorAnalyticsApi, disabled) {
       var _this$toolbarItemRef;
       if (!disabled) {
         var _this$props$editorVie;
@@ -78,7 +77,7 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           isOpen: false,
           logCloseEvent: false
         });
-        _this.changeColor(color);
+        _this.changeColor(color, editorAnalyticsApi);
         //To set the focus on the textcolor button when the menu is closed by 'Esc' only to meet aria guidelines
         (_this$props$editorVie = _this.props.editorView) === null || _this$props$editorVie === void 0 || _this$props$editorVie.focus();
       }
@@ -158,7 +157,8 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         isReducedSpacing = _this$props.isReducedSpacing,
         pluginState = _this$props.pluginState,
         formatMessage = _this$props.intl.formatMessage,
-        disabled = _this$props.disabled;
+        disabled = _this$props.disabled,
+        pluginInjectionApi = _this$props.pluginInjectionApi;
       var labelTextColor = formatMessage(messages.textColor);
       var palette = pluginState.palette;
       var fitWidth;
@@ -221,7 +221,8 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         "data-testid": "text-color-palette"
       }, jsx(ColorPalette, {
         onClick: function onClick(color) {
-          return _this2.changeTextColor(color, pluginState.disabled);
+          var _pluginInjectionApi$a;
+          return _this2.changeTextColor(color, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions, pluginState.disabled);
         },
         selectedColor: pluginState.color,
         paletteOptions: {

package/dist/esm/plugins/text-color/utils/disabled.js

@@ -1,4 +1,4 @@
-import { isMarkAllowedInRange, isMarkExcluded } from '../../../utils/mark';
+import { isMarkAllowedInRange, isMarkExcluded } from '@atlaskit/editor-common/mark';
 var hasLinkMark = function hasLinkMark($pos) {
   var linkMarkType = $pos.doc.type.schema.marks.link,
     pos = $pos.pos;

package/dist/esm/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -8,7 +8,8 @@ import BulletListIcon from '@atlaskit/icon/glyph/editor/bullet-list';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, indent as toggleIndentKeymap, outdent as toggleOutdentKeymap, tooltip } from '../../../keymaps';
 import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import ToolbarButton from '../../../ui/ToolbarButton';
-import { expandIconWrapperStyle, shortcutStyle } from '../../../ui/styles';
+import { shortcutStyle } from '../../../ui/styles';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { wrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
 import { listMessages } from '@atlaskit/editor-common/messages';
 import { messages as indentationMessages } from '../../indentation/messages';

package/dist/esm/ui/styles.js

@@ -1,6 +1,2 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
-import { css } from '@emotion/react';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export var expandIconWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));
+export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';

package/dist/esm/version-wrapper.js

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

package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import React from 'react';
-import { ToolbarButtonRef } from '../../../../ui/ToolbarButton';
+import type { ToolbarButtonRef } from '../../../../ui/ToolbarButton';
 export interface DropDownButtonProps {
     label: string;
     selected: boolean;

package/dist/types/plugins/text-color/commands/change-color.d.ts

@@ -1,2 +1,3 @@
-import { Command } from '../../../types';
-export declare const changeColor: (color: string) => Command;
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { Command } from '@atlaskit/editor-common/types';
+export declare const changeColor: (color: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;

package/dist/types/plugins/text-color/commands/remove-color.d.ts

@@ -1,2 +1,2 @@
-import type { Command } from '../../../types';
+import type { Command } from '@atlaskit/editor-common/types';
 export declare const removeColor: () => Command;

package/dist/types/plugins/text-color/commands/toggle-color.d.ts

@@ -1,2 +1,2 @@
-import type { Command } from '../../../types';
+import type { Command } from '@atlaskit/editor-common/types';
 export declare const toggleColor: (color: string) => Command;

package/dist/types/plugins/text-color/index.d.ts

@@ -1,11 +1,7 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-import type { TextColorPluginConfig, TextColorPluginState } from './pm-plugins/main';
+import type { TextColorPluginState } from './pm-plugins/main';
 import { pluginKey as textColorPluginKey } from './pm-plugins/main';
-type Config = TextColorPluginConfig | boolean;
-declare const textColorPlugin: NextEditorPlugin<'textColor', {
-    pluginConfiguration: Config | undefined;
-    dependencies: [];
-}>;
+import type { TextColorPlugin } from './types';
+declare const textColorPlugin: TextColorPlugin;
 export { textColorPluginKey };
 export type { TextColorPluginState };
 export default textColorPlugin;

package/dist/types/plugins/text-color/pm-plugins/main.d.ts

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { Dispatch } from '../../../event-dispatcher';
+import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { PaletteColor } from '@atlaskit/editor-common/ui-color';
 export { DEFAULT_COLOR } from '../utils/color';
 export type TextColorPluginState = {

package/dist/types/plugins/text-color/types.d.ts

@@ -0,0 +1,10 @@
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { TextColorPluginConfig } from './pm-plugins/main';
+type Config = TextColorPluginConfig | boolean;
+export type TextColorPluginDependencies = [OptionalPlugin<AnalyticsPlugin>];
+export type TextColorPlugin = NextEditorPlugin<'textColor', {
+    pluginConfiguration: Config | undefined;
+    dependencies: TextColorPluginDependencies;
+}>;
+export {};

package/dist/types/plugins/text-color/ui/ToolbarTextColor/index.d.ts

@@ -3,8 +3,10 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { WrappedComponentProps } from 'react-intl-next';
-import type { DispatchAnalyticsEvent } from '../../../analytics';
+import type { DispatchAnalyticsEvent, EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { TextColorPluginState } from '../../pm-plugins/main';
+import type { TextColorPlugin } from '../../types';
 export declare const messages: {
     textColor: {
         id: string;
@@ -25,11 +27,12 @@ export interface Props {
     isReducedSpacing?: boolean;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
     disabled?: boolean;
+    pluginInjectionApi: ExtractInjectionAPI<TextColorPlugin> | undefined;
 }
 export declare class ToolbarTextColor extends React.Component<Props & WrappedComponentProps, State> {
     state: State;
     private toolbarItemRef;
-    changeColor: (color: string) => boolean;
+    changeColor: (color: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => boolean;
     render(): jsx.JSX.Element;
     private onOpenChange;
     private changeTextColor;

package/dist/types/ui/styles.d.ts

@@ -1,3 +1,2 @@
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export declare const expandIconWrapperStyle: import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import React from 'react';
-import { ToolbarButtonRef } from '../../../../ui/ToolbarButton';
+import type { ToolbarButtonRef } from '../../../../ui/ToolbarButton';
 export interface DropDownButtonProps {
     label: string;
     selected: boolean;

package/dist/types-ts4.5/plugins/text-color/commands/change-color.d.ts

@@ -1,2 +1,3 @@
-import { Command } from '../../../types';
-export declare const changeColor: (color: string) => Command;
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { Command } from '@atlaskit/editor-common/types';
+export declare const changeColor: (color: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;

package/dist/types-ts4.5/plugins/text-color/commands/remove-color.d.ts

@@ -1,2 +1,2 @@
-import type { Command } from '../../../types';
+import type { Command } from '@atlaskit/editor-common/types';
 export declare const removeColor: () => Command;

package/dist/types-ts4.5/plugins/text-color/commands/toggle-color.d.ts

@@ -1,2 +1,2 @@
-import type { Command } from '../../../types';
+import type { Command } from '@atlaskit/editor-common/types';
 export declare const toggleColor: (color: string) => Command;

package/dist/types-ts4.5/plugins/text-color/index.d.ts

@@ -1,12 +1,7 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-import type { TextColorPluginConfig, TextColorPluginState } from './pm-plugins/main';
+import type { TextColorPluginState } from './pm-plugins/main';
 import { pluginKey as textColorPluginKey } from './pm-plugins/main';
-type Config = TextColorPluginConfig | boolean;
-declare const textColorPlugin: NextEditorPlugin<'textColor', {
-    pluginConfiguration: Config | undefined;
-    dependencies: [
-    ];
-}>;
+import type { TextColorPlugin } from './types';
+declare const textColorPlugin: TextColorPlugin;
 export { textColorPluginKey };
 export type { TextColorPluginState };
 export default textColorPlugin;

package/dist/types-ts4.5/plugins/text-color/pm-plugins/main.d.ts

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { Dispatch } from '../../../event-dispatcher';
+import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { PaletteColor } from '@atlaskit/editor-common/ui-color';
 export { DEFAULT_COLOR } from '../utils/color';
 export type TextColorPluginState = {

package/dist/types-ts4.5/plugins/text-color/types.d.ts

@@ -0,0 +1,12 @@
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { TextColorPluginConfig } from './pm-plugins/main';
+type Config = TextColorPluginConfig | boolean;
+export type TextColorPluginDependencies = [
+    OptionalPlugin<AnalyticsPlugin>
+];
+export type TextColorPlugin = NextEditorPlugin<'textColor', {
+    pluginConfiguration: Config | undefined;
+    dependencies: TextColorPluginDependencies;
+}>;
+export {};

package/dist/types-ts4.5/plugins/text-color/ui/ToolbarTextColor/index.d.ts

@@ -3,8 +3,10 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { WrappedComponentProps } from 'react-intl-next';
-import type { DispatchAnalyticsEvent } from '../../../analytics';
+import type { DispatchAnalyticsEvent, EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { TextColorPluginState } from '../../pm-plugins/main';
+import type { TextColorPlugin } from '../../types';
 export declare const messages: {
     textColor: {
         id: string;
@@ -25,11 +27,12 @@ export interface Props {
     isReducedSpacing?: boolean;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
     disabled?: boolean;
+    pluginInjectionApi: ExtractInjectionAPI<TextColorPlugin> | undefined;
 }
 export declare class ToolbarTextColor extends React.Component<Props & WrappedComponentProps, State> {
     state: State;
     private toolbarItemRef;
-    changeColor: (color: string) => boolean;
+    changeColor: (color: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => boolean;
     render(): jsx.JSX.Element;
     private onOpenChange;
     private changeTextColor;

package/dist/types-ts4.5/ui/styles.d.ts

@@ -1,3 +1,2 @@
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export declare const expandIconWrapperStyle: import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "188.2.4",
+  "version": "188.2.6",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
     "@atlaskit/code": "^14.6.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^12.10.0",
-    "@atlaskit/editor-common": "^76.3.0",
+    "@atlaskit/editor-common": "^76.4.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-palette": "1.5.1",

package/dist/cjs/utils/mark.js

@@ -1,40 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isMarkExcluded = exports.isMarkAllowedInRange = void 0;
-var isMarkAllowedInRange = exports.isMarkAllowedInRange = function isMarkAllowedInRange(doc, ranges, type) {
-  var _loop = function _loop() {
-      var _ranges$i = ranges[i],
-        $from = _ranges$i.$from,
-        $to = _ranges$i.$to;
-      var can = $from.depth === 0 ? doc.type.allowsMarkType(type) : false;
-      doc.nodesBetween($from.pos, $to.pos, function (node) {
-        if (can) {
-          return false;
-        }
-        can = node.inlineContent && node.type.allowsMarkType(type);
-        return;
-      });
-      if (can) {
-        return {
-          v: can
-        };
-      }
-    },
-    _ret;
-  for (var i = 0; i < ranges.length; i++) {
-    _ret = _loop();
-    if (_ret) return _ret.v;
-  }
-  return false;
-};
-var isMarkExcluded = exports.isMarkExcluded = function isMarkExcluded(type, marks) {
-  if (marks) {
-    return marks.some(function (mark) {
-      return mark.type !== type && mark.type.excludes(type);
-    });
-  }
-  return false;
-};

package/dist/es2019/utils/mark.js

@@ -1,26 +0,0 @@
-export const isMarkAllowedInRange = (doc, ranges, type) => {
-  for (let i = 0; i < ranges.length; i++) {
-    const {
-      $from,
-      $to
-    } = ranges[i];
-    let can = $from.depth === 0 ? doc.type.allowsMarkType(type) : false;
-    doc.nodesBetween($from.pos, $to.pos, node => {
-      if (can) {
-        return false;
-      }
-      can = node.inlineContent && node.type.allowsMarkType(type);
-      return;
-    });
-    if (can) {
-      return can;
-    }
-  }
-  return false;
-};
-export const isMarkExcluded = (type, marks) => {
-  if (marks) {
-    return marks.some(mark => mark.type !== type && mark.type.excludes(type));
-  }
-  return false;
-};

package/dist/esm/utils/mark.js

@@ -1,34 +0,0 @@
-export var isMarkAllowedInRange = function isMarkAllowedInRange(doc, ranges, type) {
-  var _loop = function _loop() {
-      var _ranges$i = ranges[i],
-        $from = _ranges$i.$from,
-        $to = _ranges$i.$to;
-      var can = $from.depth === 0 ? doc.type.allowsMarkType(type) : false;
-      doc.nodesBetween($from.pos, $to.pos, function (node) {
-        if (can) {
-          return false;
-        }
-        can = node.inlineContent && node.type.allowsMarkType(type);
-        return;
-      });
-      if (can) {
-        return {
-          v: can
-        };
-      }
-    },
-    _ret;
-  for (var i = 0; i < ranges.length; i++) {
-    _ret = _loop();
-    if (_ret) return _ret.v;
-  }
-  return false;
-};
-export var isMarkExcluded = function isMarkExcluded(type, marks) {
-  if (marks) {
-    return marks.some(function (mark) {
-      return mark.type !== type && mark.type.excludes(type);
-    });
-  }
-  return false;
-};

package/dist/types/utils/mark.d.ts

@@ -1,4 +0,0 @@
-import type { Node, Mark, MarkType } from '@atlaskit/editor-prosemirror/model';
-import type { SelectionRange } from '@atlaskit/editor-prosemirror/state';
-export declare const isMarkAllowedInRange: (doc: Node, ranges: readonly SelectionRange[], type: MarkType) => boolean;
-export declare const isMarkExcluded: (type: MarkType, marks?: readonly Mark[] | null) => boolean;

package/dist/types-ts4.5/utils/mark.d.ts

@@ -1,4 +0,0 @@
-import type { Node, Mark, MarkType } from '@atlaskit/editor-prosemirror/model';
-import type { SelectionRange } from '@atlaskit/editor-prosemirror/state';
-export declare const isMarkAllowedInRange: (doc: Node, ranges: readonly SelectionRange[], type: MarkType) => boolean;
-export declare const isMarkExcluded: (type: MarkType, marks?: readonly Mark[] | null) => boolean;