@atlaskit/editor-core 189.0.9 → 189.0.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 189.0.10
+
+### Patch Changes
+
+- [#42139](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42139) [`9474db7141c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9474db7141c) - [ED-20622] Fix task and decision placeholder been removed when the TypeAhead was open
+
 ## 189.0.9
 
 ### Patch Changes

package/dist/cjs/plugins/tasks-and-decisions/index.js

@@ -9,8 +9,9 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 var _react = require("@emotion/react");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
+var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _pluginKey = require("./pm-plugins/plugin-key");
 var _commands = require("./commands");
 var _inputRules = _interopRequireDefault(require("./pm-plugins/input-rules"));
 var _keymaps = _interopRequireDefault(require("./pm-plugins/keymaps"));
@@ -58,6 +59,15 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         node: _adfSchema.taskItem
       }];
     },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var pluginState = _pluginKey.stateKey.getState(editorState);
+      return {
+        focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null
+      };
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'tasksAndDecisions',
@@ -107,8 +117,8 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         var formatMessage = _ref7.formatMessage;
         return [{
           id: 'action',
-          title: formatMessage(_messages.messages.action),
-          description: formatMessage(_messages.messages.actionDescription),
+          title: formatMessage(_messages.toolbarInsertBlockMessages.action),
+          description: formatMessage(_messages.toolbarInsertBlockMessages.actionDescription),
           priority: 100,
           keywords: ['checkbox', 'task', 'todo'],
           keyshortcut: '[]',
@@ -121,8 +131,8 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
           }
         }, {
           id: 'decision',
-          title: formatMessage(_messages.messages.decision),
-          description: formatMessage(_messages.messages.decisionDescription),
+          title: formatMessage(_messages.toolbarInsertBlockMessages.decision),
+          description: formatMessage(_messages.toolbarInsertBlockMessages.decisionDescription),
           priority: 900,
           keyshortcut: '<>',
           icon: function icon() {

package/dist/cjs/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -13,19 +13,25 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _react = _interopRequireDefault(require("react"));
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _useShowPlaceholder = require("./hooks/use-show-placeholder");
 var _Decision = _interopRequireDefault(require("../ui/Decision"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var DecisionItemWrapper = function DecisionItemWrapper(_ref) {
   var api = _ref.api,
+    editorView = _ref.editorView,
     forwardRef = _ref.forwardRef,
-    isContentNodeEmpty = _ref.isContentNodeEmpty;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['typeAhead']),
-    typeAheadState = _useSharedPluginState.typeAheadState;
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    getPos = _ref.getPos;
+  var showPlaceholder = (0, _useShowPlaceholder.useShowPlaceholder)({
+    editorView: editorView,
+    isContentNodeEmpty: isContentNodeEmpty,
+    getPos: getPos,
+    api: api
+  });
   return /*#__PURE__*/_react.default.createElement(_Decision.default, {
     contentRef: forwardRef,
-    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen)
+    showPlaceholder: showPlaceholder
   });
 };
 var Decision = /*#__PURE__*/function (_ReactNodeView) {
@@ -73,6 +79,11 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
         forwardRef: forwardRef,
         isContentNodeEmpty: isContentNodeEmpty,
         api: this.api
+        // The getPosHandler type is wrong, there is no `boolean` in the real implementation
+        // @ts-expect-error 2322: Type 'getPosHandler' is not assignable to type '() => number | undefined'.
+        ,
+        getPos: this.getPos,
+        editorView: this.view
       });
     }
   }, {

package/dist/cjs/plugins/tasks-and-decisions/nodeviews/hooks/use-show-placeholder.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useShowPlaceholder = void 0;
+var _react = require("react");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var useShowPlaceholder = exports.useShowPlaceholder = function useShowPlaceholder(_ref) {
+  var editorView = _ref.editorView,
+    api = _ref.api,
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    getPos = _ref.getPos;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['typeAhead']),
+    typeAheadState = _useSharedPluginState.typeAheadState;
+  var isTypeAheadOpen = Boolean(typeAheadState === null || typeAheadState === void 0 ? void 0 : typeAheadState.isOpen);
+  var isTypeAheadOpenedInsideItem = (0, _react.useMemo)(function () {
+    var _selection$$cursor;
+    if (!isTypeAheadOpen) {
+      return false;
+    }
+    var itemPosition = getPos();
+    if (typeof itemPosition !== 'number') {
+      return false;
+    }
+    var selection = editorView.state.selection;
+    if (!(selection instanceof _state.TextSelection)) {
+      return false;
+    }
+    var maybeItemNode = editorView.state.doc.nodeAt(itemPosition);
+    var maybeParentItemNode = (_selection$$cursor = selection.$cursor) === null || _selection$$cursor === void 0 ? void 0 : _selection$$cursor.node();
+    if (maybeItemNode && maybeParentItemNode && maybeItemNode.eq(maybeParentItemNode)) {
+      return true;
+    }
+    return false;
+  }, [isTypeAheadOpen, getPos, editorView]);
+  var showPlaceholder = Boolean(!isTypeAheadOpenedInsideItem && isContentNodeEmpty);
+  return showPlaceholder;
+};

