@atlaskit/editor-plugin-highlight 1.4.1 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-highlight
 
+## 1.5.0
+
+### Minor Changes
+
+-   [#101406](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/101406)
+    [`6daffd65aec4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6daffd65aec4) -
+    [ED-23298] Extract primary toolbar components to editor plugin to allow for custom ordering
+
+### Patch Changes
+
+-   [#102478](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102478)
+    [`3378951608b0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3378951608b0) -
+    [ED-23332] Update adf-schema package to 36.10.1
+-   Updated dependencies
+
+## 1.4.2
+
+### Patch Changes
+
+-   [#101513](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/101513)
+    [`98b5dfc33bed`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/98b5dfc33bed) -
+    [ux] [ED-23156] The highlight primary toolbar button is disabled when trying to apply it on
+    nodes that don't enable the mark and when in a gap cursor. The text color primary toolbar button
+    is disabled when selecting text with a highlight.
+
 ## 1.4.1
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -14,6 +14,23 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
   var _api$analytics;
   var api = _ref.api;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
+  var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
+    var popupsMountPoint = _ref2.popupsMountPoint,
+      popupsBoundariesElement = _ref2.popupsBoundariesElement,
+      popupsScrollableElement = _ref2.popupsScrollableElement,
+      disabled = _ref2.disabled,
+      isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
+      dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
+    return /*#__PURE__*/_react.default.createElement(_ToolbarHighlightColor.ToolbarHighlightColorWithIntl, {
+      popupsMountPoint: popupsMountPoint,
+      popupsBoundariesElement: popupsBoundariesElement,
+      popupsScrollableElement: popupsScrollableElement,
+      disabled: disabled,
+      isToolbarReducedSpacing: isToolbarReducedSpacing,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      pluginInjectionApi: api
+    });
+  };
   return {
     name: 'highlight',
     commands: {
@@ -41,23 +58,13 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
       }
       return _pmPlugin.highlightPluginKey.getState(editorState);
     },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
-      var editorView = _ref2.editorView,
-        popupsMountPoint = _ref2.popupsMountPoint,
-        popupsBoundariesElement = _ref2.popupsBoundariesElement,
-        popupsScrollableElement = _ref2.popupsScrollableElement,
-        disabled = _ref2.disabled,
-        isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
-        dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
-      return /*#__PURE__*/_react.default.createElement(_ToolbarHighlightColor.ToolbarHighlightColorWithIntl, {
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        pluginInjectionApi: api
-      });
-    }
+    usePluginHook: function usePluginHook() {
+      var _api$core, _api$primaryToolbar;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.commands.registerComponent({
+        name: 'highlight',
+        component: primaryToolbarComponent
+      }));
+    },
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
 };

package/dist/cjs/pm-plugin.js

@@ -9,13 +9,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _disabled = require("./utils/disabled");
 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; }
 var highlightPluginKey = exports.highlightPluginKey = new _state.PluginKey('highlight');
-var initialState = {
-  activeColor: _uiColor.REMOVE_HIGHLIGHT_COLOR,
-  disabled: false // TODO: Should probably be true, but we can tackle it once we tackle disabled state
-};
 var HighlightPluginAction = exports.HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
   HighlightPluginAction[HighlightPluginAction["CHANGE_COLOR"] = 0] = "CHANGE_COLOR";
   return HighlightPluginAction;
@@ -26,11 +23,15 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
     key: highlightPluginKey,
     state: {
       init: function init() {
-        return initialState;
+        return {
+          activeColor: _uiColor.REMOVE_HIGHLIGHT_COLOR,
+          disabled: true
+        };
       },
-      apply: function apply(tr, pluginState) {
+      apply: function apply(tr, pluginState, _oldState, newState) {
         var _tr$getMeta;
         var action = (_tr$getMeta = tr.getMeta(highlightPluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type;
+        var nextState;
         switch (action) {
           case HighlightPluginAction.CHANGE_COLOR:
             var _tr$getMeta2 = tr.getMeta(highlightPluginKey),
@@ -39,6 +40,12 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
               activeColor: color
             });
           default:
+            nextState = _objectSpread(_objectSpread({}, pluginState), {}, {
+              disabled: (0, _disabled.getDisabledState)(newState)
+            });
+            if (pluginState && pluginState.disabled !== nextState.disabled) {
+              return nextState;
+            }
             return pluginState;
         }
       }

package/dist/cjs/ui/ToolbarHighlightColor.js

@@ -158,8 +158,6 @@ var ToolbarHighlightColor = function ToolbarHighlightColor(_ref) {
       palette: _uiColor.highlightColorPalette,
       hexToPaletteColor: _editorPalette.hexToEditorTextBackgroundPaletteColor
     }
-  }))), (0, _react2.jsx)("span", {
-    css: _styles.separatorStyles
-  }));
+  }))));
 };
 var ToolbarHighlightColorWithIntl = exports.ToolbarHighlightColorWithIntl = (0, _reactIntlNext.injectIntl)(ToolbarHighlightColor);

