@atlaskit/editor-plugin-insert-block 2.2.7 → 2.2.8

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-insert-block
2
2
 
3
+ ## 2.2.8
4
+
5
+ ### Patch Changes
6
+
7
+ - [#147412](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147412)
8
+ [`aa848a0cd334a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/aa848a0cd334a) -
9
+ fix button number issue, show more buttons on smaller screens
10
+ - Updated dependencies
11
+
3
12
  ## 2.2.7
4
13
 
5
14
  ### Patch Changes
@@ -32,9 +32,10 @@ var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize, appearance
32
32
  switch (toolbarSize) {
33
33
  case _types.ToolbarSize.XXL:
34
34
  case _types.ToolbarSize.XL:
35
- return 7;
36
35
  case _types.ToolbarSize.L:
37
- return 5;
36
+ return 7;
37
+ case _types.ToolbarSize.M:
38
+ return 3;
38
39
  default:
39
40
  return 0;
40
41
  }
@@ -216,12 +216,18 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
216
216
  disabled: false
217
217
  }));
218
218
  }
219
- var numButtonsWithoutTableSelector = numberOfButtons;
220
- if (!(0, _platformFeatureFlags.fg)('platform_editor_toolbar_responsive_fixes')) {
221
- numButtonsWithoutTableSelector = tableSupported && tableSelectorSupported ? numberOfButtons + 1 : numberOfButtons;
222
- }
223
- var buttonItems = items.slice(0, numButtonsWithoutTableSelector).map(buttonToItem);
224
- var remainingItems = items.slice(numButtonsWithoutTableSelector).filter(function (_ref) {
219
+ var numButtonsAdjusted = numberOfButtons;
220
+ if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_responsive_fixes')) {
221
+ if (items.slice(0, numButtonsAdjusted).some(function (item) {
222
+ return item.value.name === 'table selector';
223
+ })) {
224
+ numButtonsAdjusted++;
225
+ }
226
+ } else {
227
+ numButtonsAdjusted = tableSupported && tableSelectorSupported ? numberOfButtons + 1 : numberOfButtons;
228
+ }
229
+ var buttonItems = items.slice(0, numButtonsAdjusted).map(buttonToItem);
230
+ var remainingItems = items.slice(numButtonsAdjusted).filter(function (_ref) {
225
231
  var name = _ref.value.name;
226
232
  return name !== 'table selector';
227
233
  });
@@ -22,9 +22,10 @@ const toolbarSizeToButtons = (toolbarSize, appearance) => {
22
22
  switch (toolbarSize) {
23
23
  case ToolbarSize.XXL:
24
24
  case ToolbarSize.XL:
25
- return 7;
26
25
  case ToolbarSize.L:
27
- return 5;
26
+ return 7;
27
+ case ToolbarSize.M:
28
+ return 3;
28
29
  default:
29
30
  return 0;
30
31
  }
@@ -197,12 +197,16 @@ const createInsertBlockItems = config => {
197
197
  disabled: false
198
198
  }));
199
199
  }
200
- let numButtonsWithoutTableSelector = numberOfButtons;
201
- if (!fg('platform_editor_toolbar_responsive_fixes')) {
202
- numButtonsWithoutTableSelector = tableSupported && tableSelectorSupported ? numberOfButtons + 1 : numberOfButtons;
200
+ let numButtonsAdjusted = numberOfButtons;
201
+ if (fg('platform_editor_toolbar_responsive_fixes')) {
202
+ if (items.slice(0, numButtonsAdjusted).some(item => item.value.name === 'table selector')) {
203
+ numButtonsAdjusted++;
204
+ }
205
+ } else {
206
+ numButtonsAdjusted = tableSupported && tableSelectorSupported ? numberOfButtons + 1 : numberOfButtons;
203
207
  }
204
- const buttonItems = items.slice(0, numButtonsWithoutTableSelector).map(buttonToItem);
205
- const remainingItems = items.slice(numButtonsWithoutTableSelector).filter(({
208
+ const buttonItems = items.slice(0, numButtonsAdjusted).map(buttonToItem);
209
+ const remainingItems = items.slice(numButtonsAdjusted).filter(({
206
210
  value: {
207
211
  name
208
212
  }
@@ -22,9 +22,10 @@ var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize, appearance
22
22
  switch (toolbarSize) {
23
23
  case ToolbarSize.XXL:
24
24
  case ToolbarSize.XL:
25
- return 7;
26
25
  case ToolbarSize.L:
27
- return 5;
26
+ return 7;
27
+ case ToolbarSize.M:
28
+ return 3;
28
29
  default:
29
30
  return 0;
30
31
  }
@@ -209,12 +209,18 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
209
209
  disabled: false
210
210
  }));
211
211
  }
212
- var numButtonsWithoutTableSelector = numberOfButtons;
213
- if (!fg('platform_editor_toolbar_responsive_fixes')) {
214
- numButtonsWithoutTableSelector = tableSupported && tableSelectorSupported ? numberOfButtons + 1 : numberOfButtons;
215
- }
216
- var buttonItems = items.slice(0, numButtonsWithoutTableSelector).map(buttonToItem);
217
- var remainingItems = items.slice(numButtonsWithoutTableSelector).filter(function (_ref) {
212
+ var numButtonsAdjusted = numberOfButtons;
213
+ if (fg('platform_editor_toolbar_responsive_fixes')) {
214
+ if (items.slice(0, numButtonsAdjusted).some(function (item) {
215
+ return item.value.name === 'table selector';
216
+ })) {
217
+ numButtonsAdjusted++;
218
+ }
219
+ } else {
220
+ numButtonsAdjusted = tableSupported && tableSelectorSupported ? numberOfButtons + 1 : numberOfButtons;
221
+ }
222
+ var buttonItems = items.slice(0, numButtonsAdjusted).map(buttonToItem);
223
+ var remainingItems = items.slice(numButtonsAdjusted).filter(function (_ref) {
218
224
  var name = _ref.value.name;
219
225
  return name !== 'table selector';
220
226
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-insert-block",
3
- "version": "2.2.7",
3
+ "version": "2.2.8",
4
4
  "description": "Insert block plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,7 +32,7 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@atlaskit/button": "^20.2.0",
35
- "@atlaskit/editor-common": "^92.0.0",
35
+ "@atlaskit/editor-common": "^92.1.0",
36
36
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
37
37
  "@atlaskit/editor-plugin-block-type": "^3.15.0",
38
38
  "@atlaskit/editor-plugin-code-block": "^3.4.0",
@@ -65,7 +65,7 @@
65
65
  "@atlaskit/platform-feature-flags": "^0.3.0",
66
66
  "@atlaskit/primitives": "^12.2.0",
67
67
  "@atlaskit/theme": "^13.0.0",
68
- "@atlaskit/tmp-editor-statsig": "^2.1.0",
68
+ "@atlaskit/tmp-editor-statsig": "^2.2.0",
69
69
  "@atlaskit/tokens": "^2.0.0",
70
70
  "@atlaskit/tooltip": "18.7.3",
71
71
  "@babel/runtime": "^7.0.0",