package/dist/cjs/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -16,35 +16,40 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _steps = require("@atlaskit/adf-schema/steps");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
-var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
-var _pluginKey = require("../pm-plugins/plugin-key");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _useShowPlaceholder = require("./hooks/use-show-placeholder");
 var _Task = _interopRequireDefault(require("../ui/Task"));
 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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-//import { isTypeAheadOpen } from '../../type-ahead/utils';
-
 var TaskItemWrapper = function TaskItemWrapper(_ref) {
   var localId = _ref.localId,
     forwardRef = _ref.forwardRef,
     isDone = _ref.isDone,
     onChange = _ref.onChange,
-    isFocused = _ref.isFocused,
-    isContentNodeEmpty = _ref.isContentNodeEmpty,
     providerFactory = _ref.providerFactory,
-    api = _ref.api;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['typeAhead']),
-    typeAheadState = _useSharedPluginState.typeAheadState;
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    api = _ref.api,
+    getPos = _ref.getPos,
+    editorView = _ref.editorView;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['taskDecision']),
+    taskDecisionState = _useSharedPluginState.taskDecisionState;
+  var isFocused = Boolean((taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.focusedTaskItemLocalId) === localId);
+  var showPlaceholder = (0, _useShowPlaceholder.useShowPlaceholder)({
+    editorView: editorView,
+    isContentNodeEmpty: isContentNodeEmpty,
+    getPos: getPos,
+    api: api
+  });
   return /*#__PURE__*/_react.default.createElement(_Task.default, {
     taskId: localId,
     contentRef: forwardRef,
     isDone: isDone,
     onChange: onChange,
     isFocused: isFocused,
-    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen),
+    showPlaceholder: showPlaceholder,
     providers: providerFactory
   });
 };
