@atlaskit/editor-plugin-primary-toolbar 3.2.2 → 3.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/editor-plugin-primary-toolbar
2
2
 
3
+ ## 3.2.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#146886](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/146886)
8
+ [`c18099d101897`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c18099d101897) -
9
+ [ux] Do not add find&replace back to docked toolbar when the mitigation FG is enabled
10
+ - Updated dependencies
11
+
3
12
  ## 3.2.2
4
13
 
5
14
  ### Patch Changes
@@ -18,8 +18,7 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
18
18
  })) {
19
19
  var shouldShowInsertBlock = (0, _platformFeatureFlags.fg)('platform_editor_insert_button_on_primary_toolbar');
20
20
  var shouldShowUndoRedoGroup = (0, _platformFeatureFlags.fg)('platform_editor_undo_redo_find_on_primary_toolbar');
21
- var shouldShowFindGroup = (0, _platformFeatureFlags.fg)('platform_editor_undo_redo_find_on_primary_toolbar');
22
- configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup);
21
+ configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup);
23
22
  } else {
24
23
  configuration = toolbarConfiguration;
25
24
  }
@@ -122,7 +121,8 @@ var findGroup = [{
122
121
  name: 'findReplace'
123
122
  }];
124
123
  var toolbarConfiguration = [].concat(undoRedoGroup, spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, others);
125
- var toolbarConfigurationV2 = function toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup) {
124
+ var toolbarConfigurationV2 = function toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup) {
125
+ var shouldShowFindGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
126
126
  return [].concat((0, _toConsumableArray2.default)(shouldShowUndoRedoGroup ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, (0, _toConsumableArray2.default)(shouldShowInsertBlock ? insertBlockGroup : []), [{
127
127
  name: 'overflowMenu'
128
128
  }, {
@@ -11,8 +11,7 @@ export const getToolbarComponents = ({
11
11
  })) {
12
12
  const shouldShowInsertBlock = fg('platform_editor_insert_button_on_primary_toolbar');
13
13
  const shouldShowUndoRedoGroup = fg('platform_editor_undo_redo_find_on_primary_toolbar');
14
- const shouldShowFindGroup = fg('platform_editor_undo_redo_find_on_primary_toolbar');
15
- configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup);
14
+ configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup);
16
15
  } else {
17
16
  configuration = toolbarConfiguration;
18
17
  }
@@ -97,7 +96,7 @@ const findGroup = [{
97
96
  name: 'findReplace'
98
97
  }];
99
98
  const toolbarConfiguration = [...undoRedoGroup, ...spellCheckGroup, ...blockTypeGroup, ...textFormattingGroup, ...alignmentGroup, ...textColorGroup, ...listFormattingGroup, ...insertBlockGroup, ...others];
100
- const toolbarConfigurationV2 = (shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup) => [...(shouldShowUndoRedoGroup ? undoRedoGroup : []), ...blockTypeGroup, ...textFormattingGroup, ...textColorGroup, ...alignmentGroup, ...listFormattingGroup, ...hyperlinkGroup, ...(shouldShowInsertBlock ? insertBlockGroup : []), {
99
+ const toolbarConfigurationV2 = (shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup = false) => [...(shouldShowUndoRedoGroup ? undoRedoGroup : []), ...blockTypeGroup, ...textFormattingGroup, ...textColorGroup, ...alignmentGroup, ...listFormattingGroup, ...hyperlinkGroup, ...(shouldShowInsertBlock ? insertBlockGroup : []), {
101
100
  name: 'overflowMenu'
102
101
  }, {
103
102
  name: 'beforePrimaryToolbar'
@@ -11,8 +11,7 @@ export var getToolbarComponents = function getToolbarComponents(_ref) {
11
11
  })) {
12
12
  var shouldShowInsertBlock = fg('platform_editor_insert_button_on_primary_toolbar');
13
13
  var shouldShowUndoRedoGroup = fg('platform_editor_undo_redo_find_on_primary_toolbar');
14
- var shouldShowFindGroup = fg('platform_editor_undo_redo_find_on_primary_toolbar');
15
- configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup);
14
+ configuration = toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup);
16
15
  } else {
17
16
  configuration = toolbarConfiguration;
18
17
  }
@@ -115,7 +114,8 @@ var findGroup = [{
115
114
  name: 'findReplace'
116
115
  }];
117
116
  var toolbarConfiguration = [].concat(undoRedoGroup, spellCheckGroup, blockTypeGroup, textFormattingGroup, alignmentGroup, textColorGroup, listFormattingGroup, insertBlockGroup, others);
118
- var toolbarConfigurationV2 = function toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup, shouldShowFindGroup) {
117
+ var toolbarConfigurationV2 = function toolbarConfigurationV2(shouldShowInsertBlock, shouldShowUndoRedoGroup) {
118
+ var shouldShowFindGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
119
119
  return [].concat(_toConsumableArray(shouldShowUndoRedoGroup ? undoRedoGroup : []), blockTypeGroup, textFormattingGroup, textColorGroup, alignmentGroup, listFormattingGroup, hyperlinkGroup, _toConsumableArray(shouldShowInsertBlock ? insertBlockGroup : []), [{
120
120
  name: 'overflowMenu'
121
121
  }, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-primary-toolbar",
3
- "version": "3.2.2",
3
+ "version": "3.2.3",
4
4
  "description": "Primary toolbar plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,7 +36,7 @@
36
36
  ".": "./src/index.ts"
37
37
  },
38
38
  "dependencies": {
39
- "@atlaskit/editor-common": "^103.17.0",
39
+ "@atlaskit/editor-common": "^103.18.0",
40
40
  "@atlaskit/editor-prosemirror": "7.0.0",
41
41
  "@atlaskit/platform-feature-flags": "^1.1.0",
42
42
  "@atlaskit/tmp-editor-statsig": "^4.14.0",