@atlaskit/editor-plugin-tasks-and-decisions 2.0.0 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 2.1.1
+
+### Patch Changes
+
+- [#120417](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/120417)
+  [`f0b8c2371f9a2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f0b8c2371f9a2) -
+  [ux] Fixing tasks and decisions to stop them infinitely re-rendering in React 18 when using
+  createRoot.
+- Updated dependencies
+
+## 2.1.0
+
+### Minor Changes
+
+- [#119966](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119966)
+  [`596ad24e38929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/596ad24e38929) -
+  Clean up typescript references to LegacyPortalProviderAPI
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.0.0
 
 ### Major Changes

package/dist/cjs/nodeviews/decisionItem.js

@@ -13,6 +13,7 @@ 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _Decision = _interopRequireDefault(require("../ui/Decision"));
 var _useShowPlaceholder = require("./hooks/use-show-placeholder");
 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); }; }
@@ -106,12 +107,22 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
         return !_this.isContentEmpty(_newNode);
       });
     }
+  }, {
+    key: "ignoreMutation",
+    value: function ignoreMutation(mutation) {
+      if (!(0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
+        return false;
+      }
+      if (!this.contentDOM) {
+        return true;
+      }
+      return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+    }
   }]);
   return Decision;
 }(_reactNodeView.default);
 var decisionItemNodeView = exports.decisionItemNodeView = function decisionItemNodeView(portalProviderAPI, eventDispatcher, api) {
   return function (node, view, getPos) {
-    var hasIntlContext = true;
-    return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
+    return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}).initWithAPI(api);
   };
 };

package/dist/cjs/nodeviews/taskItem.js

@@ -18,6 +18,7 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _Task = _interopRequireDefault(require("../ui/Task"));
 var _useShowPlaceholder = require("./hooks/use-show-placeholder");
 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; }
@@ -198,14 +199,24 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
         );
       });
     }
+  }, {
+    key: "ignoreMutation",
+    value: function ignoreMutation(mutation) {
+      if (!(0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
+        return false;
+      }
+      if (!this.contentDOM) {
+        return true;
+      }
+      return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+    }
   }]);
   return Task;
 }(_reactNodeView.default);
 function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api) {
   return function (node, view, getPos) {
-    var hasIntlContext = true;
     return new Task(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory
-    }, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
+    }).initWithAPI(api);
   };
 }

package/dist/es2019/nodeviews/decisionItem.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import DecisionItem from '../ui/Decision';
 import { useShowPlaceholder } from './hooks/use-show-placeholder';
 const DecisionItemWrapper = ({
@@ -69,8 +70,16 @@ class Decision extends ReactNodeView {
     // Toggle the placeholder based on whether user input exists.
     (_currentNode, _newNode) => !this.isContentEmpty(_newNode));
   }
+  ignoreMutation(mutation) {
+    if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
+      return false;
+    }
+    if (!this.contentDOM) {
+      return true;
+    }
+    return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+  }
 }
 export const decisionItemNodeView = (portalProviderAPI, eventDispatcher, api) => (node, view, getPos) => {
-  const hasIntlContext = true;
-  return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
+  return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}).initWithAPI(api);
 };

package/dist/es2019/nodeviews/taskItem.js

@@ -4,6 +4,7 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import TaskItem from '../ui/Task';
 import { useShowPlaceholder } from './hooks/use-show-placeholder';
 const TaskItemWrapper = ({
@@ -162,12 +163,20 @@ class Task extends ReactNodeView {
     // Toggle the placeholder based on whether user input exists
     !this.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state));
   }
+  ignoreMutation(mutation) {
+    if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
+      return false;
+    }
+    if (!this.contentDOM) {
+      return true;
+    }
+    return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+  }
 }
 export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api) {
   return (node, view, getPos) => {
-    const hasIntlContext = true;
     return new Task(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory
-    }, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
+    }).initWithAPI(api);
   };
 }

package/dist/esm/nodeviews/decisionItem.js

