@atlaskit/editor-plugin-toolbar-lists-indentation 8.0.5 → 8.0.7

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.
Files changed (11) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/ui/toolbar-components/ListsIndentationHeroButton.js +2 -3
  3. package/dist/cjs/ui/toolbar-components/ListsIndentationMenu.js +2 -10
  4. package/dist/cjs/ui/toolbar-components/ListsIndentationMenuGroup.js +6 -24
  5. package/dist/es2019/ui/toolbar-components/ListsIndentationHeroButton.js +3 -4
  6. package/dist/es2019/ui/toolbar-components/ListsIndentationMenu.js +2 -10
  7. package/dist/es2019/ui/toolbar-components/ListsIndentationMenuGroup.js +2 -18
  8. package/dist/esm/ui/toolbar-components/ListsIndentationHeroButton.js +3 -4
  9. package/dist/esm/ui/toolbar-components/ListsIndentationMenu.js +2 -10
  10. package/dist/esm/ui/toolbar-components/ListsIndentationMenuGroup.js +7 -25
  11. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-toolbar-lists-indentation
2
2
 
3
+ ## 8.0.7
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 8.0.6
10
+
11
+ ### Patch Changes
12
+
13
+ - [`653c0c803b286`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/653c0c803b286) -
14
+ EDITOR-4620 Clean up platform_editor_toolbar_aifc_patch_6
15
+ - Updated dependencies
16
+
3
17
  ## 8.0.5
4
18
 
5
19
  ### Patch Changes
package/dist/cjs/ui/toolbar-components/ListsIndentationHeroButton.js CHANGED
@@ -13,7 +13,6 @@ var _messages = require("@atlaskit/editor-common/messages");
13
13
  var _toolbar = require("@atlaskit/editor-common/toolbar");
14
14
  var _editorToolbar = require("@atlaskit/editor-toolbar");
15
15
  var _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
16
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
17
16
  function useListsIndentationHeroButtonInfo(_ref) {
18
17
  var api = _ref.api,
19
18
  parents = _ref.parents,
@@ -34,7 +33,7 @@ function useListsIndentationHeroButtonInfo(_ref) {
34
33
  orderedListActive = _useSharedPluginState.orderedListActive,
35
34
  taskListActive = _useSharedPluginState.taskListActive;
36
35
  var getListType = taskListActive ? 'taskList' : orderedListActive ? 'orderedList' : defaultListType;
37
- var taskListKeymap = (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? _keymaps.toggleTaskList : _keymaps.toggleTaskItemCheckbox;
36
+ var taskListKeymap = _keymaps.toggleTaskList;
38
37
  var getKeymap = getListType === 'taskList' ? taskListKeymap : getListType === 'orderedList' ? _keymaps.toggleOrderedList : _keymaps.toggleBulletList;
39
38
  var shortcut = (0, _keymaps.formatShortcut)(getKeymap);
40
39
  var keymap = getKeymap;
@@ -146,7 +145,7 @@ var ListsIndentationHeroButton = exports.ListsIndentationHeroButton = function L
146
145
  bulletListDisabled = _useSharedPluginState2.bulletListDisabled,
147
146
  orderedListActive = _useSharedPluginState2.orderedListActive,
148
147
  taskListActive = _useSharedPluginState2.taskListActive;
149
- var taskListKeymap = (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? _keymaps.toggleTaskList : _keymaps.toggleTaskItemCheckbox;
148
+ var taskListKeymap = _keymaps.toggleTaskList;
150
149
  var shortcut = taskListActive ? (0, _keymaps.formatShortcut)(taskListKeymap) : orderedListActive ? (0, _keymaps.formatShortcut)(_keymaps.toggleOrderedList) : (0, _keymaps.formatShortcut)(_keymaps.toggleBulletList);
151
150
  var onClick = function onClick() {
152
151
  var inputMethod = (0, _toolbar.getInputMethodFromParentKeys)(parents);
package/dist/cjs/ui/toolbar-components/ListsIndentationMenu.js CHANGED
@@ -11,7 +11,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
11
11
  var _lists = require("@atlaskit/editor-common/lists");
12
12
  var _toolbar = require("@atlaskit/editor-common/toolbar");
13
13
  var _editorToolbar = require("@atlaskit/editor-toolbar");
14
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
15
14
  var _hooks2 = require("../utils/hooks");
16
15
  var ListsIndentationMenu = exports.ListsIndentationMenu = function ListsIndentationMenu(_ref) {
17
16
  var children = _ref.children,
@@ -38,7 +37,7 @@ var ListsIndentationMenu = exports.ListsIndentationMenu = function ListsIndentat
38
37
  orderedListDisabled = _useSharedPluginState.orderedListDisabled,
39
38
  taskListActive = _useSharedPluginState.taskListActive;
40
39
  var allItemsDisabled = bulletListDisabled && orderedListDisabled && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.indentDisabled) && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.outdentDisabled) && !taskListActive;
41
- return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
40
+ return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
42
41
  content: formatMessage(_lists.messages.lists)
43
42
  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
44
43
  iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.MoreItemsIcon, {
@@ -47,12 +46,5 @@ var ListsIndentationMenu = exports.ListsIndentationMenu = function ListsIndentat
47
46
  isDisabled: allItemsDisabled,
48
47
  testId: "editor-toolbar__lists-and-indentation-menu",
49
48
  label: formatMessage(_lists.messages.lists)
50
- }, children)) : /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
51
- iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.MoreItemsIcon, {
52
- label: formatMessage(_lists.messages.lists)
53
- }),
54
- isDisabled: allItemsDisabled,
55
- testId: "editor-toolbar__lists-and-indentation-menu",
56
- label: formatMessage(_lists.messages.lists)
57
- }, children);
49
+ }, children));
58
50
  };
