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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 2.9.0
+
+### Minor Changes
+
+- [#137506](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137506)
+  [`75c4ebf9d7515`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/75c4ebf9d7515) -
+  Pass TaskDecisionProvider via preset
+
+### Patch Changes
+
+- Updated dependencies
+
+## 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/commands.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSupportedSourceNode = exports.insertTaskDecisionWithAnalytics = exports.insertTaskDecisionCommand = exports.insertTaskDecisionAction = exports.getListTypes = exports.createListAtSelection = exports.changeInDepth = void 0;
+exports.setProvider = exports.isSupportedSourceNode = exports.insertTaskDecisionWithAnalytics = exports.insertTaskDecisionCommand = exports.insertTaskDecisionAction = exports.getListTypes = exports.createListAtSelection = exports.changeInDepth = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -14,6 +14,8 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _pluginKey = require("./pm-plugins/plugin-key");
+var _types = require("./pm-plugins/types");
 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; }
 var getContextData = function getContextData() {
@@ -285,4 +287,12 @@ var createListAtSelection = exports.createListAtSelection = function createListA
     }
   }
   return (0, _utils2.safeInsert)(emptyList)(tr);
+};
+var setProvider = exports.setProvider = function setProvider(provider) {
+  return function (tr) {
+    return tr.setMeta(_pluginKey.stateKey, {
+      action: _types.ACTIONS.SET_PROVIDER,
+      data: provider
+    });
+  };
 };

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') {
@@ -166,7 +186,8 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
       onChange: onChange,
       isFocused: isFocused,
       showPlaceholder: showPlaceholder,
-      providers: providerFactory
+      providers: providerFactory,
+      api: api
     });
   }
   return /*#__PURE__*/_react.default.createElement(_popup.default, {
@@ -185,7 +206,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);
@@ -212,7 +233,8 @@ var TaskItemWrapper = function TaskItemWrapper(_ref2) {
         isFocused: isFocused,
         showPlaceholder: showPlaceholder,
         providers: providerFactory,
-        disableOnChange: !(api !== null && api !== void 0 && (_api$taskDecision3 = api.taskDecision) !== null && _api$taskDecision3 !== void 0 && (_api$taskDecision3 = _api$taskDecision3.sharedState.currentState()) !== null && _api$taskDecision3 !== void 0 && _api$taskDecision3.hasEditPermission)
+        disableOnChange: !(api !== null && api !== void 0 && (_api$taskDecision3 = api.taskDecision) !== null && _api$taskDecision3 !== void 0 && (_api$taskDecision3 = _api$taskDecision3.sharedState.currentState()) !== null && _api$taskDecision3 !== void 0 && _api$taskDecision3.hasEditPermission),
+        api: api
       });
     },
     placement: 'bottom-start'

