@atlaskit/editor-plugin-floating-toolbar 1.12.4 → 1.13.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.13.0
+
+### Minor Changes
+
+- [#140163](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140163)
+  [`8393ffa4eb45a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8393ffa4eb45a) -
+  PGEXP-275 Extend floating toolbar API to pass config list
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.12.4
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ContentComponent = ContentComponent;
-exports.pluginKey = exports.getRelevantConfig = exports.floatingToolbarPlugin = void 0;
+exports.floatingToolbarPlugin = void 0;
+exports.floatingToolbarPluginFactory = floatingToolbarPluginFactory;
+exports.pluginKey = exports.getRelevantConfig = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
@@ -131,12 +133,10 @@ var floatingToolbarPlugin = exports.floatingToolbarPlugin = function floatingToo
         // Should be after all toolbar plugins
         name: 'floatingToolbar',
         plugin: function plugin(_ref2) {
-          var dispatch = _ref2.dispatch,
-            providerFactory = _ref2.providerFactory,
+          var providerFactory = _ref2.providerFactory,
             getIntl = _ref2.getIntl;
           return floatingToolbarPluginFactory({
             floatingToolbarHandlers: floatingToolbarHandlers,
-            dispatch: dispatch,
             providerFactory: providerFactory,
             getIntl: getIntl
           });
@@ -384,15 +384,18 @@ function floatingToolbarPluginFactory(options) {
     getIntl = options.getIntl;
   var intl = getIntl();
   var getConfigWithNodeInfo = function getConfigWithNodeInfo(editorState) {
-    var activeConfigs = floatingToolbarHandlers.map(function (handler) {
-      return handler(editorState, intl, providerFactory);
-    }).filter(filterUndefined).map(function (config) {
-      return sanitizeFloatingToolbarConfig(config);
-    });
+    var activeConfigs = [];
+    for (var index = 0; index < floatingToolbarHandlers.length; index++) {
+      var handler = floatingToolbarHandlers[index];
+      var config = handler(editorState, intl, providerFactory, activeConfigs);
+      if (config) {
+        activeConfigs.push(sanitizeFloatingToolbarConfig(config));
+      }
+    }
     var relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-  var apply = function apply(tr, pluginState) {
+  var apply = function apply() {
     var newPluginState = {
       getConfigWithNodeInfo: getConfigWithNodeInfo
     };

package/dist/es2019/plugin.js

@@ -120,12 +120,10 @@ export const floatingToolbarPlugin = ({
         // Should be after all toolbar plugins
         name: 'floatingToolbar',
         plugin: ({
-          dispatch,
           providerFactory,
           getIntl
         }) => floatingToolbarPluginFactory({
           floatingToolbarHandlers,
-          dispatch,
           providerFactory,
           getIntl
         })
@@ -361,7 +359,7 @@ function sanitizeFloatingToolbarConfig(config) {
   }
   return config;
 }
-function floatingToolbarPluginFactory(options) {
+export function floatingToolbarPluginFactory(options) {
   const {
     floatingToolbarHandlers,
     providerFactory,
@@ -369,11 +367,18 @@ function floatingToolbarPluginFactory(options) {
   } = options;
   const intl = getIntl();
   const getConfigWithNodeInfo = editorState => {
-    const activeConfigs = floatingToolbarHandlers.map(handler => handler(editorState, intl, providerFactory)).filter(filterUndefined).map(config => sanitizeFloatingToolbarConfig(config));
+    let activeConfigs = [];
+    for (let index = 0; index < floatingToolbarHandlers.length; index++) {
+      const handler = floatingToolbarHandlers[index];
+      const config = handler(editorState, intl, providerFactory, activeConfigs);
+      if (config) {
+        activeConfigs.push(sanitizeFloatingToolbarConfig(config));
+      }
+    }
     const relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-  const apply = (tr, pluginState) => {
+  const apply = () => {
     const newPluginState = {
       getConfigWithNodeInfo
     };

package/dist/esm/plugin.js

@@ -121,12 +121,10 @@ export var floatingToolbarPlugin = function floatingToolbarPlugin(_ref) {
         // Should be after all toolbar plugins
         name: 'floatingToolbar',
         plugin: function plugin(_ref2) {
-          var dispatch = _ref2.dispatch,
-            providerFactory = _ref2.providerFactory,
+          var providerFactory = _ref2.providerFactory,
             getIntl = _ref2.getIntl;
           return floatingToolbarPluginFactory({
             floatingToolbarHandlers: floatingToolbarHandlers,
-            dispatch: dispatch,
             providerFactory: providerFactory,
             getIntl: getIntl
           });
@@ -368,21 +366,24 @@ function sanitizeFloatingToolbarConfig(config) {
   }
   return config;
 }
-function floatingToolbarPluginFactory(options) {
+export function floatingToolbarPluginFactory(options) {
   var floatingToolbarHandlers = options.floatingToolbarHandlers,
     providerFactory = options.providerFactory,
     getIntl = options.getIntl;
   var intl = getIntl();
   var getConfigWithNodeInfo = function getConfigWithNodeInfo(editorState) {
-    var activeConfigs = floatingToolbarHandlers.map(function (handler) {
-      return handler(editorState, intl, providerFactory);
-    }).filter(filterUndefined).map(function (config) {
-      return sanitizeFloatingToolbarConfig(config);
-    });
+    var activeConfigs = [];
+    for (var index = 0; index < floatingToolbarHandlers.length; index++) {
+      var handler = floatingToolbarHandlers[index];
+      var config = handler(editorState, intl, providerFactory, activeConfigs);
+      if (config) {
+        activeConfigs.push(sanitizeFloatingToolbarConfig(config));
+      }
+    }
     var relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-  var apply = function apply(tr, pluginState) {
+  var apply = function apply() {
     var newPluginState = {
       getConfigWithNodeInfo: getConfigWithNodeInfo
     };

package/dist/types/plugin.d.ts

@@ -1,5 +1,8 @@
 /// <reference types="react" />
-import type { ExtractInjectionAPI, FloatingToolbarConfig, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
+import type { IntlShape } from 'react-intl-next';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarHandler, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { ConfigWithNodeInfo, FloatingToolbarPlugin, FloatingToolbarPluginState } from './types';
@@ -14,3 +17,8 @@ export declare function ContentComponent({ pluginInjectionApi, editorView, popup
  *
  */
 export declare const pluginKey: PluginKey<FloatingToolbarPluginState>;
+export declare function floatingToolbarPluginFactory(options: {
+    floatingToolbarHandlers: Array<FloatingToolbarHandler>;
+    getIntl: () => IntlShape;
+    providerFactory: ProviderFactory;
+}): SafePlugin<FloatingToolbarPluginState>;

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

@@ -1,5 +1,8 @@
 /// <reference types="react" />
-import type { ExtractInjectionAPI, FloatingToolbarConfig, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
+import type { IntlShape } from 'react-intl-next';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarHandler, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { ConfigWithNodeInfo, FloatingToolbarPlugin, FloatingToolbarPluginState } from './types';
@@ -14,3 +17,8 @@ export declare function ContentComponent({ pluginInjectionApi, editorView, popup
  *
  */
 export declare const pluginKey: PluginKey<FloatingToolbarPluginState>;
+export declare function floatingToolbarPluginFactory(options: {
+    floatingToolbarHandlers: Array<FloatingToolbarHandler>;
+    getIntl: () => IntlShape;
+    providerFactory: ProviderFactory;
+}): SafePlugin<FloatingToolbarPluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "1.12.4",
+	"version": "1.13.0",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -26,7 +26,7 @@
 		"@atlaskit/adf-utils": "^19.8.0",
 		"@atlaskit/button": "^20.1.0",
 		"@atlaskit/checkbox": "^14.0.0",
-		"@atlaskit/editor-common": "^89.0.0",
+		"@atlaskit/editor-common": "^89.1.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-block-controls": "^1.13.0",
 		"@atlaskit/editor-plugin-context-panel": "^1.3.0",
@@ -39,12 +39,12 @@
 		"@atlaskit/editor-plugin-table": "^7.25.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/emoji": "^67.7.0",
-		"@atlaskit/icon": "^22.16.0",
+		"@atlaskit/icon": "^22.17.0",
 		"@atlaskit/menu": "^2.12.0",
 		"@atlaskit/modal-dialog": "^12.15.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^12.1.0",
-		"@atlaskit/select": "^17.16.0",
+		"@atlaskit/select": "^17.17.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tokens": "^1.59.0",
 		"@atlaskit/tooltip": "^18.7.0",