@@ -8,6 +8,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import DecisionItem from '../ui/Decision';
 import { useShowPlaceholder } from './hooks/use-show-placeholder';
 var DecisionItemWrapper = function DecisionItemWrapper(_ref) {
@@ -99,12 +100,22 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
         return !_this.isContentEmpty(_newNode);
       });
     }
+  }, {
+    key: "ignoreMutation",
+    value: function ignoreMutation(mutation) {
+      if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
+        return false;
+      }
+      if (!this.contentDOM) {
+        return true;
+      }
+      return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+    }
   }]);
   return Decision;
 }(ReactNodeView);
 export var decisionItemNodeView = function decisionItemNodeView(portalProviderAPI, eventDispatcher, api) {
   return function (node, view, getPos) {
-    var hasIntlContext = true;
-    return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
+    return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}).initWithAPI(api);
   };
 };

package/dist/esm/nodeviews/taskItem.js

@@ -15,6 +15,7 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import TaskItem from '../ui/Task';
 import { useShowPlaceholder } from './hooks/use-show-placeholder';
 var TaskItemWrapper = function TaskItemWrapper(_ref) {
@@ -191,14 +192,24 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
         );
       });
     }
+  }, {
+    key: "ignoreMutation",
+    value: function ignoreMutation(mutation) {
+      if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
+        return false;
+      }
+      if (!this.contentDOM) {
+        return true;
+      }
+      return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+    }
   }]);
   return Task;
 }(ReactNodeView);
 export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api) {
   return function (node, view, getPos) {
-    var hasIntlContext = true;
     return new Task(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory
-    }, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
+    }).initWithAPI(api);
   };
 }

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

@@ -1,5 +1,4 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -7,5 +6,5 @@ import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { TasksAndDecisionsPlugin } from '../types';
 type getPosHandler = getPosHandlerNode | boolean;
 type getPosHandlerNode = () => number | undefined;
-export declare const decisionItemNodeView: (portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
+export declare const decisionItemNodeView: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
 export {};

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

@@ -1,5 +1,4 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
@@ -11,5 +10,5 @@ type getPosHandlerNode = () => number | undefined;
 export interface Props {
     providerFactory: ProviderFactory;
 }
-export declare function taskItemNodeViewFactory(portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
+export declare function taskItemNodeViewFactory(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
 export {};

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

@@ -1,8 +1,7 @@
 import type { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 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: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean): SafePlugin<any>;
+export declare function createPlugin(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean): SafePlugin<any>;

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

@@ -1,5 +1,4 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -7,5 +6,5 @@ import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { TasksAndDecisionsPlugin } from '../types';
 type getPosHandler = getPosHandlerNode | boolean;
 type getPosHandlerNode = () => number | undefined;
-export declare const decisionItemNodeView: (portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
+export declare const decisionItemNodeView: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
 export {};

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

@@ -1,5 +1,4 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
@@ -11,5 +10,5 @@ type getPosHandlerNode = () => number | undefined;
 export interface Props {
     providerFactory: ProviderFactory;
 }
-export declare function taskItemNodeViewFactory(portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
+export declare function taskItemNodeViewFactory(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
 export {};

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

@@ -1,8 +1,7 @@
 import type { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 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: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean): SafePlugin<any>;
+export declare function createPlugin(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined, useLongPressSelection?: boolean): SafePlugin<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "2.0.0",
+	"version": "2.1.1",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,12 +36,13 @@
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/editor-common": "^84.0.0",
+		"@atlaskit/editor-common": "^85.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.1.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.4.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
-		"@atlaskit/icon": "^22.5.0",
+		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.1.0",
 		"@atlaskit/task-decision": "^17.10.0",
 		"@babel/runtime": "^7.0.0",
@@ -54,7 +55,6 @@
 	"devDependencies": {
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/util-data-test": "^17.9.0",
 		"@atlaskit/visual-regression": "*",
@@ -96,5 +96,10 @@
 				"import-no-extraneous-disable-for-examples-and-docs"
 			]
 		}
+	},
+	"platform-feature-flags": {
+		"react_18_tasks_and_decisions_concurrent_mode": {
+			"type": "boolean"
+		}
 	}
 }