@atlaskit/editor-plugin-collab-edit 1.14.2 → 1.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-collab-edit
2
2
 
3
+ ## 1.15.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#133504](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133504)
8
+ [`024439741fcdc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/024439741fcdc) -
9
+ Replaced usage of `originalTransactionHasMeta` to avoid infinite loop issue
10
+
3
11
  ## 1.14.2
4
12
 
5
13
  ### Patch Changes
@@ -20,8 +20,11 @@ var createPlugin = exports.createPlugin = function createPlugin() {
20
20
  };
21
21
  },
22
22
  apply: function apply(transaction, prevPluginState) {
23
- var isRemote = (0, _utils.originalTransactionHasMeta)(transaction, 'isRemote');
24
- var isDocumentReplaceFromRemote = isRemote && (0, _utils.originalTransactionHasMeta)(transaction, 'replaceDocument');
23
+ if (Boolean(transaction.getMeta('appendedTransaction'))) {
24
+ return prevPluginState;
25
+ }
26
+ var isRemote = Boolean(transaction.getMeta('isRemote'));
27
+ var isDocumentReplaceFromRemote = isRemote && Boolean(transaction.getMeta('replaceDocument'));
25
28
  if (isDocumentReplaceFromRemote) {
26
29
  return prevPluginState;
27
30
  }
@@ -1,7 +1,7 @@
1
1
  import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
2
2
  import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
3
3
  import { PluginKey } from '@atlaskit/editor-prosemirror/state';
4
- import { isOrganicChange, originalTransactionHasMeta } from '../utils';
4
+ import { isOrganicChange } from '../utils';
5
5
  export const trackLastOrganicChangePluginKey = new PluginKey('collabTrackLastOrganicChangePlugin');
6
6
  export const createPlugin = () => {
7
7
  return new SafePlugin({
@@ -14,8 +14,11 @@ export const createPlugin = () => {
14
14
  };
15
15
  },
16
16
  apply(transaction, prevPluginState) {
17
- const isRemote = originalTransactionHasMeta(transaction, 'isRemote');
18
- const isDocumentReplaceFromRemote = isRemote && originalTransactionHasMeta(transaction, 'replaceDocument');
17
+ if (Boolean(transaction.getMeta('appendedTransaction'))) {
18
+ return prevPluginState;
19
+ }
20
+ const isRemote = Boolean(transaction.getMeta('isRemote'));
21
+ const isDocumentReplaceFromRemote = isRemote && Boolean(transaction.getMeta('replaceDocument'));
19
22
  if (isDocumentReplaceFromRemote) {
20
23
  return prevPluginState;
21
24
  }
@@ -1,7 +1,7 @@
1
1
  import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
2
2
  import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
3
3
  import { PluginKey } from '@atlaskit/editor-prosemirror/state';
4
- import { isOrganicChange, originalTransactionHasMeta } from '../utils';
4
+ import { isOrganicChange } from '../utils';
5
5
  export var trackLastOrganicChangePluginKey = new PluginKey('collabTrackLastOrganicChangePlugin');
6
6
  export var createPlugin = function createPlugin() {
7
7
  return new SafePlugin({
@@ -14,8 +14,11 @@ export var createPlugin = function createPlugin() {
14
14
  };
15
15
  },
16
16
  apply: function apply(transaction, prevPluginState) {
17
- var isRemote = originalTransactionHasMeta(transaction, 'isRemote');
18
- var isDocumentReplaceFromRemote = isRemote && originalTransactionHasMeta(transaction, 'replaceDocument');
17
+ if (Boolean(transaction.getMeta('appendedTransaction'))) {
18
+ return prevPluginState;
19
+ }
20
+ var isRemote = Boolean(transaction.getMeta('isRemote'));
21
+ var isDocumentReplaceFromRemote = isRemote && Boolean(transaction.getMeta('replaceDocument'));
19
22
  if (isDocumentReplaceFromRemote) {
20
23
  return prevPluginState;
21
24
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-collab-edit",
3
- "version": "1.14.2",
3
+ "version": "1.15.0",
4
4
  "description": "Collab Edit plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -34,7 +34,7 @@
34
34
  "dependencies": {
35
35
  "@atlaskit/adf-schema": "^40.8.1",
36
36
  "@atlaskit/custom-steps": "^0.7.0",
37
- "@atlaskit/editor-common": "^88.0.0",
37
+ "@atlaskit/editor-common": "^88.1.0",
38
38
  "@atlaskit/editor-plugin-analytics": "1.8.1",
39
39
  "@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
40
40
  "@atlaskit/editor-plugin-feature-flags": "^1.2.0",
@@ -51,8 +51,8 @@
51
51
  "devDependencies": {
52
52
  "@af/integration-testing": "*",
53
53
  "@af/visual-regression": "*",
54
- "@atlaskit/editor-plugin-mentions": "^2.4.0",
55
- "@atlaskit/editor-plugin-text-formatting": "^1.13.0",
54
+ "@atlaskit/editor-plugin-mentions": "^2.5.0",
55
+ "@atlaskit/editor-plugin-text-formatting": "^1.14.0",
56
56
  "@atlaskit/editor-plugin-type-ahead": "^1.8.0",
57
57
  "@atlaskit/editor-plugin-unsupported-content": "^1.8.0",
58
58
  "@atlaskit/editor-test-helpers": "^18.31.0",