package/dist/cjs/utils/disabled.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDisabledState = void 0;
+var _mark = require("@atlaskit/editor-common/mark");
+var _selection = require("@atlaskit/editor-common/selection");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var getDisabledState = exports.getDisabledState = function getDisabledState(state) {
+  var backgroundColor = state.schema.marks.backgroundColor;
+  var _ref = state.selection,
+    empty = _ref.empty,
+    ranges = _ref.ranges,
+    $cursor = _ref.$cursor;
+  if (!backgroundColor) {
+    return true;
+  }
+  if (state.selection instanceof _state.NodeSelection || state.selection instanceof _selection.GapCursorSelection) {
+    return true;
+  }
+  if (empty && !$cursor || (0, _mark.isMarkAllowedInRange)(state.doc, ranges, backgroundColor) === false) {
+    return true;
+  }
+  if ((0, _mark.isMarkExcluded)(backgroundColor, state.storedMarks || $cursor && $cursor.marks())) {
+    return true;
+  }
+  return false;
+};

package/dist/es2019/plugin.js

@@ -8,6 +8,22 @@ export const highlightPlugin = ({
 }) => {
   var _api$analytics;
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
+  const primaryToolbarComponent = ({
+    popupsMountPoint,
+    popupsBoundariesElement,
+    popupsScrollableElement,
+    disabled,
+    isToolbarReducedSpacing,
+    dispatchAnalyticsEvent
+  }) => /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    disabled: disabled,
+    isToolbarReducedSpacing: isToolbarReducedSpacing,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    pluginInjectionApi: api
+  });
   return {
     name: 'highlight',
     commands: {
@@ -31,22 +47,13 @@ export const highlightPlugin = ({
       }
       return highlightPluginKey.getState(editorState);
     },
-    primaryToolbarComponent: ({
-      editorView,
-      popupsMountPoint,
-      popupsBoundariesElement,
-      popupsScrollableElement,
-      disabled,
-      isToolbarReducedSpacing,
-      dispatchAnalyticsEvent
-    }) => /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
-      popupsMountPoint: popupsMountPoint,
-      popupsBoundariesElement: popupsBoundariesElement,
-      popupsScrollableElement: popupsScrollableElement,
-      disabled: disabled,
-      isToolbarReducedSpacing: isToolbarReducedSpacing,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      pluginInjectionApi: api
-    })
+    usePluginHook: () => {
+      var _api$core, _api$primaryToolbar;
+      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.commands.registerComponent({
+        name: 'highlight',
+        component: primaryToolbarComponent
+      }));
+    },
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
 };

package/dist/es2019/pm-plugin.js

@@ -1,11 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { getDisabledState } from './utils/disabled';
 export const highlightPluginKey = new PluginKey('highlight');
-const initialState = {
-  activeColor: REMOVE_HIGHLIGHT_COLOR,
-  disabled: false // TODO: Should probably be true, but we can tackle it once we tackle disabled state
-};
 export let HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
   HighlightPluginAction[HighlightPluginAction["CHANGE_COLOR"] = 0] = "CHANGE_COLOR";
   return HighlightPluginAction;