@@ -150,7 +155,6 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(props, forwardRef) {
-      var _this2 = this;
       var _this$node$attrs = this.node.attrs,
         localId = _this$node$attrs.localId,
         state = _this$node$attrs.state;
@@ -158,23 +162,19 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
       return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsListener, {
         channel: "fabric-elements",
         onEvent: this.addListAnalyticsData
-      }, /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
-        plugins: {
-          taskDecisionPlugin: _pluginKey.stateKey
-        },
-        render: function render(_ref2) {
-          var taskDecisionPlugin = _ref2.taskDecisionPlugin;
-          return /*#__PURE__*/_react.default.createElement(TaskItemWrapper, {
-            localId: localId,
-            forwardRef: forwardRef,
-            isDone: state === 'DONE',
-            onChange: _this2.handleOnChange,
-            isFocused: Boolean((taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId),
-            isContentNodeEmpty: isContentNodeEmpty,
-            providerFactory: props.providerFactory,
-            api: _this2.api
-          });
-        }
+      }, /*#__PURE__*/_react.default.createElement(TaskItemWrapper, {
+        localId: localId,
+        forwardRef: forwardRef,
+        isDone: state === 'DONE',
+        onChange: this.handleOnChange,
+        isContentNodeEmpty: isContentNodeEmpty,
+        providerFactory: props.providerFactory
+        // The getPosHandler type is wrong, there is no `boolean` in the real implementation
+        // @ts-expect-error 2322: Type 'getPosHandler' is not assignable to type '() => number | undefined'.
+        ,
+        getPos: this.getPos,
+        editorView: this.view,
+        api: this.api
       }));
     }
   }, {
@@ -190,11 +190,11 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "update",
     value: function update(node, decorations) {
-      var _this3 = this;
+      var _this2 = this;
       return (0, _get2.default)((0, _getPrototypeOf2.default)(Task.prototype), "update", this).call(this, node, decorations, undefined, function (currentNode, newNode) {
         return (
           // Toggle the placeholder based on whether user input exists
-          !_this3.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
+          !_this2.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
         );
       });
     }

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.0.9";
+var version = exports.version = "189.0.10";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/plugins/tasks-and-decisions/index.js

@@ -2,8 +2,9 @@
 import { css, jsx } from '@emotion/react';
 import { decisionItem, decisionList, taskItem, taskList } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { messages as insertBlockMessages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { toolbarInsertBlockMessages as insertBlockMessages } from '@atlaskit/editor-common/messages';
 import { IconAction, IconDecision } from '@atlaskit/editor-common/quick-insert';
+import { stateKey as taskPluginKey } from './pm-plugins/plugin-key';
 import { insertTaskDecisionAction, getListTypes } from './commands';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymap from './pm-plugins/keymaps';
@@ -51,6 +52,15 @@ const tasksAndDecisionsPlugin = ({
       node: taskItem
     }];
   },
+  getSharedState(editorState) {
+    if (!editorState) {
+      return undefined;
+    }
+    const pluginState = taskPluginKey.getState(editorState);
+    return {
+      focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null
+    };
+  },
   pmPlugins() {
     return [{
       name: 'tasksAndDecisions',

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -1,18 +1,23 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useShowPlaceholder } from './hooks/use-show-placeholder';
 import DecisionItem from '../ui/Decision';
 const DecisionItemWrapper = ({
   api,
+  editorView,
   forwardRef,
-  isContentNodeEmpty
+  isContentNodeEmpty,
+  getPos
 }) => {
-  const {
-    typeAheadState
-  } = useSharedPluginState(api, ['typeAhead']);
+  const showPlaceholder = useShowPlaceholder({
+    editorView,
+    isContentNodeEmpty,
+    getPos,
+    api
+  });
   return /*#__PURE__*/React.createElement(DecisionItem, {
     contentRef: forwardRef,
-    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen)
+    showPlaceholder: showPlaceholder
   });
 };
 class Decision extends ReactNodeView {
@@ -44,6 +49,11 @@ class Decision extends ReactNodeView {
       forwardRef: forwardRef,
       isContentNodeEmpty: isContentNodeEmpty,
       api: this.api
+      // The getPosHandler type is wrong, there is no `boolean` in the real implementation
+      // @ts-expect-error 2322: Type 'getPosHandler' is not assignable to type '() => number | undefined'.
+      ,
+      getPos: this.getPos,
+      editorView: this.view
     });
   }
   viewShouldUpdate(nextNode) {

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/hooks/use-show-placeholder.js

@@ -0,0 +1,36 @@
+import { useMemo } from 'react';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+export const useShowPlaceholder = ({
+  editorView,
+  api,
+  isContentNodeEmpty,
+  getPos
+}) => {
+  const {
+    typeAheadState
+  } = useSharedPluginState(api, ['typeAhead']);
+  const isTypeAheadOpen = Boolean(typeAheadState === null || typeAheadState === void 0 ? void 0 : typeAheadState.isOpen);
+  const isTypeAheadOpenedInsideItem = useMemo(() => {
+    var _selection$$cursor;
+    if (!isTypeAheadOpen) {
+      return false;
+    }
+    const itemPosition = getPos();
+    if (typeof itemPosition !== 'number') {
+      return false;
+    }
+    const selection = editorView.state.selection;
+    if (!(selection instanceof TextSelection)) {
+      return false;
+    }
+    const maybeItemNode = editorView.state.doc.nodeAt(itemPosition);
+    const maybeParentItemNode = (_selection$$cursor = selection.$cursor) === null || _selection$$cursor === void 0 ? void 0 : _selection$$cursor.node();
+    if (maybeItemNode && maybeParentItemNode && maybeItemNode.eq(maybeParentItemNode)) {
+      return true;
+    }
+    return false;
+  }, [isTypeAheadOpen, getPos, editorView]);
+  const showPlaceholder = Boolean(!isTypeAheadOpenedInsideItem && isContentNodeEmpty);
+  return showPlaceholder;
+};

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -2,34 +2,38 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
-import { stateKey as taskPluginKey } from '../pm-plugins/plugin-key';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useShowPlaceholder } from './hooks/use-show-placeholder';
 import TaskItem from '../ui/Task';
-
-//import { isTypeAheadOpen } from '../../type-ahead/utils';
-
 const TaskItemWrapper = ({
   localId,
   forwardRef,
   isDone,
   onChange,
-  isFocused,
-  isContentNodeEmpty,
   providerFactory,
-  api
+  isContentNodeEmpty,
+  api,
+  getPos,
+  editorView
 }) => {
   const {
-    typeAheadState
-  } = useSharedPluginState(api, ['typeAhead']);
+    taskDecisionState
+  } = useSharedPluginState(api, ['taskDecision']);
+  const isFocused = Boolean((taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.focusedTaskItemLocalId) === localId);
+  const showPlaceholder = useShowPlaceholder({
+    editorView,
+    isContentNodeEmpty,
+    getPos,
+    api
+  });
   return /*#__PURE__*/React.createElement(TaskItem, {
     taskId: localId,
     contentRef: forwardRef,
     isDone: isDone,
     onChange: onChange,
     isFocused: isFocused,
-    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen),
+    showPlaceholder: showPlaceholder,
     providers: providerFactory
   });
 };
