@atlaskit/editor-plugin-primary-toolbar 1.3.2 → 2.0.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-primary-toolbar
 
+## 2.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.0.0
+
+### Major Changes
+
+- [#126478](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/126478)
+  [`ca1665ebbfe4d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ca1665ebbfe4d) -
+  [ED-23435] Store primary toolbar component registry in a plugin variable instead of in plugin
+  state to avoid having to add effects to all plugins and enable SSR for the toolbar. [Breaking
+  change] Converted registerComponent from the primary toolbar plugin into an action.
+
 ## 1.3.2
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.registerComponent = void 0;
+var registerComponent = exports.registerComponent = function registerComponent(componentRegistry) {
+  return function (_ref) {
+    var name = _ref.name,
+      component = _ref.component;
+    componentRegistry.set(name, component);
+  };
+};

package/dist/cjs/plugin.js

@@ -1,22 +1,31 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.primaryToolbarPlugin = void 0;
-var _commands = require("./commands");
+var _actions = require("./actions");
 var _pmPlugin = require("./pm-plugin");
+var _separator = _interopRequireDefault(require("./ui/separator"));
 var primaryToolbarPlugin = exports.primaryToolbarPlugin = function primaryToolbarPlugin() {
+  // We use a plugin variable to store the component registry to avoid having to use
+  // effects in each plugin, and to enable rendering the toolbar in SSR
+  // TODO: Replace this with something in plugin state once we have a way to initialise across plugins on plugin initialisation
+  var componentRegistry = new Map();
+
+  // Pre-fill registry with the separator component
+  componentRegistry.set('separator', _separator.default);
   return {
     name: 'primaryToolbar',
-    commands: {
-      registerComponent: _commands.registerComponent
+    actions: {
+      registerComponent: (0, _actions.registerComponent)(componentRegistry)
     },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'primaryToolbar',
         plugin: function plugin() {
-          return (0, _pmPlugin.createPlugin)();
+          return (0, _pmPlugin.createPlugin)(componentRegistry);
         }
       }];
     },

package/dist/cjs/pm-plugin.js

@@ -1,51 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.primaryToolbarPluginKey = exports.createPlugin = exports.PrimaryToolbarPluginAction = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+exports.primaryToolbarPluginKey = exports.createPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _toolbarConfiguration = require("./toolbar-configuration");
-var _separator = _interopRequireDefault(require("./ui/separator"));
-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 primaryToolbarPluginKey = exports.primaryToolbarPluginKey = new _state.PluginKey('primaryToolbar');
-var PrimaryToolbarPluginAction = exports.PrimaryToolbarPluginAction = /*#__PURE__*/function (PrimaryToolbarPluginAction) {
-  PrimaryToolbarPluginAction[PrimaryToolbarPluginAction["REGISTER"] = 0] = "REGISTER";
-  return PrimaryToolbarPluginAction;
-}({});
-var createPlugin = exports.createPlugin = function createPlugin() {
+var createPlugin = exports.createPlugin = function createPlugin(componentRegistry) {
   return new _safePlugin.SafePlugin({
     key: primaryToolbarPluginKey,
     state: {
-      init: function init() {
-        var componentRegistry = new Map();
-
-        // Pre-fill registry with the separator component
-        componentRegistry.set('separator', _separator.default);
+      init: function init(_config, editorState) {
         return {
-          componentRegistry: componentRegistry,
-          components: []
+          components: (0, _toolbarConfiguration.getToolbarComponents)(componentRegistry, editorState)
         };
       },
-      apply: function apply(tr, pluginState) {
-        var _tr$getMeta;
-        var action = (_tr$getMeta = tr.getMeta(primaryToolbarPluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type;
-        switch (action) {
-          case PrimaryToolbarPluginAction.REGISTER:
-            var _tr$getMeta2 = tr.getMeta(primaryToolbarPluginKey),
-              name = _tr$getMeta2.name,
-              component = _tr$getMeta2.component;
-            pluginState.componentRegistry.set(name, component);
-            return _objectSpread(_objectSpread({}, pluginState), {}, {
-              components: (0, _toolbarConfiguration.getToolbarComponents)(pluginState)
-            });
-          default:
-            return pluginState;
-        }
+      apply: function apply(_tr, pluginState) {
+        return pluginState;
       }
     }
   });

package/dist/cjs/toolbar-configuration.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getToolbarComponents = void 0;
-var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(pluginState) {
+var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(componentRegistry, editorState) {
   return toolbarConfiguration.filter(function (toolbarElement) {
-    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(pluginState.componentRegistry);
+    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState);
   }).reduce(function (acc, toolbarElement) {
-    if (pluginState.componentRegistry.has(toolbarElement.name)) {
-      var component = pluginState.componentRegistry.get(toolbarElement.name);
+    if (componentRegistry.has(toolbarElement.name)) {
+      var component = componentRegistry.get(toolbarElement.name);
       if (!!component) {
         acc.push(component);
       }
@@ -37,8 +37,10 @@ var blockTypeGroup = [{
   name: 'blockType'
 }, {
   name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('blockType');
+  enabled: function enabled(componentRegistry, editorState) {
+    return componentRegistry.has('blockType') &&
+    // Use case where you want to have the block plugin but not render any toolbar items (when you exclude headings), we should be able to get rid of this when we split block type plugin up and check for the presence of the heading plugin directly
+    !!editorState.schema.nodes.heading;
   }
 }];
 var textFormattingGroup = [{
@@ -77,13 +79,6 @@ var listFormatting = [{
 }];
 var insertBlockGroup = [{
   name: 'insertBlock'
-}, {
-  name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('insertBlock') &&
-    // is last group in the toolbar
-    !componentRegistry.has('beforePrimaryToolbar') && !componentRegistry.has('avatarGroup') && !componentRegistry.has('findReplace') && !componentRegistry.has('aiExperience') && !componentRegistry.has('loom');
-  }
 }];
 var others = [{
   name: 'beforePrimaryToolbar'

package/dist/es2019/actions.js

@@ -0,0 +1,6 @@
+export const registerComponent = componentRegistry => ({
+  name,
+  component
+}) => {
+  componentRegistry.set(name, component);
+};

package/dist/es2019/plugin.js

@@ -1,18 +1,28 @@
-import { registerComponent } from './commands';
+import { registerComponent } from './actions';
 import { createPlugin, primaryToolbarPluginKey } from './pm-plugin';
-export const primaryToolbarPlugin = () => ({
-  name: 'primaryToolbar',
-  commands: {
-    registerComponent
-  },
-  pmPlugins: () => [{
+import Separator from './ui/separator';
+export const primaryToolbarPlugin = () => {
+  // We use a plugin variable to store the component registry to avoid having to use
+  // effects in each plugin, and to enable rendering the toolbar in SSR
+  // TODO: Replace this with something in plugin state once we have a way to initialise across plugins on plugin initialisation
+  const componentRegistry = new Map();
+
+  // Pre-fill registry with the separator component
+  componentRegistry.set('separator', Separator);
+  return {
     name: 'primaryToolbar',
-    plugin: () => createPlugin()
-  }],
-  getSharedState(editorState) {
-    if (!editorState) {
-      return;
+    actions: {
+      registerComponent: registerComponent(componentRegistry)
+    },
+    pmPlugins: () => [{
+      name: 'primaryToolbar',
+      plugin: () => createPlugin(componentRegistry)
+    }],
+    getSharedState(editorState) {
+      if (!editorState) {
+        return;
+      }
+      return primaryToolbarPluginKey.getState(editorState);
     }
-    return primaryToolbarPluginKey.getState(editorState);
-  }
-});
+  };
+};

package/dist/es2019/pm-plugin.js

@@ -1,44 +1,15 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getToolbarComponents } from './toolbar-configuration';
-import Separator from './ui/separator';
 export const primaryToolbarPluginKey = new PluginKey('primaryToolbar');
-export let PrimaryToolbarPluginAction = /*#__PURE__*/function (PrimaryToolbarPluginAction) {
-  PrimaryToolbarPluginAction[PrimaryToolbarPluginAction["REGISTER"] = 0] = "REGISTER";
-  return PrimaryToolbarPluginAction;
-}({});
-export const createPlugin = () => {
+export const createPlugin = componentRegistry => {
   return new SafePlugin({
     key: primaryToolbarPluginKey,
     state: {
-      init: () => {
-        const componentRegistry = new Map();
-
-        // Pre-fill registry with the separator component
-        componentRegistry.set('separator', Separator);
-        return {
-          componentRegistry,
-          components: []
-        };
-      },
-      apply: (tr, pluginState) => {
-        var _tr$getMeta;
-        const action = (_tr$getMeta = tr.getMeta(primaryToolbarPluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type;
-        switch (action) {
-          case PrimaryToolbarPluginAction.REGISTER:
-            const {
-              name,
-              component
-            } = tr.getMeta(primaryToolbarPluginKey);
-            pluginState.componentRegistry.set(name, component);
-            return {
-              ...pluginState,
-              components: getToolbarComponents(pluginState)
-            };
-          default:
-            return pluginState;
-        }
-      }
+      init: (_config, editorState) => ({
+        components: getToolbarComponents(componentRegistry, editorState)
+      }),
+      apply: (_tr, pluginState) => pluginState
     }
   });
 };

package/dist/es2019/toolbar-configuration.js

@@ -1,6 +1,6 @@
-export const getToolbarComponents = pluginState => toolbarConfiguration.filter(toolbarElement => typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(pluginState.componentRegistry)).reduce((acc, toolbarElement) => {
-  if (pluginState.componentRegistry.has(toolbarElement.name)) {
-    const component = pluginState.componentRegistry.get(toolbarElement.name);
+export const getToolbarComponents = (componentRegistry, editorState) => toolbarConfiguration.filter(toolbarElement => typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState)).reduce((acc, toolbarElement) => {
+  if (componentRegistry.has(toolbarElement.name)) {
+    const component = componentRegistry.get(toolbarElement.name);
     if (!!component) {
       acc.push(component);
     }
@@ -23,7 +23,9 @@ const blockTypeGroup = [{
   name: 'blockType'
 }, {
   name: 'separator',
-  enabled: componentRegistry => componentRegistry.has('blockType')
+  enabled: (componentRegistry, editorState) => componentRegistry.has('blockType') &&
+  // Use case where you want to have the block plugin but not render any toolbar items (when you exclude headings), we should be able to get rid of this when we split block type plugin up and check for the presence of the heading plugin directly
+  !!editorState.schema.nodes.heading
 }];
 const textFormattingGroup = [{
   name: 'textFormatting'
@@ -53,11 +55,6 @@ const listFormatting = [{
 }];
 const insertBlockGroup = [{
   name: 'insertBlock'
-}, {
-  name: 'separator',
-  enabled: componentRegistry => componentRegistry.has('insertBlock') &&
-  // is last group in the toolbar
-  !componentRegistry.has('beforePrimaryToolbar') && !componentRegistry.has('avatarGroup') && !componentRegistry.has('findReplace') && !componentRegistry.has('aiExperience') && !componentRegistry.has('loom')
 }];
 const others = [{
   name: 'beforePrimaryToolbar'

package/dist/esm/actions.js

@@ -0,0 +1,7 @@
+export var registerComponent = function registerComponent(componentRegistry) {
+  return function (_ref) {
+    var name = _ref.name,
+      component = _ref.component;
+    componentRegistry.set(name, component);
+  };
+};

package/dist/esm/plugin.js

@@ -1,16 +1,24 @@
-import { registerComponent } from './commands';
+import { registerComponent } from './actions';
 import { createPlugin, primaryToolbarPluginKey } from './pm-plugin';
+import Separator from './ui/separator';
 export var primaryToolbarPlugin = function primaryToolbarPlugin() {
+  // We use a plugin variable to store the component registry to avoid having to use
+  // effects in each plugin, and to enable rendering the toolbar in SSR
+  // TODO: Replace this with something in plugin state once we have a way to initialise across plugins on plugin initialisation
+  var componentRegistry = new Map();
+
+  // Pre-fill registry with the separator component
+  componentRegistry.set('separator', Separator);
   return {
     name: 'primaryToolbar',
-    commands: {
-      registerComponent: registerComponent
+    actions: {
+      registerComponent: registerComponent(componentRegistry)
     },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'primaryToolbar',
         plugin: function plugin() {
-          return createPlugin();
+          return createPlugin(componentRegistry);
         }
       }];
     },

package/dist/esm/pm-plugin.js

@@ -1,44 +1,18 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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) { _defineProperty(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; }
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getToolbarComponents } from './toolbar-configuration';
-import Separator from './ui/separator';
 export var primaryToolbarPluginKey = new PluginKey('primaryToolbar');
-export var PrimaryToolbarPluginAction = /*#__PURE__*/function (PrimaryToolbarPluginAction) {
-  PrimaryToolbarPluginAction[PrimaryToolbarPluginAction["REGISTER"] = 0] = "REGISTER";
-  return PrimaryToolbarPluginAction;
-}({});
-export var createPlugin = function createPlugin() {
+export var createPlugin = function createPlugin(componentRegistry) {
   return new SafePlugin({
     key: primaryToolbarPluginKey,
     state: {
-      init: function init() {
-        var componentRegistry = new Map();
-
-        // Pre-fill registry with the separator component
-        componentRegistry.set('separator', Separator);
+      init: function init(_config, editorState) {
         return {
-          componentRegistry: componentRegistry,
-          components: []
+          components: getToolbarComponents(componentRegistry, editorState)
         };
       },
-      apply: function apply(tr, pluginState) {
-        var _tr$getMeta;
-        var action = (_tr$getMeta = tr.getMeta(primaryToolbarPluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type;
-        switch (action) {
-          case PrimaryToolbarPluginAction.REGISTER:
-            var _tr$getMeta2 = tr.getMeta(primaryToolbarPluginKey),
-              name = _tr$getMeta2.name,
-              component = _tr$getMeta2.component;
-            pluginState.componentRegistry.set(name, component);
-            return _objectSpread(_objectSpread({}, pluginState), {}, {
-              components: getToolbarComponents(pluginState)
-            });
-          default:
-            return pluginState;
-        }
+      apply: function apply(_tr, pluginState) {
+        return pluginState;
       }
     }
   });

package/dist/esm/toolbar-configuration.js

@@ -1,9 +1,9 @@
-export var getToolbarComponents = function getToolbarComponents(pluginState) {
+export var getToolbarComponents = function getToolbarComponents(componentRegistry, editorState) {
   return toolbarConfiguration.filter(function (toolbarElement) {
-    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(pluginState.componentRegistry);
+    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState);
   }).reduce(function (acc, toolbarElement) {
-    if (pluginState.componentRegistry.has(toolbarElement.name)) {
-      var component = pluginState.componentRegistry.get(toolbarElement.name);
+    if (componentRegistry.has(toolbarElement.name)) {
+      var component = componentRegistry.get(toolbarElement.name);
       if (!!component) {
         acc.push(component);
       }
@@ -31,8 +31,10 @@ var blockTypeGroup = [{
   name: 'blockType'
 }, {
   name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('blockType');
+  enabled: function enabled(componentRegistry, editorState) {
+    return componentRegistry.has('blockType') &&
+    // Use case where you want to have the block plugin but not render any toolbar items (when you exclude headings), we should be able to get rid of this when we split block type plugin up and check for the presence of the heading plugin directly
+    !!editorState.schema.nodes.heading;
   }
 }];
 var textFormattingGroup = [{
@@ -71,13 +73,6 @@ var listFormatting = [{
 }];
 var insertBlockGroup = [{
   name: 'insertBlock'
-}, {
-  name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('insertBlock') &&
-    // is last group in the toolbar
-    !componentRegistry.has('beforePrimaryToolbar') && !componentRegistry.has('avatarGroup') && !componentRegistry.has('findReplace') && !componentRegistry.has('aiExperience') && !componentRegistry.has('loom');
-  }
 }];
 var others = [{
   name: 'beforePrimaryToolbar'

package/dist/types/actions.d.ts

@@ -0,0 +1,6 @@
+import type { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { ComponentRegistry, ToolbarElementNames } from './types';
+export declare const registerComponent: (componentRegistry: ComponentRegistry) => ({ name, component, }: {
+    name: ToolbarElementNames;
+    component: ToolbarUIComponentFactory;
+}) => void;

package/dist/types/pm-plugin.d.ts

@@ -1,8 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { PrimaryToolbarPluginState } from './types';
+import type { ComponentRegistry, PrimaryToolbarPluginState } from './types';
 export declare const primaryToolbarPluginKey: PluginKey<PrimaryToolbarPluginState>;
-export declare enum PrimaryToolbarPluginAction {
-    REGISTER = 0
-}
-export declare const createPlugin: () => SafePlugin<PrimaryToolbarPluginState>;
+export declare const createPlugin: (componentRegistry: ComponentRegistry) => SafePlugin<PrimaryToolbarPluginState>;

package/dist/types/toolbar-configuration.d.ts

@@ -1,3 +1,4 @@
 import type { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
-import type { PrimaryToolbarPluginState } from './types';
-export declare const getToolbarComponents: (pluginState: PrimaryToolbarPluginState) => ToolbarUIComponentFactory[];
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { ComponentRegistry } from './types';
+export declare const getToolbarComponents: (componentRegistry: ComponentRegistry, editorState: EditorState) => ToolbarUIComponentFactory[];

package/dist/types/types.d.ts

@@ -1,21 +1,20 @@
-import type { EditorCommand, NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     sharedState: PrimaryToolbarPluginState | undefined;
-    commands: {
+    actions: {
         registerComponent: ({ name, component, }: {
             name: ToolbarElementNames;
             component: ToolbarUIComponentFactory;
-        }) => EditorCommand;
+        }) => void;
     };
 }>;
-type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
+export type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
 export type ToolbarElementNames = 'separator' | 'undoRedoPlugin' | 'blockType' | 'textFormatting' | 'alignment' | 'textColor' | 'highlight' | 'toolbarListsIndentation' | 'insertBlock' | 'beforePrimaryToolbar' | 'avatarGroup' | 'findReplace' | 'aiExperience' | 'loom' | 'spellCheck';
 export type ToolbarElementConfig = {
     name: ToolbarElementNames;
-    enabled?: (componentRegistry: ComponentRegistry) => boolean;
+    enabled?: (componentRegistry: ComponentRegistry, editorState: EditorState) => boolean;
 };
 export type PrimaryToolbarPluginState = {
-    componentRegistry: ComponentRegistry;
     components: ToolbarUIComponentFactory[];
 };
-export {};

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

@@ -0,0 +1,6 @@
+import type { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { ComponentRegistry, ToolbarElementNames } from './types';
+export declare const registerComponent: (componentRegistry: ComponentRegistry) => ({ name, component, }: {
+    name: ToolbarElementNames;
+    component: ToolbarUIComponentFactory;
+}) => void;

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

@@ -1,8 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { PrimaryToolbarPluginState } from './types';
+import type { ComponentRegistry, PrimaryToolbarPluginState } from './types';
 export declare const primaryToolbarPluginKey: PluginKey<PrimaryToolbarPluginState>;
-export declare enum PrimaryToolbarPluginAction {
-    REGISTER = 0
-}
-export declare const createPlugin: () => SafePlugin<PrimaryToolbarPluginState>;
+export declare const createPlugin: (componentRegistry: ComponentRegistry) => SafePlugin<PrimaryToolbarPluginState>;

package/dist/types-ts4.5/toolbar-configuration.d.ts

@@ -1,3 +1,4 @@
 import type { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
-import type { PrimaryToolbarPluginState } from './types';
-export declare const getToolbarComponents: (pluginState: PrimaryToolbarPluginState) => ToolbarUIComponentFactory[];
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { ComponentRegistry } from './types';
+export declare const getToolbarComponents: (componentRegistry: ComponentRegistry, editorState: EditorState) => ToolbarUIComponentFactory[];

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

@@ -1,21 +1,20 @@
-import type { EditorCommand, NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     sharedState: PrimaryToolbarPluginState | undefined;
-    commands: {
+    actions: {
         registerComponent: ({ name, component, }: {
             name: ToolbarElementNames;
             component: ToolbarUIComponentFactory;
-        }) => EditorCommand;
+        }) => void;
     };
 }>;
-type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
+export type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
 export type ToolbarElementNames = 'separator' | 'undoRedoPlugin' | 'blockType' | 'textFormatting' | 'alignment' | 'textColor' | 'highlight' | 'toolbarListsIndentation' | 'insertBlock' | 'beforePrimaryToolbar' | 'avatarGroup' | 'findReplace' | 'aiExperience' | 'loom' | 'spellCheck';
 export type ToolbarElementConfig = {
     name: ToolbarElementNames;
-    enabled?: (componentRegistry: ComponentRegistry) => boolean;
+    enabled?: (componentRegistry: ComponentRegistry, editorState: EditorState) => boolean;
 };
 export type PrimaryToolbarPluginState = {
-    componentRegistry: ComponentRegistry;
     components: ToolbarUIComponentFactory[];
 };
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-primary-toolbar",
-	"version": "1.3.2",
+	"version": "2.0.1",
 	"description": "Primary toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,7 +38,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^87.1.0",
+		"@atlaskit/editor-common": "^88.0.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"

package/dist/cjs/commands.js

@@ -1,20 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.registerComponent = void 0;
-var _pmPlugin = require("./pm-plugin");
-var registerComponent = exports.registerComponent = function registerComponent(_ref) {
-  var name = _ref.name,
-    component = _ref.component;
-  return function (_ref2) {
-    var tr = _ref2.tr;
-    tr.setMeta(_pmPlugin.primaryToolbarPluginKey, {
-      type: _pmPlugin.PrimaryToolbarPluginAction.REGISTER,
-      name: name,
-      component: component
-    });
-    return tr;
-  };
-};

package/dist/es2019/commands.js

@@ -1,14 +0,0 @@
-import { PrimaryToolbarPluginAction, primaryToolbarPluginKey } from './pm-plugin';
-export const registerComponent = ({
-  name,
-  component
-}) => ({
-  tr
-}) => {
-  tr.setMeta(primaryToolbarPluginKey, {
-    type: PrimaryToolbarPluginAction.REGISTER,
-    name,
-    component
-  });
-  return tr;
-};

package/dist/esm/commands.js

@@ -1,14 +0,0 @@
-import { PrimaryToolbarPluginAction, primaryToolbarPluginKey } from './pm-plugin';
-export var registerComponent = function registerComponent(_ref) {
-  var name = _ref.name,
-    component = _ref.component;
-  return function (_ref2) {
-    var tr = _ref2.tr;
-    tr.setMeta(primaryToolbarPluginKey, {
-      type: PrimaryToolbarPluginAction.REGISTER,
-      name: name,
-      component: component
-    });
-    return tr;
-  };
-};

package/dist/types/commands.d.ts

@@ -1,6 +0,0 @@
-import type { EditorCommand, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
-import type { ToolbarElementNames } from './types';
-export declare const registerComponent: ({ name, component, }: {
-    name: ToolbarElementNames;
-    component: ToolbarUIComponentFactory;
-}) => EditorCommand;

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

@@ -1,6 +0,0 @@
-import type { EditorCommand, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
-import type { ToolbarElementNames } from './types';
-export declare const registerComponent: ({ name, component, }: {
-    name: ToolbarElementNames;
-    component: ToolbarUIComponentFactory;
-}) => EditorCommand;