@@ -16,10 +13,14 @@ export const createPlugin = ({
   return new SafePlugin({
     key: highlightPluginKey,
     state: {
-      init: () => initialState,
-      apply: (tr, pluginState) => {
+      init: () => ({
+        activeColor: REMOVE_HIGHLIGHT_COLOR,
+        disabled: true
+      }),
+      apply: (tr, pluginState, _oldState, newState) => {
         var _tr$getMeta;
         const action = (_tr$getMeta = tr.getMeta(highlightPluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type;
+        let nextState;
         switch (action) {
           case HighlightPluginAction.CHANGE_COLOR:
             const {
@@ -30,6 +31,13 @@ export const createPlugin = ({
               activeColor: color
             };
           default:
+            nextState = {
+              ...pluginState,
+              disabled: getDisabledState(newState)
+            };
+            if (pluginState && pluginState.disabled !== nextState.disabled) {
+              return nextState;
+            }
             return pluginState;
         }
       }

package/dist/es2019/ui/ToolbarHighlightColor.js

@@ -5,7 +5,7 @@ import { injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { expandIconWrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { ColorPalette, getSelectedRowAndColumnFromPalette, highlightColorPalette, REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
 import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
@@ -141,8 +141,6 @@ const ToolbarHighlightColor = ({
       palette: highlightColorPalette,
       hexToPaletteColor: hexToEditorTextBackgroundPaletteColor
     }
-  }))), jsx("span", {
-    css: separatorStyles
-  }));
+  }))));
 };
 export const ToolbarHighlightColorWithIntl = injectIntl(ToolbarHighlightColor);

package/dist/es2019/utils/disabled.js

@@ -0,0 +1,26 @@
+import { isMarkAllowedInRange, isMarkExcluded } from '@atlaskit/editor-common/mark';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+export const getDisabledState = state => {
+  const {
+    backgroundColor
+  } = state.schema.marks;
+  const {
+    empty,
+    ranges,
+    $cursor
+  } = state.selection;
+  if (!backgroundColor) {
+    return true;
+  }
+  if (state.selection instanceof NodeSelection || state.selection instanceof GapCursorSelection) {
+    return true;
+  }
+  if (empty && !$cursor || isMarkAllowedInRange(state.doc, ranges, backgroundColor) === false) {
+    return true;
+  }
+  if (isMarkExcluded(backgroundColor, state.storedMarks || $cursor && $cursor.marks())) {
+    return true;
+  }
+  return false;
+};

package/dist/esm/plugin.js

@@ -7,6 +7,23 @@ export var highlightPlugin = function highlightPlugin(_ref) {
   var _api$analytics;
   var api = _ref.api;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
+  var primaryToolbarComponent = function primaryToolbarComponent(_ref2) {
+    var popupsMountPoint = _ref2.popupsMountPoint,
+      popupsBoundariesElement = _ref2.popupsBoundariesElement,
+      popupsScrollableElement = _ref2.popupsScrollableElement,
+      disabled = _ref2.disabled,
+      isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
+      dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
+    return /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
+      popupsMountPoint: popupsMountPoint,
+      popupsBoundariesElement: popupsBoundariesElement,
+      popupsScrollableElement: popupsScrollableElement,
+      disabled: disabled,
+      isToolbarReducedSpacing: isToolbarReducedSpacing,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      pluginInjectionApi: api
+    });
+  };
   return {
     name: 'highlight',
     commands: {
@@ -34,23 +51,13 @@ export var highlightPlugin = function highlightPlugin(_ref) {
       }
       return highlightPluginKey.getState(editorState);
     },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
-      var editorView = _ref2.editorView,
-        popupsMountPoint = _ref2.popupsMountPoint,
-        popupsBoundariesElement = _ref2.popupsBoundariesElement,
-        popupsScrollableElement = _ref2.popupsScrollableElement,
-        disabled = _ref2.disabled,
-        isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
-        dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
-      return /*#__PURE__*/React.createElement(ToolbarHighlightColor, {
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        pluginInjectionApi: api
-      });
-    }
+    usePluginHook: function usePluginHook() {
+      var _api$core, _api$primaryToolbar;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$primaryToolbar = api.primaryToolbar) === null || _api$primaryToolbar === void 0 ? void 0 : _api$primaryToolbar.commands.registerComponent({
+        name: 'highlight',
+        component: primaryToolbarComponent
+      }));
+    },
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
 };

package/dist/esm/pm-plugin.js

@@ -4,11 +4,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { getDisabledState } from './utils/disabled';
 export var highlightPluginKey = new PluginKey('highlight');
-var initialState = {
-  activeColor: REMOVE_HIGHLIGHT_COLOR,
-  disabled: false // TODO: Should probably be true, but we can tackle it once we tackle disabled state
-};
 export var HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
   HighlightPluginAction[HighlightPluginAction["CHANGE_COLOR"] = 0] = "CHANGE_COLOR";
   return HighlightPluginAction;
