@atlaskit/editor-plugin-primary-toolbar 3.1.2 → 3.2.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-primary-toolbar
 
+## 3.2.1
+
+### Patch Changes
+
+- [#140839](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/140839)
+  [`8c413615979d2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8c413615979d2) -
+  [ux] Include element insert plus button on Editor primary toolbar
+- Updated dependencies
+
+## 3.2.0
+
+### Minor Changes
+
+- [#139139](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139139)
+  [`7f6b665d778dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7f6b665d778dd) -
+  [https://product-fabric.atlassian.net/browse/ED-27499](ED-27499) - the new
+  `@atlassian/confluence-presets` package with Confluence `full-page` preset is created
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.1.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/toolbar-configuration.js

@@ -16,11 +16,9 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
   if (contextualFormattingEnabled && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
     exposure: true
   })) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_move_actions')) {
-      configuration = toolbarConfigurationV2;
-    } else {
-      configuration = toolbarConfigurationV2WithUndoRedoAndFindReplace;
-    }
+    var shouldShowInsertBlock = (0, _platformFeatureFlags.fg)('platform_editor_insert_button_on_primary_toolbar');
+    var shouldShowUndoRedoFindGroup = (0, _platformFeatureFlags.fg)('platform_editor_controls_move_actions');
+    configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoFindGroup);
   } else {
     configuration = toolbarConfiguration;
   }
@@ -123,9 +121,12 @@ var findGroup = [{
   name: 'findReplace'
 }];
 var toolbarConfiguration = [].concat(undoRedoGroup, spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, others);
