@atlaskit/editor-plugin-tasks-and-decisions 2.1.2 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 2.2.0
+
+### Minor Changes
+
+- [#122895](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122895)
+  [`49b8c7658f3b5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/49b8c7658f3b5) -
+  [ED-24173] bump @atlaskit/adf-schema to 40.3.0 and @atlassian/adf-schema-json to 1.18.0
+
+### Patch Changes
+
+- [#122776](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122776)
+  [`6ccf1a43db89a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6ccf1a43db89a) -
+  Fix tasks and decisions placeholder not disappearing when using type-ahead on React 18.
+- Updated dependencies
+
 ## 2.1.2
 
 ### Patch Changes

package/dist/cjs/nodeviews/decisionItem.js

@@ -92,20 +92,27 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
     value: function viewShouldUpdate(nextNode) {
       /**
        * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion.
-       * Note: last character deletion is handled externally and automatically re-renders.
+       * on first character insertion or when the last character is deleted.
        */
-      return this.isContentEmpty(this.node) && !!nextNode.content.childCount;
+      if ((0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
+      } else {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode);
+      }
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
       var _this = this;
-      return (0, _get2.default)((0, _getPrototypeOf2.default)(Decision.prototype), "update", this).call(this, node, decorations, undefined,
-      // Toggle the placeholder based on whether user input exists.
-      function (_currentNode, _newNode) {
-        return !_this.isContentEmpty(_newNode);
-      });
+      if ((0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
+        return (0, _get2.default)((0, _getPrototypeOf2.default)(Decision.prototype), "update", this).call(this, node, decorations);
+      } else {
+        return (0, _get2.default)((0, _getPrototypeOf2.default)(Decision.prototype), "update", this).call(this, node, decorations, undefined,
+        // Toggle the placeholder based on whether user input exists.
+        function (_currentNode, _newNode) {
+          return !_this.isContentEmpty(_newNode);
+        });
+      }
     }
   }, {
     key: "ignoreMutation",

package/dist/cjs/nodeviews/taskItem.js

@@ -183,21 +183,30 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
     value: function viewShouldUpdate(nextNode) {
       /**
        * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion.
-       * Note: last character deletion is handled externally and automatically re-renders.
+       * on first character insertion or when the last character is deleted.
        */
-      return this.isContentEmpty(this.node) && !!nextNode.content.childCount;
+      if ((0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
+      } else {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode);
+      }
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
       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
-          !_this2.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
-        );
-      });
+      if ((0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
+        return (0, _get2.default)((0, _getPrototypeOf2.default)(Task.prototype), "update", this).call(this, node, decorations, undefined, function (currentNode, newNode) {
+          return !!(currentNode.attrs.state === newNode.attrs.state);
+        });
+      } else {
+        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
+            !_this2.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
+          );
+        });
+      }
     }
   }, {
     key: "ignoreMutation",

package/dist/cjs/plugin.js

@@ -22,7 +22,10 @@ var _ToolbarDecision = _interopRequireDefault(require("./ui/ToolbarDecision"));
 var _ToolbarTask = _interopRequireDefault(require("./ui/ToolbarTask"));
 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 && Object.prototype.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; }
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 var taskDecisionToolbarGroupStyles = (0, _react.css)({

package/dist/es2019/nodeviews/decisionItem.js

@@ -60,15 +60,22 @@ class Decision extends ReactNodeView {
   viewShouldUpdate(nextNode) {
     /**
      * To ensure the placeholder is correctly toggled we need to allow react to re-render
-     * on first character insertion.
-     * Note: last character deletion is handled externally and automatically re-renders.
+     * on first character insertion or when the last character is deleted.
      */
-    return this.isContentEmpty(this.node) && !!nextNode.content.childCount;
+    if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
+    } else {
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode);
+    }
   }
   update(node, decorations) {
-    return super.update(node, decorations, undefined,
-    // Toggle the placeholder based on whether user input exists.
-    (_currentNode, _newNode) => !this.isContentEmpty(_newNode));
+    if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+      return super.update(node, decorations);
+    } else {
+      return super.update(node, decorations, undefined,
+      // 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')) {

package/dist/es2019/nodeviews/taskItem.js

@@ -153,15 +153,22 @@ class Task extends ReactNodeView {
   viewShouldUpdate(nextNode) {
     /**
      * To ensure the placeholder is correctly toggled we need to allow react to re-render
-     * on first character insertion.
-     * Note: last character deletion is handled externally and automatically re-renders.
+     * on first character insertion or when the last character is deleted.
      */
-    return this.isContentEmpty(this.node) && !!nextNode.content.childCount;
+    if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
+    } else {
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode);
+    }
   }
   update(node, decorations) {
-    return super.update(node, decorations, undefined, (currentNode, newNode) =>
-    // Toggle the placeholder based on whether user input exists
-    !this.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state));
+    if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+      return super.update(node, decorations, undefined, (currentNode, newNode) => !!(currentNode.attrs.state === newNode.attrs.state));
+    } else {
+      return super.update(node, decorations, undefined, (currentNode, newNode) =>
+      // 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')) {

package/dist/es2019/plugin.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { decisionItem, decisionList, taskItem, taskList } from '@atlaskit/adf-schema';

package/dist/esm/nodeviews/decisionItem.js

@@ -85,20 +85,27 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
     value: function viewShouldUpdate(nextNode) {
       /**
        * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion.
-       * Note: last character deletion is handled externally and automatically re-renders.
+       * on first character insertion or when the last character is deleted.
        */
-      return this.isContentEmpty(this.node) && !!nextNode.content.childCount;
+      if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
+      } else {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode);
+      }
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
       var _this = this;
-      return _get(_getPrototypeOf(Decision.prototype), "update", this).call(this, node, decorations, undefined,
-      // Toggle the placeholder based on whether user input exists.
-      function (_currentNode, _newNode) {
-        return !_this.isContentEmpty(_newNode);
-      });
+      if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+        return _get(_getPrototypeOf(Decision.prototype), "update", this).call(this, node, decorations);
+      } else {
+        return _get(_getPrototypeOf(Decision.prototype), "update", this).call(this, node, decorations, undefined,
+        // Toggle the placeholder based on whether user input exists.
+        function (_currentNode, _newNode) {
+          return !_this.isContentEmpty(_newNode);
+        });
+      }
     }
   }, {
     key: "ignoreMutation",

package/dist/esm/nodeviews/taskItem.js

@@ -176,21 +176,30 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
     value: function viewShouldUpdate(nextNode) {
       /**
        * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion.
-       * Note: last character deletion is handled externally and automatically re-renders.
+       * on first character insertion or when the last character is deleted.
        */
-      return this.isContentEmpty(this.node) && !!nextNode.content.childCount;
+      if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
+      } else {
+        return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode);
+      }
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
       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
-          !_this2.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
-        );
-      });
+      if (fg('react_18_tasks_and_decisions_concurrent_mode')) {
+        return _get(_getPrototypeOf(Task.prototype), "update", this).call(this, node, decorations, undefined, function (currentNode, newNode) {
+          return !!(currentNode.attrs.state === newNode.attrs.state);
+        });
+      } else {
+        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
+            !_this2.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state)
+          );
+        });
+      }
     }
   }, {
     key: "ignoreMutation",

package/dist/esm/plugin.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { decisionItem, decisionList, taskItem, taskList } from '@atlaskit/adf-schema';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "2.1.2",
+	"version": "2.2.0",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,15 +33,15 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^39.0.3",
+		"@atlaskit/adf-schema": "^40.3.0",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/editor-common": "^86.0.0",
-		"@atlaskit/editor-plugin-analytics": "^1.4.0",
+		"@atlaskit/editor-common": "^86.7.0",
+		"@atlaskit/editor-plugin-analytics": "^1.5.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.1.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.4.0",
+		"@atlaskit/editor-plugin-type-ahead": "^1.5.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
-		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/icon": "^22.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.1.0",
 		"@atlaskit/task-decision": "^17.10.0",