package/dist/cjs/ui/toolbar-components/ListsIndentationMenuGroup.js CHANGED
@@ -5,17 +5,14 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.getListsIndentationMenu = void 0;
8
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
8
  var _react = _interopRequireDefault(require("react"));
10
9
  var _toolbar = require("@atlaskit/editor-common/toolbar");
11
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
12
10
  var _BulletedListMenuItem = require("./BulletedListMenuItem");
13
11
  var _IndentMenuItem = require("./IndentMenuItem");
14
12
  var _ListsIndentationMenu = require("./ListsIndentationMenu");
15
13
  var _MenuSection = require("./MenuSection");
16
14
  var _NumberedListMenuItem = require("./NumberedListMenuItem");
17
15
  var _OutdentMenuItem = require("./OutdentMenuItem");
18
- var _TaskListMenuItem = require("./TaskListMenuItem");
19
16
  var getListsIndentationMenu = exports.getListsIndentationMenu = function getListsIndentationMenu(allowHeadingAndParagraphIndentation, showIndentationButtons, api) {
20
17
  return [{
21
18
  type: _toolbar.LISTS_INDENTATION_MENU.type,
@@ -83,22 +80,7 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
83
80
  parents: parents
84
81
  });
85
82
  }
86
- }].concat((0, _toConsumableArray2.default)(!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? [{
87
- type: _toolbar.TASK_LIST_MENU_ITEM.type,
88
- key: _toolbar.TASK_LIST_MENU_ITEM.key,
89
- parents: [{
90
- type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
91
- key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
92
- rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.TASK_LIST_MENU_ITEM.key]
93
- }],
94
- component: function component(_ref4) {
95
- var parents = _ref4.parents;
96
- return /*#__PURE__*/_react.default.createElement(_TaskListMenuItem.TaskListMenuItem, {
97
- api: api,
98
- parents: parents
99
- });
100
- }
101
- }] : []), [{
83
+ }, {
102
84
  type: _toolbar.OUTDENT_MENU_ITEM.type,
103
85
  key: _toolbar.OUTDENT_MENU_ITEM.key,
104
86
  parents: [{
@@ -106,8 +88,8 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
106
88
  key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
107
89
  rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.OUTDENT_MENU_ITEM.key]
108
90
  }],
109
- component: function component(_ref5) {
110
- var parents = _ref5.parents;
91
+ component: function component(_ref4) {
92
+ var parents = _ref4.parents;
111
93
  return /*#__PURE__*/_react.default.createElement(_OutdentMenuItem.OutdentMenuItem, {
112
94
  api: api,
113
95
  allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
@@ -123,8 +105,8 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
123
105
  key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
124
106
  rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.INDENT_MENU_ITEM.key]
125
107
  }],
126
- component: function component(_ref6) {
127
- var parents = _ref6.parents;
108
+ component: function component(_ref5) {
109
+ var parents = _ref5.parents;
128
110
  return /*#__PURE__*/_react.default.createElement(_IndentMenuItem.IndentMenuItem, {
129
111
  api: api,
130
112
  allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
@@ -132,5 +114,5 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
132
114
  parents: parents
133
115
  });
134
116
  }
135
- }]);
117
+ }];
136
118
  };
