@atlaskit/editor-plugin-selection-toolbar 1.4.0 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-selection-toolbar
 
+## 1.5.1
+
+### Patch Changes
+
+- [#171440](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171440)
+  [`835f7bbff3122`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/835f7bbff3122) -
+  ED-25816: refactors plugins to meet folder standards
+- Updated dependencies
+
+## 1.5.0
+
+### Minor Changes
+
+- [#173684](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/173684)
+  [`e022c83d84bd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e022c83d84bd3) -
+  Fix errors caused by not checking for undefined annotation toolbar
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "selectionToolbarPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.selectionToolbarPlugin;
+    return _selectionToolbarPlugin.selectionToolbarPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _selectionToolbarPlugin = require("./selectionToolbarPlugin");

package/dist/cjs/{plugin.js → selectionToolbarPlugin.js}

@@ -13,8 +13,8 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _commands = require("./commands");
-var _pluginKey = require("./plugin-key");
+var _commands = require("./pm-plugins/commands");
+var _pluginKey = require("./pm-plugins/plugin-key");
 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 selectionToolbarPlugin = exports.selectionToolbarPlugin = function selectionToolbarPlugin(options) {
@@ -145,13 +145,16 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
 
         // This flattens the groups passed into the floating toolbar into a single list of items
         for (var i = 0; i < resolved.length; i++) {
+          var _resolved$i;
           // add a seperator icon after each group except the last
-          items.push.apply(items, (0, _toConsumableArray2.default)(resolved[i].items));
+          if (Array.isArray((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.items)) {
+            items.push.apply(items, (0, _toConsumableArray2.default)(resolved[i].items));
+          }
           if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true)) {
             var shouldNotAddSeparator = false;
             if (resolved[i] && resolved[i + 1]) {
-              var _resolved$i, _resolved, _resolved$i2, _resolved2;
-              shouldNotAddSeparator = ((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
+              var _resolved$i2, _resolved, _resolved$i3, _resolved2;
+              shouldNotAddSeparator = ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i3 = resolved[i]) === null || _resolved$i3 === void 0 ? void 0 : _resolved$i3.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
             }
             if (i !== resolved.length - 1 && !shouldNotAddSeparator) {
               items.push({

package/dist/cjs/selectionToolbarPluginType.js

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

package/dist/es2019/index.js

@@ -1 +1 @@
-export { selectionToolbarPlugin } from './plugin';
+export { selectionToolbarPlugin } from './selectionToolbarPlugin';

package/dist/es2019/{plugin.js → selectionToolbarPlugin.js}

@@ -4,8 +4,8 @@ import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHe
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { toggleToolbar } from './commands';
-import { selectionToolbarPluginKey } from './plugin-key';
+import { toggleToolbar } from './pm-plugins/commands';
+import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
 export const selectionToolbarPlugin = options => {
   let __selectionToolbarHandlers = [];
   return {
@@ -134,13 +134,16 @@ export const selectionToolbarPlugin = options => {
 
         // This flattens the groups passed into the floating toolbar into a single list of items
         for (let i = 0; i < resolved.length; i++) {
+          var _resolved$i;
           // add a seperator icon after each group except the last
-          items.push(...resolved[i].items);
+          if (Array.isArray((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.items)) {
+            items.push(...resolved[i].items);
+          }
           if (editorExperiment('contextual_formatting_toolbar', true)) {
             let shouldNotAddSeparator = false;
             if (resolved[i] && resolved[i + 1]) {
-              var _resolved$i, _resolved, _resolved$i2, _resolved2;
-              shouldNotAddSeparator = ((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
+              var _resolved$i2, _resolved, _resolved$i3, _resolved2;
+              shouldNotAddSeparator = ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i3 = resolved[i]) === null || _resolved$i3 === void 0 ? void 0 : _resolved$i3.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
             }
             if (i !== resolved.length - 1 && !shouldNotAddSeparator) {
               items.push({

package/dist/es2019/selectionToolbarPluginType.js

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

package/dist/esm/index.js

@@ -1 +1 @@
-export { selectionToolbarPlugin } from './plugin';
+export { selectionToolbarPlugin } from './selectionToolbarPlugin';

package/dist/esm/{plugin.js → selectionToolbarPlugin.js}

@@ -8,8 +8,8 @@ import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHe
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { toggleToolbar } from './commands';
-import { selectionToolbarPluginKey } from './plugin-key';
+import { toggleToolbar } from './pm-plugins/commands';
+import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
 export var selectionToolbarPlugin = function selectionToolbarPlugin(options) {
   var __selectionToolbarHandlers = [];
   return _objectSpread(_objectSpread({
@@ -138,13 +138,16 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(options) {
 
         // This flattens the groups passed into the floating toolbar into a single list of items
         for (var i = 0; i < resolved.length; i++) {
+          var _resolved$i;
           // add a seperator icon after each group except the last
-          items.push.apply(items, _toConsumableArray(resolved[i].items));
+          if (Array.isArray((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.items)) {
+            items.push.apply(items, _toConsumableArray(resolved[i].items));
+          }
           if (editorExperiment('contextual_formatting_toolbar', true)) {
             var shouldNotAddSeparator = false;
             if (resolved[i] && resolved[i + 1]) {
-              var _resolved$i, _resolved, _resolved$i2, _resolved2;
-              shouldNotAddSeparator = ((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
+              var _resolved$i2, _resolved, _resolved$i3, _resolved2;
+              shouldNotAddSeparator = ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i3 = resolved[i]) === null || _resolved$i3 === void 0 ? void 0 : _resolved$i3.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
             }
             if (i !== resolved.length - 1 && !shouldNotAddSeparator) {
               items.push({

package/dist/esm/selectionToolbarPluginType.js

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

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export { selectionToolbarPlugin } from './plugin';
-export type { SelectionToolbarPlugin } from './plugin';
+export { selectionToolbarPlugin } from './selectionToolbarPlugin';
+export type { SelectionToolbarPlugin } from './selectionToolbarPluginType';

package/dist/types/selectionToolbarPlugin.d.ts

@@ -0,0 +1,2 @@
+import type { SelectionToolbarPlugin } from './selectionToolbarPluginType';
+export declare const selectionToolbarPlugin: SelectionToolbarPlugin;

package/dist/types/{plugin.d.ts → selectionToolbarPluginType.d.ts}

@@ -1,6 +1,6 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-export declare const selectionToolbarPlugin: NextEditorPlugin<'selectionToolbar', {
+export type SelectionToolbarPlugin = NextEditorPlugin<'selectionToolbar', {
     pluginConfiguration: {
         /**
          * Defaults to false
@@ -13,4 +13,3 @@ export declare const selectionToolbarPlugin: NextEditorPlugin<'selectionToolbar'
         unsuppressToolbar?: () => boolean;
     };
 }>;
-export type SelectionToolbarPlugin = typeof selectionToolbarPlugin;

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

@@ -1,2 +1,2 @@
-export { selectionToolbarPlugin } from './plugin';
-export type { SelectionToolbarPlugin } from './plugin';
+export { selectionToolbarPlugin } from './selectionToolbarPlugin';
+export type { SelectionToolbarPlugin } from './selectionToolbarPluginType';

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

@@ -0,0 +1,2 @@
+import type { SelectionToolbarPlugin } from './selectionToolbarPluginType';
+export declare const selectionToolbarPlugin: SelectionToolbarPlugin;

package/dist/types-ts4.5/{plugin.d.ts → selectionToolbarPluginType.d.ts}

@@ -1,6 +1,6 @@
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-export declare const selectionToolbarPlugin: NextEditorPlugin<'selectionToolbar', {
+export type SelectionToolbarPlugin = NextEditorPlugin<'selectionToolbar', {
     pluginConfiguration: {
         /**
          * Defaults to false
@@ -15,4 +15,3 @@ export declare const selectionToolbarPlugin: NextEditorPlugin<'selectionToolbar'
         unsuppressToolbar?: () => boolean;
     };
 }>;
-export type SelectionToolbarPlugin = typeof selectionToolbarPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-toolbar",
-	"version": "1.4.0",
+	"version": "1.5.1",
 	"description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,11 +36,11 @@
 		}
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^96.1.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.24.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
@@ -58,6 +58,9 @@
 	},
 	"techstack": {
 		"@atlassian/frontend": {
+			"code-structure": [
+				"editor-plugin"
+			],
 			"import-structure": [
 				"atlassian-conventions"
 			],