@@ -19,11 +16,15 @@ export var createPlugin = function createPlugin(_ref) {
     key: highlightPluginKey,
     state: {
       init: function init() {
-        return initialState;
+        return {
+          activeColor: REMOVE_HIGHLIGHT_COLOR,
+          disabled: true
+        };
       },
-      apply: function apply(tr, pluginState) {
+      apply: function apply(tr, pluginState, _oldState, newState) {
         var _tr$getMeta;
         var action = (_tr$getMeta = tr.getMeta(highlightPluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type;
+        var nextState;
         switch (action) {
           case HighlightPluginAction.CHANGE_COLOR:
             var _tr$getMeta2 = tr.getMeta(highlightPluginKey),
@@ -32,6 +33,12 @@ export var createPlugin = function createPlugin(_ref) {
               activeColor: color
             });
           default:
+            nextState = _objectSpread(_objectSpread({}, pluginState), {}, {
+              disabled: getDisabledState(newState)
+            });
+            if (pluginState && pluginState.disabled !== nextState.disabled) {
+              return nextState;
+            }
             return pluginState;
         }
       }

package/dist/esm/ui/ToolbarHighlightColor.js

@@ -6,7 +6,7 @@ import { injectIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { expandIconWrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
+import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { ColorPalette, getSelectedRowAndColumnFromPalette, highlightColorPalette, REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
 import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
@@ -147,8 +147,6 @@ var ToolbarHighlightColor = function ToolbarHighlightColor(_ref) {
       palette: highlightColorPalette,
       hexToPaletteColor: hexToEditorTextBackgroundPaletteColor
     }
-  }))), jsx("span", {
-    css: separatorStyles
-  }));
+  }))));
 };
 export var ToolbarHighlightColorWithIntl = injectIntl(ToolbarHighlightColor);

package/dist/esm/utils/disabled.js

@@ -0,0 +1,23 @@
+import { isMarkAllowedInRange, isMarkExcluded } from '@atlaskit/editor-common/mark';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+export var getDisabledState = function getDisabledState(state) {
+  var backgroundColor = state.schema.marks.backgroundColor;
+  var _ref = state.selection,
+    empty = _ref.empty,
+    ranges = _ref.ranges,
+    $cursor = _ref.$cursor;
+  if (!backgroundColor) {
+    return true;
+  }
+  if (state.selection instanceof NodeSelection || state.selection instanceof GapCursorSelection) {
+    return true;
+  }
+  if (empty && !$cursor || isMarkAllowedInRange(state.doc, ranges, backgroundColor) === false) {
+    return true;
+  }
+  if (isMarkExcluded(backgroundColor, state.storedMarks || $cursor && $cursor.marks())) {
+    return true;
+  }
+  return false;
+};

package/dist/types/plugin.d.ts

@@ -1,11 +1,13 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import type { HighlightPluginState } from './pm-plugin';
 export type HighlightPlugin = NextEditorPlugin<'highlight', {
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<TextFormattingPlugin>
+        OptionalPlugin<TextFormattingPlugin>,
+        OptionalPlugin<PrimaryToolbarPlugin>
     ];
     sharedState: HighlightPluginState | undefined;
 }>;

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

@@ -0,0 +1,2 @@
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const getDisabledState: (state: EditorState) => boolean;

package/dist/types-ts4.5/plugin.d.ts

@@ -1,11 +1,13 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import type { HighlightPluginState } from './pm-plugin';
 export type HighlightPlugin = NextEditorPlugin<'highlight', {
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<TextFormattingPlugin>
+        OptionalPlugin<TextFormattingPlugin>,
+        OptionalPlugin<PrimaryToolbarPlugin>
     ];
     sharedState: HighlightPluginState | undefined;
 }>;

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

@@ -0,0 +1,2 @@
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const getDisabledState: (state: EditorState) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-highlight",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Highlight plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -38,15 +38,16 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^36.8.0",
-    "@atlaskit/editor-common": "^80.4.0",
+    "@atlaskit/adf-schema": "^36.10.7",
+    "@atlaskit/editor-common": "^81.0.0",
     "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
-    "@atlaskit/editor-plugin-text-formatting": "^1.6.0",
+    "@atlaskit/editor-plugin-primary-toolbar": "^1.1.0",
+    "@atlaskit/editor-plugin-text-formatting": "^1.7.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/editor-shared-styles": "^2.11.0",
-    "@atlaskit/icon": "^22.2.0",
-    "@atlaskit/primitives": "^6.2.0",
+    "@atlaskit/icon": "^22.3.0",
+    "@atlaskit/primitives": "^6.3.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1"
   },
@@ -55,7 +56,7 @@
     "react-intl-next": "npm:react-intl@^5.18.1"
   },
   "devDependencies": {
-    "@atlaskit/tokens": "^1.48.0",
+    "@atlaskit/tokens": "^1.49.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "typescript": "~5.4.2"
   },