@atlaskit/editor-common 74.52.2 → 74.53.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-common
 
+## 74.53.0
+
+### Minor Changes
+
+- [`8467bdcdf4f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8467bdcdf4f) - Removing `dependencies` prop from PluginInjectionAPI and changing
+  signature of `NextEditorPlugin`.
+
+  Previously a `NextEditorPlugin` would be consumed as so:
+
+  ```ts
+  const plugin: NextEditorPlugin< ... > = (config, api) => {
+    // Can use api like so:
+    api.dependencies.core.actions.execute( ... )
+    return { ... }
+  }
+  ```
+
+  Now these have become named parameters like so and the `pluginInjectionAPI` is used
+  without the `dependencies` prop:
+
+  ```ts
+  const plugin: NextEditorPlugin< ... > = ({ config, api }) => {
+    // Can use api like so:
+    api.core.actions.execute( ... )
+    return { ... }
+  }
+  ```
+
 ## 74.52.2
 
 ### Patch Changes

package/dist/cjs/hooks/useSharedPluginState.js

@@ -54,7 +54,7 @@ function useStaticPlugins(plugins) {
  *   return <p>{ dogState.title } { exampleState.description }</p>
  * }
  *
- * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = (_, api) => {
+ * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = ({ api }) => {
  *   return {
  *     name: 'example',
  *     contentComponent: () =>
@@ -76,9 +76,9 @@ function useSharedPluginState(injectionApi, plugins) {
   // Create a memoized object containing the named plugins
   var namedExternalPlugins = (0, _react.useMemo)(function () {
     return pluginNames.reduce(function (acc, pluginName) {
-      return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, "".concat(pluginName, "State"), injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi.dependencies[pluginName]));
+      return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, "".concat(pluginName, "State"), injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi[pluginName]));
     }, {});
-  }, [injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi.dependencies, pluginNames]);
+  }, [injectionApi, pluginNames]);
   return useSharedPluginStateInternal(namedExternalPlugins);
 }
 function useSharedPluginStateInternal(externalPlugins) {

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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 SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "74.52.2";
+var packageVersion = "74.53.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/preset/builder.js

@@ -116,7 +116,12 @@ var EditorPresetBuilder = /*#__PURE__*/function () {
         if (typeof fn !== 'function') {
           return null;
         }
-        var plugin = pluginInjectionAPI ? fn(config, pluginInjectionAPI.api()) : fn(config);
+        var plugin = pluginInjectionAPI ? fn({
+          config: config,
+          api: pluginInjectionAPI.api()
+        }) : fn({
+          config: config
+        });
         if (plugin && excludePlugins !== null && excludePlugins !== void 0 && excludePlugins.has(plugin.name)) {
           return null;
         }

package/dist/cjs/preset/core-plugin.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.corePlugin = void 0;
 var _editorCommands = require("./editor-commands");
 var corePlugin = function corePlugin(_ref) {
-  var getEditorView = _ref.getEditorView;
+  var config = _ref.config;
   return {
     name: 'core',
     actions: {
       execute: function execute(command) {
-        var editorView = getEditorView();
+        var editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
         if (!editorView || !command) {
           return false;
         }

package/dist/cjs/preset/editor-commands.js

@@ -17,7 +17,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /**
  * Convert a EditorCommand to a standard Prosemirror Command.
  * The preferred approach to dispatching a `EditorCommand` is via the
- * `dependencies.core.actions.execute` on `pluginInjectionAPI`. In some cases
+ * `core.actions.execute` on `pluginInjectionAPI`. In some cases
  * the type may require a Command until we refactor this out and this
  * function is suitable for those cases.
  *

package/dist/cjs/preset/plugin-injection-api.js

@@ -280,7 +280,9 @@ var EditorPluginInjectionAPI = /*#__PURE__*/function () {
     this.commandsAPI = new EditorCommandsAPI();
     // Special core plugin that is always added
     this.addPlugin((0, _corePlugin.corePlugin)({
-      getEditorView: getEditorView
+      config: {
+        getEditorView: getEditorView
+      }
     }));
   }
   (0, _createClass2.default)(EditorPluginInjectionAPI, [{
@@ -290,7 +292,7 @@ var EditorPluginInjectionAPI = /*#__PURE__*/function () {
         actionsAPI = this.actionsAPI,
         commandsAPI = this.commandsAPI,
         getPluginByName = this.getPluginByName;
-      var dependencies = new Proxy({}, {
+      return new Proxy({}, {
         get: function get(target, prop, receiver) {
           // If we pass this as a prop React hates us
           // Let's just reflect the result and ignore these
@@ -316,9 +318,6 @@ var EditorPluginInjectionAPI = /*#__PURE__*/function () {
           return proxyCoreAPI;
         }
       });
-      return {
-        dependencies: dependencies
-      };
     }
   }]);
   return EditorPluginInjectionAPI;

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ var _templateObject, _templateObject2, _templateObject3;
 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); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.52.2";
+var packageVersion = "74.53.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/hooks/useSharedPluginState.js

@@ -39,7 +39,7 @@ function useStaticPlugins(plugins) {
  *   return <p>{ dogState.title } { exampleState.description }</p>
  * }
  *
- * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = (_, api) => {
+ * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = ({ api }) => {
  *   return {
  *     name: 'example',
  *     contentComponent: () =>
@@ -61,8 +61,8 @@ export function useSharedPluginState(injectionApi, plugins) {
   // Create a memoized object containing the named plugins
   const namedExternalPlugins = useMemo(() => pluginNames.reduce((acc, pluginName) => ({
     ...acc,
-    [`${pluginName}State`]: injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi.dependencies[pluginName]
-  }), {}), [injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi.dependencies, pluginNames]);
+    [`${pluginName}State`]: injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi[pluginName]
+  }), {}), [injectionApi, pluginNames]);
   return useSharedPluginStateInternal(namedExternalPlugins);
 }
 function useSharedPluginStateInternal(externalPlugins) {

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "74.52.2";
+const packageVersion = "74.53.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/preset/builder.js

@@ -81,7 +81,12 @@ export class EditorPresetBuilder {
       if (typeof fn !== 'function') {
         return null;
       }
-      const plugin = pluginInjectionAPI ? fn(config, pluginInjectionAPI.api()) : fn(config);
+      const plugin = pluginInjectionAPI ? fn({
+        config,
+        api: pluginInjectionAPI.api()
+      }) : fn({
+        config
+      });
       if (plugin && excludePlugins !== null && excludePlugins !== void 0 && excludePlugins.has(plugin.name)) {
         return null;
       }

package/dist/es2019/preset/core-plugin.js

@@ -1,12 +1,12 @@
 import { editorCommandToPMCommand } from './editor-commands';
 export const corePlugin = ({
-  getEditorView
+  config
 }) => {
   return {
     name: 'core',
     actions: {
       execute: command => {
-        const editorView = getEditorView();
+        const editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
         if (!editorView || !command) {
           return false;
         }

package/dist/es2019/preset/editor-commands.js

@@ -2,7 +2,7 @@ import { Transaction } from '@atlaskit/editor-prosemirror/state';
 /**
  * Convert a EditorCommand to a standard Prosemirror Command.
  * The preferred approach to dispatching a `EditorCommand` is via the
- * `dependencies.core.actions.execute` on `pluginInjectionAPI`. In some cases
+ * `core.actions.execute` on `pluginInjectionAPI`. In some cases
  * the type may require a Command until we refactor this out and this
  * function is suitable for those cases.
  *

package/dist/es2019/preset/plugin-injection-api.js

@@ -199,7 +199,9 @@ export class EditorPluginInjectionAPI {
     this.commandsAPI = new EditorCommandsAPI();
     // Special core plugin that is always added
     this.addPlugin(corePlugin({
-      getEditorView
+      config: {
+        getEditorView
+      }
     }));
   }
   api() {
@@ -209,7 +211,7 @@ export class EditorPluginInjectionAPI {
       commandsAPI,
       getPluginByName
     } = this;
-    const dependencies = new Proxy({}, {
+    return new Proxy({}, {
       get: function (target, prop, receiver) {
         // If we pass this as a prop React hates us
         // Let's just reflect the result and ignore these
@@ -235,8 +237,5 @@ export class EditorPluginInjectionAPI {
         return proxyCoreAPI;
       }
     });
-    return {
-      dependencies
-    };
   }
 }

package/dist/es2019/ui/DropList/index.js

@@ -8,7 +8,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "74.52.2";
+const packageVersion = "74.53.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/hooks/useSharedPluginState.js

@@ -47,7 +47,7 @@ function useStaticPlugins(plugins) {
  *   return <p>{ dogState.title } { exampleState.description }</p>
  * }
  *
- * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = (_, api) => {
+ * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = ({ api }) => {
  *   return {
  *     name: 'example',
  *     contentComponent: () =>
@@ -69,9 +69,9 @@ export function useSharedPluginState(injectionApi, plugins) {
   // Create a memoized object containing the named plugins
   var namedExternalPlugins = useMemo(function () {
     return pluginNames.reduce(function (acc, pluginName) {
-      return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, "".concat(pluginName, "State"), injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi.dependencies[pluginName]));
+      return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, "".concat(pluginName, "State"), injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi[pluginName]));
     }, {});
-  }, [injectionApi === null || injectionApi === void 0 ? void 0 : injectionApi.dependencies, pluginNames]);
+  }, [injectionApi, pluginNames]);
   return useSharedPluginStateInternal(namedExternalPlugins);
 }
 function useSharedPluginStateInternal(externalPlugins) {

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "74.52.2";
+var packageVersion = "74.53.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/preset/builder.js

@@ -109,7 +109,12 @@ export var EditorPresetBuilder = /*#__PURE__*/function () {
         if (typeof fn !== 'function') {
           return null;
         }
-        var plugin = pluginInjectionAPI ? fn(config, pluginInjectionAPI.api()) : fn(config);
+        var plugin = pluginInjectionAPI ? fn({
+          config: config,
+          api: pluginInjectionAPI.api()
+        }) : fn({
+          config: config
+        });
         if (plugin && excludePlugins !== null && excludePlugins !== void 0 && excludePlugins.has(plugin.name)) {
           return null;
         }

package/dist/esm/preset/core-plugin.js

@@ -1,11 +1,11 @@
 import { editorCommandToPMCommand } from './editor-commands';
 export var corePlugin = function corePlugin(_ref) {
-  var getEditorView = _ref.getEditorView;
+  var config = _ref.config;
   return {
     name: 'core',
     actions: {
       execute: function execute(command) {
-        var editorView = getEditorView();
+        var editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
         if (!editorView || !command) {
           return false;
         }

package/dist/esm/preset/editor-commands.js

@@ -9,7 +9,7 @@ import { Transaction } from '@atlaskit/editor-prosemirror/state';
 /**
  * Convert a EditorCommand to a standard Prosemirror Command.
  * The preferred approach to dispatching a `EditorCommand` is via the
- * `dependencies.core.actions.execute` on `pluginInjectionAPI`. In some cases
+ * `core.actions.execute` on `pluginInjectionAPI`. In some cases
  * the type may require a Command until we refactor this out and this
  * function is suitable for those cases.
  *

package/dist/esm/preset/plugin-injection-api.js

@@ -271,7 +271,9 @@ export var EditorPluginInjectionAPI = /*#__PURE__*/function () {
     this.commandsAPI = new EditorCommandsAPI();
     // Special core plugin that is always added
     this.addPlugin(corePlugin({
-      getEditorView: getEditorView
+      config: {
+        getEditorView: getEditorView
+      }
     }));
   }
   _createClass(EditorPluginInjectionAPI, [{
@@ -281,7 +283,7 @@ export var EditorPluginInjectionAPI = /*#__PURE__*/function () {
         actionsAPI = this.actionsAPI,
         commandsAPI = this.commandsAPI,
         getPluginByName = this.getPluginByName;
-      var dependencies = new Proxy({}, {
+      return new Proxy({}, {
         get: function get(target, prop, receiver) {
           // If we pass this as a prop React hates us
           // Let's just reflect the result and ignore these
@@ -307,9 +309,6 @@ export var EditorPluginInjectionAPI = /*#__PURE__*/function () {
           return proxyCoreAPI;
         }
       });
-      return {
-        dependencies: dependencies
-      };
     }
   }]);
   return EditorPluginInjectionAPI;

package/dist/esm/ui/DropList/index.js

@@ -18,7 +18,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.52.2";
+var packageVersion = "74.53.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/hooks/useSharedPluginState.d.ts

@@ -1,8 +1,8 @@
-import type { ExtractPluginSharedState, NextEditorPlugin, PluginDependenciesAPI, PluginInjectionAPIWithDependencies, PublicPluginAPI } from '../types/next-editor-plugin';
-type NamedPluginStatesFromInjectionAPI<API extends PluginInjectionAPIWithDependencies<any> | undefined, PluginList extends string[]> = Readonly<{
-    [K in PluginList[number] as `${K}State`]: API extends PluginInjectionAPIWithDependencies<any> ? API['dependencies'][K] extends PluginDependenciesAPI<infer Plugin> | undefined ? ExtractPluginSharedState<Plugin> | undefined : never : never;
+import type { ExtractPluginSharedState, NextEditorPlugin, PluginDependenciesAPI, PublicPluginAPI } from '../types/next-editor-plugin';
+type NamedPluginStatesFromInjectionAPI<API extends PublicPluginAPI<any> | undefined, PluginList extends string[]> = Readonly<{
+    [K in PluginList[number] as `${K}State`]: API extends PublicPluginAPI<any> ? API[K] extends PluginDependenciesAPI<infer Plugin> | undefined ? ExtractPluginSharedState<Plugin> | undefined : never : never;
 }>;
-type ExtractPluginNames<API extends PluginInjectionAPIWithDependencies<any>> = API extends PluginInjectionAPIWithDependencies<any> ? keyof API['dependencies'] : never;
+type ExtractPluginNames<API extends PublicPluginAPI<any>> = API extends PublicPluginAPI<any> ? keyof API : never;
 /**
  *
  * Used to return the current plugin state of
@@ -19,7 +19,7 @@ type ExtractPluginNames<API extends PluginInjectionAPIWithDependencies<any>> = A
  *   return <p>{ dogState.title } { exampleState.description }</p>
  * }
  *
- * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = (_, api) => {
+ * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = ({ api }) => {
  *   return {
  *     name: 'example',
  *     contentComponent: () =>

package/dist/types/preset/editor-commands.d.ts

@@ -4,7 +4,7 @@ import type { EditorCommand } from '../types/editor-command';
 /**
  * Convert a EditorCommand to a standard Prosemirror Command.
  * The preferred approach to dispatching a `EditorCommand` is via the
- * `dependencies.core.actions.execute` on `pluginInjectionAPI`. In some cases
+ * `core.actions.execute` on `pluginInjectionAPI`. In some cases
  * the type may require a Command until we refactor this out and this
  * function is suitable for those cases.
  *

package/dist/types/preset/plugin-injection-api.d.ts

@@ -1,6 +1,6 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { DefaultEditorPlugin, NextEditorPlugin, PluginDependenciesAPI, PluginInjectionAPI } from '../types/next-editor-plugin';
+import type { NextEditorPlugin, PluginDependenciesAPI, PluginInjectionAPI } from '../types/next-editor-plugin';
 type NextEditorPluginInitializedType = ReturnType<NextEditorPlugin<any>>;
 type SharedStateAPIProps = {
     getEditorState: () => EditorState | undefined;
@@ -29,7 +29,7 @@ type EditorStateDelta = {
     readonly oldEditorState: EditorState;
 };
 interface PluginInjectionAPIDefinition {
-    api: <T extends NextEditorPlugin<any, any>>() => PluginInjectionAPI<T extends NextEditorPlugin<infer Name, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata> ? Metadata : never>;
+    api: <T extends NextEditorPlugin<any, any>>() => PluginInjectionAPI<T extends NextEditorPlugin<infer Name, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata> ? Metadata : never>['dependencies'];
     onEditorViewUpdated: (props: EditorStateDelta) => void;
     onEditorPluginInitialized: (plugin: NextEditorPluginInitializedType) => void;
 }
@@ -39,25 +39,7 @@ export declare class EditorPluginInjectionAPI implements PluginInjectionAPIDefin
     private commandsAPI;
     private plugins;
     constructor({ getEditorState, getEditorView }: PluginInjectionAPIProps);
-    api<T extends NextEditorPlugin<any, any>>(): {
-        dependencies: import("../types/next-editor-plugin").CreatePluginDependenciesAPI<[NextEditorPlugin<T extends (config?: any, api?: PluginInjectionAPI<infer Name extends string, any> | undefined) => DefaultEditorPlugin<infer Name extends string, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never>, ..."dependencies" extends keyof (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never) ? (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"] extends (((config?: any, api?: PluginInjectionAPI<any, any> | undefined) => DefaultEditorPlugin<any, any>) | import("../types/next-editor-plugin").OptionalPlugin<(config?: any, api?: PluginInjectionAPI<any, any> | undefined) => DefaultEditorPlugin<any, any>>)[] ? Exclude<(T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"], undefined> : [] : [], (config: {
-            getEditorView: () => EditorView | undefined;
-        }, api?: PluginInjectionAPI<"core", {
-            pluginConfiguration: {
-                getEditorView: () => EditorView | undefined;
-            };
-            actions: {
-                execute: (command: import("../types").EditorCommand | undefined) => boolean;
-            };
-        }> | undefined) => DefaultEditorPlugin<"core", {
-            pluginConfiguration: {
-                getEditorView: () => EditorView | undefined;
-            };
-            actions: {
-                execute: (command: import("../types").EditorCommand | undefined) => boolean;
-            };
-        }>]>;
-    };
+    api<T extends NextEditorPlugin<any, any>>(): import("../types/next-editor-plugin").PublicPluginAPI<[NextEditorPlugin<T extends import("../types/next-editor-plugin").NextEditorPluginFunctionOptionalConfigDefinition<infer Name extends string, any, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never>, ..."dependencies" extends keyof (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never) ? (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"] extends (import("../types/next-editor-plugin").NextEditorPluginFunctionOptionalConfigDefinition<any, any, any> | import("../types/next-editor-plugin").OptionalPlugin<import("../types/next-editor-plugin").NextEditorPluginFunctionOptionalConfigDefinition<any, any, any>>)[] ? Exclude<(T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"], undefined> : [] : []]>;
     onEditorViewUpdated: ({ newEditorState, oldEditorState, }: EditorStateDiff) => void;
     onEditorPluginInitialized: (plugin: NextEditorPluginInitializedType) => void;
     private addPlugin;

package/dist/types/types/index.d.ts

@@ -28,7 +28,7 @@ export type { EditorReactContext } from './editor-react-context';
 export type { PMPluginFactoryParams, PMPluginFactory, PMPlugin, } from './plugin-factory';
 export type { NodeConfig, MarkConfig, NodeViewConfig, } from './prosemirror-config';
 export type { PluginsOptions, EditorPlugin, getPosHandler, getPosHandlerNode, } from './editor-plugin';
-export type { NextEditorPlugin, AllEditorPresetPluginTypes, PluginDependenciesAPI, ExtractPluginNameFromAllBuilderPlugins, SafePresetCheck, DefaultEditorPlugin, OptionalPlugin, PluginInjectionAPI, CreatePluginDependenciesAPI, NextEditorPluginMetadata, ExtractInjectionAPI, ExtractPluginActions, PluginInjectionAPIWithDependency, PluginInjectionAPIWithDependencies, PublicPluginAPI, } from './next-editor-plugin';
+export type { NextEditorPlugin, AllEditorPresetPluginTypes, PluginDependenciesAPI, ExtractPluginNameFromAllBuilderPlugins, SafePresetCheck, DefaultEditorPlugin, OptionalPlugin, PluginInjectionAPI, CreatePluginDependenciesAPI, NextEditorPluginMetadata, ExtractInjectionAPI, ExtractPluginActions, PluginInjectionAPIWithDependency, PluginInjectionAPIWithDependencies, PublicPluginAPI, NextEditorPluginFunctionOptionalConfigDefinition, } from './next-editor-plugin';
 export type { ExtractPublicEditorAPI } from './editor-public-api';
 export type { EditorCommand, EditorCommandWithMetadata, } from './editor-command';
 export type IconProps = {

package/dist/types/types/next-editor-plugin.d.ts

@@ -34,20 +34,30 @@ export interface NextEditorPluginMetadata {
     readonly actions?: NextEditorPluginActions;
     readonly commands?: NextEditorEditorCommands;
 }
-export type PluginInjectionAPI<Name extends string, Metadata extends NextEditorPluginMetadata> = PublicPluginAPI<[
-    NextEditorPlugin<Name, Metadata>,
-    ...ExtractPluginDependenciesFromMetadata<Metadata>
-]>;
+/**
+ * `PluginInjectionAPI` doesn't actually use `dependencies`,
+ * we should use it as PluginInjectionAPI< ... >['dependencies']
+ * it is only here because otherwise typescript blows up
+ * trying to compare `PluginInjectionAPI` to `PublicPluginAPI`
+ */
+export type PluginInjectionAPI<Name extends string, Metadata extends NextEditorPluginMetadata> = {
+    dependencies: PublicPluginAPI<[
+        NextEditorPlugin<Name, Metadata>,
+        ...ExtractPluginDependenciesFromMetadata<Metadata>
+    ]>;
+};
 export type PluginInjectionAPIWithDependency<Plugin extends NextEditorPlugin<any, any>> = PublicPluginAPI<[Plugin]>;
 export type PluginInjectionAPIWithDependencies<Plugins extends NextEditorPlugin<any, any>[]> = PublicPluginAPI<Plugins>;
-type NextEditorPluginFunctionDefinition<Name extends string, Metadata extends NextEditorPluginMetadata, Configuration> = (config: Configuration, api?: PluginInjectionAPI<Name, Metadata>) => DefaultEditorPlugin<Name, Metadata>;
-type NextEditorPluginFunctionOptionalConfigDefinition<Name extends string, Metadata extends NextEditorPluginMetadata, Configuration = undefined> = (config?: Configuration, api?: PluginInjectionAPI<Name, Metadata>) => DefaultEditorPlugin<Name, Metadata>;
+export type NextEditorPluginFunctionOptionalConfigDefinition<Name extends string, Metadata extends NextEditorPluginMetadata, Configuration = undefined> = (props: {
+    config: Configuration;
+    api?: PluginInjectionAPI<Name, Metadata>['dependencies'];
+}) => DefaultEditorPlugin<Name, Metadata>;
 type OptionalPrivateProperty = {
     __optionalPluginType: true;
 };
 export type OptionalPlugin<EditorPlugin extends NextEditorPlugin<any, any>> = EditorPlugin & OptionalPrivateProperty;
 type DependencyPlugin = OptionalPlugin<NextEditorPlugin<any, any>> | NextEditorPlugin<any, any>;
-export type NextEditorPlugin<Name extends string, Metadata extends NextEditorPluginMetadata = {}> = Metadata extends NextEditorPluginMetadata ? 'pluginConfiguration' extends keyof Metadata ? undefined extends Metadata['pluginConfiguration'] ? NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata, Metadata['pluginConfiguration']> : NextEditorPluginFunctionDefinition<Name, Metadata, Metadata['pluginConfiguration']> : NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata> : never;
+export type NextEditorPlugin<Name extends string, Metadata extends NextEditorPluginMetadata = {}> = Metadata extends NextEditorPluginMetadata ? 'pluginConfiguration' extends keyof Metadata ? NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata, Metadata['pluginConfiguration']> : NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata> : never;
 type FilterOptionalPlugins<T extends DependencyPlugin[]> = T extends [
     infer Head,
     ...infer Tail
@@ -58,10 +68,22 @@ type ExtractSharedStateFromMetadata<Metadata> = 'sharedState' extends keyof Meta
 type ExtractActionsFromMetadata<Metadata> = 'actions' extends keyof Metadata ? Metadata['actions'] : never;
 type ExtractCommandsFromMetadata<Metadata> = 'commands' extends keyof Metadata ? Metadata['commands'] : never;
 type ExtractPluginConfigurationFromMetadata<Metadata> = 'pluginConfiguration' extends keyof Metadata ? Metadata['pluginConfiguration'] : never;
-export type ExtractPluginDependencies<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginDependenciesFromMetadataWithoutOptionals<Metadata> : never : never;
-type ExtractPluginConfiguration<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginConfigurationFromMetadata<Metadata> : never : never;
-export type ExtractPluginSharedState<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractSharedStateFromMetadata<Metadata> : never : never;
-export type ExtractPluginActions<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractActionsFromMetadata<Metadata> : never : never;
+export type ExtractPluginDependencies<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginDependenciesFromMetadataWithoutOptionals<Metadata> : never : never;
+type ExtractPluginConfiguration<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginConfigurationFromMetadata<Metadata> : never : never;
+export type ExtractPluginSharedState<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractSharedStateFromMetadata<Metadata> : never : never;
+export type ExtractPluginActions<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractActionsFromMetadata<Metadata> : never : never;
 type ExtractPluginName<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (...args: any) => DefaultEditorPlugin<infer PluginName, any> ? PluginName : never : never;
 type Unsubscribe = () => void;
 export type PluginDependenciesAPI<Plugin extends NextEditorPlugin<any, any>> = {
@@ -101,10 +123,8 @@ type CheckTupleRequirements<Plugin, Config, ArrayType> = unknown extends Config
 ] extends [never] ? Plugin : ArrayType;
 type CheckBasicPlugin<Plugin> = Plugin extends (args: any, api: any) => EditorPlugin ? CheckTupleRequirements<Plugin, ExtractPluginConfiguration<Plugin>, PluginAsArray<Plugin>> : never;
 export type ExtractPluginNameFromAllBuilderPlugins<Plugin extends AllEditorPresetPluginTypes> = Plugin extends Array<any> ? Plugin extends [infer MaybePlugin, ...any] ? MaybePlugin extends NextEditorPlugin<any, any> ? ExtractPluginName<MaybePlugin> : never : never : Plugin extends NextEditorPlugin<any, any> ? ExtractPluginName<Plugin> : never;
-export type ExtractInjectionAPI<Plugin> = Plugin extends NextEditorPlugin<infer Name, infer Metadata> ? PluginInjectionAPI<Name, Metadata> : never;
-export type PublicPluginAPI<PluginList extends NextEditorPlugin<any, any>[]> = {
-    dependencies: CreatePluginDependenciesAPI<[...PluginList, CorePlugin]>;
-};
+export type ExtractInjectionAPI<Plugin> = Plugin extends NextEditorPlugin<infer Name, infer Metadata> ? PluginInjectionAPI<Name, Metadata>['dependencies'] : never;
+export type PublicPluginAPI<PluginList extends NextEditorPlugin<any, any>[]> = CreatePluginDependenciesAPI<[...PluginList, CorePlugin]>;
 export type ExtractNextEditorPlugins<Plugins extends AllEditorPresetPluginTypes[]> = {
     [PluginNumber in keyof Plugins]: Plugins[PluginNumber] extends NextEditorPlugin<infer Name, infer Metadata> ? NextEditorPlugin<Name, Metadata> : Plugins[PluginNumber] extends [
         NextEditorPlugin<infer Name, infer Metadata>,

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

@@ -1,8 +1,8 @@
-import type { ExtractPluginSharedState, NextEditorPlugin, PluginDependenciesAPI, PluginInjectionAPIWithDependencies, PublicPluginAPI } from '../types/next-editor-plugin';
-type NamedPluginStatesFromInjectionAPI<API extends PluginInjectionAPIWithDependencies<any> | undefined, PluginList extends string[]> = Readonly<{
-    [K in PluginList[number] as `${K}State`]: API extends PluginInjectionAPIWithDependencies<any> ? API['dependencies'][K] extends PluginDependenciesAPI<infer Plugin> | undefined ? ExtractPluginSharedState<Plugin> | undefined : never : never;
+import type { ExtractPluginSharedState, NextEditorPlugin, PluginDependenciesAPI, PublicPluginAPI } from '../types/next-editor-plugin';
+type NamedPluginStatesFromInjectionAPI<API extends PublicPluginAPI<any> | undefined, PluginList extends string[]> = Readonly<{
+    [K in PluginList[number] as `${K}State`]: API extends PublicPluginAPI<any> ? API[K] extends PluginDependenciesAPI<infer Plugin> | undefined ? ExtractPluginSharedState<Plugin> | undefined : never : never;
 }>;
-type ExtractPluginNames<API extends PluginInjectionAPIWithDependencies<any>> = API extends PluginInjectionAPIWithDependencies<any> ? keyof API['dependencies'] : never;
+type ExtractPluginNames<API extends PublicPluginAPI<any>> = API extends PublicPluginAPI<any> ? keyof API : never;
 /**
  *
  * Used to return the current plugin state of
@@ -19,7 +19,7 @@ type ExtractPluginNames<API extends PluginInjectionAPIWithDependencies<any>> = A
  *   return <p>{ dogState.title } { exampleState.description }</p>
  * }
  *
- * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = (_, api) => {
+ * const examplePlugin: NextEditorPlugin<'example', { dependencies: [typeof pluginDog] }> = ({ api }) => {
  *   return {
  *     name: 'example',
  *     contentComponent: () =>

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

@@ -4,7 +4,7 @@ import type { EditorCommand } from '../types/editor-command';
 /**
  * Convert a EditorCommand to a standard Prosemirror Command.
  * The preferred approach to dispatching a `EditorCommand` is via the
- * `dependencies.core.actions.execute` on `pluginInjectionAPI`. In some cases
+ * `core.actions.execute` on `pluginInjectionAPI`. In some cases
  * the type may require a Command until we refactor this out and this
  * function is suitable for those cases.
  *

package/dist/types-ts4.5/preset/plugin-injection-api.d.ts

@@ -1,6 +1,6 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { DefaultEditorPlugin, NextEditorPlugin, PluginDependenciesAPI, PluginInjectionAPI } from '../types/next-editor-plugin';
+import type { NextEditorPlugin, PluginDependenciesAPI, PluginInjectionAPI } from '../types/next-editor-plugin';
 type NextEditorPluginInitializedType = ReturnType<NextEditorPlugin<any>>;
 type SharedStateAPIProps = {
     getEditorState: () => EditorState | undefined;
@@ -29,7 +29,7 @@ type EditorStateDelta = {
     readonly oldEditorState: EditorState;
 };
 interface PluginInjectionAPIDefinition {
-    api: <T extends NextEditorPlugin<any, any>>() => PluginInjectionAPI<T extends NextEditorPlugin<infer Name, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata> ? Metadata : never>;
+    api: <T extends NextEditorPlugin<any, any>>() => PluginInjectionAPI<T extends NextEditorPlugin<infer Name, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata> ? Metadata : never>['dependencies'];
     onEditorViewUpdated: (props: EditorStateDelta) => void;
     onEditorPluginInitialized: (plugin: NextEditorPluginInitializedType) => void;
 }
@@ -39,31 +39,12 @@ export declare class EditorPluginInjectionAPI implements PluginInjectionAPIDefin
     private commandsAPI;
     private plugins;
     constructor({ getEditorState, getEditorView }: PluginInjectionAPIProps);
-    api<T extends NextEditorPlugin<any, any>>(): {
-        dependencies: import("../types/next-editor-plugin").CreatePluginDependenciesAPI<[
-            NextEditorPlugin<T extends (config?: any, api?: PluginInjectionAPI<infer Name extends string, any> | undefined) => DefaultEditorPlugin<infer Name extends string, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never>,
-            ..."dependencies" extends keyof (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never) ? (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"] extends (((config?: any, api?: PluginInjectionAPI<any, any> | undefined) => DefaultEditorPlugin<any, any>) | import("../types/next-editor-plugin").OptionalPlugin<(config?: any, api?: PluginInjectionAPI<any, any> | undefined) => DefaultEditorPlugin<any, any>>)[] ? Exclude<(T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"], undefined> : [
-            ] : [
-            ],
-            (config: {
-                getEditorView: () => EditorView | undefined;
-            }, api?: PluginInjectionAPI<"core", {
-                pluginConfiguration: {
-                    getEditorView: () => EditorView | undefined;
-                };
-                actions: {
-                    execute: (command: import("../types").EditorCommand | undefined) => boolean;
-                };
-            }> | undefined) => DefaultEditorPlugin<"core", {
-                pluginConfiguration: {
-                    getEditorView: () => EditorView | undefined;
-                };
-                actions: {
-                    execute: (command: import("../types").EditorCommand | undefined) => boolean;
-                };
-            }>
-        ]>;
-    };
+    api<T extends NextEditorPlugin<any, any>>(): import("../types/next-editor-plugin").PublicPluginAPI<[
+        NextEditorPlugin<T extends import("../types/next-editor-plugin").NextEditorPluginFunctionOptionalConfigDefinition<infer Name extends string, any, any> ? Name : never, T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never>,
+        ..."dependencies" extends keyof (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never) ? (T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"] extends (import("../types/next-editor-plugin").NextEditorPluginFunctionOptionalConfigDefinition<any, any, any> | import("../types/next-editor-plugin").OptionalPlugin<import("../types/next-editor-plugin").NextEditorPluginFunctionOptionalConfigDefinition<any, any, any>>)[] ? Exclude<(T extends NextEditorPlugin<any, infer Metadata extends import("../types/next-editor-plugin").NextEditorPluginMetadata> ? Metadata : never)["dependencies"], undefined> : [
+        ] : [
+        ]
+    ]>;
     onEditorViewUpdated: ({ newEditorState, oldEditorState, }: EditorStateDiff) => void;
     onEditorPluginInitialized: (plugin: NextEditorPluginInitializedType) => void;
     private addPlugin;

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

@@ -28,7 +28,7 @@ export type { EditorReactContext } from './editor-react-context';
 export type { PMPluginFactoryParams, PMPluginFactory, PMPlugin, } from './plugin-factory';
 export type { NodeConfig, MarkConfig, NodeViewConfig, } from './prosemirror-config';
 export type { PluginsOptions, EditorPlugin, getPosHandler, getPosHandlerNode, } from './editor-plugin';
-export type { NextEditorPlugin, AllEditorPresetPluginTypes, PluginDependenciesAPI, ExtractPluginNameFromAllBuilderPlugins, SafePresetCheck, DefaultEditorPlugin, OptionalPlugin, PluginInjectionAPI, CreatePluginDependenciesAPI, NextEditorPluginMetadata, ExtractInjectionAPI, ExtractPluginActions, PluginInjectionAPIWithDependency, PluginInjectionAPIWithDependencies, PublicPluginAPI, } from './next-editor-plugin';
+export type { NextEditorPlugin, AllEditorPresetPluginTypes, PluginDependenciesAPI, ExtractPluginNameFromAllBuilderPlugins, SafePresetCheck, DefaultEditorPlugin, OptionalPlugin, PluginInjectionAPI, CreatePluginDependenciesAPI, NextEditorPluginMetadata, ExtractInjectionAPI, ExtractPluginActions, PluginInjectionAPIWithDependency, PluginInjectionAPIWithDependencies, PublicPluginAPI, NextEditorPluginFunctionOptionalConfigDefinition, } from './next-editor-plugin';
 export type { ExtractPublicEditorAPI } from './editor-public-api';
 export type { EditorCommand, EditorCommandWithMetadata, } from './editor-command';
 export type IconProps = {

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

@@ -34,22 +34,32 @@ export interface NextEditorPluginMetadata {
     readonly actions?: NextEditorPluginActions;
     readonly commands?: NextEditorEditorCommands;
 }
-export type PluginInjectionAPI<Name extends string, Metadata extends NextEditorPluginMetadata> = PublicPluginAPI<[
-    NextEditorPlugin<Name, Metadata>,
-    ...ExtractPluginDependenciesFromMetadata<Metadata>
-]>;
+/**
+ * `PluginInjectionAPI` doesn't actually use `dependencies`,
+ * we should use it as PluginInjectionAPI< ... >['dependencies']
+ * it is only here because otherwise typescript blows up
+ * trying to compare `PluginInjectionAPI` to `PublicPluginAPI`
+ */
+export type PluginInjectionAPI<Name extends string, Metadata extends NextEditorPluginMetadata> = {
+    dependencies: PublicPluginAPI<[
+        NextEditorPlugin<Name, Metadata>,
+        ...ExtractPluginDependenciesFromMetadata<Metadata>
+    ]>;
+};
 export type PluginInjectionAPIWithDependency<Plugin extends NextEditorPlugin<any, any>> = PublicPluginAPI<[
     Plugin
 ]>;
 export type PluginInjectionAPIWithDependencies<Plugins extends NextEditorPlugin<any, any>[]> = PublicPluginAPI<Plugins>;
-type NextEditorPluginFunctionDefinition<Name extends string, Metadata extends NextEditorPluginMetadata, Configuration> = (config: Configuration, api?: PluginInjectionAPI<Name, Metadata>) => DefaultEditorPlugin<Name, Metadata>;
-type NextEditorPluginFunctionOptionalConfigDefinition<Name extends string, Metadata extends NextEditorPluginMetadata, Configuration = undefined> = (config?: Configuration, api?: PluginInjectionAPI<Name, Metadata>) => DefaultEditorPlugin<Name, Metadata>;
+export type NextEditorPluginFunctionOptionalConfigDefinition<Name extends string, Metadata extends NextEditorPluginMetadata, Configuration = undefined> = (props: {
+    config: Configuration;
+    api?: PluginInjectionAPI<Name, Metadata>['dependencies'];
+}) => DefaultEditorPlugin<Name, Metadata>;
 type OptionalPrivateProperty = {
     __optionalPluginType: true;
 };
 export type OptionalPlugin<EditorPlugin extends NextEditorPlugin<any, any>> = EditorPlugin & OptionalPrivateProperty;
 type DependencyPlugin = OptionalPlugin<NextEditorPlugin<any, any>> | NextEditorPlugin<any, any>;
-export type NextEditorPlugin<Name extends string, Metadata extends NextEditorPluginMetadata = {}> = Metadata extends NextEditorPluginMetadata ? 'pluginConfiguration' extends keyof Metadata ? undefined extends Metadata['pluginConfiguration'] ? NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata, Metadata['pluginConfiguration']> : NextEditorPluginFunctionDefinition<Name, Metadata, Metadata['pluginConfiguration']> : NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata> : never;
+export type NextEditorPlugin<Name extends string, Metadata extends NextEditorPluginMetadata = {}> = Metadata extends NextEditorPluginMetadata ? 'pluginConfiguration' extends keyof Metadata ? NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata, Metadata['pluginConfiguration']> : NextEditorPluginFunctionOptionalConfigDefinition<Name, Metadata> : never;
 type FilterOptionalPlugins<T extends DependencyPlugin[]> = T extends [
     infer Head,
     ...infer Tail
@@ -66,10 +76,22 @@ type ExtractSharedStateFromMetadata<Metadata> = 'sharedState' extends keyof Meta
 type ExtractActionsFromMetadata<Metadata> = 'actions' extends keyof Metadata ? Metadata['actions'] : never;
 type ExtractCommandsFromMetadata<Metadata> = 'commands' extends keyof Metadata ? Metadata['commands'] : never;
 type ExtractPluginConfigurationFromMetadata<Metadata> = 'pluginConfiguration' extends keyof Metadata ? Metadata['pluginConfiguration'] : never;
-export type ExtractPluginDependencies<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginDependenciesFromMetadataWithoutOptionals<Metadata> : never : never;
-type ExtractPluginConfiguration<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginConfigurationFromMetadata<Metadata> : never : never;
-export type ExtractPluginSharedState<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractSharedStateFromMetadata<Metadata> : never : never;
-export type ExtractPluginActions<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (config: any, api: any) => DefaultEditorPlugin<any, infer Metadata> ? ExtractActionsFromMetadata<Metadata> : never : never;
+export type ExtractPluginDependencies<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginDependenciesFromMetadataWithoutOptionals<Metadata> : never : never;
+type ExtractPluginConfiguration<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractPluginConfigurationFromMetadata<Metadata> : never : never;
+export type ExtractPluginSharedState<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractSharedStateFromMetadata<Metadata> : never : never;
+export type ExtractPluginActions<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (props: {
+    config: any;
+    api: any;
+}) => DefaultEditorPlugin<any, infer Metadata> ? ExtractActionsFromMetadata<Metadata> : never : never;
 type ExtractPluginName<Plugin> = Plugin extends NextEditorPlugin<any, any> ? Plugin extends (...args: any) => DefaultEditorPlugin<infer PluginName, any> ? PluginName : never : never;
 type Unsubscribe = () => void;
 export type PluginDependenciesAPI<Plugin extends NextEditorPlugin<any, any>> = {
@@ -121,13 +143,11 @@ export type ExtractPluginNameFromAllBuilderPlugins<Plugin extends AllEditorPrese
     infer MaybePlugin,
     ...any
 ] ? MaybePlugin extends NextEditorPlugin<any, any> ? ExtractPluginName<MaybePlugin> : never : never : Plugin extends NextEditorPlugin<any, any> ? ExtractPluginName<Plugin> : never;
-export type ExtractInjectionAPI<Plugin> = Plugin extends NextEditorPlugin<infer Name, infer Metadata> ? PluginInjectionAPI<Name, Metadata> : never;
-export type PublicPluginAPI<PluginList extends NextEditorPlugin<any, any>[]> = {
-    dependencies: CreatePluginDependenciesAPI<[
-        ...PluginList,
-        CorePlugin
-    ]>;
-};
+export type ExtractInjectionAPI<Plugin> = Plugin extends NextEditorPlugin<infer Name, infer Metadata> ? PluginInjectionAPI<Name, Metadata>['dependencies'] : never;
+export type PublicPluginAPI<PluginList extends NextEditorPlugin<any, any>[]> = CreatePluginDependenciesAPI<[
+    ...PluginList,
+    CorePlugin
+]>;
 export type ExtractNextEditorPlugins<Plugins extends AllEditorPresetPluginTypes[]> = {
     [PluginNumber in keyof Plugins]: Plugins[PluginNumber] extends NextEditorPlugin<infer Name, infer Metadata> ? NextEditorPlugin<Name, Metadata> : Plugins[PluginNumber] extends [
         NextEditorPlugin<infer Name, infer Metadata>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "74.52.2",
+  "version": "74.53.0",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -112,7 +112,7 @@
     "@atlaskit/spinner": "^15.5.0",
     "@atlaskit/task-decision": "^17.7.0",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.16.0",
+    "@atlaskit/tokens": "^1.17.0",
     "@atlaskit/tooltip": "^17.8.0",
     "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/width-detector": "^4.1.0",