@atlaskit/editor-plugin-tasks-and-decisions 2.3.3 → 2.3.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 2.3.4
+
+### Patch Changes
+
+- [`17f9128c6a629`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/17f9128c6a629) -
+  Cleanup feature flag for tasks and decisions react 18 concurrent mode fix.
+- Updated dependencies
+
 ## 2.3.3
 
 ### Patch Changes

package/dist/cjs/nodeviews/decisionItem.js

@@ -13,7 +13,6 @@ 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); }; }
@@ -90,36 +89,16 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "viewShouldUpdate",
     value: function viewShouldUpdate(nextNode) {
-      /**
-       * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion or when the last character is deleted.
-       */
-      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);
-      }
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
-      var _this = this;
-      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);
-        });
-      }
+      return (0, _get2.default)((0, _getPrototypeOf2.default)(Decision.prototype), "update", this).call(this, node, decorations);
     }
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      if (!(0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
-        return false;
-      }
       if (!this.contentDOM) {
         return true;
       }

package/dist/cjs/nodeviews/taskItem.js

@@ -18,7 +18,6 @@ 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; }
@@ -181,39 +180,18 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "viewShouldUpdate",
     value: function viewShouldUpdate(nextNode) {
-      /**
-       * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion or when the last character is deleted.
-       */
-      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);
-      }
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
-      var _this2 = this;
-      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)
-          );
-        });
-      }
+      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);
+      });
     }
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      if (!(0, _platformFeatureFlags.fg)('react_18_tasks_and_decisions_concurrent_mode')) {
-        return false;
-      }
       if (!this.contentDOM) {
         return true;
       }

package/dist/es2019/nodeviews/decisionItem.js

@@ -1,6 +1,5 @@
 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 = ({
@@ -58,29 +57,12 @@ 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 or when the last character is deleted.
-     */
-    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);
-    }
+    return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
   }
   update(node, decorations) {
-    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));
-    }
+    return super.update(node, decorations);
   }
   ignoreMutation(mutation) {
-    if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
-      return false;
-    }
     if (!this.contentDOM) {
       return true;
     }

package/dist/es2019/nodeviews/taskItem.js

@@ -4,7 +4,6 @@ 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 = ({
@@ -151,29 +150,12 @@ 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 or when the last character is deleted.
-     */
-    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);
-    }
+    return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
   }
   update(node, decorations) {
-    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));
-    }
+    return super.update(node, decorations, undefined, (currentNode, 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;
     }

package/dist/esm/nodeviews/decisionItem.js

@@ -8,7 +8,6 @@ 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) {
@@ -83,36 +82,16 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "viewShouldUpdate",
     value: function viewShouldUpdate(nextNode) {
-      /**
-       * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion or when the last character is deleted.
-       */
-      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);
-      }
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
-      var _this = this;
-      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);
-        });
-      }
+      return _get(_getPrototypeOf(Decision.prototype), "update", this).call(this, node, decorations);
     }
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
-        return false;
-      }
       if (!this.contentDOM) {
         return true;
       }

package/dist/esm/nodeviews/taskItem.js

@@ -15,7 +15,6 @@ 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) {
@@ -174,39 +173,18 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "viewShouldUpdate",
     value: function viewShouldUpdate(nextNode) {
-      /**
-       * To ensure the placeholder is correctly toggled we need to allow react to re-render
-       * on first character insertion or when the last character is deleted.
-       */
-      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);
-      }
+      return this.isContentEmpty(this.node) && !this.isContentEmpty(nextNode) || this.isContentEmpty(nextNode) && !this.isContentEmpty(this.node);
     }
   }, {
     key: "update",
     value: function update(node, decorations) {
-      var _this2 = this;
-      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)
-          );
-        });
-      }
+      return _get(_getPrototypeOf(Task.prototype), "update", this).call(this, node, decorations, undefined, function (currentNode, newNode) {
+        return !!(currentNode.attrs.state === newNode.attrs.state);
+      });
     }
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      if (!fg('react_18_tasks_and_decisions_concurrent_mode')) {
-        return false;
-      }
       if (!this.contentDOM) {
         return true;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "2.3.3",
+	"version": "2.3.4",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,7 +36,7 @@
 		"@atlaskit/adf-schema": "^40.3.0",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^10.0.0",
-		"@atlaskit/editor-common": "^87.4.0",
+		"@atlaskit/editor-common": "^87.5.0",
 		"@atlaskit/editor-plugin-analytics": "^1.6.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.2.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.6.0",
@@ -98,9 +98,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"react_18_tasks_and_decisions_concurrent_mode": {
-			"type": "boolean"
-		},
 		"platform_editor_lazy-node-views": {
 			"type": "boolean"
 		}