@@ -130,24 +134,19 @@ class Task extends ReactNodeView {
     return /*#__PURE__*/React.createElement(AnalyticsListener, {
       channel: "fabric-elements",
       onEvent: this.addListAnalyticsData
-    }, /*#__PURE__*/React.createElement(WithPluginState, {
-      plugins: {
-        taskDecisionPlugin: taskPluginKey
-      },
-      render: ({
-        taskDecisionPlugin
-      }) => {
-        return /*#__PURE__*/React.createElement(TaskItemWrapper, {
-          localId: localId,
-          forwardRef: forwardRef,
-          isDone: state === 'DONE',
-          onChange: this.handleOnChange,
-          isFocused: Boolean((taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId),
-          isContentNodeEmpty: isContentNodeEmpty,
-          providerFactory: props.providerFactory,
-          api: this.api
-        });
-      }
+    }, /*#__PURE__*/React.createElement(TaskItemWrapper, {
+      localId: localId,
+      forwardRef: forwardRef,
+      isDone: state === 'DONE',
+      onChange: this.handleOnChange,
+      isContentNodeEmpty: isContentNodeEmpty,
+      providerFactory: props.providerFactory
+      // The getPosHandler type is wrong, there is no `boolean` in the real implementation
+      // @ts-expect-error 2322: Type 'getPosHandler' is not assignable to type '() => number | undefined'.
+      ,
+      getPos: this.getPos,
+      editorView: this.view,
+      api: this.api
     }));
   }
   viewShouldUpdate(nextNode) {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.0.9";
+export const version = "189.0.10";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/tasks-and-decisions/index.js

@@ -4,8 +4,9 @@ var _templateObject;
 import { css, jsx } from '@emotion/react';
 import { decisionItem, decisionList, taskItem, taskList } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { messages as insertBlockMessages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { toolbarInsertBlockMessages as insertBlockMessages } from '@atlaskit/editor-common/messages';
 import { IconAction, IconDecision } from '@atlaskit/editor-common/quick-insert';
+import { stateKey as taskPluginKey } from './pm-plugins/plugin-key';
 import { insertTaskDecisionAction, getListTypes } from './commands';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymap from './pm-plugins/keymaps';
@@ -51,6 +52,15 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         node: taskItem
       }];
     },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var pluginState = taskPluginKey.getState(editorState);
+      return {
+        focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null
+      };
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'tasksAndDecisions',

package/dist/esm/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -8,17 +8,23 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useShowPlaceholder } from './hooks/use-show-placeholder';
 import DecisionItem from '../ui/Decision';
 var DecisionItemWrapper = function DecisionItemWrapper(_ref) {
   var api = _ref.api,
+    editorView = _ref.editorView,
     forwardRef = _ref.forwardRef,
-    isContentNodeEmpty = _ref.isContentNodeEmpty;
-  var _useSharedPluginState = useSharedPluginState(api, ['typeAhead']),
-    typeAheadState = _useSharedPluginState.typeAheadState;
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    getPos = _ref.getPos;
+  var showPlaceholder = useShowPlaceholder({
+    editorView: editorView,
+    isContentNodeEmpty: isContentNodeEmpty,
+    getPos: getPos,
+    api: api
+  });
   return /*#__PURE__*/React.createElement(DecisionItem, {
     contentRef: forwardRef,
-    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen)
+    showPlaceholder: showPlaceholder
   });
 };
 var Decision = /*#__PURE__*/function (_ReactNodeView) {
@@ -66,6 +72,11 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
         forwardRef: forwardRef,
         isContentNodeEmpty: isContentNodeEmpty,
         api: this.api
+        // The getPosHandler type is wrong, there is no `boolean` in the real implementation
+        // @ts-expect-error 2322: Type 'getPosHandler' is not assignable to type '() => number | undefined'.
+        ,
+        getPos: this.getPos,
+        editorView: this.view
       });
     }
   }, {

package/dist/esm/plugins/tasks-and-decisions/nodeviews/hooks/use-show-placeholder.js

@@ -0,0 +1,34 @@
+import { useMemo } from 'react';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+export var useShowPlaceholder = function useShowPlaceholder(_ref) {
+  var editorView = _ref.editorView,
+    api = _ref.api,
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    getPos = _ref.getPos;
+  var _useSharedPluginState = useSharedPluginState(api, ['typeAhead']),
+    typeAheadState = _useSharedPluginState.typeAheadState;
+  var isTypeAheadOpen = Boolean(typeAheadState === null || typeAheadState === void 0 ? void 0 : typeAheadState.isOpen);
+  var isTypeAheadOpenedInsideItem = useMemo(function () {
+    var _selection$$cursor;
+    if (!isTypeAheadOpen) {
+      return false;
+    }
+    var itemPosition = getPos();
+    if (typeof itemPosition !== 'number') {
+      return false;
+    }
+    var selection = editorView.state.selection;
+    if (!(selection instanceof TextSelection)) {
+      return false;
+    }
+    var maybeItemNode = editorView.state.doc.nodeAt(itemPosition);
+    var maybeParentItemNode = (_selection$$cursor = selection.$cursor) === null || _selection$$cursor === void 0 ? void 0 : _selection$$cursor.node();
+    if (maybeItemNode && maybeParentItemNode && maybeItemNode.eq(maybeParentItemNode)) {
+      return true;
+    }
+    return false;
+  }, [isTypeAheadOpen, getPos, editorView]);
+  var showPlaceholder = Boolean(!isTypeAheadOpenedInsideItem && isContentNodeEmpty);
+  return showPlaceholder;
+};

package/dist/esm/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -13,32 +13,36 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
-import { stateKey as taskPluginKey } from '../pm-plugins/plugin-key';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { useShowPlaceholder } from './hooks/use-show-placeholder';
 import TaskItem from '../ui/Task';
-
-//import { isTypeAheadOpen } from '../../type-ahead/utils';
-
 var TaskItemWrapper = function TaskItemWrapper(_ref) {
   var localId = _ref.localId,
     forwardRef = _ref.forwardRef,
     isDone = _ref.isDone,
     onChange = _ref.onChange,
-    isFocused = _ref.isFocused,
-    isContentNodeEmpty = _ref.isContentNodeEmpty,
     providerFactory = _ref.providerFactory,
-    api = _ref.api;
-  var _useSharedPluginState = useSharedPluginState(api, ['typeAhead']),
-    typeAheadState = _useSharedPluginState.typeAheadState;
+    isContentNodeEmpty = _ref.isContentNodeEmpty,
+    api = _ref.api,
+    getPos = _ref.getPos,
+    editorView = _ref.editorView;
+  var _useSharedPluginState = useSharedPluginState(api, ['taskDecision']),
+    taskDecisionState = _useSharedPluginState.taskDecisionState;
+  var isFocused = Boolean((taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.focusedTaskItemLocalId) === localId);
+  var showPlaceholder = useShowPlaceholder({
+    editorView: editorView,
+    isContentNodeEmpty: isContentNodeEmpty,
+    getPos: getPos,
+    api: api
+  });
   return /*#__PURE__*/React.createElement(TaskItem, {
     taskId: localId,
     contentRef: forwardRef,
     isDone: isDone,
     onChange: onChange,
     isFocused: isFocused,
-    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen),
+    showPlaceholder: showPlaceholder,
     providers: providerFactory
   });
 };