package/dist/es2019/ui/toolbar-components/ListsIndentationHeroButton.js CHANGED
@@ -1,12 +1,11 @@
1
1
  import React from 'react';
2
2
  import { useIntl } from 'react-intl-next';
3
3
  import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
4
- import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, toggleTaskItemCheckbox as toggleTaskItemCheckboxKeymap, toggleTaskList as toggleTaskListKeymap, formatShortcut, ToolTipContent } from '@atlaskit/editor-common/keymaps';
4
+ import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, toggleTaskList as toggleTaskListKeymap, formatShortcut, ToolTipContent } from '@atlaskit/editor-common/keymaps';
5
5
  import { listMessages, tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
6
6
  import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
7
7
  import { ListBulletedIcon, ListNumberedIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
8
8
  import TaskIcon from '@atlaskit/icon/core/task';
9
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
9
  function useListsIndentationHeroButtonInfo({
11
10
  api,
12
11
  parents,
@@ -30,7 +29,7 @@ function useListsIndentationHeroButtonInfo({
30
29
  };
31
30
  });
32
31
  const getListType = taskListActive ? 'taskList' : orderedListActive ? 'orderedList' : defaultListType;
33
- const taskListKeymap = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? toggleTaskListKeymap : toggleTaskItemCheckboxKeymap;
32
+ const taskListKeymap = toggleTaskListKeymap;
34
33
  const getKeymap = getListType === 'taskList' ? taskListKeymap : getListType === 'orderedList' ? toggleOrderedListKeymap : toggleBulletListKeymap;
35
34
  const shortcut = formatShortcut(getKeymap);
36
35
  const keymap = getKeymap;
@@ -149,7 +148,7 @@ export const ListsIndentationHeroButton = ({
149
148
  taskListActive: (_states$taskDecisionS2 = states.taskDecisionState) === null || _states$taskDecisionS2 === void 0 ? void 0 : _states$taskDecisionS2.isInsideTask
150
149
  };
151
150
  });
152
- const taskListKeymap = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? toggleTaskListKeymap : toggleTaskItemCheckboxKeymap;
151
+ const taskListKeymap = toggleTaskListKeymap;
153
152
  const shortcut = taskListActive ? formatShortcut(taskListKeymap) : orderedListActive ? formatShortcut(toggleOrderedListKeymap) : formatShortcut(toggleBulletListKeymap);
154
153
  const onClick = () => {
155
154
  const inputMethod = getInputMethodFromParentKeys(parents);
package/dist/es2019/ui/toolbar-components/ListsIndentationMenu.js CHANGED
@@ -4,7 +4,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
4
4
  import { messages } from '@atlaskit/editor-common/lists';
5
5
  import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
6
6
  import { MoreItemsIcon, ToolbarDropdownMenu, ToolbarTooltip } from '@atlaskit/editor-toolbar';
7
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
8
7
  import { useIndentationState } from '../utils/hooks';
9
8
  export const ListsIndentationMenu = ({
10
9
  children,
@@ -35,7 +34,7 @@ export const ListsIndentationMenu = ({
35
34
  };
36
35
  });
37
36
  const allItemsDisabled = bulletListDisabled && orderedListDisabled && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.indentDisabled) && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.outdentDisabled) && !taskListActive;
38
- return expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolbarTooltip, {
37
+ return /*#__PURE__*/React.createElement(ToolbarTooltip, {
39
38
  content: formatMessage(messages.lists)
40
39
  }, /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
41
40
  iconBefore: /*#__PURE__*/React.createElement(MoreItemsIcon, {
@@ -44,12 +43,5 @@ export const ListsIndentationMenu = ({
44
43
  isDisabled: allItemsDisabled,
45
44
  testId: "editor-toolbar__lists-and-indentation-menu",
46
45
  label: formatMessage(messages.lists)
47
- }, children)) : /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
48
- iconBefore: /*#__PURE__*/React.createElement(MoreItemsIcon, {
49
- label: formatMessage(messages.lists)
50
- }),
51
- isDisabled: allItemsDisabled,
52
- testId: "editor-toolbar__lists-and-indentation-menu",
53
- label: formatMessage(messages.lists)
54
- }, children);
46
+ }, children));
55
47
  };
