@atlaskit/editor-plugin-tasks-and-decisions 9.0.3 → 9.0.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 9.0.4
+
+### Patch Changes
+
+- [`f2edf4a20927d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2edf4a20927d) -
+  ED-29303 Move TaskListMenuItem component to taskAndDecision plugin
+- Updated dependencies
+
 ## 9.0.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/keymaps.js

@@ -24,6 +24,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands2 = require("./commands");
 var _helpers = require("./helpers");
 var _insertCommands = require("./insert-commands");
+var _toggleTasklistCommands = require("./toggle-tasklist-commands");
 var _utils3 = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -703,12 +704,31 @@ function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
     'Shift-Tab': _helpers.isInsideTaskOrDecisionItem,
     Tab: _helpers.isInsideTaskOrDecisionItem
   } : {};
-  var keymaps = _objectSpread((0, _defineProperty2.default)({
+  var toggleTaskListShortcut = function toggleTaskListShortcut(state, dispatch) {
+    if (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true)) {
+      return false;
+    }
+    if (!state.schema.nodes.taskItem) {
+      return false;
+    }
+    if (dispatch) {
+      var command = (0, _toggleTasklistCommands.toggleTaskList)();
+      var tr = command({
+        tr: state.tr
+      });
+      if (tr) {
+        dispatch(tr);
+        return true;
+      }
+    }
+    return false;
+  };
+  var keymaps = _objectSpread((0, _defineProperty2.default)((0, _defineProperty2.default)({
     Backspace: backspace(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
     Delete: deleteForwards,
     'Ctrl-d': deleteForwards,
     Enter: enter(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getContextIdentifier)
-  }, _keymaps.toggleTaskItemCheckbox.common, cmdOptEnter), allowNestedTasks ? indentHandlers : defaultHandlers);
+  }, _keymaps.toggleTaskItemCheckbox.common, cmdOptEnter), _keymaps.toggleTaskList.common, toggleTaskListShortcut), allowNestedTasks ? indentHandlers : defaultHandlers);
   return (0, _keymap.keymap)(keymaps);
 }
 var _default = exports.default = keymapPlugin;

package/dist/cjs/tasksAndDecisionsPlugin.js

@@ -24,6 +24,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _taskItemNodeSpec = require("./nodeviews/taskItemNodeSpec");
 var _decisionItem = require("./nodeviews/toDOM-fixes/decisionItem");
 var _helpers = require("./pm-plugins/helpers");
@@ -35,6 +36,7 @@ var _pluginKey = require("./pm-plugins/plugin-key");
 var _toggleTasklistCommands = require("./pm-plugins/toggle-tasklist-commands");
 var _RequestToEditPopup = require("./ui/Task/RequestToEditPopup");
 var _TaskListBlockMenuItem = require("./ui/TaskListBlockMenuItem/TaskListBlockMenuItem");
+var _toolbarComponents = require("./ui/toolbar-components");
 var _ToolbarDecision = _interopRequireDefault(require("./ui/ToolbarDecision"));
 var _ToolbarTask = _interopRequireDefault(require("./ui/ToolbarTask"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -109,6 +111,15 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
     return api === null || api === void 0 || (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 || (_api$contextIdentifie = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie === void 0 ? void 0 : _api$contextIdentifie.contextIdentifierProvider;
   };
   var previousTaskAndDecisionProvider;
+  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true, {
+    exposure: true
+  });
+  if (isToolbarAIFCEnabled && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_task_list_menu_item', 'isEnabled', true)) {
+    var _api$toolbar;
+    api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents((0, _toolbarComponents.getTasksAndDecisionsToolbarComponents)({
+      api: api
+    }));
+  }
   if (taskDecisionProvider) {
     taskDecisionProvider.then(function (provider) {
       api === null || api === void 0 || api.core.actions.execute(function (_ref4) {

package/dist/cjs/ui/TaskListMenuItem/TaskListMenuItem.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TaskListMenuItem = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _messages = require("@atlaskit/editor-common/messages");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var TaskListMenuItem = exports.TaskListMenuItem = function TaskListMenuItem(_ref) {
+  var api = _ref.api;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['taskDecision'], function (states) {
+      var _states$taskDecisionS;
+      return {
+        isInsideTask: (_states$taskDecisionS = states.taskDecisionState) === null || _states$taskDecisionS === void 0 ? void 0 : _states$taskDecisionS.isInsideTask
+      };
+    }),
+    isInsideTask = _useSharedPluginState.isInsideTask;
+  var handleClick = function handleClick() {
+    var _api$taskDecision;
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 ? void 0 : _api$taskDecision.commands.toggleTaskList());
+  };
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TaskIcon, {
+      size: "small",
+      label: ""
+    }),
+    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+      shortcut: (0, _keymaps.formatShortcut)(_keymaps.toggleTaskList)
+    }),
+    isSelected: isInsideTask,
+    isDisabled: false,
+    onClick: handleClick,
+    ariaKeyshortcuts: (0, _keymaps.formatShortcut)(_keymaps.toggleTaskList)
+  }, formatMessage(_messages.tasksAndDecisionsMessages.taskList));
+};

package/dist/cjs/ui/toolbar-components.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTasksAndDecisionsToolbarComponents = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _toolbar = require("@atlaskit/editor-common/toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _TaskListMenuItem = require("./TaskListMenuItem/TaskListMenuItem");
+var getTasksAndDecisionsToolbarComponents = exports.getTasksAndDecisionsToolbarComponents = function getTasksAndDecisionsToolbarComponents(_ref) {
+  var api = _ref.api;
+  if (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) || !(0, _expValEquals.expValEquals)('platform_editor_toolbar_task_list_menu_item', 'isEnabled', true)) {
+    return [];
+  }
+  return [{
+    type: _toolbar.TASK_LIST_MENU_ITEM.type,
+    key: _toolbar.TASK_LIST_MENU_ITEM.key,
+    parents: [{
+      type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
+      key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
+      rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.TASK_LIST_MENU_ITEM.key]
+    }],
+    component: function component(_ref2) {
+      var parents = _ref2.parents;
+      return /*#__PURE__*/_react.default.createElement(_TaskListMenuItem.TaskListMenuItem, {
+        api: api,
+        parents: parents
+      });
+    }
+  }];
+};

package/dist/es2019/pm-plugins/keymaps.js

@@ -2,7 +2,7 @@ import { uuid } from '@atlaskit/adf-schema';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { toggleTaskItemCheckbox } from '@atlaskit/editor-common/keymaps';
+import { toggleTaskItemCheckbox, toggleTaskList as toggleTaskListKeymap } from '@atlaskit/editor-common/keymaps';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { deleteEmptyParagraphAndMoveBlockUp, filterCommand as filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { autoJoin, chainCommands } from '@atlaskit/editor-prosemirror/commands';
@@ -15,6 +15,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
 import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInFirstTextblockOfBlockTaskItem, isInLastTextblockOfBlockTaskItem, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
 import { insertTaskDecisionWithAnalytics } from './insert-commands';
+import { toggleTaskList } from './toggle-tasklist-commands';
 import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
 const indentationAnalytics = (curIndentLevel, direction, inputMethod) => ({
   action: ACTION.FORMATTED,
@@ -701,6 +702,25 @@ export function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
     'Shift-Tab': isInsideTaskOrDecisionItem,
     Tab: isInsideTaskOrDecisionItem
   } : {};
+  const toggleTaskListShortcut = (state, dispatch) => {
+    if (!expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true)) {
+      return false;
+    }
+    if (!state.schema.nodes.taskItem) {
+      return false;
+    }
+    if (dispatch) {
+      const command = toggleTaskList();
+      const tr = command({
+        tr: state.tr
+      });
+      if (tr) {
+        dispatch(tr);
+        return true;
+      }
+    }
+    return false;
+  };
   const keymaps = {
     Backspace: backspace(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
     Delete: deleteForwards,
@@ -709,6 +729,9 @@ export function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     [toggleTaskItemCheckbox.common]: cmdOptEnter,
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    [toggleTaskListKeymap.common]: toggleTaskListShortcut,
     ...(allowNestedTasks ? indentHandlers : defaultHandlers)
   };
   return keymap(keymaps);

package/dist/es2019/tasksAndDecisionsPlugin.js

@@ -13,6 +13,7 @@ import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { taskItemNodeSpec, blockTaskItemNodeSpec } from './nodeviews/taskItemNodeSpec';
 import { decisionItemSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/decisionItem';
 import { closeRequestEditPopupAt, getCurrentIndentLevel, getTaskItemIndex, isInsideTask } from './pm-plugins/helpers';
@@ -26,6 +27,7 @@ import { stateKey as taskPluginKey } from './pm-plugins/plugin-key';
 import { toggleTaskList } from './pm-plugins/toggle-tasklist-commands';
 import { RequestToEditPopup } from './ui/Task/RequestToEditPopup';
 import { TaskListBlockMenuItem } from './ui/TaskListBlockMenuItem/TaskListBlockMenuItem';
+import { getTasksAndDecisionsToolbarComponents } from './ui/toolbar-components';
 import ToolbarDecision from './ui/ToolbarDecision';
 import ToolbarTask from './ui/ToolbarTask';
 const taskDecisionToolbarGroupStyles = null;
@@ -98,6 +100,15 @@ export const tasksAndDecisionsPlugin = ({
     return api === null || api === void 0 ? void 0 : (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 ? void 0 : (_api$contextIdentifie2 = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.contextIdentifierProvider;
   };
   let previousTaskAndDecisionProvider;
+  const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true, {
+    exposure: true
+  });
+  if (isToolbarAIFCEnabled && expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && expValEquals('platform_editor_toolbar_task_list_menu_item', 'isEnabled', true)) {
+    var _api$toolbar;
+    api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.registerComponents(getTasksAndDecisionsToolbarComponents({
+      api
+    }));
+  }
   if (taskDecisionProvider) {
     taskDecisionProvider.then(provider => {
       api === null || api === void 0 ? void 0 : api.core.actions.execute(({

package/dist/es2019/ui/TaskListMenuItem/TaskListMenuItem.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import { useIntl } from 'react-intl-next';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { formatShortcut, toggleTaskList } from '@atlaskit/editor-common/keymaps';
+import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
+import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint, TaskIcon } from '@atlaskit/editor-toolbar';
+export const TaskListMenuItem = ({
+  api
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  const {
+    isInsideTask
+  } = useSharedPluginStateWithSelector(api, ['taskDecision'], states => {
+    var _states$taskDecisionS;
+    return {
+      isInsideTask: (_states$taskDecisionS = states.taskDecisionState) === null || _states$taskDecisionS === void 0 ? void 0 : _states$taskDecisionS.isInsideTask
+    };
+  });
+  const handleClick = () => {
+    var _api$taskDecision;
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 ? void 0 : _api$taskDecision.commands.toggleTaskList());
+  };
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/React.createElement(TaskIcon, {
+      size: "small",
+      label: ""
+    }),
+    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+      shortcut: formatShortcut(toggleTaskList)
+    }),
+    isSelected: isInsideTask,
+    isDisabled: false,
+    onClick: handleClick,
+    ariaKeyshortcuts: formatShortcut(toggleTaskList)
+  }, formatMessage(tasksAndDecisionsMessages.taskList));
+};

package/dist/es2019/ui/toolbar-components.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import { LISTS_INDENTATION_MENU_SECTION, LISTS_INDENTATION_MENU_SECTION_RANK, TASK_LIST_MENU_ITEM } from '@atlaskit/editor-common/toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { TaskListMenuItem } from './TaskListMenuItem/TaskListMenuItem';
+export const getTasksAndDecisionsToolbarComponents = ({
+  api
+}) => {
+  if (!expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) || !expValEquals('platform_editor_toolbar_task_list_menu_item', 'isEnabled', true)) {
+    return [];
+  }
+  return [{
+    type: TASK_LIST_MENU_ITEM.type,
+    key: TASK_LIST_MENU_ITEM.key,
+    parents: [{
+      type: LISTS_INDENTATION_MENU_SECTION.type,
+      key: LISTS_INDENTATION_MENU_SECTION.key,
+      rank: LISTS_INDENTATION_MENU_SECTION_RANK[TASK_LIST_MENU_ITEM.key]
+    }],
+    component: ({
+      parents
+    }) => /*#__PURE__*/React.createElement(TaskListMenuItem, {
+      api: api,
+      parents: parents
+    })
+  }];
+};

package/dist/esm/pm-plugins/keymaps.js

@@ -5,7 +5,7 @@ import { uuid } from '@atlaskit/adf-schema';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { toggleTaskItemCheckbox } from '@atlaskit/editor-common/keymaps';
+import { toggleTaskItemCheckbox, toggleTaskList as toggleTaskListKeymap } from '@atlaskit/editor-common/keymaps';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { deleteEmptyParagraphAndMoveBlockUp, filterCommand as filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { autoJoin, chainCommands } from '@atlaskit/editor-prosemirror/commands';
@@ -18,6 +18,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
 import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInFirstTextblockOfBlockTaskItem, isInLastTextblockOfBlockTaskItem, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
 import { insertTaskDecisionWithAnalytics } from './insert-commands';
+import { toggleTaskList } from './toggle-tasklist-commands';
 import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction, inputMethod) {
   return {
@@ -695,12 +696,31 @@ export function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
     'Shift-Tab': isInsideTaskOrDecisionItem,
     Tab: isInsideTaskOrDecisionItem
   } : {};
-  var keymaps = _objectSpread(_defineProperty({
+  var toggleTaskListShortcut = function toggleTaskListShortcut(state, dispatch) {
+    if (!expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true)) {
+      return false;
+    }
+    if (!state.schema.nodes.taskItem) {
+      return false;
+    }
+    if (dispatch) {
+      var command = toggleTaskList();
+      var tr = command({
+        tr: state.tr
+      });
+      if (tr) {
+        dispatch(tr);
+        return true;
+      }
+    }
+    return false;
+  };
+  var keymaps = _objectSpread(_defineProperty(_defineProperty({
     Backspace: backspace(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
     Delete: deleteForwards,
     'Ctrl-d': deleteForwards,
     Enter: enter(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getContextIdentifier)
-  }, toggleTaskItemCheckbox.common, cmdOptEnter), allowNestedTasks ? indentHandlers : defaultHandlers);
+  }, toggleTaskItemCheckbox.common, cmdOptEnter), toggleTaskListKeymap.common, toggleTaskListShortcut), allowNestedTasks ? indentHandlers : defaultHandlers);
   return keymap(keymaps);
 }
 export default keymapPlugin;

package/dist/esm/tasksAndDecisionsPlugin.js

@@ -16,6 +16,7 @@ import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { taskItemNodeSpec, blockTaskItemNodeSpec } from './nodeviews/taskItemNodeSpec';
 import { decisionItemSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/decisionItem';
 import { closeRequestEditPopupAt, getCurrentIndentLevel, getTaskItemIndex, isInsideTask } from './pm-plugins/helpers';
@@ -29,6 +30,7 @@ import { stateKey as taskPluginKey } from './pm-plugins/plugin-key';
 import { toggleTaskList } from './pm-plugins/toggle-tasklist-commands';
 import { RequestToEditPopup } from './ui/Task/RequestToEditPopup';
 import { TaskListBlockMenuItem } from './ui/TaskListBlockMenuItem/TaskListBlockMenuItem';
+import { getTasksAndDecisionsToolbarComponents } from './ui/toolbar-components';
 import ToolbarDecision from './ui/ToolbarDecision';
 import ToolbarTask from './ui/ToolbarTask';
 var taskDecisionToolbarGroupStyles = null;
@@ -100,6 +102,15 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref3) {
     return api === null || api === void 0 || (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 || (_api$contextIdentifie = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie === void 0 ? void 0 : _api$contextIdentifie.contextIdentifierProvider;
   };
   var previousTaskAndDecisionProvider;
+  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true, {
+    exposure: true
+  });
+  if (isToolbarAIFCEnabled && expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) && expValEquals('platform_editor_toolbar_task_list_menu_item', 'isEnabled', true)) {
+    var _api$toolbar;
+    api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents(getTasksAndDecisionsToolbarComponents({
+      api: api
+    }));
+  }
   if (taskDecisionProvider) {
     taskDecisionProvider.then(function (provider) {
       api === null || api === void 0 || api.core.actions.execute(function (_ref4) {

package/dist/esm/ui/TaskListMenuItem/TaskListMenuItem.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { useIntl } from 'react-intl-next';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { formatShortcut, toggleTaskList } from '@atlaskit/editor-common/keymaps';
+import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
+import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint, TaskIcon } from '@atlaskit/editor-toolbar';
+export var TaskListMenuItem = function TaskListMenuItem(_ref) {
+  var api = _ref.api;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['taskDecision'], function (states) {
+      var _states$taskDecisionS;
+      return {
+        isInsideTask: (_states$taskDecisionS = states.taskDecisionState) === null || _states$taskDecisionS === void 0 ? void 0 : _states$taskDecisionS.isInsideTask
+      };
+    }),
+    isInsideTask = _useSharedPluginState.isInsideTask;
+  var handleClick = function handleClick() {
+    var _api$taskDecision;
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 ? void 0 : _api$taskDecision.commands.toggleTaskList());
+  };
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/React.createElement(TaskIcon, {
+      size: "small",
+      label: ""
+    }),
+    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+      shortcut: formatShortcut(toggleTaskList)
+    }),
+    isSelected: isInsideTask,
+    isDisabled: false,
+    onClick: handleClick,
+    ariaKeyshortcuts: formatShortcut(toggleTaskList)
+  }, formatMessage(tasksAndDecisionsMessages.taskList));
+};

package/dist/esm/ui/toolbar-components.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import { LISTS_INDENTATION_MENU_SECTION, LISTS_INDENTATION_MENU_SECTION_RANK, TASK_LIST_MENU_ITEM } from '@atlaskit/editor-common/toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { TaskListMenuItem } from './TaskListMenuItem/TaskListMenuItem';
+export var getTasksAndDecisionsToolbarComponents = function getTasksAndDecisionsToolbarComponents(_ref) {
+  var api = _ref.api;
+  if (!expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) || !expValEquals('platform_editor_toolbar_task_list_menu_item', 'isEnabled', true)) {
+    return [];
+  }
+  return [{
+    type: TASK_LIST_MENU_ITEM.type,
+    key: TASK_LIST_MENU_ITEM.key,
+    parents: [{
+      type: LISTS_INDENTATION_MENU_SECTION.type,
+      key: LISTS_INDENTATION_MENU_SECTION.key,
+      rank: LISTS_INDENTATION_MENU_SECTION_RANK[TASK_LIST_MENU_ITEM.key]
+    }],
+    component: function component(_ref2) {
+      var parents = _ref2.parents;
+      return /*#__PURE__*/React.createElement(TaskListMenuItem, {
+        api: api,
+        parents: parents
+      });
+    }
+  }];
+};

package/dist/types/tasksAndDecisionsPluginType.d.ts

@@ -4,6 +4,7 @@ import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-identifier';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { TaskDecisionProvider } from '@atlaskit/task-decision/types';
 import type { insertTaskDecisionCommand } from './pm-plugins/insert-commands';
@@ -15,7 +16,8 @@ export type TasksAndDecisionsPluginDependencies = [
     OptionalPlugin<ContextIdentifierPlugin>,
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<BlockMenuPlugin>,
-    OptionalPlugin<SelectionPlugin>
+    OptionalPlugin<SelectionPlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     actions: {

package/dist/types/ui/TaskListMenuItem/TaskListMenuItem.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ToolbarComponentTypes } from '@atlaskit/editor-toolbar-model';
+import type { TasksAndDecisionsPlugin } from '../../tasksAndDecisionsPluginType';
+type TaskListMenuItemProps = {
+    api?: ExtractInjectionAPI<TasksAndDecisionsPlugin>;
+    parents?: ToolbarComponentTypes;
+};
+export declare const TaskListMenuItem: ({ api }: TaskListMenuItemProps) => React.JSX.Element;
+export {};

package/dist/types/ui/toolbar-components.d.ts

@@ -0,0 +1,8 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
+import type { TasksAndDecisionsPlugin } from '../tasksAndDecisionsPluginType';
+type GetTasksAndDecisionsToolbarComponentsProps = {
+    api?: ExtractInjectionAPI<TasksAndDecisionsPlugin>;
+};
+export declare const getTasksAndDecisionsToolbarComponents: ({ api, }: GetTasksAndDecisionsToolbarComponentsProps) => RegisterComponent[];
+export {};

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

@@ -4,6 +4,7 @@ import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-identifier';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { TaskDecisionProvider } from '@atlaskit/task-decision/types';
 import type { insertTaskDecisionCommand } from './pm-plugins/insert-commands';
@@ -15,7 +16,8 @@ export type TasksAndDecisionsPluginDependencies = [
     OptionalPlugin<ContextIdentifierPlugin>,
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<BlockMenuPlugin>,
-    OptionalPlugin<SelectionPlugin>
+    OptionalPlugin<SelectionPlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     actions: {

package/dist/types-ts4.5/ui/TaskListMenuItem/TaskListMenuItem.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ToolbarComponentTypes } from '@atlaskit/editor-toolbar-model';
+import type { TasksAndDecisionsPlugin } from '../../tasksAndDecisionsPluginType';
+type TaskListMenuItemProps = {
+    api?: ExtractInjectionAPI<TasksAndDecisionsPlugin>;
+    parents?: ToolbarComponentTypes;
+};
+export declare const TaskListMenuItem: ({ api }: TaskListMenuItemProps) => React.JSX.Element;
+export {};

package/dist/types-ts4.5/ui/toolbar-components.d.ts

@@ -0,0 +1,8 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
+import type { TasksAndDecisionsPlugin } from '../tasksAndDecisionsPluginType';
+type GetTasksAndDecisionsToolbarComponentsProps = {
+    api?: ExtractInjectionAPI<TasksAndDecisionsPlugin>;
+};
+export declare const getTasksAndDecisionsToolbarComponents: ({ api, }: GetTasksAndDecisionsToolbarComponentsProps) => RegisterComponent[];
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "9.0.3",
+	"version": "9.0.4",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,10 +38,12 @@
 		"@atlaskit/editor-plugin-context-identifier": "^6.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
 		"@atlaskit/editor-plugin-selection": "^6.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^3.0.0",
 		"@atlaskit/editor-plugin-type-ahead": "^6.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-toolbar": "^0.10.0",
+		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^28.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",