@@ -144,7 +148,6 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(props, forwardRef) {
-      var _this2 = this;
       var _this$node$attrs = this.node.attrs,
         localId = _this$node$attrs.localId,
         state = _this$node$attrs.state;
@@ -152,23 +155,19 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
       return /*#__PURE__*/React.createElement(AnalyticsListener, {
         channel: "fabric-elements",
         onEvent: this.addListAnalyticsData
-      }, /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          taskDecisionPlugin: taskPluginKey
-        },
-        render: function render(_ref2) {
-          var taskDecisionPlugin = _ref2.taskDecisionPlugin;
-          return /*#__PURE__*/React.createElement(TaskItemWrapper, {
-            localId: localId,
-            forwardRef: forwardRef,
-            isDone: state === 'DONE',
-            onChange: _this2.handleOnChange,
-            isFocused: Boolean((taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId),
-            isContentNodeEmpty: isContentNodeEmpty,
-            providerFactory: props.providerFactory,
-            api: _this2.api
-          });
-        }
+      }, /*#__PURE__*/React.createElement(TaskItemWrapper, {
+        localId: localId,
+        forwardRef: forwardRef,
+        isDone: state === 'DONE',
+        onChange: this.handleOnChange,
+        isContentNodeEmpty: isContentNodeEmpty,
+        providerFactory: props.providerFactory
+        // The getPosHandler type is wrong, there is no `boolean` in the real implementation
+        // @ts-expect-error 2322: Type 'getPosHandler' is not assignable to type '() => number | undefined'.
+        ,
+        getPos: this.getPos,
+        editorView: this.view,
+        api: this.api
       }));
     }
   }, {
@@ -184,11 +183,11 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "update",
     value: function update(node, decorations) {
-      var _this3 = this;
+      var _this2 = this;
       return _get(_getPrototypeOf(Task.prototype), "update", this).call(this, node, decorations, undefined, function (currentNode, newNode) {
         return (
           // Toggle the placeholder based on whether user input exists
-          !_this3.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
+          !_this2.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
         );
       });
     }

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.0.9";
+export var version = "189.0.10";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/tasks-and-decisions/nodeviews/hooks/use-show-placeholder.d.ts

@@ -0,0 +1,11 @@
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { TaskAndDecisionsPlugin } from '../../types';
+type Props2 = {
+    editorView: EditorView;
+    api: ExtractInjectionAPI<TaskAndDecisionsPlugin> | undefined;
+    getPos: () => number | undefined;
+    isContentNodeEmpty: boolean;
+};
+export declare const useShowPlaceholder: ({ editorView, api, isContentNodeEmpty, getPos, }: Props2) => boolean;
+export {};

package/dist/types/plugins/tasks-and-decisions/types.d.ts

@@ -26,8 +26,12 @@ export interface TaskDecisionPluginOptions extends LongPressSelectionPluginOptio
     allowNestedTasks?: boolean;
     consumeTabs?: boolean;
 }
