@atlaskit/editor-plugin-annotation 1.7.0 → 1.7.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.7.2
+
+### Patch Changes
+
+-   [#98086](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98086)
+    [`c0151fc09063`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c0151fc09063) -
+    [ux] Disabled the scroll into view effect which occurs when an annotation is resolved, due to an
+    issue which occurs when a collab user resolves a comment. There's currently (due to how
+    annotations are built) no way to detect if the resolve action can from a remote or local user.
+    So this is a quick fix to unblock live pages from scrolling when a collab users resolves a
+    comment.
+-   Updated dependencies
+
+## 1.7.1
+
+### Patch Changes
+
+-   [#97698](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97698)
+    [`1c7b378c0d3b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1c7b378c0d3b) -
+    [HOT-108999] We had an incident where the cursor jumps back a character in table headers for any
+    language triggering composition on an empty line.This was fixed in a patch bump of
+    prosemirror-view. https://github.com/ProseMirror/prosemirror-view/compare/1.33.4...1.33.5
+
 ## 1.7.0
 
 ### Minor Changes

package/dist/cjs/commands/index.js

@@ -23,10 +23,22 @@ var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState
     var allResolved = Object.values(partialNewState).every(function (state) {
       return state;
     });
+
+    // FIXME: https://product-fabric.atlassian.net/browse/EDF-716 -- This is nuking the scroll into view which occurs
+    // when a comment is resolved. The problem is this is called when either a collab user or the current user resolves a comment.
+    // and the problem is since cc is just dispatching an event through the provider to resolve the comment and this
+    // is not comming via NCS, we have not way to know if this is a local or remote transaction.
+    // To quickly fix this problem to unblock live pages this will just stop the transaction causing a scroll when the
+    // resolve method is set.
+    var transformer = function transformer(tr, state) {
+      return resolveMethod === _analytics.RESOLVE_METHOD.CONSUMER ? tr.setMeta('scrollIntoView', false) : tr;
+    };
     if (resolveMethod && allResolved) {
-      return (0, _pluginFactory.createCommand)(command, _transform.default.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
+      return (0, _pluginFactory.createCommand)(command, function (tr, state) {
+        return transformer(_transform.default.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod)(tr, state), state);
+      });
     }
-    return (0, _pluginFactory.createCommand)(command);
+    return (0, _pluginFactory.createCommand)(command, transformer);
   };
 };
 var closeComponent = exports.closeComponent = function closeComponent() {

package/dist/es2019/commands/index.js

@@ -1,5 +1,5 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
@@ -12,10 +12,18 @@ export const updateInlineCommentResolvedState = editorAnalyticsAPI => (partialNe
     data: partialNewState
   };
   const allResolved = Object.values(partialNewState).every(state => state);
+
+  // FIXME: https://product-fabric.atlassian.net/browse/EDF-716 -- This is nuking the scroll into view which occurs
+  // when a comment is resolved. The problem is this is called when either a collab user or the current user resolves a comment.
+  // and the problem is since cc is just dispatching an event through the provider to resolve the comment and this
+  // is not comming via NCS, we have not way to know if this is a local or remote transaction.
+  // To quickly fix this problem to unblock live pages this will just stop the transaction causing a scroll when the
+  // resolve method is set.
+  const transformer = (tr, state) => resolveMethod === RESOLVE_METHOD.CONSUMER ? tr.setMeta('scrollIntoView', false) : tr;
   if (resolveMethod && allResolved) {
-    return createCommand(command, transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
+    return createCommand(command, (tr, state) => transformer(transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod)(tr, state), state));
   }
-  return createCommand(command);
+  return createCommand(command, transformer);
 };
 export const closeComponent = () => createCommand({
   type: ACTIONS.CLOSE_COMPONENT

package/dist/esm/commands/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
@@ -16,10 +16,22 @@ export var updateInlineCommentResolvedState = function updateInlineCommentResolv
     var allResolved = Object.values(partialNewState).every(function (state) {
       return state;
     });
+
+    // FIXME: https://product-fabric.atlassian.net/browse/EDF-716 -- This is nuking the scroll into view which occurs
+    // when a comment is resolved. The problem is this is called when either a collab user or the current user resolves a comment.
+    // and the problem is since cc is just dispatching an event through the provider to resolve the comment and this
+    // is not comming via NCS, we have not way to know if this is a local or remote transaction.
+    // To quickly fix this problem to unblock live pages this will just stop the transaction causing a scroll when the
+    // resolve method is set.
+    var transformer = function transformer(tr, state) {
+      return resolveMethod === RESOLVE_METHOD.CONSUMER ? tr.setMeta('scrollIntoView', false) : tr;
+    };
     if (resolveMethod && allResolved) {
-      return createCommand(command, transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
+      return createCommand(command, function (tr, state) {
+        return transformer(transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod)(tr, state), state);
+      });
     }
-    return createCommand(command);
+    return createCommand(command, transformer);
   };
 };
 export var closeComponent = function closeComponent() {

package/dist/types/commands/index.d.ts

@@ -1,5 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';

package/dist/types-ts4.5/commands/index.d.ts

@@ -1,5 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,11 +33,11 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.12.2",
-    "@atlaskit/editor-common": "^79.0.0",
+    "@atlaskit/editor-common": "^79.2.0",
     "@atlaskit/editor-plugin-analytics": "^1.1.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
-    "@atlaskit/editor-prosemirror": "4.0.0",
+    "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@babel/runtime": "^7.0.0"