@atlaskit/editor-plugin-primary-toolbar 4.1.0 → 4.1.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-primary-toolbar
 
+## 4.1.2
+
+### Patch Changes
+
+- [#192343](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/192343)
+  [`9cb0878241016`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9cb0878241016) -
+  ED-28736 more extensible selection extensions API
+
+## 4.1.1
+
+### Patch Changes
+
+- [#193685](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/193685)
+  [`ee3ba46cb3d0a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ee3ba46cb3d0a) -
+  [EDITOR-1073] Add undo/ redo & show diff to comment toolbar
+- Updated dependencies
+
 ## 4.1.0
 
 ### Minor Changes

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

@@ -20,7 +20,11 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
     configuration = toolbarConfigurationV2(true, shouldShowUndoRedoGroup);
   } else {
     var shouldShowFindGroup = !!contextualFormattingEnabled;
-    configuration = toolbarConfiguration(shouldShowFindGroup);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_ai_in_document_streaming')) {
+      configuration = toolbarConfigurationV3(shouldShowFindGroup);
+    } else {
+      configuration = toolbarConfiguration(shouldShowFindGroup);
+    }
   }
   return configuration.filter(function (toolbarElement) {
     return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState);
@@ -34,6 +38,22 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
     return acc;
   }, []);
 };
+var trackChangesGroup = [{
+  name: 'separator',
+  enabled: function enabled(componentRegistry) {
+    return componentRegistry.has('undoRedo') || componentRegistry.has('trackChanges');
+  }
+}, {
+  name: 'undoRedoPlugin',
+  enabled: function enabled(componentRegistry) {
+    return componentRegistry.has('undoRedoPlugin');
+  }
+}, {
+  name: 'trackChanges',
+  enabled: function enabled(componentRegistry) {
+    return componentRegistry.has('trackChanges');
+  }
+}];
 var undoRedoGroup = [{
   name: 'undoRedoPlugin'
 }, {
@@ -130,6 +150,9 @@ var othersGroupNoFind = [{
 var findGroup = [{
   name: 'findReplace'
 }];
+var toolbarConfigurationV3 = function toolbarConfigurationV3(shouldShowFindGroup) {
+  return [].concat(spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, (0, _toConsumableArray2.default)(shouldShowFindGroup ? others : othersGroupNoFind), trackChangesGroup);
+};
 var toolbarConfiguration = function toolbarConfiguration(shouldShowFindGroup) {
   return [].concat(undoRedoGroup, spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, (0, _toConsumableArray2.default)(shouldShowFindGroup ? others : othersGroupNoFind));
 };
@@ -138,7 +161,9 @@ var pinToolbar = [{
 }];
 var toolbarConfigurationV2 = function toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup) {
   var shouldShowFindGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  return [].concat((0, _toConsumableArray2.default)(shouldShowUndoRedoGroup ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, (0, _toConsumableArray2.default)(shouldShowInsertBlock ? insertBlockGroup : []), pinToolbar, [{
+  return [].concat((0, _toConsumableArray2.default)(shouldShowUndoRedoGroup ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, (0, _toConsumableArray2.default)(shouldShowInsertBlock ? insertBlockGroup : []), [{
+    name: 'selectionExtension'
+  }], pinToolbar, [{
     name: 'beforePrimaryToolbar'
   }], (0, _toConsumableArray2.default)(shouldShowFindGroup ? findGroup : []));
 };

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

@@ -13,7 +13,11 @@ export const getToolbarComponents = ({
     configuration = toolbarConfigurationV2(true, shouldShowUndoRedoGroup);
   } else {
     const shouldShowFindGroup = !!contextualFormattingEnabled;
-    configuration = toolbarConfiguration(shouldShowFindGroup);
+    if (fg('platform_editor_ai_in_document_streaming')) {
+      configuration = toolbarConfigurationV3(shouldShowFindGroup);
+    } else {
+      configuration = toolbarConfiguration(shouldShowFindGroup);
+    }
   }
   return configuration.filter(toolbarElement => typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState)).reduce((acc, toolbarElement) => {
     if (componentRegistry.has(toolbarElement.name)) {
@@ -25,6 +29,16 @@ export const getToolbarComponents = ({
     return acc;
   }, []);
 };
+const trackChangesGroup = [{
+  name: 'separator',
+  enabled: componentRegistry => componentRegistry.has('undoRedo') || componentRegistry.has('trackChanges')
+}, {
+  name: 'undoRedoPlugin',
+  enabled: componentRegistry => componentRegistry.has('undoRedoPlugin')
+}, {
+  name: 'trackChanges',
+  enabled: componentRegistry => componentRegistry.has('trackChanges')
+}];
 const undoRedoGroup = [{
   name: 'undoRedoPlugin'
 }, {
@@ -105,10 +119,13 @@ const othersGroupNoFind = [{
 const findGroup = [{
   name: 'findReplace'
 }];
+const toolbarConfigurationV3 = shouldShowFindGroup => [...spellCheckGroup, ...blockTypeGroup, ...textFormattingGroup, ...alignmentGroup, ...textColorGroup, ...listFormattingGroup, ...insertBlockGroup, ...(shouldShowFindGroup ? others : othersGroupNoFind), ...trackChangesGroup];
 const toolbarConfiguration = shouldShowFindGroup => [...undoRedoGroup, ...spellCheckGroup, ...blockTypeGroup, ...textFormattingGroup, ...alignmentGroup, ...textColorGroup, ...listFormattingGroup, ...insertBlockGroup, ...(shouldShowFindGroup ? others : othersGroupNoFind)];
 const pinToolbar = [{
   name: 'pinToolbar'
 }];
-const toolbarConfigurationV2 = (shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup = false) => [...(shouldShowUndoRedoGroup ? undoRedoGroup : []), ...blockTypeGroup, ...textFormattingGroup, ...textColorGroup, ...alignmentGroup, ...listFormattingGroup, ...hyperlinkGroup, ...(shouldShowInsertBlock ? insertBlockGroup : []), ...pinToolbar, {
+const toolbarConfigurationV2 = (shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup = false) => [...(shouldShowUndoRedoGroup ? undoRedoGroup : []), ...blockTypeGroup, ...textFormattingGroup, ...textColorGroup, ...alignmentGroup, ...listFormattingGroup, ...hyperlinkGroup, ...(shouldShowInsertBlock ? insertBlockGroup : []), {
+  name: 'selectionExtension'
+}, ...pinToolbar, {
   name: 'beforePrimaryToolbar'
 }, ...(shouldShowFindGroup ? findGroup : [])];

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

@@ -13,7 +13,11 @@ export var getToolbarComponents = function getToolbarComponents(_ref) {
     configuration = toolbarConfigurationV2(true, shouldShowUndoRedoGroup);
   } else {
     var shouldShowFindGroup = !!contextualFormattingEnabled;
-    configuration = toolbarConfiguration(shouldShowFindGroup);
+    if (fg('platform_editor_ai_in_document_streaming')) {
+      configuration = toolbarConfigurationV3(shouldShowFindGroup);
+    } else {
+      configuration = toolbarConfiguration(shouldShowFindGroup);
+    }
   }
   return configuration.filter(function (toolbarElement) {
     return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState);
@@ -27,6 +31,22 @@ export var getToolbarComponents = function getToolbarComponents(_ref) {
     return acc;
   }, []);
 };
+var trackChangesGroup = [{
+  name: 'separator',
+  enabled: function enabled(componentRegistry) {
+    return componentRegistry.has('undoRedo') || componentRegistry.has('trackChanges');
+  }
+}, {
+  name: 'undoRedoPlugin',
+  enabled: function enabled(componentRegistry) {
+    return componentRegistry.has('undoRedoPlugin');
+  }
+}, {
+  name: 'trackChanges',
+  enabled: function enabled(componentRegistry) {
+    return componentRegistry.has('trackChanges');
+  }
+}];
 var undoRedoGroup = [{
   name: 'undoRedoPlugin'
 }, {
@@ -123,6 +143,9 @@ var othersGroupNoFind = [{
 var findGroup = [{
   name: 'findReplace'
 }];
+var toolbarConfigurationV3 = function toolbarConfigurationV3(shouldShowFindGroup) {
+  return [].concat(spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, _toConsumableArray(shouldShowFindGroup ? others : othersGroupNoFind), trackChangesGroup);
+};
 var toolbarConfiguration = function toolbarConfiguration(shouldShowFindGroup) {
   return [].concat(undoRedoGroup, spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, _toConsumableArray(shouldShowFindGroup ? others : othersGroupNoFind));
 };
@@ -131,7 +154,9 @@ var pinToolbar = [{
 }];
 var toolbarConfigurationV2 = function toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup) {
   var shouldShowFindGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  return [].concat(_toConsumableArray(shouldShowUndoRedoGroup ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, _toConsumableArray(shouldShowInsertBlock ? insertBlockGroup : []), pinToolbar, [{
+  return [].concat(_toConsumableArray(shouldShowUndoRedoGroup ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, _toConsumableArray(shouldShowInsertBlock ? insertBlockGroup : []), [{
+    name: 'selectionExtension'
+  }], pinToolbar, [{
     name: 'beforePrimaryToolbar'
   }], _toConsumableArray(shouldShowFindGroup ? findGroup : []));
 };

package/dist/types/primaryToolbarPluginType.d.ts

@@ -14,7 +14,7 @@ export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     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' | 'pinToolbar';
+export type ToolbarElementNames = 'aiExperience' | 'aiSimplified' | 'alignment' | 'avatarGroup' | 'beforePrimaryToolbar' | 'blockType' | 'findReplace' | 'highlight' | 'hyperlink' | 'insertBlock' | 'loom' | 'overflowMenu' | 'pinToolbar' | 'selectionExtension' | 'separator' | 'spellCheck' | 'textColor' | 'textFormatting' | 'toolbarListsIndentation' | 'trackChanges' | 'undoRedoPlugin';
 export type ToolbarElementConfig = {
     name: ToolbarElementNames;
     enabled?: (componentRegistry: ComponentRegistry, editorState: EditorState) => boolean;

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

@@ -14,7 +14,7 @@ export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     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' | 'pinToolbar';
+export type ToolbarElementNames = 'aiExperience' | 'aiSimplified' | 'alignment' | 'avatarGroup' | 'beforePrimaryToolbar' | 'blockType' | 'findReplace' | 'highlight' | 'hyperlink' | 'insertBlock' | 'loom' | 'overflowMenu' | 'pinToolbar' | 'selectionExtension' | 'separator' | 'spellCheck' | 'textColor' | 'textFormatting' | 'toolbarListsIndentation' | 'trackChanges' | 'undoRedoPlugin';
 export type ToolbarElementConfig = {
     name: ToolbarElementNames;
     enabled?: (componentRegistry: ComponentRegistry, editorState: EditorState) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-primary-toolbar",
-	"version": "4.1.0",
+	"version": "4.1.2",
 	"description": "Primary toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,12 +37,12 @@
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^9.7.0",
+		"@atlaskit/tmp-editor-statsig": "^9.17.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.8.0",
+		"@atlaskit/editor-common": "^107.13.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -84,6 +84,10 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform_editor_ai_in_document_streaming": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_undo_redo_find_on_primary_toolbar": {
 			"type": "boolean"
 		}