@atlaskit/editor-plugin-tasks-and-decisions 2.7.7 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 2.8.0
+
+### Minor Changes
+
+- [#148391](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/148391)
+  [`3588af87c8dc3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3588af87c8dc3) -
+  [ux] ED-24964 Sync up request to edit between plugin and confluence
+
 ## 2.7.7
 
 ### Patch Changes

package/dist/cjs/nodeviews/taskItem.js

@@ -36,6 +36,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+var TRYING_REQUEST_TIMEOUT = 3000;
 var wrapperStyles = (0, _primitives.xcss)({
   display: 'flex',
   flexDirection: 'column',
@@ -116,12 +117,31 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOpen = _useState2[0],
     setIsOpen = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)(taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     requested = _useState4[0],
     setRequested = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    tryingRequest = _useState6[0],
+    setTryingRequest = _useState6[1];
   var _useIntl3 = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl3.formatMessage;
+  (0, _react.useEffect)(function () {
+    if ((0, _platformFeatureFlags.fg)('editor_request_to_edit_task')) {
+      setRequested(taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission);
+    }
+  }, [taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission]);
+  (0, _react.useEffect)(function () {
+    if (!tryingRequest && (0, _platformFeatureFlags.fg)('editor_request_to_edit_task')) {
+      var timout = setTimeout(function () {
+        setTryingRequest(false);
+      }, TRYING_REQUEST_TIMEOUT);
+      return function () {
+        return clearTimeout(timout);
+      };
+    }
+  }, [tryingRequest]);
   var showPlaceholder = (0, _useShowPlaceholder.useShowPlaceholder)({
     editorView: editorView,
     isContentNodeEmpty: isContentNodeEmpty,
@@ -131,7 +151,7 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
   var onHandleEdit = function onHandleEdit(editorAnalyticsAPI) {
     if ((0, _platformFeatureFlags.fg)('editor_request_to_edit_task')) {
       var _api$taskDecision;
-      setRequested(true);
+      setTryingRequest(true);
       var tr = editorView.state.tr;
       var nodePos = getPos();
       if (typeof nodePos !== 'number') {
@@ -185,7 +205,7 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
         size: "xsmall"
       }, formatMessage(_messages.tasksAndDecisionsMessages.editAccessTitle)), /*#__PURE__*/_react.default.createElement("div", null, formatMessage(_messages.tasksAndDecisionsMessages.requestToEditDescription)), /*#__PURE__*/_react.default.createElement(_primitives.Box, {
         xcss: wrapperBoxStyles
-      }, requested ? /*#__PURE__*/_react.default.createElement(RequestedMessage, null) : /*#__PURE__*/_react.default.createElement(RequestToEditButton, {
+      }, tryingRequest || requested ? /*#__PURE__*/_react.default.createElement(RequestedMessage, null) : /*#__PURE__*/_react.default.createElement(RequestToEditButton, {
         onClick: (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view' ? function () {
           var _api$analytics2;
           return onHandleEdit(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);

package/dist/cjs/plugin.js

@@ -121,6 +121,7 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
     consumeTabs = _ref2$config2.consumeTabs,
     useLongPressSelection = _ref2$config2.useLongPressSelection,
     hasEditPermission = _ref2$config2.hasEditPermission,
+    hasRequestedEditPermission = _ref2$config2.hasRequestedEditPermission,
     requestToEditContent = _ref2$config2.requestToEditContent,
     api = _ref2.api;
   var getIdentifierProvider = function getIdentifierProvider() {
@@ -157,7 +158,8 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
         indentDisabled: itemIndex === 0 || indentLevel >= _indentation.MAX_INDENTATION_LEVEL,
         outdentDisabled: indentLevel <= 1,
         hasEditPermission: pluginState === null || pluginState === void 0 ? void 0 : pluginState.hasEditPermission,
-        requestToEditContent: pluginState === null || pluginState === void 0 ? void 0 : pluginState.requestToEditContent
+        requestToEditContent: pluginState === null || pluginState === void 0 ? void 0 : pluginState.requestToEditContent,
+        hasRequestedEditPermission: pluginState === null || pluginState === void 0 ? void 0 : pluginState.hasRequestedEditPermission
       };
     },
     commands: {
@@ -168,6 +170,14 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
             hasEditPermission: hasEditPermission
           });
         };
+      },
+      updateHasRequestedEditPermission: function updateHasRequestedEditPermission(hasRequestedEditPermission) {
+        return function (_ref4) {
+          var tr = _ref4.tr;
+          return tr.setMeta(_pluginKey.stateKey, {
+            hasRequestedEditPermission: hasRequestedEditPermission
+          });
+        };
       }
     },
     actions: {
@@ -178,33 +188,33 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
     pmPlugins: function pmPlugins() {
       return [{
         name: 'tasksAndDecisions',
-        plugin: function plugin(_ref4) {
-          var portalProviderAPI = _ref4.portalProviderAPI,
-            providerFactory = _ref4.providerFactory,
-            eventDispatcher = _ref4.eventDispatcher,
-            dispatch = _ref4.dispatch;
-          return (0, _main.createPlugin)(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, requestToEditContent);
+        plugin: function plugin(_ref5) {
+          var portalProviderAPI = _ref5.portalProviderAPI,
+            providerFactory = _ref5.providerFactory,
+            eventDispatcher = _ref5.eventDispatcher,
+            dispatch = _ref5.dispatch;
+          return (0, _main.createPlugin)(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, hasRequestedEditPermission, requestToEditContent);
         }
       }, {
         name: 'tasksAndDecisionsInputRule',
-        plugin: function plugin(_ref5) {
+        plugin: function plugin(_ref6) {
           var _api$analytics4;
-          var schema = _ref5.schema,
-            featureFlags = _ref5.featureFlags;
+          var schema = _ref6.schema,
+            featureFlags = _ref6.featureFlags;
           return (0, _inputRules.default)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getIdentifierProvider)(schema, featureFlags);
         }
       }, {
         name: 'tasksAndDecisionsKeyMap',
-        plugin: function plugin(_ref6) {
-          var schema = _ref6.schema;
+        plugin: function plugin(_ref7) {
+          var schema = _ref7.schema;
           return (0, _keymaps.default)(schema, api, allowNestedTasks, consumeTabs);
         }
       } // Needs to be after "save-on-enter"
       ];
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref7) {
-      var editorView = _ref7.editorView,
-        disabled = _ref7.disabled;
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref8) {
+      var editorView = _ref8.editorView,
+        disabled = _ref8.disabled;
       return (0, _react.jsx)("div", {
         css: taskDecisionToolbarGroupStyles
       }, (0, _react.jsx)(_ToolbarDecision.default, {
@@ -220,8 +230,8 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
       }));
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref8) {
-        var formatMessage = _ref8.formatMessage;
+      quickInsert: function quickInsert(_ref9) {
+        var formatMessage = _ref9.formatMessage;
         return [{
           id: 'action',
           title: formatMessage(_messages.toolbarInsertBlockMessages.action),

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

@@ -32,7 +32,8 @@ function nodesBetweenChanged(tr, f, startPos) {
 function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api) {
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var hasEditPermission = arguments.length > 6 ? arguments[6] : undefined;
-  var requestToEditContent = arguments.length > 7 ? arguments[7] : undefined;
+  var hasRequestedEditPermission = arguments.length > 7 ? arguments[7] : undefined;
+  var requestToEditContent = arguments.length > 8 ? arguments[8] : undefined;
   return new _safePlugin.SafePlugin({
     props: {
       nodeViews: {
@@ -169,6 +170,7 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
         return {
           insideTaskDecisionItem: false,
           hasEditPermission: hasEditPermission,
+          hasRequestedEditPermission: hasRequestedEditPermission,
           requestToEditContent: requestToEditContent
         };
       },
@@ -197,6 +199,11 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
             hasEditPermission: metaData.hasEditPermission
           });
         }
+        if (metaData && 'hasRequestedEditPermission' in metaData && (0, _platformFeatureFlags.fg)('editor_request_to_edit_task')) {
+          newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+            hasRequestedEditPermission: metaData.hasRequestedEditPermission
+          });
+        }
 
         // Dispatch
         dispatch(_pluginKey.stateKey, newPluginState);

package/dist/es2019/nodeviews/taskItem.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
@@ -14,6 +14,7 @@ import Popup from '@atlaskit/popup';
 import { Box, Pressable, Stack, xcss } from '@atlaskit/primitives';
 import TaskItem from '../ui/Task';
 import { useShowPlaceholder } from './hooks/use-show-placeholder';
+const TRYING_REQUEST_TIMEOUT = 3000;
 const wrapperStyles = xcss({
   display: 'flex',
   flexDirection: 'column',
@@ -96,10 +97,24 @@ const TaskItemWrapper = ({
   } = useSharedPluginState(api, ['taskDecision']);
   const isFocused = Boolean((taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.focusedTaskItemLocalId) === localId);
   const [isOpen, setIsOpen] = useState(false);
-  const [requested, setRequested] = useState(false);
+  const [requested, setRequested] = useState(taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission);
+  const [tryingRequest, setTryingRequest] = useState(false);
   const {
     formatMessage
   } = useIntl();
+  useEffect(() => {
+    if (fg('editor_request_to_edit_task')) {
+      setRequested(taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission);
+    }
+  }, [taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission]);
+  useEffect(() => {
+    if (!tryingRequest && fg('editor_request_to_edit_task')) {
+      const timout = setTimeout(() => {
+        setTryingRequest(false);
+      }, TRYING_REQUEST_TIMEOUT);
+      return () => clearTimeout(timout);
+    }
+  }, [tryingRequest]);
   const showPlaceholder = useShowPlaceholder({
     editorView,
     isContentNodeEmpty,
@@ -109,7 +124,7 @@ const TaskItemWrapper = ({
   const onHandleEdit = editorAnalyticsAPI => {
     if (fg('editor_request_to_edit_task')) {
       var _api$taskDecision, _api$taskDecision$sha;
-      setRequested(true);
+      setTryingRequest(true);
       const {
         tr
       } = editorView.state;
@@ -165,7 +180,7 @@ const TaskItemWrapper = ({
         size: "xsmall"
       }, formatMessage(tasksAndDecisionsMessages.editAccessTitle)), /*#__PURE__*/React.createElement("div", null, formatMessage(tasksAndDecisionsMessages.requestToEditDescription)), /*#__PURE__*/React.createElement(Box, {
         xcss: wrapperBoxStyles
-      }, requested ? /*#__PURE__*/React.createElement(RequestedMessage, null) : /*#__PURE__*/React.createElement(RequestToEditButton, {
+      }, tryingRequest || requested ? /*#__PURE__*/React.createElement(RequestedMessage, null) : /*#__PURE__*/React.createElement(RequestToEditButton, {
         onClick: (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : (_api$editorViewMode$s = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode$s === void 0 ? void 0 : _api$editorViewMode$s.mode) === 'view' ? () => {
           var _api$analytics2;
           return onHandleEdit(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);

package/dist/es2019/plugin.js

@@ -110,6 +110,7 @@ export const tasksAndDecisionsPlugin = ({
     consumeTabs,
     useLongPressSelection,
     hasEditPermission,
+    hasRequestedEditPermission,
     requestToEditContent
   } = {},
   api
@@ -149,7 +150,8 @@ export const tasksAndDecisionsPlugin = ({
         indentDisabled: itemIndex === 0 || indentLevel >= MAX_INDENTATION_LEVEL,
         outdentDisabled: indentLevel <= 1,
         hasEditPermission: pluginState === null || pluginState === void 0 ? void 0 : pluginState.hasEditPermission,
-        requestToEditContent: pluginState === null || pluginState === void 0 ? void 0 : pluginState.requestToEditContent
+        requestToEditContent: pluginState === null || pluginState === void 0 ? void 0 : pluginState.requestToEditContent,
+        hasRequestedEditPermission: pluginState === null || pluginState === void 0 ? void 0 : pluginState.hasRequestedEditPermission
       };
     },
     commands: {
@@ -157,6 +159,11 @@ export const tasksAndDecisionsPlugin = ({
         tr
       }) => tr.setMeta(taskPluginKey, {
         hasEditPermission
+      }),
+      updateHasRequestedEditPermission: hasRequestedEditPermission => ({
+        tr
+      }) => tr.setMeta(taskPluginKey, {
+        hasRequestedEditPermission
       })
     },
     actions: {
@@ -173,7 +180,7 @@ export const tasksAndDecisionsPlugin = ({
           eventDispatcher,
           dispatch
         }) => {
-          return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, requestToEditContent);
+          return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, hasRequestedEditPermission, requestToEditContent);
         }
       }, {
         name: 'tasksAndDecisionsInputRule',

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

@@ -17,7 +17,7 @@ function nodesBetweenChanged(tr, f, startPos) {
   }
   tr.doc.nodesBetween(stepRange.from, stepRange.to, f, startPos);
 }
-export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection = false, hasEditPermission, requestToEditContent) {
+export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection = false, hasEditPermission, hasRequestedEditPermission, requestToEditContent) {
   return new SafePlugin({
     props: {
       nodeViews: {
@@ -162,6 +162,7 @@ export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory
         return {
           insideTaskDecisionItem: false,
           hasEditPermission,
+          hasRequestedEditPermission,
           requestToEditContent
         };
       },
@@ -193,6 +194,12 @@ export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory
             hasEditPermission: metaData.hasEditPermission
           };
         }
+        if (metaData && 'hasRequestedEditPermission' in metaData && fg('editor_request_to_edit_task')) {
+          newPluginState = {
+            ...newPluginState,
+            hasRequestedEditPermission: metaData.hasRequestedEditPermission
+          };
+        }
 
         // Dispatch
         dispatch(stateKey, newPluginState);

package/dist/esm/nodeviews/taskItem.js

@@ -11,7 +11,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
@@ -26,6 +26,7 @@ import Popup from '@atlaskit/popup';
 import { Box, Pressable, Stack, xcss } from '@atlaskit/primitives';
 import TaskItem from '../ui/Task';
 import { useShowPlaceholder } from './hooks/use-show-placeholder';
+var TRYING_REQUEST_TIMEOUT = 3000;
 var wrapperStyles = xcss({
   display: 'flex',
   flexDirection: 'column',
@@ -106,12 +107,31 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
     _useState2 = _slicedToArray(_useState, 2),
     isOpen = _useState2[0],
     setIsOpen = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission),
     _useState4 = _slicedToArray(_useState3, 2),
     requested = _useState4[0],
     setRequested = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    tryingRequest = _useState6[0],
+    setTryingRequest = _useState6[1];
   var _useIntl3 = useIntl(),
     formatMessage = _useIntl3.formatMessage;
+  useEffect(function () {
+    if (fg('editor_request_to_edit_task')) {
+      setRequested(taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission);
+    }
+  }, [taskDecisionState === null || taskDecisionState === void 0 ? void 0 : taskDecisionState.hasRequestedEditPermission]);
+  useEffect(function () {
+    if (!tryingRequest && fg('editor_request_to_edit_task')) {
+      var timout = setTimeout(function () {
+        setTryingRequest(false);
+      }, TRYING_REQUEST_TIMEOUT);
+      return function () {
+        return clearTimeout(timout);
+      };
+    }
+  }, [tryingRequest]);
   var showPlaceholder = useShowPlaceholder({
     editorView: editorView,
     isContentNodeEmpty: isContentNodeEmpty,
@@ -121,7 +141,7 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
   var onHandleEdit = function onHandleEdit(editorAnalyticsAPI) {
     if (fg('editor_request_to_edit_task')) {
       var _api$taskDecision;
-      setRequested(true);
+      setTryingRequest(true);
       var tr = editorView.state.tr;
       var nodePos = getPos();
       if (typeof nodePos !== 'number') {
@@ -175,7 +195,7 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
         size: "xsmall"
       }, formatMessage(tasksAndDecisionsMessages.editAccessTitle)), /*#__PURE__*/React.createElement("div", null, formatMessage(tasksAndDecisionsMessages.requestToEditDescription)), /*#__PURE__*/React.createElement(Box, {
         xcss: wrapperBoxStyles
-      }, requested ? /*#__PURE__*/React.createElement(RequestedMessage, null) : /*#__PURE__*/React.createElement(RequestToEditButton, {
+      }, tryingRequest || requested ? /*#__PURE__*/React.createElement(RequestedMessage, null) : /*#__PURE__*/React.createElement(RequestToEditButton, {
         onClick: (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view' ? function () {
           var _api$analytics2;
           return onHandleEdit(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);

package/dist/esm/plugin.js

@@ -113,6 +113,7 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
     consumeTabs = _ref2$config2.consumeTabs,
     useLongPressSelection = _ref2$config2.useLongPressSelection,
     hasEditPermission = _ref2$config2.hasEditPermission,
+    hasRequestedEditPermission = _ref2$config2.hasRequestedEditPermission,
     requestToEditContent = _ref2$config2.requestToEditContent,
     api = _ref2.api;
   var getIdentifierProvider = function getIdentifierProvider() {
@@ -149,7 +150,8 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         indentDisabled: itemIndex === 0 || indentLevel >= MAX_INDENTATION_LEVEL,
         outdentDisabled: indentLevel <= 1,
         hasEditPermission: pluginState === null || pluginState === void 0 ? void 0 : pluginState.hasEditPermission,
-        requestToEditContent: pluginState === null || pluginState === void 0 ? void 0 : pluginState.requestToEditContent
+        requestToEditContent: pluginState === null || pluginState === void 0 ? void 0 : pluginState.requestToEditContent,
+        hasRequestedEditPermission: pluginState === null || pluginState === void 0 ? void 0 : pluginState.hasRequestedEditPermission
       };
     },
     commands: {
@@ -160,6 +162,14 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
             hasEditPermission: hasEditPermission
           });
         };
+      },
+      updateHasRequestedEditPermission: function updateHasRequestedEditPermission(hasRequestedEditPermission) {
+        return function (_ref4) {
+          var tr = _ref4.tr;
+          return tr.setMeta(taskPluginKey, {
+            hasRequestedEditPermission: hasRequestedEditPermission
+          });
+        };
       }
     },
     actions: {
@@ -170,33 +180,33 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'tasksAndDecisions',
-        plugin: function plugin(_ref4) {
-          var portalProviderAPI = _ref4.portalProviderAPI,
-            providerFactory = _ref4.providerFactory,
-            eventDispatcher = _ref4.eventDispatcher,
-            dispatch = _ref4.dispatch;
-          return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, requestToEditContent);
+        plugin: function plugin(_ref5) {
+          var portalProviderAPI = _ref5.portalProviderAPI,
+            providerFactory = _ref5.providerFactory,
+            eventDispatcher = _ref5.eventDispatcher,
+            dispatch = _ref5.dispatch;
+          return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, hasRequestedEditPermission, requestToEditContent);
         }
       }, {
         name: 'tasksAndDecisionsInputRule',
-        plugin: function plugin(_ref5) {
+        plugin: function plugin(_ref6) {
           var _api$analytics4;
-          var schema = _ref5.schema,
-            featureFlags = _ref5.featureFlags;
+          var schema = _ref6.schema,
+            featureFlags = _ref6.featureFlags;
           return inputRulePlugin(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getIdentifierProvider)(schema, featureFlags);
         }
       }, {
         name: 'tasksAndDecisionsKeyMap',
-        plugin: function plugin(_ref6) {
-          var schema = _ref6.schema;
+        plugin: function plugin(_ref7) {
+          var schema = _ref7.schema;
           return keymap(schema, api, allowNestedTasks, consumeTabs);
         }
       } // Needs to be after "save-on-enter"
       ];
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref7) {
-      var editorView = _ref7.editorView,
-        disabled = _ref7.disabled;
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref8) {
+      var editorView = _ref8.editorView,
+        disabled = _ref8.disabled;
       return jsx("div", {
         css: taskDecisionToolbarGroupStyles
       }, jsx(ToolbarDecision, {
@@ -212,8 +222,8 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
       }));
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref8) {
-        var formatMessage = _ref8.formatMessage;
+      quickInsert: function quickInsert(_ref9) {
+        var formatMessage = _ref9.formatMessage;
         return [{
           id: 'action',
           title: formatMessage(insertBlockMessages.action),

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

@@ -25,7 +25,8 @@ function nodesBetweenChanged(tr, f, startPos) {
 export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api) {
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var hasEditPermission = arguments.length > 6 ? arguments[6] : undefined;
-  var requestToEditContent = arguments.length > 7 ? arguments[7] : undefined;
+  var hasRequestedEditPermission = arguments.length > 7 ? arguments[7] : undefined;
+  var requestToEditContent = arguments.length > 8 ? arguments[8] : undefined;
   return new SafePlugin({
     props: {
       nodeViews: {
@@ -162,6 +163,7 @@ export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory
         return {
           insideTaskDecisionItem: false,
           hasEditPermission: hasEditPermission,
+          hasRequestedEditPermission: hasRequestedEditPermission,
           requestToEditContent: requestToEditContent
         };
       },
@@ -190,6 +192,11 @@ export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory
             hasEditPermission: metaData.hasEditPermission
           });
         }
+        if (metaData && 'hasRequestedEditPermission' in metaData && fg('editor_request_to_edit_task')) {
+          newPluginState = _objectSpread(_objectSpread({}, newPluginState), {}, {
+            hasRequestedEditPermission: metaData.hasRequestedEditPermission
+          });
+        }
 
         // Dispatch
         dispatch(stateKey, newPluginState);

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

@@ -4,4 +4,4 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { TasksAndDecisionsPlugin } from '../types';
-export declare function createPlugin(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean, hasEditPermission?: boolean, requestToEditContent?: () => void): SafePlugin<any>;
+export declare function createPlugin(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean, hasEditPermission?: boolean, hasRequestedEditPermission?: boolean, requestToEditContent?: () => void): SafePlugin<any>;

package/dist/types/types.d.ts

@@ -47,6 +47,11 @@ export interface TaskDecisionPluginOptions extends LongPressSelectionPluginOptio
      * @default false
      */
     hasEditPermission?: boolean;
+    /**
+     * Indicates whether the user has requested permission to edit.
+     * @default false
+     */
+    hasRequestedEditPermission?: boolean;
     /**
      * Function to request edit permission.
      */
@@ -58,6 +63,7 @@ export type TaskAndDecisionsSharedState = {
     outdentDisabled: boolean;
     isInsideTask: boolean;
     hasEditPermission?: boolean;
+    hasRequestedEditPermission?: boolean;
     requestToEditContent?: () => void;
 };
 export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
@@ -76,6 +82,7 @@ export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     };
     commands: {
         updateEditPermission: (hasEditPermission: boolean | undefined) => EditorCommand;
+        updateHasRequestedEditPermission: (hasRequestedEditPermission: boolean) => EditorCommand;
     };
 }>;
 export type GetContextIdentifier = () => ContextIdentifierProvider | undefined;

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

@@ -4,4 +4,4 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { TasksAndDecisionsPlugin } from '../types';
-export declare function createPlugin(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean, hasEditPermission?: boolean, requestToEditContent?: () => void): SafePlugin<any>;
+export declare function createPlugin(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean, hasEditPermission?: boolean, hasRequestedEditPermission?: boolean, requestToEditContent?: () => void): SafePlugin<any>;

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

@@ -47,6 +47,11 @@ export interface TaskDecisionPluginOptions extends LongPressSelectionPluginOptio
      * @default false
      */
     hasEditPermission?: boolean;
+    /**
+     * Indicates whether the user has requested permission to edit.
+     * @default false
+     */
+    hasRequestedEditPermission?: boolean;
     /**
      * Function to request edit permission.
      */
@@ -58,6 +63,7 @@ export type TaskAndDecisionsSharedState = {
     outdentDisabled: boolean;
     isInsideTask: boolean;
     hasEditPermission?: boolean;
+    hasRequestedEditPermission?: boolean;
     requestToEditContent?: () => void;
 };
 export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
@@ -76,6 +82,7 @@ export type TasksAndDecisionsPlugin = NextEditorPlugin<'taskDecision', {
     };
     commands: {
         updateEditPermission: (hasEditPermission: boolean | undefined) => EditorCommand;
+        updateHasRequestedEditPermission: (hasRequestedEditPermission: boolean) => EditorCommand;
     };
 }>;
 export type GetContextIdentifier = () => ContextIdentifierProvider | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "2.7.7",
+	"version": "2.8.0",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",