@atlaskit/editor-plugin-tasks-and-decisions 8.4.2 → 8.4.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 8.4.4
+
+### Patch Changes
+
+- [`9662879e8506e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9662879e8506e) -
+  [ux] EDITOR-1354 Prevent remount of taskItemNodeView children when state is changed
+- Updated dependencies
+
+## 8.4.3
+
+### Patch Changes
+
+- [`3922df338eb20`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3922df338eb20) -
+  ED-29170: fix tasks under hydration
+- Updated dependencies
+
 ## 8.4.2
 
 ### Patch Changes

package/dist/cjs/nodeviews/TaskItemNodeView.js

@@ -146,9 +146,11 @@ var TaskItemNodeView = exports.TaskItemNodeView = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(node) {
-      var isValidUpdate = node.type === this.node.type && !!(node.attrs.state === this.node.attrs.state);
-      if (!isValidUpdate) {
-        return false;
+      if (!(0, _expValEquals.expValEquals)('platform_editor_prevent_taskitem_remount', 'isEnabled', true)) {
+        var isValidUpdate = node.type === this.node.type && !!(node.attrs.state === this.node.attrs.state);
+        if (!isValidUpdate) {
+          return false;
+        }
       }
       if ((0, _platformFeatureFlags.fg)('platform_editor_task_check_status_fix')) {
         // Only return false if this is a completely different task
@@ -156,6 +158,19 @@ var TaskItemNodeView = exports.TaskItemNodeView = /*#__PURE__*/function () {
           return false;
         }
       }
+      if ((0, _expValEquals.expValEquals)('platform_editor_prevent_taskitem_remount', 'isEnabled', true)) {
+        if (node.type !== this.node.type) {
+          return false;
+        }
+        var stateChanged = node.type === this.node.type && !!(node.attrs.state !== this.node.attrs.state);
+
+        // Update task checkbox state to match document state.
+        // It's possible the state may have changed from a collab edit and not from a checkbox click
+        // so we need to update the checkbox to match.
+        if (stateChanged && this.input) {
+          this.input.checked = node.attrs.state === 'DONE';
+        }
+      }
       this.updatePlaceholder(node);
       if (this.domElement && !node.sameMarkup(this.node)) {
         this.domElement.setAttribute('data-task-state', node.attrs.state);

package/dist/cjs/tasksAndDecisionsPlugin.js

@@ -60,12 +60,15 @@ function ContentComponent(_ref2) {
     popupsBoundariesElement = _ref2.popupsBoundariesElement,
     popupsScrollableElement = _ref2.popupsScrollableElement,
     dependencyApi = _ref2.dependencyApi;
-  var domAtPos = editorView.domAtPos.bind(editorView);
   var openRequestToEditPopupAt = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(dependencyApi, 'taskDecision.openRequestToEditPopupAt');
   var hasEditPermission = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(dependencyApi, 'taskDecision.hasEditPermission');
+  if ((0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) && !editorView) {
+    return null;
+  }
   if (hasEditPermission || !openRequestToEditPopupAt) {
     return null;
   }
+  var domAtPos = editorView.domAtPos.bind(editorView);
 
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   var element = (0, _utils.findDomRefAtPos)(openRequestToEditPopupAt, domAtPos);

package/dist/es2019/nodeviews/TaskItemNodeView.js

@@ -130,9 +130,11 @@ export class TaskItemNodeView {
     }
   }
   update(node) {
-    const isValidUpdate = node.type === this.node.type && !!(node.attrs.state === this.node.attrs.state);
-    if (!isValidUpdate) {
-      return false;
+    if (!expValEquals('platform_editor_prevent_taskitem_remount', 'isEnabled', true)) {
+      const isValidUpdate = node.type === this.node.type && !!(node.attrs.state === this.node.attrs.state);
+      if (!isValidUpdate) {
+        return false;
+      }
     }
     if (fg('platform_editor_task_check_status_fix')) {
       // Only return false if this is a completely different task
@@ -140,6 +142,19 @@ export class TaskItemNodeView {
         return false;
       }
     }
+    if (expValEquals('platform_editor_prevent_taskitem_remount', 'isEnabled', true)) {
+      if (node.type !== this.node.type) {
+        return false;
+      }
+      const stateChanged = node.type === this.node.type && !!(node.attrs.state !== this.node.attrs.state);
+
+      // Update task checkbox state to match document state.
+      // It's possible the state may have changed from a collab edit and not from a checkbox click
+      // so we need to update the checkbox to match.
+      if (stateChanged && this.input) {
+        this.input.checked = node.attrs.state === 'DONE';
+      }
+    }
     this.updatePlaceholder(node);
     if (this.domElement && !node.sameMarkup(this.node)) {
       this.domElement.setAttribute('data-task-state', node.attrs.state);

package/dist/es2019/tasksAndDecisionsPlugin.js

@@ -49,12 +49,15 @@ function ContentComponent({
   popupsScrollableElement,
   dependencyApi
 }) {
-  const domAtPos = editorView.domAtPos.bind(editorView);
   const openRequestToEditPopupAt = useSharedPluginStateSelector(dependencyApi, 'taskDecision.openRequestToEditPopupAt');
   const hasEditPermission = useSharedPluginStateSelector(dependencyApi, 'taskDecision.hasEditPermission');
+  if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !editorView) {
+    return null;
+  }
   if (hasEditPermission || !openRequestToEditPopupAt) {
     return null;
   }
+  const domAtPos = editorView.domAtPos.bind(editorView);
 
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   const element = findDomRefAtPos(openRequestToEditPopupAt, domAtPos);

package/dist/esm/nodeviews/TaskItemNodeView.js

@@ -139,9 +139,11 @@ export var TaskItemNodeView = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(node) {
-      var isValidUpdate = node.type === this.node.type && !!(node.attrs.state === this.node.attrs.state);
-      if (!isValidUpdate) {
-        return false;
+      if (!expValEquals('platform_editor_prevent_taskitem_remount', 'isEnabled', true)) {
+        var isValidUpdate = node.type === this.node.type && !!(node.attrs.state === this.node.attrs.state);
+        if (!isValidUpdate) {
+          return false;
+        }
       }
       if (fg('platform_editor_task_check_status_fix')) {
         // Only return false if this is a completely different task
@@ -149,6 +151,19 @@ export var TaskItemNodeView = /*#__PURE__*/function () {
           return false;
         }
       }
+      if (expValEquals('platform_editor_prevent_taskitem_remount', 'isEnabled', true)) {
+        if (node.type !== this.node.type) {
+          return false;
+        }
+        var stateChanged = node.type === this.node.type && !!(node.attrs.state !== this.node.attrs.state);
+
+        // Update task checkbox state to match document state.
+        // It's possible the state may have changed from a collab edit and not from a checkbox click
+        // so we need to update the checkbox to match.
+        if (stateChanged && this.input) {
+          this.input.checked = node.attrs.state === 'DONE';
+        }
+      }
       this.updatePlaceholder(node);
       if (this.domElement && !node.sameMarkup(this.node)) {
         this.domElement.setAttribute('data-task-state', node.attrs.state);

package/dist/esm/tasksAndDecisionsPlugin.js

@@ -51,12 +51,15 @@ function ContentComponent(_ref2) {
     popupsBoundariesElement = _ref2.popupsBoundariesElement,
     popupsScrollableElement = _ref2.popupsScrollableElement,
     dependencyApi = _ref2.dependencyApi;
-  var domAtPos = editorView.domAtPos.bind(editorView);
   var openRequestToEditPopupAt = useSharedPluginStateSelector(dependencyApi, 'taskDecision.openRequestToEditPopupAt');
   var hasEditPermission = useSharedPluginStateSelector(dependencyApi, 'taskDecision.hasEditPermission');
+  if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && !editorView) {
+    return null;
+  }
   if (hasEditPermission || !openRequestToEditPopupAt) {
     return null;
   }
+  var domAtPos = editorView.domAtPos.bind(editorView);
 
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   var element = findDomRefAtPos(openRequestToEditPopupAt, domAtPos);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "8.4.2",
+	"version": "8.4.4",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,20 +43,20 @@
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-toolbar": "^0.9.0",
 		"@atlaskit/heading": "^5.2.0",
-		"@atlaskit/icon": "^28.1.0",
+		"@atlaskit/icon": "^28.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/popup": "^4.3.0",
+		"@atlaskit/popup": "^4.4.0",
 		"@atlaskit/primitives": "^14.14.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^12.21.0",
+		"@atlaskit/tmp-editor-statsig": "^12.23.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.6.0",
+		"@atlaskit/editor-common": "^109.8.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"