-var toolbarConfigurationV2 = [].concat(blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, [{
-  name: 'overflowMenu'
-}, {
-  name: 'beforePrimaryToolbar'
-}]);
-var toolbarConfigurationV2WithUndoRedoAndFindReplace = [].concat(undoRedoGroup, (0, _toConsumableArray2.default)(toolbarConfigurationV2), findGroup);
+var toolbarConfigurationV2 = function toolbarConfigurationV2() {
+  var shouldShowInsertBlock = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  var shouldShowMoveActions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  return [].concat((0, _toConsumableArray2.default)(shouldShowMoveActions ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, (0, _toConsumableArray2.default)(shouldShowInsertBlock ? insertBlockGroup : []), [{
+    name: 'overflowMenu'
+  }, {
+    name: 'beforePrimaryToolbar'
+  }], (0, _toConsumableArray2.default)(shouldShowMoveActions ? findGroup : []));
+};

package/dist/es2019/pm-plugins/toolbar-configuration.js

@@ -9,11 +9,9 @@ export const getToolbarComponents = ({
   if (contextualFormattingEnabled && editorExperiment('platform_editor_controls', 'variant1', {
     exposure: true
   })) {
-    if (fg('platform_editor_controls_move_actions')) {
-      configuration = toolbarConfigurationV2;
-    } else {
-      configuration = toolbarConfigurationV2WithUndoRedoAndFindReplace;
-    }
+    const shouldShowInsertBlock = fg('platform_editor_insert_button_on_primary_toolbar');
+    const shouldShowUndoRedoFindGroup = fg('platform_editor_controls_move_actions');
+    configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoFindGroup);
   } else {
     configuration = toolbarConfiguration;
   }
@@ -98,9 +96,8 @@ const findGroup = [{
   name: 'findReplace'
 }];
 const toolbarConfiguration = [...undoRedoGroup, ...spellCheckGroup, ...blockTypeGroup, ...textFormattingGroup, ...alignmentGroup, ...textColorGroup, ...listFormattingGroup, ...insertBlockGroup, ...others];
-const toolbarConfigurationV2 = [...blockTypeGroup, ...textFormattingGroup, ...textColorGroup, ...alignmentGroup, ...listFormattingGroup, ...hyperlinkGroup, {
+const toolbarConfigurationV2 = (shouldShowInsertBlock = false, shouldShowMoveActions = false) => [...(shouldShowMoveActions ? undoRedoGroup : []), ...blockTypeGroup, ...textFormattingGroup, ...textColorGroup, ...alignmentGroup, ...listFormattingGroup, ...hyperlinkGroup, ...(shouldShowInsertBlock ? insertBlockGroup : []), {
   name: 'overflowMenu'
 }, {
   name: 'beforePrimaryToolbar'
-}];
-const toolbarConfigurationV2WithUndoRedoAndFindReplace = [...undoRedoGroup, ...toolbarConfigurationV2, ...findGroup];
+}, ...(shouldShowMoveActions ? findGroup : [])];

package/dist/esm/pm-plugins/toolbar-configuration.js

@@ -9,11 +9,9 @@ export var getToolbarComponents = function getToolbarComponents(_ref) {
   if (contextualFormattingEnabled && editorExperiment('platform_editor_controls', 'variant1', {
     exposure: true
   })) {
-    if (fg('platform_editor_controls_move_actions')) {
-      configuration = toolbarConfigurationV2;
-    } else {
-      configuration = toolbarConfigurationV2WithUndoRedoAndFindReplace;
-    }
+    var shouldShowInsertBlock = fg('platform_editor_insert_button_on_primary_toolbar');
+    var shouldShowUndoRedoFindGroup = fg('platform_editor_controls_move_actions');
+    configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoFindGroup);
   } else {
     configuration = toolbarConfiguration;
   }
@@ -116,9 +114,12 @@ var findGroup = [{
   name: 'findReplace'
 }];
 var toolbarConfiguration = [].concat(undoRedoGroup, spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, others);
-var toolbarConfigurationV2 = [].concat(blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, [{
-  name: 'overflowMenu'
-}, {
-  name: 'beforePrimaryToolbar'
-}]);
-var toolbarConfigurationV2WithUndoRedoAndFindReplace = [].concat(undoRedoGroup, _toConsumableArray(toolbarConfigurationV2), findGroup);
+var toolbarConfigurationV2 = function toolbarConfigurationV2() {
+  var shouldShowInsertBlock = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  var shouldShowMoveActions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  return [].concat(_toConsumableArray(shouldShowMoveActions ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, _toConsumableArray(shouldShowInsertBlock ? insertBlockGroup : []), [{
+    name: 'overflowMenu'
+  }, {
+    name: 'beforePrimaryToolbar'
+  }], _toConsumableArray(shouldShowMoveActions ? findGroup : []));
+};

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { primaryToolbarPlugin } from './primaryToolbarPlugin';
-export type { PrimaryToolbarPlugin, PrimaryToolbarPluginState, ToolbarElementNames, } from './primaryToolbarPluginType';
+export type { PrimaryToolbarPlugin, PrimaryToolbarPluginOptions, PrimaryToolbarPluginState, ToolbarElementNames, } from './primaryToolbarPluginType';

package/dist/types/primaryToolbarPluginType.d.ts

@@ -1,5 +1,8 @@
 import type { NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export interface PrimaryToolbarPluginOptions {
+    contextualFormattingEnabled?: boolean;
+}
 export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     sharedState: PrimaryToolbarPluginState | undefined;
     actions: {
@@ -8,9 +11,7 @@ export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
             component: ToolbarUIComponentFactory;
         }) => void;
     };
-    pluginConfiguration?: {
-        contextualFormattingEnabled?: boolean;
-    };
+    pluginConfiguration?: PrimaryToolbarPluginOptions;
 }>;
 export type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
 export type ToolbarElementNames = 'separator' | 'undoRedoPlugin' | 'blockType' | 'textFormatting' | 'alignment' | 'textColor' | 'highlight' | 'hyperlink' | 'toolbarListsIndentation' | 'insertBlock' | 'beforePrimaryToolbar' | 'avatarGroup' | 'findReplace' | 'aiExperience' | 'aiSimplified' | 'loom' | 'spellCheck' | 'overflowMenu';

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

@@ -1,2 +1,2 @@
 export { primaryToolbarPlugin } from './primaryToolbarPlugin';
-export type { PrimaryToolbarPlugin, PrimaryToolbarPluginState, ToolbarElementNames, } from './primaryToolbarPluginType';
+export type { PrimaryToolbarPlugin, PrimaryToolbarPluginOptions, PrimaryToolbarPluginState, ToolbarElementNames, } from './primaryToolbarPluginType';

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

@@ -1,5 +1,8 @@
 import type { NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export interface PrimaryToolbarPluginOptions {
+    contextualFormattingEnabled?: boolean;
+}
 export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     sharedState: PrimaryToolbarPluginState | undefined;
     actions: {
@@ -8,9 +11,7 @@ export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
             component: ToolbarUIComponentFactory;
         }) => void;
     };
-    pluginConfiguration?: {
-        contextualFormattingEnabled?: boolean;
-    };
+    pluginConfiguration?: PrimaryToolbarPluginOptions;
 }>;
 export type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
 export type ToolbarElementNames = 'separator' | 'undoRedoPlugin' | 'blockType' | 'textFormatting' | 'alignment' | 'textColor' | 'highlight' | 'hyperlink' | 'toolbarListsIndentation' | 'insertBlock' | 'beforePrimaryToolbar' | 'avatarGroup' | 'findReplace' | 'aiExperience' | 'aiSimplified' | 'loom' | 'spellCheck' | 'overflowMenu';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-primary-toolbar",
-	"version": "3.1.2",
+	"version": "3.2.1",
 	"description": "Primary toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,10 +36,10 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^103.1.0",
+		"@atlaskit/editor-common": "^103.14.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
+		"@atlaskit/tmp-editor-statsig": "^4.13.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -87,6 +87,9 @@
 	"platform-feature-flags": {
 		"platform_editor_controls_move_actions": {
 			"type": "boolean"
+		},
+		"platform_editor_insert_button_on_primary_toolbar": {
+			"type": "boolean"
 		}
 	}
 }