@atlaskit/editor-plugin-collab-edit 1.13.0 → 1.14.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.
Files changed (10) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/plugin.js +4 -2
  3. package/dist/cjs/pm-plugins/track-last-organic-change.js +11 -3
  4. package/dist/es2019/plugin.js +4 -2
  5. package/dist/es2019/pm-plugins/track-last-organic-change.js +11 -3
  6. package/dist/esm/plugin.js +4 -2
  7. package/dist/esm/pm-plugins/track-last-organic-change.js +11 -3
  8. package/dist/types/types.d.ts +3 -2
  9. package/dist/types-ts4.5/types.d.ts +3 -2
  10. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-collab-edit
2
2
 
3
+ ## 1.14.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#130280](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130280)
8
+ [`48d1e33c0076a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/48d1e33c0076a) -
9
+ Split lastOrganicchange in two fields `lastLocalOrganicChange` and `lastRemoteOrganicChange`
10
+
3
11
  ## 1.13.0
4
12
 
5
13
  ### Minor Changes
package/dist/cjs/plugin.js CHANGED
@@ -112,7 +112,8 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
112
112
  collabInitialisedAt: null,
113
113
  firstChangeAfterInitAt: null,
114
114
  firstContentBodyChangeAfterInitAt: null,
115
- lastOrganicChangeAt: null
115
+ lastLocalOrganicChangeAt: null,
116
+ lastRemoteOrganicChangeAt: null
116
117
  },
117
118
  activeParticipants: undefined,
118
119
  sessionId: undefined
@@ -128,7 +129,8 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
128
129
  collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
129
130
  firstChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstChangeAfterInitAt) || null,
130
131
  firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null,
131
- lastOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastOrganicChangeAt) || null
132
+ lastLocalOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastLocalOrganicChangeAt) || null,
133
+ lastRemoteOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicChangeAt) || null
132
134
  }
133
135
  };
134
136
  },
package/dist/cjs/pm-plugins/track-last-organic-change.js CHANGED
@@ -15,7 +15,8 @@ var createPlugin = exports.createPlugin = function createPlugin() {
15
15
  state: {
16
16
  init: function init() {
17
17
  return {
18
- lastOrganicChangeAt: null
18
+ lastLocalOrganicChangeAt: null,
19
+ lastRemoteOrganicChangeAt: null
19
20
  };
20
21
  },
21
22
  apply: function apply(transaction, prevPluginState) {
@@ -24,12 +25,19 @@ var createPlugin = exports.createPlugin = function createPlugin() {
24
25
  if (isDocumentReplaceFromRemote) {
25
26
  return prevPluginState;
26
27
  }
27
- if (isRemote || (0, _collab.isDirtyTransaction)(transaction)) {
28
+ if ((0, _collab.isDirtyTransaction)(transaction)) {
28
29
  return prevPluginState;
29
30
  }
30
31
  if ((0, _utils.isOrganicChange)(transaction)) {
32
+ if (isRemote) {
33
+ return {
34
+ lastLocalOrganicChangeAt: prevPluginState.lastLocalOrganicChangeAt,
35
+ lastRemoteOrganicChangeAt: Date.now()
36
+ };
37
+ }
31
38
  return {
32
- lastOrganicChangeAt: Date.now()
39
+ lastLocalOrganicChangeAt: Date.now(),
40
+ lastRemoteOrganicChangeAt: prevPluginState.lastRemoteOrganicChangeAt
33
41
  };
34
42
  }
35
43
  return prevPluginState;
package/dist/es2019/plugin.js CHANGED
@@ -73,7 +73,8 @@ export const collabEditPlugin = ({
73
73
  collabInitialisedAt: null,
74
74
  firstChangeAfterInitAt: null,
75
75
  firstContentBodyChangeAfterInitAt: null,
76
- lastOrganicChangeAt: null
76
+ lastLocalOrganicChangeAt: null,
77
+ lastRemoteOrganicChangeAt: null
77
78
  },
78
79
  activeParticipants: undefined,
79
80
  sessionId: undefined
@@ -89,7 +90,8 @@ export const collabEditPlugin = ({
89
90
  collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
90
91
  firstChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstChangeAfterInitAt) || null,
91
92
  firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null,
92
- lastOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastOrganicChangeAt) || null
93
+ lastLocalOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastLocalOrganicChangeAt) || null,
94
+ lastRemoteOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicChangeAt) || null
93
95
  }
94
96
  };
95
97
  },
package/dist/es2019/pm-plugins/track-last-organic-change.js CHANGED
@@ -9,7 +9,8 @@ export const createPlugin = () => {
9
9
  state: {
10
10
  init() {
11
11
  return {
12
- lastOrganicChangeAt: null
12
+ lastLocalOrganicChangeAt: null,
13
+ lastRemoteOrganicChangeAt: null
13
14
  };
14
15
  },
15
16
  apply(transaction, prevPluginState) {
@@ -18,12 +19,19 @@ export const createPlugin = () => {
18
19
  if (isDocumentReplaceFromRemote) {
19
20
  return prevPluginState;
20
21
  }
21
- if (isRemote || isDirtyTransaction(transaction)) {
22
+ if (isDirtyTransaction(transaction)) {
22
23
  return prevPluginState;
23
24
  }
24
25
  if (isOrganicChange(transaction)) {
26
+ if (isRemote) {
27
+ return {
28
+ lastLocalOrganicChangeAt: prevPluginState.lastLocalOrganicChangeAt,
29
+ lastRemoteOrganicChangeAt: Date.now()
30
+ };
31
+ }
25
32
  return {
26
- lastOrganicChangeAt: Date.now()
33
+ lastLocalOrganicChangeAt: Date.now(),
34
+ lastRemoteOrganicChangeAt: prevPluginState.lastRemoteOrganicChangeAt
27
35
  };
28
36
  }
29
37
  return prevPluginState;
package/dist/esm/plugin.js CHANGED
@@ -105,7 +105,8 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
105
105
  collabInitialisedAt: null,
106
106
  firstChangeAfterInitAt: null,
107
107
  firstContentBodyChangeAfterInitAt: null,
108
- lastOrganicChangeAt: null
108
+ lastLocalOrganicChangeAt: null,
109
+ lastRemoteOrganicChangeAt: null
109
110
  },
110
111
  activeParticipants: undefined,
111
112
  sessionId: undefined
@@ -121,7 +122,8 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
121
122
  collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
122
123
  firstChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstChangeAfterInitAt) || null,
123
124
  firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null,
124
- lastOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastOrganicChangeAt) || null
125
+ lastLocalOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastLocalOrganicChangeAt) || null,
126
+ lastRemoteOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicChangeAt) || null
125
127
  }
126
128
  };
127
129
  },
package/dist/esm/pm-plugins/track-last-organic-change.js CHANGED
@@ -9,7 +9,8 @@ export var createPlugin = function createPlugin() {
9
9
  state: {
10
10
  init: function init() {
11
11
  return {
12
- lastOrganicChangeAt: null
12
+ lastLocalOrganicChangeAt: null,
13
+ lastRemoteOrganicChangeAt: null
13
14
  };
14
15
  },
15
16
  apply: function apply(transaction, prevPluginState) {
@@ -18,12 +19,19 @@ export var createPlugin = function createPlugin() {
18
19
  if (isDocumentReplaceFromRemote) {
19
20
  return prevPluginState;
20
21
  }
21
- if (isRemote || isDirtyTransaction(transaction)) {
22
+ if (isDirtyTransaction(transaction)) {
22
23
  return prevPluginState;
23
24
  }
24
25
  if (isOrganicChange(transaction)) {
26
+ if (isRemote) {
27
+ return {
28
+ lastLocalOrganicChangeAt: prevPluginState.lastLocalOrganicChangeAt,
29
+ lastRemoteOrganicChangeAt: Date.now()
30
+ };
31
+ }
25
32
  return {
26
- lastOrganicChangeAt: Date.now()
33
+ lastLocalOrganicChangeAt: Date.now(),
34
+ lastRemoteOrganicChangeAt: prevPluginState.lastRemoteOrganicChangeAt
27
35
  };
28
36
  }
29
37
  return prevPluginState;
package/dist/types/types.d.ts CHANGED
@@ -23,10 +23,11 @@ export type CollabInitializedMetadata = {
23
23
  firstContentBodyChangeAfterInitAt: null | number;
24
24
  };
25
25
  export type LastOrganicChangeMetadata = {
26
- lastOrganicChangeAt: null | number;
26
+ lastLocalOrganicChangeAt: null | number;
27
+ lastRemoteOrganicChangeAt: null | number;
27
28
  };
28
29
  export type CollabEditPluginSharedState = {
29
- initialised: CollabInitializedMetadata;
30
+ initialised: CollabInitializedMetadata & LastOrganicChangeMetadata;
30
31
  activeParticipants: ReadOnlyParticipants | undefined;
31
32
  sessionId: string | undefined;
32
33
  };
package/dist/types-ts4.5/types.d.ts CHANGED
@@ -23,10 +23,11 @@ export type CollabInitializedMetadata = {
23
23
  firstContentBodyChangeAfterInitAt: null | number;
24
24
  };
25
25
  export type LastOrganicChangeMetadata = {
26
- lastOrganicChangeAt: null | number;
26
+ lastLocalOrganicChangeAt: null | number;
27
+ lastRemoteOrganicChangeAt: null | number;
27
28
  };
28
29
  export type CollabEditPluginSharedState = {
29
- initialised: CollabInitializedMetadata;
30
+ initialised: CollabInitializedMetadata & LastOrganicChangeMetadata;
30
31
  activeParticipants: ReadOnlyParticipants | undefined;
31
32
  sessionId: string | undefined;
32
33
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-collab-edit",
3
- "version": "1.13.0",
3
+ "version": "1.14.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": "^87.6.0",
37
+ "@atlaskit/editor-common": "^87.13.0",
38
38
  "@atlaskit/editor-plugin-analytics": "1.7.0",
39
39
  "@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
40
40
  "@atlaskit/editor-plugin-feature-flags": "^1.2.0",
@@ -51,11 +51,11 @@
51
51
  "devDependencies": {
52
52
  "@af/integration-testing": "*",
53
53
  "@af/visual-regression": "*",
54
- "@atlaskit/editor-plugin-mentions": "^2.3.0",
54
+ "@atlaskit/editor-plugin-mentions": "^2.4.0",
55
55
  "@atlaskit/editor-plugin-text-formatting": "^1.13.0",
56
- "@atlaskit/editor-plugin-type-ahead": "^1.7.0",
56
+ "@atlaskit/editor-plugin-type-ahead": "^1.8.0",
57
57
  "@atlaskit/editor-plugin-unsupported-content": "^1.8.0",
58
- "@atlaskit/editor-test-helpers": "^18.30.0",
58
+ "@atlaskit/editor-test-helpers": "^18.31.0",
59
59
  "@atlaskit/ssr": "*",
60
60
  "@atlaskit/synchrony-test-helpers": "^2.5.0",
61
61
  "@atlaskit/util-data-test": "^17.9.0",