@atlaskit/editor-plugin-primary-toolbar 4.1.1 → 4.1.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-primary-toolbar
 
+## 4.1.3
+
+### Patch Changes
+
+- [#195513](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/195513)
+  [`98c0ba1c91086`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/98c0ba1c91086) -
+  [EDITOR-1073] Adding a FG to gate Jira as well as Confluence for Undo/ Redo/ Show Diff buttons in
+  the 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

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

@@ -20,7 +20,9 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
     configuration = toolbarConfigurationV2(true, shouldShowUndoRedoGroup);
   } else {
     var shouldShowFindGroup = !!contextualFormattingEnabled;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_ai_in_document_streaming')) {
+    // platform_editor_ai_in_document_streaming is the feature flag for Confluence
+    // editor-jira-undo-redo-show-diff-buttons is the feature flag for Jira
+    if (((0, _platformFeatureFlags.fg)('platform_editor_ai_in_document_streaming') || (0, _platformFeatureFlags.fg)('editor-jira-undo-redo-show-diff-buttons')) && componentRegistry.has('trackChanges')) {
       configuration = toolbarConfigurationV3(shouldShowFindGroup);
     } else {
       configuration = toolbarConfiguration(shouldShowFindGroup);
@@ -161,7 +163,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,9 @@ export const getToolbarComponents = ({
     configuration = toolbarConfigurationV2(true, shouldShowUndoRedoGroup);
   } else {
     const shouldShowFindGroup = !!contextualFormattingEnabled;
-    if (fg('platform_editor_ai_in_document_streaming')) {
+    // platform_editor_ai_in_document_streaming is the feature flag for Confluence
+    // editor-jira-undo-redo-show-diff-buttons is the feature flag for Jira
+    if ((fg('platform_editor_ai_in_document_streaming') || fg('editor-jira-undo-redo-show-diff-buttons')) && componentRegistry.has('trackChanges')) {
       configuration = toolbarConfigurationV3(shouldShowFindGroup);
     } else {
       configuration = toolbarConfiguration(shouldShowFindGroup);
@@ -124,6 +126,8 @@ const toolbarConfiguration = shouldShowFindGroup => [...undoRedoGroup, ...spellC
 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,9 @@ export var getToolbarComponents = function getToolbarComponents(_ref) {
     configuration = toolbarConfigurationV2(true, shouldShowUndoRedoGroup);
   } else {
     var shouldShowFindGroup = !!contextualFormattingEnabled;
-    if (fg('platform_editor_ai_in_document_streaming')) {
+    // platform_editor_ai_in_document_streaming is the feature flag for Confluence
+    // editor-jira-undo-redo-show-diff-buttons is the feature flag for Jira
+    if ((fg('platform_editor_ai_in_document_streaming') || fg('editor-jira-undo-redo-show-diff-buttons')) && componentRegistry.has('trackChanges')) {
       configuration = toolbarConfigurationV3(shouldShowFindGroup);
     } else {
       configuration = toolbarConfiguration(shouldShowFindGroup);
@@ -154,7 +156,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 = 'aiExperience' | 'aiSimplified' | 'alignment' | 'avatarGroup' | 'beforePrimaryToolbar' | 'blockType' | 'findReplace' | 'highlight' | 'hyperlink' | 'insertBlock' | 'loom' | 'overflowMenu' | 'pinToolbar' | 'separator' | 'spellCheck' | 'textColor' | 'textFormatting' | 'toolbarListsIndentation' | 'trackChanges' | 'undoRedoPlugin';
+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 = 'aiExperience' | 'aiSimplified' | 'alignment' | 'avatarGroup' | 'beforePrimaryToolbar' | 'blockType' | 'findReplace' | 'highlight' | 'hyperlink' | 'insertBlock' | 'loom' | 'overflowMenu' | 'pinToolbar' | 'separator' | 'spellCheck' | 'textColor' | 'textFormatting' | 'toolbarListsIndentation' | 'trackChanges' | 'undoRedoPlugin';
+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.1",
+	"version": "4.1.3",
 	"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.17.0",
+		"@atlaskit/tmp-editor-statsig": "^9.24.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.13.0",
+		"@atlaskit/editor-common": "^107.17.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -88,6 +88,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"editor-jira-undo-redo-show-diff-buttons": {
+			"type": "boolean"
+		},
 		"platform_editor_undo_redo_find_on_primary_toolbar": {
 			"type": "boolean"
 		}