package/dist/es2019/ui/toolbar-components/ListsIndentationMenuGroup.js CHANGED
@@ -1,13 +1,11 @@
1
1
  import React from 'react';
2
- import { BULLETED_LIST_MENU_ITEM, INDENT_MENU_ITEM, LISTS_INDENTATION_GROUP, LISTS_INDENTATION_GROUP_COLLAPSED, LISTS_INDENTATION_GROUP_COLLAPSED_RANK, LISTS_INDENTATION_GROUP_INLINE, LISTS_INDENTATION_GROUP_RANK, LISTS_INDENTATION_MENU, LISTS_INDENTATION_MENU_RANK, LISTS_INDENTATION_MENU_SECTION, LISTS_INDENTATION_MENU_SECTION_RANK, NUMBERED_LIST_MENU_ITEM, OUTDENT_MENU_ITEM, TASK_LIST_MENU_ITEM, TEXT_COLLAPSED_MENU, TEXT_COLLAPSED_MENU_RANK } from '@atlaskit/editor-common/toolbar';
3
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
2
+ import { BULLETED_LIST_MENU_ITEM, INDENT_MENU_ITEM, LISTS_INDENTATION_GROUP, LISTS_INDENTATION_GROUP_COLLAPSED, LISTS_INDENTATION_GROUP_COLLAPSED_RANK, LISTS_INDENTATION_GROUP_INLINE, LISTS_INDENTATION_GROUP_RANK, LISTS_INDENTATION_MENU, LISTS_INDENTATION_MENU_RANK, LISTS_INDENTATION_MENU_SECTION, LISTS_INDENTATION_MENU_SECTION_RANK, NUMBERED_LIST_MENU_ITEM, OUTDENT_MENU_ITEM, TEXT_COLLAPSED_MENU, TEXT_COLLAPSED_MENU_RANK } from '@atlaskit/editor-common/toolbar';
4
3
  import { BulletedListMenuItem } from './BulletedListMenuItem';
5
4
  import { IndentMenuItem } from './IndentMenuItem';
6
5
  import { ListsIndentationMenu } from './ListsIndentationMenu';
7
6
  import { MenuSection } from './MenuSection';
8
7
  import { NumberedListMenuItem } from './NumberedListMenuItem';
9
8
  import { OutdentMenuItem } from './OutdentMenuItem';