+export type TaskAndDecisionsSharedState = {
+    focusedTaskItemLocalId: string | null;
+};
 export type TaskAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     pluginConfiguration: TaskDecisionPluginOptions | undefined;
+    sharedState: TaskAndDecisionsSharedState | undefined;
     dependencies: [
         OptionalPlugin<TypeAheadPlugin>,
         OptionalPlugin<AnalyticsPlugin>

package/dist/types-ts4.5/plugins/tasks-and-decisions/nodeviews/hooks/use-show-placeholder.d.ts

@@ -0,0 +1,11 @@
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { TaskAndDecisionsPlugin } from '../../types';
+type Props2 = {
+    editorView: EditorView;
+    api: ExtractInjectionAPI<TaskAndDecisionsPlugin> | undefined;
+    getPos: () => number | undefined;
+    isContentNodeEmpty: boolean;
+};
+export declare const useShowPlaceholder: ({ editorView, api, isContentNodeEmpty, getPos, }: Props2) => boolean;
+export {};

package/dist/types-ts4.5/plugins/tasks-and-decisions/types.d.ts

@@ -26,8 +26,12 @@ export interface TaskDecisionPluginOptions extends LongPressSelectionPluginOptio
     allowNestedTasks?: boolean;
     consumeTabs?: boolean;
 }
+export type TaskAndDecisionsSharedState = {
+    focusedTaskItemLocalId: string | null;
+};
 export type TaskAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     pluginConfiguration: TaskDecisionPluginOptions | undefined;
+    sharedState: TaskAndDecisionsSharedState | undefined;
     dependencies: [
         OptionalPlugin<TypeAheadPlugin>,
         OptionalPlugin<AnalyticsPlugin>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.0.9",
+  "version": "189.0.10",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"