package/dist/cjs/plugin.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tasksAndDecisionsPlugin = exports.taskItemSpecWithFixedToDOM = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -15,6 +17,7 @@ var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _styles = require("@atlaskit/editor-common/styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
 var _helpers = require("./pm-plugins/helpers");
@@ -121,12 +124,25 @@ 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,
+    taskDecisionProvider = _ref2$config2.taskDecisionProvider,
     api = _ref2.api;
   var getIdentifierProvider = function getIdentifierProvider() {
     var _api$contextIdentifie;
     return api === null || api === void 0 || (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 || (_api$contextIdentifie = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie === void 0 ? void 0 : _api$contextIdentifie.contextIdentifierProvider;
   };
+  var previousTaskAndDecisionProvider;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_td_provider_from_plugin_config')) {
+    if (taskDecisionProvider) {
+      taskDecisionProvider.then(function (provider) {
+        api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
+          var tr = _ref3.tr;
+          return (0, _commands.setProvider)(provider)(tr);
+        });
+      });
+    }
+  }
   return {
     name: 'taskDecision',
     nodes: function nodes() {
@@ -157,54 +173,97 @@ 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,
+        taskDecisionProvider: pluginState === null || pluginState === void 0 ? void 0 : pluginState.taskDecisionProvider
       };
     },
     commands: {
       updateEditPermission: function updateEditPermission(hasEditPermission) {
-        return function (_ref3) {
-          var tr = _ref3.tr;
+        return function (_ref4) {
+          var tr = _ref4.tr;
           return tr.setMeta(_pluginKey.stateKey, {
             hasEditPermission: hasEditPermission
           });
         };
+      },
+      updateHasRequestedEditPermission: function updateHasRequestedEditPermission(hasRequestedEditPermission) {
+        return function (_ref5) {
+          var tr = _ref5.tr;
+          return tr.setMeta(_pluginKey.stateKey, {
+            hasRequestedEditPermission: hasRequestedEditPermission
+          });
+        };
       }
     },
     actions: {
       insertTaskDecision: (0, _commands.insertTaskDecisionCommand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, getIdentifierProvider),
       indentTaskList: (0, _keymaps.getIndentCommand)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
-      outdentTaskList: (0, _keymaps.getUnindentCommand)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)
+      outdentTaskList: (0, _keymaps.getUnindentCommand)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
+      setProvider: function () {
+        var _setProvider2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(providerPromise) {
+          var _api$core$actions$exe;
+          var provider;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return providerPromise;
+              case 2:
+                provider = _context.sent;
+                if (!(previousTaskAndDecisionProvider === provider || taskDecisionProvider === providerPromise)) {
+                  _context.next = 5;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 5:
+                previousTaskAndDecisionProvider = provider;
+                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref6) {
+                  var tr = _ref6.tr;
+                  return (0, _commands.setProvider)(provider)(tr);
+                })) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false);
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function setProvider(_x) {
+          return _setProvider2.apply(this, arguments);
+        }
+        return setProvider;
+      }()
     },
     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(_ref7) {
+          var portalProviderAPI = _ref7.portalProviderAPI,
+            providerFactory = _ref7.providerFactory,
+            eventDispatcher = _ref7.eventDispatcher,
+            dispatch = _ref7.dispatch;
+          return (0, _main.createPlugin)(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection, hasEditPermission, hasRequestedEditPermission, requestToEditContent);
         }
       }, {
         name: 'tasksAndDecisionsInputRule',
-        plugin: function plugin(_ref5) {
+        plugin: function plugin(_ref8) {
           var _api$analytics4;
-          var schema = _ref5.schema,
-            featureFlags = _ref5.featureFlags;
+          var schema = _ref8.schema,
+            featureFlags = _ref8.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(_ref9) {
+          var schema = _ref9.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(_ref10) {
+      var editorView = _ref10.editorView,
+        disabled = _ref10.disabled;
       return (0, _react.jsx)("div", {
         css: taskDecisionToolbarGroupStyles
       }, (0, _react.jsx)(_ToolbarDecision.default, {
@@ -220,8 +279,8 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
       }));
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref8) {
-        var formatMessage = _ref8.formatMessage;
+      quickInsert: function quickInsert(_ref11) {
+        var formatMessage = _ref11.formatMessage;
         return [{
           id: 'action',
           title: formatMessage(_messages.toolbarInsertBlockMessages.action),

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

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setProvider = exports.focusTaskDecision = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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; }
+var focusTaskDecision = exports.focusTaskDecision = function focusTaskDecision(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    focusedTaskItemLocalId: action.data
+  });
+};
+var setProvider = exports.setProvider = function setProvider(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    taskDecisionProvider: action.data
+  });
+};

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

@@ -16,6 +16,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _decisionLazyNodeView = require("../nodeviews/decision-lazy-node-view");
 var _taskLazyNodeView = require("../nodeviews/task-lazy-node-view");
+var _actions = require("./actions");
 var _helpers = require("./helpers");
 var _pluginKey = require("./plugin-key");
 var _types = require("./types");
@@ -32,7 +33,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,12 +171,15 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
         return {
           insideTaskDecisionItem: false,
           hasEditPermission: hasEditPermission,
-          requestToEditContent: requestToEditContent
+          hasRequestedEditPermission: hasRequestedEditPermission,
+          requestToEditContent: requestToEditContent,
+          focusedTaskItemLocalId: null,
+          taskDecisionProvider: undefined
         };
       },
       apply: function apply(tr, pluginState) {
         var metaData = tr.getMeta(_pluginKey.stateKey);
-        var _ref = metaData || {
+        var _ref = metaData !== null && metaData !== void 0 ? metaData : {
             action: null,
             data: null
           },
@@ -185,8 +190,15 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
         // Actions
         switch (action) {
           case _types.ACTIONS.FOCUS_BY_LOCALID:
-            newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
-              focusedTaskItemLocalId: data
+            newPluginState = (0, _actions.focusTaskDecision)(newPluginState, {
+              action: _types.ACTIONS.FOCUS_BY_LOCALID,
+              data: data
+            });
+            break;
+          case _types.ACTIONS.SET_PROVIDER:
+            newPluginState = (0, _actions.setProvider)(newPluginState, {
+              action: _types.ACTIONS.SET_PROVIDER,
+              data: data
             });
             break;
         }
@@ -197,6 +209,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/cjs/pm-plugins/types.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ACTIONS = void 0;
 var ACTIONS = exports.ACTIONS = /*#__PURE__*/function (ACTIONS) {
-  ACTIONS[ACTIONS["FOCUS_BY_LOCALID"] = 0] = "FOCUS_BY_LOCALID";
+  ACTIONS[ACTIONS["SET_PROVIDER"] = 0] = "SET_PROVIDER";
+  ACTIONS[ACTIONS["FOCUS_BY_LOCALID"] = 1] = "FOCUS_BY_LOCALID";
   return ACTIONS;
-}({});
+}({}); // actions
+// commands

package/dist/cjs/ui/Task/index.js

@@ -17,10 +17,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _providerFactory2 = require("@atlaskit/editor-common/provider-factory");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _taskItemWithProviders = _interopRequireDefault(require("./task-item-with-providers"));
-var _excluded = ["providers", "intl"];
+var _excluded = ["providers", "intl", "api"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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); }; }
@@ -37,13 +39,20 @@ var TaskItem = exports.TaskItem = /*#__PURE__*/function (_PureComponent) {
       var _this$props = _this.props,
         _providerFactory = _this$props.providers,
         formatMessage = _this$props.intl.formatMessage,
+        api = _this$props.api,
         otherProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
-      var taskDecisionProvider = providers.taskDecisionProvider,
-        contextIdentifierProvider = providers.contextIdentifierProvider;
+      var contextIdentifierProvider = providers.contextIdentifierProvider;
       var placeholder = formatMessage(_messages.tasksAndDecisionsMessages.taskPlaceholder);
+      var getTaskDecisionProvider = function getTaskDecisionProvider() {
+        if ((0, _platformFeatureFlags.fg)('platform_editor_td_provider_from_plugin_config')) {
+          var _this$props$taskDecis;
+          return (_this$props$taskDecis = _this.props.taskDecisionState) !== null && _this$props$taskDecis !== void 0 && _this$props$taskDecis.taskDecisionProvider ? Promise.resolve(_this.props.taskDecisionState.taskDecisionProvider) : undefined;
+        }
+        return providers.taskDecisionProvider;
+      };
       return /*#__PURE__*/_react.default.createElement(_taskItemWithProviders.default, (0, _extends2.default)({}, otherProps, {
         placeholder: placeholder,
-        taskDecisionProvider: taskDecisionProvider,
+        taskDecisionProvider: getTaskDecisionProvider(),
         contextIdentifierProvider: contextIdentifierProvider
       }));
     });