10
- import { TaskListMenuItem } from './TaskListMenuItem';
11
9
  export const getListsIndentationMenu = (allowHeadingAndParagraphIndentation, showIndentationButtons, api) => {
12
10
  return [{
13
11
  type: LISTS_INDENTATION_MENU.type,
@@ -72,21 +70,7 @@ export const getListsIndentationMenu = (allowHeadingAndParagraphIndentation, sho
72
70
  api: api,
73
71
  parents: parents
74
72
  })
75
- }, ...(!expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? [{
76
- type: TASK_LIST_MENU_ITEM.type,
77
- key: TASK_LIST_MENU_ITEM.key,
78
- parents: [{
79
- type: LISTS_INDENTATION_MENU_SECTION.type,
80
- key: LISTS_INDENTATION_MENU_SECTION.key,
81
- rank: LISTS_INDENTATION_MENU_SECTION_RANK[TASK_LIST_MENU_ITEM.key]
82
- }],
83
- component: ({
84
- parents
85
- }) => /*#__PURE__*/React.createElement(TaskListMenuItem, {
86
- api: api,
87
- parents: parents
88
- })
89
- }] : []), {
73
+ }, {
90
74
  type: OUTDENT_MENU_ITEM.type,
91
75
  key: OUTDENT_MENU_ITEM.key,
92
76
  parents: [{
package/dist/esm/ui/toolbar-components/ListsIndentationHeroButton.js CHANGED
@@ -1,12 +1,11 @@
1
1
  import React from 'react';
2
2
  import { useIntl } from 'react-intl-next';
3
3
  import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
4
- import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, toggleTaskItemCheckbox as toggleTaskItemCheckboxKeymap, toggleTaskList as toggleTaskListKeymap, formatShortcut, ToolTipContent } from '@atlaskit/editor-common/keymaps';
4
+ import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, toggleTaskList as toggleTaskListKeymap, formatShortcut, ToolTipContent } from '@atlaskit/editor-common/keymaps';
5
5
  import { listMessages, tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
6
6
  import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
7
7
  import { ListBulletedIcon, ListNumberedIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
8
8
  import TaskIcon from '@atlaskit/icon/core/task';
9
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
9
  function useListsIndentationHeroButtonInfo(_ref) {
11
10
  var api = _ref.api,
12
11
  parents = _ref.parents,
@@ -27,7 +26,7 @@ function useListsIndentationHeroButtonInfo(_ref) {
27
26
  orderedListActive = _useSharedPluginState.orderedListActive,
28
27
  taskListActive = _useSharedPluginState.taskListActive;
29
28
  var getListType = taskListActive ? 'taskList' : orderedListActive ? 'orderedList' : defaultListType;
30
- var taskListKeymap = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? toggleTaskListKeymap : toggleTaskItemCheckboxKeymap;
29
+ var taskListKeymap = toggleTaskListKeymap;
31
30
  var getKeymap = getListType === 'taskList' ? taskListKeymap : getListType === 'orderedList' ? toggleOrderedListKeymap : toggleBulletListKeymap;
32
31
  var shortcut = formatShortcut(getKeymap);
33
32
  var keymap = getKeymap;
@@ -139,7 +138,7 @@ export var ListsIndentationHeroButton = function ListsIndentationHeroButton(_ref
139
138
  bulletListDisabled = _useSharedPluginState2.bulletListDisabled,
140
139
  orderedListActive = _useSharedPluginState2.orderedListActive,
141
140
  taskListActive = _useSharedPluginState2.taskListActive;
142
- var taskListKeymap = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? toggleTaskListKeymap : toggleTaskItemCheckboxKeymap;
141
+ var taskListKeymap = toggleTaskListKeymap;
143
142
  var shortcut = taskListActive ? formatShortcut(taskListKeymap) : orderedListActive ? formatShortcut(toggleOrderedListKeymap) : formatShortcut(toggleBulletListKeymap);
144
143
  var onClick = function onClick() {
145
144
  var inputMethod = getInputMethodFromParentKeys(parents);
package/dist/esm/ui/toolbar-components/ListsIndentationMenu.js CHANGED
@@ -4,7 +4,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
4
4
  import { messages } from '@atlaskit/editor-common/lists';
5
5
  import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
6
6
  import { MoreItemsIcon, ToolbarDropdownMenu, ToolbarTooltip } from '@atlaskit/editor-toolbar';
7
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
8
7
  import { useIndentationState } from '../utils/hooks';
9
8
  export var ListsIndentationMenu = function ListsIndentationMenu(_ref) {
10
9
  var children = _ref.children,
@@ -31,7 +30,7 @@ export var ListsIndentationMenu = function ListsIndentationMenu(_ref) {
31
30
  orderedListDisabled = _useSharedPluginState.orderedListDisabled,
32
31
  taskListActive = _useSharedPluginState.taskListActive;
33
32
  var allItemsDisabled = bulletListDisabled && orderedListDisabled && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.indentDisabled) && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.outdentDisabled) && !taskListActive;
34
- return expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolbarTooltip, {
33
+ return /*#__PURE__*/React.createElement(ToolbarTooltip, {
35
34
  content: formatMessage(messages.lists)
36
35
  }, /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
37
36
  iconBefore: /*#__PURE__*/React.createElement(MoreItemsIcon, {
@@ -40,12 +39,5 @@ export var ListsIndentationMenu = function ListsIndentationMenu(_ref) {
40
39
  isDisabled: allItemsDisabled,
41
40
  testId: "editor-toolbar__lists-and-indentation-menu",
42
41
  label: formatMessage(messages.lists)
43
- }, children)) : /*#__PURE__*/React.createElement(ToolbarDropdownMenu, {
44
- iconBefore: /*#__PURE__*/React.createElement(MoreItemsIcon, {
45
- label: formatMessage(messages.lists)
46
- }),
47
- isDisabled: allItemsDisabled,
48
- testId: "editor-toolbar__lists-and-indentation-menu",
49
- label: formatMessage(messages.lists)
50
- }, children);
42
+ }, children));
51
43
  };
package/dist/esm/ui/toolbar-components/ListsIndentationMenuGroup.js CHANGED
@@ -1,14 +1,11 @@
1
- import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
1
  import React from 'react';
3
- import { BULLETED_LIST_MENU_ITEM, INDENT_MENU_ITEM, LISTS_INDENTATION_GROUP, LISTS_INDENTATION_GROUP_COLLAPSED, LISTS_INDENTATION_GROUP_COLLAPSED_RANK, LISTS_INDENTATION_GROUP_INLINE, LISTS_INDENTATION_GROUP_RANK, LISTS_INDENTATION_MENU, LISTS_INDENTATION_MENU_RANK, LISTS_INDENTATION_MENU_SECTION, LISTS_INDENTATION_MENU_SECTION_RANK, NUMBERED_LIST_MENU_ITEM, OUTDENT_MENU_ITEM, TASK_LIST_MENU_ITEM, TEXT_COLLAPSED_MENU, TEXT_COLLAPSED_MENU_RANK } from '@atlaskit/editor-common/toolbar';
4
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
2
+ import { BULLETED_LIST_MENU_ITEM, INDENT_MENU_ITEM, LISTS_INDENTATION_GROUP, LISTS_INDENTATION_GROUP_COLLAPSED, LISTS_INDENTATION_GROUP_COLLAPSED_RANK, LISTS_INDENTATION_GROUP_INLINE, LISTS_INDENTATION_GROUP_RANK, LISTS_INDENTATION_MENU, LISTS_INDENTATION_MENU_RANK, LISTS_INDENTATION_MENU_SECTION, LISTS_INDENTATION_MENU_SECTION_RANK, NUMBERED_LIST_MENU_ITEM, OUTDENT_MENU_ITEM, TEXT_COLLAPSED_MENU, TEXT_COLLAPSED_MENU_RANK } from '@atlaskit/editor-common/toolbar';
5
3
  import { BulletedListMenuItem } from './BulletedListMenuItem';
6
4
  import { IndentMenuItem } from './IndentMenuItem';
7
5
  import { ListsIndentationMenu } from './ListsIndentationMenu';
8
6
  import { MenuSection } from './MenuSection';
9
7
  import { NumberedListMenuItem } from './NumberedListMenuItem';
10
8
  import { OutdentMenuItem } from './OutdentMenuItem';
11
- import { TaskListMenuItem } from './TaskListMenuItem';
12
9
  export var getListsIndentationMenu = function getListsIndentationMenu(allowHeadingAndParagraphIndentation, showIndentationButtons, api) {
13
10
  return [{
14
11
  type: LISTS_INDENTATION_MENU.type,
@@ -76,22 +73,7 @@ export var getListsIndentationMenu = function getListsIndentationMenu(allowHeadi
76
73
  parents: parents
77
74
  });
78
75
  }
79
- }].concat(_toConsumableArray(!expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? [{
80
- type: TASK_LIST_MENU_ITEM.type,
81
- key: TASK_LIST_MENU_ITEM.key,
82
- parents: [{
83
- type: LISTS_INDENTATION_MENU_SECTION.type,
84
- key: LISTS_INDENTATION_MENU_SECTION.key,
85
- rank: LISTS_INDENTATION_MENU_SECTION_RANK[TASK_LIST_MENU_ITEM.key]
86
- }],
87
- component: function component(_ref4) {
88
- var parents = _ref4.parents;
89
- return /*#__PURE__*/React.createElement(TaskListMenuItem, {
90
- api: api,
91
- parents: parents
92
- });
93
- }
94
- }] : []), [{
76
+ }, {
95
77
  type: OUTDENT_MENU_ITEM.type,
96
78
  key: OUTDENT_MENU_ITEM.key,
97
79
  parents: [{
@@ -99,8 +81,8 @@ export var getListsIndentationMenu = function getListsIndentationMenu(allowHeadi
99
81
  key: LISTS_INDENTATION_MENU_SECTION.key,
100
82
  rank: LISTS_INDENTATION_MENU_SECTION_RANK[OUTDENT_MENU_ITEM.key]
101
83
  }],
102
- component: function component(_ref5) {
103
- var parents = _ref5.parents;
84
+ component: function component(_ref4) {
85
+ var parents = _ref4.parents;
104
86
  return /*#__PURE__*/React.createElement(OutdentMenuItem, {
105
87
  api: api,
106
88
  allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
@@ -116,8 +98,8 @@ export var getListsIndentationMenu = function getListsIndentationMenu(allowHeadi
116
98
  key: LISTS_INDENTATION_MENU_SECTION.key,
117
99
  rank: LISTS_INDENTATION_MENU_SECTION_RANK[INDENT_MENU_ITEM.key]
118
100
  }],
119
- component: function component(_ref6) {
120
- var parents = _ref6.parents;
101
+ component: function component(_ref5) {
102
+ var parents = _ref5.parents;
121
103
  return /*#__PURE__*/React.createElement(IndentMenuItem, {
122
104
  api: api,
123
105
  allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
@@ -125,5 +107,5 @@ export var getListsIndentationMenu = function getListsIndentationMenu(allowHeadi
125
107
  parents: parents
126
108
  });
127
109
  }
128
- }]);
110
+ }];
129
111
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-toolbar-lists-indentation",
3
- "version": "8.0.5",
3
+ "version": "8.0.7",
4
4
  "description": "Toolbar lists and indentation plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -44,12 +44,12 @@
44
44
  "@atlaskit/editor-toolbar-model": "^0.3.0",
45
45
  "@atlaskit/icon": "^30.0.0",
46
46
  "@atlaskit/platform-feature-flags": "^1.1.0",
47
- "@atlaskit/tmp-editor-statsig": "^17.0.0",
48
- "@atlaskit/tokens": "^10.1.0",
47
+ "@atlaskit/tmp-editor-statsig": "^17.10.0",
48
+ "@atlaskit/tokens": "^11.0.0",
49
49
  "@babel/runtime": "^7.0.0"
50
50
  },
51
51
  "peerDependencies": {
52
- "@atlaskit/editor-common": "^111.9.0",
52
+ "@atlaskit/editor-common": "^111.11.0",
53
53
  "react": "^18.2.0",
54
54
  "react-dom": "^18.2.0",
55
55
  "react-intl-next": "npm:react-intl@^5.18.1"