@atlaskit/editor-plugin-tasks-and-decisions 6.4.6 → 6.5.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 6.5.0
+
+### Minor Changes
+
+- [`bfd653291c561`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bfd653291c561) -
+  [ux] ED-29018 Register taskList dropdown item and add menu item keys
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.4.7
+
+### Patch Changes
+
+- [`a2cd8c46a3e94`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a2cd8c46a3e94) -
+  EDITOR-1442 Bump adf-schema
+- [`14592f727f369`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/14592f727f369) -
+  [EDITOR-1153] Patch bug with undenting blockTaskItems
+- [`016e787a561d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/016e787a561d9) -
+  EDITOR-1149 Ensuring placeholder displays correctly for blockTaskItem
+- Updated dependencies
+
 ## 6.4.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/TaskItemNodeView.js

@@ -13,8 +13,10 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _helpers = require("../pm-plugins/helpers");
 var _taskItemNodeSpec = require("./taskItemNodeSpec");
+var _utils = require("./utils");
 var TaskItemNodeView = exports.TaskItemNodeView = /*#__PURE__*/function () {
   function TaskItemNodeView(node, view, getPos, _ref) {
     var _this = this;
@@ -132,6 +134,9 @@ var TaskItemNodeView = exports.TaskItemNodeView = /*#__PURE__*/function () {
     key: "updatePlaceholder",
     value: function updatePlaceholder(node) {
       var currentIsContentEmpty = this.isContentEmpty(node);
+      if ((0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_node', 'isEnabled', true)) {
+        currentIsContentEmpty = (0, _utils.isContentEmpty)(node);
+      }
       if (currentIsContentEmpty !== this.emptyContent) {
         var _this$contentDOM;
         this.emptyContent = currentIsContentEmpty;

package/dist/cjs/nodeviews/taskItemNodeSpec.js

@@ -11,7 +11,9 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _utils = 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; }
 /**
@@ -84,6 +86,11 @@ function taskItemToDom(node, placeholder, intl) {
   var contentDomDataAttrs = node.content.childCount > 0 ? {} : {
     'data-empty': 'true'
   };
+  if ((0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_node', 'isEnabled', true)) {
+    contentDomDataAttrs = (0, _utils.isContentEmpty)(node) ? {
+      'data-empty': 'true'
+    } : {};
+  }
   return ['div', _objectSpread(_objectSpread({
     class: "".concat(_styles.TaskDecisionSharedCssClassName.TASK_CONTAINER)
   }, dataAttrs), {}, {

package/dist/cjs/nodeviews/utils.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isContentEmpty = void 0;
+var isContentEmpty = exports.isContentEmpty = function isContentEmpty(node) {
+  if (node.content.childCount === 0) {
+    return true;
+  }
+  if (node.type.name === 'blockTaskItem') {
+    var _node$content$firstCh, _node$content$firstCh2;
+    return node.content.childCount === 1 && ((_node$content$firstCh = node.content.firstChild) === null || _node$content$firstCh === void 0 ? void 0 : _node$content$firstCh.type.name) === 'paragraph' && ((_node$content$firstCh2 = node.content.firstChild) === null || _node$content$firstCh2 === void 0 ? void 0 : _node$content$firstCh2.childCount) === 0;
+  }
+  return false;
+};

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

@@ -65,7 +65,10 @@ var wrapSelectionInTaskList = exports.wrapSelectionInTaskList = function wrapSel
   if (maxDepth >= 6) {
     return true;
   }
-  var blockRange = (0, _helpers.getBlockRange)($from, $to);
+  var blockRange = (0, _helpers.getBlockRange)({
+    $from: $from,
+    $to: $to
+  });
   if (!blockRange) {
     return true;
   }

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

@@ -72,7 +72,11 @@ var isTable = exports.isTable = function isTable(node) {
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-var getBlockRange = exports.getBlockRange = function getBlockRange($from, $to) {
+var getBlockRange = exports.getBlockRange = function getBlockRange(_ref) {
+  var $from = _ref.$from,
+    $to = _ref.$to,
+    _ref$isLifting = _ref.isLifting,
+    isLifting = _ref$isLifting === void 0 ? false : _ref$isLifting;
   var _$from$doc$type$schem = $from.doc.type.schema.nodes,
     taskList = _$from$doc$type$schem.taskList,
     blockTaskItem = _$from$doc$type$schem.blockTaskItem;
@@ -83,7 +87,9 @@ var getBlockRange = exports.getBlockRange = function getBlockRange($from, $to) {
     var startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
     var lastNode = $to.node($to.depth);
     var endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
-    return new _model.NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
+    return new _model.NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem,
+    // When lifting we want to ignore the potential depth of nested nodes so reduce the depth
+    isLifting ? blockTaskItemNode.depth - 2 : blockTaskItemNode.depth - 1);
   }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
@@ -197,7 +203,10 @@ var subtreeHeight = exports.subtreeHeight = function subtreeHeight($from, $to, t
   //
   // this is unlike regular bullet lists where the orderedList
   // appears as descendent of listItem
-  var blockRange = getBlockRange($from, $to);
+  var blockRange = getBlockRange({
+    $from: $from,
+    $to: $to
+  });
   if (!blockRange) {
     return -1;
   }
@@ -236,7 +245,11 @@ var isEmptyTaskDecision = exports.isEmptyTaskDecision = function isEmptyTaskDeci
  * @param $to End of range you want to lift (can be same as `$from`)
  */
 var liftBlock = exports.liftBlock = function liftBlock(tr, $from, $to) {
-  var blockRange = getBlockRange($from, $to);
+  var blockRange = getBlockRange({
+    $from: $from,
+    $to: $to,
+    isLifting: true
+  });
   if (!blockRange) {
     return null;
   }

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

@@ -307,7 +307,10 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
       // getBlockRange expects to be inside the taskItem
       var pos = tr.mapping.map($oldAfter.pos + 2);
       var $after = tr.doc.resolve(pos);
-      var blockRange = (0, _helpers.getBlockRange)($after, tr.doc.resolve($after.after($after.depth - 1) - 1));
+      var blockRange = (0, _helpers.getBlockRange)({
+        $from: $after,
+        $to: tr.doc.resolve($after.after($after.depth - 1) - 1)
+      });
       if (blockRange) {
         tr = tr.lift(blockRange, blockRange.depth - 1).scrollIntoView();
       }

package/dist/cjs/tasksAndDecisionsPlugin.js

@@ -15,12 +15,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _indentation = require("@atlaskit/editor-common/indentation");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _taskItemNodeSpec = require("./nodeviews/taskItemNodeSpec");
 var _decisionItem = require("./nodeviews/toDOM-fixes/decisionItem");
 var _helpers = require("./pm-plugins/helpers");
@@ -30,6 +32,7 @@ var _keymaps = _interopRequireWildcard(require("./pm-plugins/keymaps"));
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _RequestToEditPopup = require("./ui/Task/RequestToEditPopup");
+var _TaskListBlockMenuItem = require("./ui/TaskListBlockMenuItem/TaskListBlockMenuItem");
 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); }
@@ -110,6 +113,23 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
       });
     });
   }
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    var _api$blockMenu;
+    api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
+      type: 'block-menu-item',
+      key: _blockMenu.FORMAT_TASK_LIST_MENU_ITEM.key,
+      parent: {
+        type: 'block-menu-section',
+        key: _blockMenu.NESTED_FORMAT_MENU_SECTION.key,
+        rank: _blockMenu.FORMAT_NESTED_MENU_RANK[_blockMenu.FORMAT_TASK_LIST_MENU_ITEM.key]
+      },
+      component: function component() {
+        return /*#__PURE__*/React.createElement(_TaskListBlockMenuItem.TaskListBlockMenuItem, {
+          api: api
+        });
+      }
+    }]);
+  }
   return {
     name: 'taskDecision',
     nodes: function nodes() {

package/dist/cjs/ui/TaskListBlockMenuItem/TaskListBlockMenuItem.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TaskListBlockMenuItem = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _messages = require("@atlaskit/editor-common/messages");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
+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); }
+var TaskListBlockMenuItem = exports.TaskListBlockMenuItem = function TaskListBlockMenuItem(_ref) {
+  var api = _ref.api;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
+  var isSelected = (0, _react.useMemo)(function () {
+    return selection && selection.$from.parent.type.name === 'taskItem';
+  }, [selection]);
+  var onClick = function onClick() {
+    var _api$blockMenu;
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.formatNode('taskList'));
+  };
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+    isSelected: isSelected,
+    onClick: onClick,
+    elemBefore: /*#__PURE__*/_react.default.createElement(_task.default, {
+      label: ""
+    })
+  }, formatMessage(_messages.tasksAndDecisionsMessages.taskList));
+};

package/dist/es2019/nodeviews/TaskItemNodeView.js

@@ -4,8 +4,10 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { openRequestEditPopupAt } from '../pm-plugins/helpers';
 import { taskItemToDom } from './taskItemNodeSpec';
+import { isContentEmpty } from './utils';
 export class TaskItemNodeView {
   constructor(node, view, getPos, {
     api,
@@ -117,7 +119,10 @@ export class TaskItemNodeView {
 
   // Update the placeholder visibility based on content
   updatePlaceholder(node) {
-    const currentIsContentEmpty = this.isContentEmpty(node);
+    let currentIsContentEmpty = this.isContentEmpty(node);
+    if (expValEquals('platform_editor_blocktaskitem_node', 'isEnabled', true)) {
+      currentIsContentEmpty = isContentEmpty(node);
+    }
     if (currentIsContentEmpty !== this.emptyContent) {
       var _this$contentDOM;
       this.emptyContent = currentIsContentEmpty;

package/dist/es2019/nodeviews/taskItemNodeSpec.js

@@ -2,7 +2,9 @@ import { taskItem, blockTaskItemStage0 as blockTaskItem } from '@atlaskit/adf-sc
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
 import { TaskDecisionSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { isContentEmpty } from './utils';
 /**
  * Wrapper for ADF taskItem node spec to augment toDOM implementation
  * with fallback UI for lazy node view rendering / window virtualization
@@ -67,9 +69,14 @@ export function taskItemToDom(node, placeholder, intl) {
       'data-task-is-block': 'true'
     } : {})
   };
-  const contentDomDataAttrs = node.content.childCount > 0 ? {} : {
+  let contentDomDataAttrs = node.content.childCount > 0 ? {} : {
     'data-empty': 'true'
   };
+  if (expValEquals('platform_editor_blocktaskitem_node', 'isEnabled', true)) {
+    contentDomDataAttrs = isContentEmpty(node) ? {
+      'data-empty': 'true'
+    } : {};
+  }
   return ['div', {
     class: `${TaskDecisionSharedCssClassName.TASK_CONTAINER}`,
     ...dataAttrs,

package/dist/es2019/nodeviews/utils.js

@@ -0,0 +1,10 @@
+export const isContentEmpty = node => {
+  if (node.content.childCount === 0) {
+    return true;
+  }
+  if (node.type.name === 'blockTaskItem') {
+    var _node$content$firstCh, _node$content$firstCh2;
+    return node.content.childCount === 1 && ((_node$content$firstCh = node.content.firstChild) === null || _node$content$firstCh === void 0 ? void 0 : _node$content$firstCh.type.name) === 'paragraph' && ((_node$content$firstCh2 = node.content.firstChild) === null || _node$content$firstCh2 === void 0 ? void 0 : _node$content$firstCh2.childCount) === 0;
+  }
+  return false;
+};

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

@@ -61,7 +61,10 @@ export const wrapSelectionInTaskList = (state, dispatch) => {
   if (maxDepth >= 6) {
     return true;
   }
-  const blockRange = getBlockRange($from, $to);
+  const blockRange = getBlockRange({
+    $from,
+    $to
+  });
   if (!blockRange) {
     return true;
   }

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

@@ -61,7 +61,11 @@ export const isTable = node => {
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-export const getBlockRange = ($from, $to) => {
+export const getBlockRange = ({
+  $from,
+  $to,
+  isLifting = false
+}) => {
   const {
     taskList,
     blockTaskItem
@@ -71,7 +75,9 @@ export const getBlockRange = ($from, $to) => {
     const startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
     const lastNode = $to.node($to.depth);
     const endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
-    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
+    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem,
+    // When lifting we want to ignore the potential depth of nested nodes so reduce the depth
+    isLifting ? blockTaskItemNode.depth - 2 : blockTaskItemNode.depth - 1);
   }
   let end = $to.end();
   const $after = $to.doc.resolve(end + 1);
@@ -180,7 +186,10 @@ export const subtreeHeight = ($from, $to, types) => {
   //
   // this is unlike regular bullet lists where the orderedList
   // appears as descendent of listItem
-  const blockRange = getBlockRange($from, $to);
+  const blockRange = getBlockRange({
+    $from,
+    $to
+  });
   if (!blockRange) {
     return -1;
   }
@@ -223,7 +232,11 @@ export const isEmptyTaskDecision = state => {
  * @param $to End of range you want to lift (can be same as `$from`)
  */
 export const liftBlock = (tr, $from, $to) => {
-  const blockRange = getBlockRange($from, $to);
+  const blockRange = getBlockRange({
+    $from,
+    $to,
+    isLifting: true
+  });
   if (!blockRange) {
     return null;
   }

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

@@ -282,7 +282,10 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
       // getBlockRange expects to be inside the taskItem
       const pos = tr.mapping.map($oldAfter.pos + 2);
       const $after = tr.doc.resolve(pos);
-      const blockRange = getBlockRange($after, tr.doc.resolve($after.after($after.depth - 1) - 1));
+      const blockRange = getBlockRange({
+        $from: $after,
+        $to: tr.doc.resolve($after.after($after.depth - 1) - 1)
+      });
       if (blockRange) {
         tr = tr.lift(blockRange, blockRange.depth - 1).scrollIntoView();
       }

package/dist/es2019/tasksAndDecisionsPlugin.js

@@ -4,12 +4,14 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { decisionList, taskList } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { FORMAT_TASK_LIST_MENU_ITEM, FORMAT_NESTED_MENU_RANK, NESTED_FORMAT_MENU_SECTION } from '@atlaskit/editor-common/block-menu';
 import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 import { toolbarInsertBlockMessages as insertBlockMessages } from '@atlaskit/editor-common/messages';
 import { IconAction, IconDecision } from '@atlaskit/editor-common/quick-insert';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { taskItemNodeSpec, blockTaskItemNodeSpec } from './nodeviews/taskItemNodeSpec';
 import { decisionItemSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/decisionItem';
 import { closeRequestEditPopupAt, getCurrentIndentLevel, getTaskItemIndex, isInsideTask } from './pm-plugins/helpers';
@@ -21,6 +23,7 @@ import keymap, { getIndentCommand, getUnindentCommand } from './pm-plugins/keyma
 import { createPlugin } from './pm-plugins/main';
 import { stateKey as taskPluginKey } from './pm-plugins/plugin-key';
 import { RequestToEditPopup } from './ui/Task/RequestToEditPopup';
+import { TaskListBlockMenuItem } from './ui/TaskListBlockMenuItem/TaskListBlockMenuItem';
 import ToolbarDecision from './ui/ToolbarDecision';
 import ToolbarTask from './ui/ToolbarTask';
 const taskDecisionToolbarGroupStyles = null;
@@ -98,6 +101,21 @@ export const tasksAndDecisionsPlugin = ({
       }) => setProvider(provider)(tr));
     });
   }
+  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _api$blockMenu;
+    api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.registerBlockMenuComponents([{
+      type: 'block-menu-item',
+      key: FORMAT_TASK_LIST_MENU_ITEM.key,
+      parent: {
+        type: 'block-menu-section',
+        key: NESTED_FORMAT_MENU_SECTION.key,
+        rank: FORMAT_NESTED_MENU_RANK[FORMAT_TASK_LIST_MENU_ITEM.key]
+      },
+      component: () => /*#__PURE__*/React.createElement(TaskListBlockMenuItem, {
+        api: api
+      })
+    }]);
+  }
   return {
     name: 'taskDecision',
     nodes() {

package/dist/es2019/ui/TaskListBlockMenuItem/TaskListBlockMenuItem.js

@@ -0,0 +1,28 @@
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import TaskIcon from '@atlaskit/icon/core/task';
+export const TaskListBlockMenuItem = ({
+  api
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  const selection = useSharedPluginStateSelector(api, 'selection.selection');
+  const isSelected = useMemo(() => {
+    return selection && selection.$from.parent.type.name === 'taskItem';
+  }, [selection]);
+  const onClick = () => {
+    var _api$blockMenu;
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.formatNode('taskList'));
+  };
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    isSelected: isSelected,
+    onClick: onClick,
+    elemBefore: /*#__PURE__*/React.createElement(TaskIcon, {
+      label: ""
+    })
+  }, formatMessage(tasksAndDecisionsMessages.taskList));
+};

package/dist/esm/nodeviews/TaskItemNodeView.js

@@ -6,8 +6,10 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { openRequestEditPopupAt } from '../pm-plugins/helpers';
 import { taskItemToDom } from './taskItemNodeSpec';
+import { isContentEmpty } from './utils';
 export var TaskItemNodeView = /*#__PURE__*/function () {
   function TaskItemNodeView(node, view, getPos, _ref) {
     var _this = this;
@@ -125,6 +127,9 @@ export var TaskItemNodeView = /*#__PURE__*/function () {
     key: "updatePlaceholder",
     value: function updatePlaceholder(node) {
       var currentIsContentEmpty = this.isContentEmpty(node);
+      if (expValEquals('platform_editor_blocktaskitem_node', 'isEnabled', true)) {
+        currentIsContentEmpty = isContentEmpty(node);
+      }
       if (currentIsContentEmpty !== this.emptyContent) {
         var _this$contentDOM;
         this.emptyContent = currentIsContentEmpty;

package/dist/esm/nodeviews/taskItemNodeSpec.js

@@ -5,7 +5,9 @@ import { taskItem, blockTaskItemStage0 as blockTaskItem } from '@atlaskit/adf-sc
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
 import { TaskDecisionSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { isContentEmpty } from './utils';
 /**
  * Wrapper for ADF taskItem node spec to augment toDOM implementation
  * with fallback UI for lazy node view rendering / window virtualization
@@ -76,6 +78,11 @@ export function taskItemToDom(node, placeholder, intl) {
   var contentDomDataAttrs = node.content.childCount > 0 ? {} : {
     'data-empty': 'true'
   };
+  if (expValEquals('platform_editor_blocktaskitem_node', 'isEnabled', true)) {
+    contentDomDataAttrs = isContentEmpty(node) ? {
+      'data-empty': 'true'
+    } : {};
+  }
   return ['div', _objectSpread(_objectSpread({
     class: "".concat(TaskDecisionSharedCssClassName.TASK_CONTAINER)
   }, dataAttrs), {}, {

package/dist/esm/nodeviews/utils.js

@@ -0,0 +1,10 @@
+export var isContentEmpty = function isContentEmpty(node) {
+  if (node.content.childCount === 0) {
+    return true;
+  }
+  if (node.type.name === 'blockTaskItem') {
+    var _node$content$firstCh, _node$content$firstCh2;
+    return node.content.childCount === 1 && ((_node$content$firstCh = node.content.firstChild) === null || _node$content$firstCh === void 0 ? void 0 : _node$content$firstCh.type.name) === 'paragraph' && ((_node$content$firstCh2 = node.content.firstChild) === null || _node$content$firstCh2 === void 0 ? void 0 : _node$content$firstCh2.childCount) === 0;
+  }
+  return false;
+};

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

@@ -59,7 +59,10 @@ export var wrapSelectionInTaskList = function wrapSelectionInTaskList(state, dis
   if (maxDepth >= 6) {
     return true;
   }
-  var blockRange = getBlockRange($from, $to);
+  var blockRange = getBlockRange({
+    $from: $from,
+    $to: $to
+  });
   if (!blockRange) {
     return true;
   }

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

@@ -54,7 +54,11 @@ export var isTable = function isTable(node) {
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-export var getBlockRange = function getBlockRange($from, $to) {
+export var getBlockRange = function getBlockRange(_ref) {
+  var $from = _ref.$from,
+    $to = _ref.$to,
+    _ref$isLifting = _ref.isLifting,
+    isLifting = _ref$isLifting === void 0 ? false : _ref$isLifting;
   var _$from$doc$type$schem = $from.doc.type.schema.nodes,
     taskList = _$from$doc$type$schem.taskList,
     blockTaskItem = _$from$doc$type$schem.blockTaskItem;
@@ -65,7 +69,9 @@ export var getBlockRange = function getBlockRange($from, $to) {
     var startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
     var lastNode = $to.node($to.depth);
     var endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
-    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
+    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem,
+    // When lifting we want to ignore the potential depth of nested nodes so reduce the depth
+    isLifting ? blockTaskItemNode.depth - 2 : blockTaskItemNode.depth - 1);
   }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
@@ -179,7 +185,10 @@ export var subtreeHeight = function subtreeHeight($from, $to, types) {
   //
   // this is unlike regular bullet lists where the orderedList
   // appears as descendent of listItem
-  var blockRange = getBlockRange($from, $to);
+  var blockRange = getBlockRange({
+    $from: $from,
+    $to: $to
+  });
   if (!blockRange) {
     return -1;
   }
@@ -218,7 +227,11 @@ export var isEmptyTaskDecision = function isEmptyTaskDecision(state) {
  * @param $to End of range you want to lift (can be same as `$from`)
  */
 export var liftBlock = function liftBlock(tr, $from, $to) {
-  var blockRange = getBlockRange($from, $to);
+  var blockRange = getBlockRange({
+    $from: $from,
+    $to: $to,
+    isLifting: true
+  });
   if (!blockRange) {
     return null;
   }

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

@@ -299,7 +299,10 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
       // getBlockRange expects to be inside the taskItem
       var pos = tr.mapping.map($oldAfter.pos + 2);
       var $after = tr.doc.resolve(pos);
-      var blockRange = getBlockRange($after, tr.doc.resolve($after.after($after.depth - 1) - 1));
+      var blockRange = getBlockRange({
+        $from: $after,
+        $to: tr.doc.resolve($after.after($after.depth - 1) - 1)
+      });
       if (blockRange) {
         tr = tr.lift(blockRange, blockRange.depth - 1).scrollIntoView();
       }

package/dist/esm/tasksAndDecisionsPlugin.js

@@ -7,12 +7,14 @@ import { ax, ix } from "@compiled/react/runtime";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { decisionList, taskList } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { FORMAT_TASK_LIST_MENU_ITEM, FORMAT_NESTED_MENU_RANK, NESTED_FORMAT_MENU_SECTION } from '@atlaskit/editor-common/block-menu';
 import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 import { toolbarInsertBlockMessages as insertBlockMessages } from '@atlaskit/editor-common/messages';
 import { IconAction, IconDecision } from '@atlaskit/editor-common/quick-insert';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { taskItemNodeSpec, blockTaskItemNodeSpec } from './nodeviews/taskItemNodeSpec';
 import { decisionItemSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/decisionItem';
 import { closeRequestEditPopupAt, getCurrentIndentLevel, getTaskItemIndex, isInsideTask } from './pm-plugins/helpers';
@@ -24,6 +26,7 @@ import keymap, { getIndentCommand, getUnindentCommand } from './pm-plugins/keyma
 import { createPlugin } from './pm-plugins/main';
 import { stateKey as taskPluginKey } from './pm-plugins/plugin-key';
 import { RequestToEditPopup } from './ui/Task/RequestToEditPopup';
+import { TaskListBlockMenuItem } from './ui/TaskListBlockMenuItem/TaskListBlockMenuItem';
 import ToolbarDecision from './ui/ToolbarDecision';
 import ToolbarTask from './ui/ToolbarTask';
 var taskDecisionToolbarGroupStyles = null;
@@ -101,6 +104,23 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref3) {
       });
     });
   }
+  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _api$blockMenu;
+    api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
+      type: 'block-menu-item',
+      key: FORMAT_TASK_LIST_MENU_ITEM.key,
+      parent: {
+        type: 'block-menu-section',
+        key: NESTED_FORMAT_MENU_SECTION.key,
+        rank: FORMAT_NESTED_MENU_RANK[FORMAT_TASK_LIST_MENU_ITEM.key]
+      },
+      component: function component() {
+        return /*#__PURE__*/React.createElement(TaskListBlockMenuItem, {
+          api: api
+        });
+      }
+    }]);
+  }
   return {
     name: 'taskDecision',
     nodes: function nodes() {

package/dist/esm/ui/TaskListBlockMenuItem/TaskListBlockMenuItem.js

@@ -0,0 +1,26 @@
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import { tasksAndDecisionsMessages } from '@atlaskit/editor-common/messages';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import TaskIcon from '@atlaskit/icon/core/task';
+export var TaskListBlockMenuItem = function TaskListBlockMenuItem(_ref) {
+  var api = _ref.api;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var selection = useSharedPluginStateSelector(api, 'selection.selection');
+  var isSelected = useMemo(function () {
+    return selection && selection.$from.parent.type.name === 'taskItem';
+  }, [selection]);
+  var onClick = function onClick() {
+    var _api$blockMenu;
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.commands.formatNode('taskList'));
+  };
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    isSelected: isSelected,
+    onClick: onClick,
+    elemBefore: /*#__PURE__*/React.createElement(TaskIcon, {
+      label: ""
+    })
+  }, formatMessage(tasksAndDecisionsMessages.taskList));
+};

package/dist/types/nodeviews/utils.d.ts

@@ -0,0 +1,2 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+export declare const isContentEmpty: (node: PMNode) => boolean;

package/dist/types/pm-plugins/helpers.d.ts

@@ -12,7 +12,11 @@ export declare const isTable: (node?: Node | null) => boolean;
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-export declare const getBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => NodeRange | null;
+export declare const getBlockRange: ({ $from, $to, isLifting, }: {
+    $from: ResolvedPos;
+    $to: ResolvedPos;
+    isLifting?: boolean;
+}) => NodeRange | null;
 /**
  * Calculates the current indent level of the selection within a task list in the ProseMirror document.
  *

package/dist/types/tasksAndDecisionsPluginType.d.ts

@@ -1,7 +1,9 @@
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+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 { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { TaskDecisionProvider } from '@atlaskit/task-decision/types';
 import type { insertTaskDecisionCommand } from './pm-plugins/insert-commands';
@@ -11,7 +13,9 @@ export type TasksAndDecisionsPluginDependencies = [
     OptionalPlugin<TypeAheadPlugin>,
     OptionalPlugin<AnalyticsPlugin>,
     OptionalPlugin<ContextIdentifierPlugin>,
-    OptionalPlugin<EditorViewModePlugin>
+    OptionalPlugin<EditorViewModePlugin>,
+    OptionalPlugin<BlockMenuPlugin>,
+    OptionalPlugin<SelectionPlugin>
 ];
 export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     actions: {

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

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { TasksAndDecisionsPlugin } from '../../tasksAndDecisionsPluginType';
+export declare const TaskListBlockMenuItem: ({ api, }: {
+    api: ExtractInjectionAPI<TasksAndDecisionsPlugin>;
+}) => React.JSX.Element;

package/dist/types-ts4.5/nodeviews/utils.d.ts

@@ -0,0 +1,2 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+export declare const isContentEmpty: (node: PMNode) => boolean;

package/dist/types-ts4.5/pm-plugins/helpers.d.ts

@@ -12,7 +12,11 @@ export declare const isTable: (node?: Node | null) => boolean;
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-export declare const getBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => NodeRange | null;
+export declare const getBlockRange: ({ $from, $to, isLifting, }: {
+    $from: ResolvedPos;
+    $to: ResolvedPos;
+    isLifting?: boolean;
+}) => NodeRange | null;
 /**
  * Calculates the current indent level of the selection within a task list in the ProseMirror document.
  *

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

@@ -1,7 +1,9 @@
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+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 { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { TaskDecisionProvider } from '@atlaskit/task-decision/types';
 import type { insertTaskDecisionCommand } from './pm-plugins/insert-commands';
@@ -11,7 +13,9 @@ export type TasksAndDecisionsPluginDependencies = [
     OptionalPlugin<TypeAheadPlugin>,
     OptionalPlugin<AnalyticsPlugin>,
     OptionalPlugin<ContextIdentifierPlugin>,
-    OptionalPlugin<EditorViewModePlugin>
+    OptionalPlugin<EditorViewModePlugin>,
+    OptionalPlugin<BlockMenuPlugin>,
+    OptionalPlugin<SelectionPlugin>
 ];
 export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     actions: {

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

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { TasksAndDecisionsPlugin } from '../../tasksAndDecisionsPluginType';
+export declare const TaskListBlockMenuItem: ({ api, }: {
+    api: ExtractInjectionAPI<TasksAndDecisionsPlugin>;
+}) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "6.4.6",
+	"version": "6.5.0",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,16 +29,19 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^50.2.2",
+		"@atlaskit/adf-schema": "^50.2.3",
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/css": "^0.12.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^0.0.19",
 		"@atlaskit/editor-plugin-context-identifier": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
+		"@atlaskit/editor-plugin-selection": "^3.2.0",
 		"@atlaskit/editor-plugin-type-ahead": "^3.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
+		"@atlaskit/editor-toolbar": "^0.6.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
@@ -46,14 +49,14 @@
 		"@atlaskit/primitives": "^14.12.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^11.8.0",
+		"@atlaskit/tmp-editor-statsig": "^11.12.0",
 		"@atlaskit/tokens": "^6.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.32.0",
+		"@atlaskit/editor-common": "^107.35.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"