@@ -62,8 +71,12 @@ var TaskItem = exports.TaskItem = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "render",
     value: function render() {
+      var providers = ['contextIdentifierProvider'];
+      if (!(0, _platformFeatureFlags.fg)('platform_editor_td_provider_from_plugin_config')) {
+        providers.push('taskDecisionProvider');
+      }
       return /*#__PURE__*/_react.default.createElement(_providerFactory2.WithProviders, {
-        providers: ['taskDecisionProvider', 'contextIdentifierProvider'],
+        providers: providers,
         providerFactory: this.providerFactory,
         renderNode: this.renderWithProvider
       });
@@ -72,4 +85,11 @@ var TaskItem = exports.TaskItem = /*#__PURE__*/function (_PureComponent) {
   return TaskItem;
 }(_react.PureComponent);
 (0, _defineProperty2.default)(TaskItem, "displayName", 'TaskItem');
-var _default = exports.default = (0, _reactIntlNext.injectIntl)(TaskItem);
+var TaskItemWrapper = function TaskItemWrapper(props) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(props.api, ['taskDecision']),
+    taskDecisionState = _useSharedPluginState.taskDecisionState;
+  return /*#__PURE__*/_react.default.createElement(TaskItem, (0, _extends2.default)({
+    taskDecisionState: taskDecisionState
+  }, props));
+};
+var _default = exports.default = (0, _reactIntlNext.injectIntl)(TaskItemWrapper);

package/dist/es2019/commands.js

@@ -6,6 +6,8 @@ import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType, hasParentNodeOfType, replaceParentNodeOfType, safeInsert, setTextSelection } from '@atlaskit/editor-prosemirror/utils';
+import { stateKey } from './pm-plugins/plugin-key';
+import { ACTIONS } from './pm-plugins/types';
 const getContextData = (contextProvider = {}) => {
   const {
     objectId,
@@ -276,4 +278,10 @@ export const createListAtSelection = (tr, list, item, schema, state, listLocalId
     }
   }
   return safeInsert(emptyList)(tr);
+};
+export const setProvider = provider => tr => {
+  return tr.setMeta(stateKey, {
+    action: ACTIONS.SET_PROVIDER,
+    data: provider
+  });
 };

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;
@@ -146,7 +161,8 @@ const TaskItemWrapper = ({
       onChange: onChange,
       isFocused: isFocused,
       showPlaceholder: showPlaceholder,
-      providers: providerFactory
+      providers: providerFactory,
+      api: api
     });
   }
   return /*#__PURE__*/React.createElement(Popup, {
@@ -165,7 +181,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);
@@ -192,7 +208,8 @@ const TaskItemWrapper = ({
         isFocused: isFocused,
         showPlaceholder: showPlaceholder,
         providers: providerFactory,
-        disableOnChange: !(api !== null && api !== void 0 && (_api$taskDecision3 = api.taskDecision) !== null && _api$taskDecision3 !== void 0 && (_api$taskDecision3$sh = _api$taskDecision3.sharedState.currentState()) !== null && _api$taskDecision3$sh !== void 0 && _api$taskDecision3$sh.hasEditPermission)
+        disableOnChange: !(api !== null && api !== void 0 && (_api$taskDecision3 = api.taskDecision) !== null && _api$taskDecision3 !== void 0 && (_api$taskDecision3$sh = _api$taskDecision3.sharedState.currentState()) !== null && _api$taskDecision3$sh !== void 0 && _api$taskDecision3$sh.hasEditPermission),
+        api: api
       });
     },
     placement: 'bottom-start'