@atlaskit/editor-plugin-collab-edit 32.0.7 → 32.0.9
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 +15 -0
- package/dist/cjs/collabEditPlugin.js +3 -2
- package/dist/cjs/pm-plugins/track-last-organic-change.js +5 -5
- package/dist/cjs/pm-plugins/utils.js +1 -2
- package/dist/es2019/collabEditPlugin.js +3 -2
- package/dist/es2019/pm-plugins/track-last-organic-change.js +5 -5
- package/dist/es2019/pm-plugins/utils.js +1 -2
- package/dist/esm/collabEditPlugin.js +3 -2
- package/dist/esm/pm-plugins/track-last-organic-change.js +5 -5
- package/dist/esm/pm-plugins/utils.js +1 -2
- package/package.json +3 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-collab-edit
|
|
2
2
|
|
|
3
|
+
## 32.0.9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`202f9b8386f13`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/202f9b8386f13) -
|
|
8
|
+
Migrate attributed version history checks to the platform_editor_attributed_version_history
|
|
9
|
+
experiment.
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 32.0.8
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
3
18
|
## 32.0.7
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
|
@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
9
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
|
+
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
12
13
|
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
13
14
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
14
15
|
var _JSONTransformer = require("@atlaskit/editor-json-transformer/JSONTransformer-2");
|
|
@@ -123,7 +124,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
|
|
|
123
124
|
var _lastOrganicChangeSta;
|
|
124
125
|
if (!state) {
|
|
125
126
|
return {
|
|
126
|
-
initialised: _objectSpread(_objectSpread({}, (0,
|
|
127
|
+
initialised: _objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && {
|
|
127
128
|
localHumanBodyChangeCount: 0
|
|
128
129
|
}), {}, {
|
|
129
130
|
collabInitialisedAt: null,
|
|
@@ -146,7 +147,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
|
|
|
146
147
|
return {
|
|
147
148
|
activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
|
|
148
149
|
sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
|
|
149
|
-
initialised: _objectSpread(_objectSpread({}, (0,
|
|
150
|
+
initialised: _objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && {
|
|
150
151
|
localHumanBodyChangeCount: (_lastOrganicChangeSta = lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.localHumanBodyChangeCount) !== null && _lastOrganicChangeSta !== void 0 ? _lastOrganicChangeSta : 0
|
|
151
152
|
}), {}, {
|
|
152
153
|
collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
|
|
@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.trackLastOrganicChangePluginKey = exports.createPlugin = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
+
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
9
10
|
var _collab = require("@atlaskit/editor-common/collab");
|
|
10
11
|
var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
|
|
11
12
|
var _transactionAgentAttribution = require("@atlaskit/editor-common/transaction-agent-attribution");
|
|
12
13
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
13
14
|
var _transform = require("@atlaskit/editor-prosemirror/transform");
|
|
14
|
-
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
15
15
|
var _utils = require("./utils");
|
|
16
16
|
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; }
|
|
17
17
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -21,7 +21,7 @@ var createPlugin = exports.createPlugin = function createPlugin() {
|
|
|
21
21
|
key: trackLastOrganicChangePluginKey,
|
|
22
22
|
state: {
|
|
23
23
|
init: function init() {
|
|
24
|
-
return _objectSpread(_objectSpread({}, (0,
|
|
24
|
+
return _objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && {
|
|
25
25
|
localHumanBodyChangeCount: 0
|
|
26
26
|
}), {}, {
|
|
27
27
|
lastLocalOrganicChangeAt: null,
|
|
@@ -51,7 +51,7 @@ var createPlugin = exports.createPlugin = function createPlugin() {
|
|
|
51
51
|
if ((0, _utils.isOrganicChange)(transaction)) {
|
|
52
52
|
var _prevPluginState$loca;
|
|
53
53
|
if (isRemote) {
|
|
54
|
-
return _objectSpread(_objectSpread({}, (0,
|
|
54
|
+
return _objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && {
|
|
55
55
|
localHumanBodyChangeCount: prevPluginState.localHumanBodyChangeCount
|
|
56
56
|
}), {}, {
|
|
57
57
|
lastLocalOrganicChangeAt: prevPluginState.lastLocalOrganicChangeAt,
|
|
@@ -62,8 +62,8 @@ var createPlugin = exports.createPlugin = function createPlugin() {
|
|
|
62
62
|
}
|
|
63
63
|
// Agent transactions can be local (frontend streaming) or remote (NCS).
|
|
64
64
|
// Keep organic-change tracking intact for saving, but track human attribution separately.
|
|
65
|
-
var isAgentChange = (0,
|
|
66
|
-
return _objectSpread(_objectSpread({}, (0,
|
|
65
|
+
var isAgentChange = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && Boolean(transaction.getMeta(_transactionAgentAttribution.AGENT_ATTRIBUTION_META));
|
|
66
|
+
return _objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') && {
|
|
67
67
|
localHumanBodyChangeCount: ((_prevPluginState$loca = prevPluginState.localHumanBodyChangeCount) !== null && _prevPluginState$loca !== void 0 ? _prevPluginState$loca : 0) + (isAnnotationStep || isAgentChange ? 0 : 1)
|
|
68
68
|
}), {}, {
|
|
69
69
|
lastLocalOrganicChangeAt: Date.now(),
|
|
@@ -21,7 +21,6 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
|
|
|
21
21
|
var _view = require("@atlaskit/editor-prosemirror/view");
|
|
22
22
|
var _utils = require("@atlaskit/editor-shared-styles/utils");
|
|
23
23
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
24
|
-
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
25
24
|
var _preserveNodeIdentity = require("./preserve-node-identity");
|
|
26
25
|
var findPointers = exports.findPointers = function findPointers(id, decorations) {
|
|
27
26
|
return decorations.find().reduce(
|
|
@@ -38,7 +37,7 @@ function style(options) {
|
|
|
38
37
|
return "border-right: ".concat(borderWidth, " solid ").concat(color, "; margin-right: calc(-1 * ").concat(borderWidth, "); z-index: 1");
|
|
39
38
|
}
|
|
40
39
|
function getAvatarColor(str, agentName, agentNamedId) {
|
|
41
|
-
var participantColor = (0, _utils.getParticipantColor)(str, (0,
|
|
40
|
+
var participantColor = (0, _utils.getParticipantColor)(str, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? agentName : undefined, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_attributed_version_history') ? agentNamedId : undefined);
|
|
42
41
|
return {
|
|
43
42
|
index: participantColor.index,
|
|
44
43
|
backgroundColor: participantColor.color.backgroundColor,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
1
2
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
|
|
2
3
|
import { isEmptyDocument } from '@atlaskit/editor-common/utils';
|
|
3
4
|
import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransformer-2';
|
|
@@ -85,7 +86,7 @@ export const collabEditPlugin = ({
|
|
|
85
86
|
if (!state) {
|
|
86
87
|
return {
|
|
87
88
|
initialised: {
|
|
88
|
-
...(
|
|
89
|
+
...(isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
89
90
|
localHumanBodyChangeCount: 0
|
|
90
91
|
}),
|
|
91
92
|
collabInitialisedAt: null,
|
|
@@ -109,7 +110,7 @@ export const collabEditPlugin = ({
|
|
|
109
110
|
activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
|
|
110
111
|
sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
|
|
111
112
|
initialised: {
|
|
112
|
-
...(
|
|
113
|
+
...(isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
113
114
|
localHumanBodyChangeCount: (_lastOrganicChangeSta = lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.localHumanBodyChangeCount) !== null && _lastOrganicChangeSta !== void 0 ? _lastOrganicChangeSta : 0
|
|
114
115
|
}),
|
|
115
116
|
collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
1
2
|
import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
|
|
2
3
|
import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
3
4
|
import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
|
|
4
5
|
import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
5
6
|
import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
7
7
|
import { isOrganicChange } from './utils';
|
|
8
8
|
export const trackLastOrganicChangePluginKey = new PluginKey('collabTrackLastOrganicChangePlugin');
|
|
9
9
|
export const createPlugin = () => {
|
|
@@ -12,7 +12,7 @@ export const createPlugin = () => {
|
|
|
12
12
|
state: {
|
|
13
13
|
init() {
|
|
14
14
|
return {
|
|
15
|
-
...(
|
|
15
|
+
...(isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
16
16
|
localHumanBodyChangeCount: 0
|
|
17
17
|
}),
|
|
18
18
|
lastLocalOrganicChangeAt: null,
|
|
@@ -43,7 +43,7 @@ export const createPlugin = () => {
|
|
|
43
43
|
var _prevPluginState$loca;
|
|
44
44
|
if (isRemote) {
|
|
45
45
|
return {
|
|
46
|
-
...(
|
|
46
|
+
...(isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
47
47
|
localHumanBodyChangeCount: prevPluginState.localHumanBodyChangeCount
|
|
48
48
|
}),
|
|
49
49
|
lastLocalOrganicChangeAt: prevPluginState.lastLocalOrganicChangeAt,
|
|
@@ -54,9 +54,9 @@ export const createPlugin = () => {
|
|
|
54
54
|
}
|
|
55
55
|
// Agent transactions can be local (frontend streaming) or remote (NCS).
|
|
56
56
|
// Keep organic-change tracking intact for saving, but track human attribution separately.
|
|
57
|
-
const isAgentChange =
|
|
57
|
+
const isAgentChange = isExperimentEnabled('platform_editor_attributed_version_history') && Boolean(transaction.getMeta(AGENT_ATTRIBUTION_META));
|
|
58
58
|
return {
|
|
59
|
-
...(
|
|
59
|
+
...(isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
60
60
|
localHumanBodyChangeCount: ((_prevPluginState$loca = prevPluginState.localHumanBodyChangeCount) !== null && _prevPluginState$loca !== void 0 ? _prevPluginState$loca : 0) + (isAnnotationStep || isAgentChange ? 0 : 1)
|
|
61
61
|
}),
|
|
62
62
|
lastLocalOrganicChangeAt: Date.now(),
|
|
@@ -11,7 +11,6 @@ import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
|
|
|
11
11
|
import { Decoration } from '@atlaskit/editor-prosemirror/view';
|
|
12
12
|
import { getParticipantColor } from '@atlaskit/editor-shared-styles/utils';
|
|
13
13
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
15
14
|
import { preserveNodeIdentity } from './preserve-node-identity';
|
|
16
15
|
export const findPointers = (id, decorations) => decorations.find().reduce(
|
|
17
16
|
// `pointer` is absent on non-telepointer decorations (e.g. the agent-shimmer
|
|
@@ -26,7 +25,7 @@ function style(options) {
|
|
|
26
25
|
return `border-right: ${borderWidth} solid ${color}; margin-right: calc(-1 * ${borderWidth}); z-index: 1`;
|
|
27
26
|
}
|
|
28
27
|
export function getAvatarColor(str, agentName, agentNamedId) {
|
|
29
|
-
const participantColor = getParticipantColor(str,
|
|
28
|
+
const participantColor = getParticipantColor(str, isExperimentEnabled('platform_editor_attributed_version_history') ? agentName : undefined, isExperimentEnabled('platform_editor_attributed_version_history') ? agentNamedId : undefined);
|
|
30
29
|
return {
|
|
31
30
|
index: participantColor.index,
|
|
32
31
|
backgroundColor: participantColor.color.backgroundColor,
|
|
@@ -4,6 +4,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
|
4
4
|
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; }
|
|
5
5
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
6
6
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
7
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
7
8
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
|
|
8
9
|
import { isEmptyDocument } from '@atlaskit/editor-common/utils';
|
|
9
10
|
import { JSONTransformer } from '@atlaskit/editor-json-transformer/JSONTransformer-2';
|
|
@@ -116,7 +117,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
|
|
|
116
117
|
var _lastOrganicChangeSta;
|
|
117
118
|
if (!state) {
|
|
118
119
|
return {
|
|
119
|
-
initialised: _objectSpread(_objectSpread({},
|
|
120
|
+
initialised: _objectSpread(_objectSpread({}, isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
120
121
|
localHumanBodyChangeCount: 0
|
|
121
122
|
}), {}, {
|
|
122
123
|
collabInitialisedAt: null,
|
|
@@ -139,7 +140,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
|
|
|
139
140
|
return {
|
|
140
141
|
activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
|
|
141
142
|
sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
|
|
142
|
-
initialised: _objectSpread(_objectSpread({},
|
|
143
|
+
initialised: _objectSpread(_objectSpread({}, isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
143
144
|
localHumanBodyChangeCount: (_lastOrganicChangeSta = lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.localHumanBodyChangeCount) !== null && _lastOrganicChangeSta !== void 0 ? _lastOrganicChangeSta : 0
|
|
144
145
|
}), {}, {
|
|
145
146
|
collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
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; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
4
5
|
import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
|
|
5
6
|
import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
|
|
6
7
|
import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
|
|
7
8
|
import { PluginKey } from '@atlaskit/editor-prosemirror/state';
|
|
8
9
|
import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
|
|
9
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
10
10
|
import { isOrganicChange } from './utils';
|
|
11
11
|
export var trackLastOrganicChangePluginKey = new PluginKey('collabTrackLastOrganicChangePlugin');
|
|
12
12
|
export var createPlugin = function createPlugin() {
|
|
@@ -14,7 +14,7 @@ export var createPlugin = function createPlugin() {
|
|
|
14
14
|
key: trackLastOrganicChangePluginKey,
|
|
15
15
|
state: {
|
|
16
16
|
init: function init() {
|
|
17
|
-
return _objectSpread(_objectSpread({},
|
|
17
|
+
return _objectSpread(_objectSpread({}, isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
18
18
|
localHumanBodyChangeCount: 0
|
|
19
19
|
}), {}, {
|
|
20
20
|
lastLocalOrganicChangeAt: null,
|
|
@@ -44,7 +44,7 @@ export var createPlugin = function createPlugin() {
|
|
|
44
44
|
if (isOrganicChange(transaction)) {
|
|
45
45
|
var _prevPluginState$loca;
|
|
46
46
|
if (isRemote) {
|
|
47
|
-
return _objectSpread(_objectSpread({},
|
|
47
|
+
return _objectSpread(_objectSpread({}, isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
48
48
|
localHumanBodyChangeCount: prevPluginState.localHumanBodyChangeCount
|
|
49
49
|
}), {}, {
|
|
50
50
|
lastLocalOrganicChangeAt: prevPluginState.lastLocalOrganicChangeAt,
|
|
@@ -55,8 +55,8 @@ export var createPlugin = function createPlugin() {
|
|
|
55
55
|
}
|
|
56
56
|
// Agent transactions can be local (frontend streaming) or remote (NCS).
|
|
57
57
|
// Keep organic-change tracking intact for saving, but track human attribution separately.
|
|
58
|
-
var isAgentChange =
|
|
59
|
-
return _objectSpread(_objectSpread({},
|
|
58
|
+
var isAgentChange = isExperimentEnabled('platform_editor_attributed_version_history') && Boolean(transaction.getMeta(AGENT_ATTRIBUTION_META));
|
|
59
|
+
return _objectSpread(_objectSpread({}, isExperimentEnabled('platform_editor_attributed_version_history') && {
|
|
60
60
|
localHumanBodyChangeCount: ((_prevPluginState$loca = prevPluginState.localHumanBodyChangeCount) !== null && _prevPluginState$loca !== void 0 ? _prevPluginState$loca : 0) + (isAnnotationStep || isAgentChange ? 0 : 1)
|
|
61
61
|
}), {}, {
|
|
62
62
|
lastLocalOrganicChangeAt: Date.now(),
|
|
@@ -12,7 +12,6 @@ import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
|
|
|
12
12
|
import { Decoration } from '@atlaskit/editor-prosemirror/view';
|
|
13
13
|
import { getParticipantColor } from '@atlaskit/editor-shared-styles/utils';
|
|
14
14
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
15
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
16
15
|
import { preserveNodeIdentity } from './preserve-node-identity';
|
|
17
16
|
export var findPointers = function findPointers(id, decorations) {
|
|
18
17
|
return decorations.find().reduce(
|
|
@@ -29,7 +28,7 @@ function style(options) {
|
|
|
29
28
|
return "border-right: ".concat(borderWidth, " solid ").concat(color, "; margin-right: calc(-1 * ").concat(borderWidth, "); z-index: 1");
|
|
30
29
|
}
|
|
31
30
|
export function getAvatarColor(str, agentName, agentNamedId) {
|
|
32
|
-
var participantColor = getParticipantColor(str,
|
|
31
|
+
var participantColor = getParticipantColor(str, isExperimentEnabled('platform_editor_attributed_version_history') ? agentName : undefined, isExperimentEnabled('platform_editor_attributed_version_history') ? agentNamedId : undefined);
|
|
33
32
|
return {
|
|
34
33
|
index: participantColor.index,
|
|
35
34
|
backgroundColor: participantColor.color.backgroundColor,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-collab-edit",
|
|
3
|
-
"version": "32.0.
|
|
3
|
+
"version": "32.0.9",
|
|
4
4
|
"description": "Collab Edit plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -27,11 +27,11 @@
|
|
|
27
27
|
"@atlaskit/editor-plugin-editor-viewmode": "^32.0.0",
|
|
28
28
|
"@atlaskit/editor-plugin-feature-flags": "^29.0.0",
|
|
29
29
|
"@atlaskit/editor-prosemirror": "^9.0.0",
|
|
30
|
-
"@atlaskit/editor-shared-styles": "^5.
|
|
30
|
+
"@atlaskit/editor-shared-styles": "^5.1.0",
|
|
31
31
|
"@atlaskit/platform-feature-experiments": "^0.3.0",
|
|
32
32
|
"@atlaskit/platform-feature-flags": "^2.2.0",
|
|
33
33
|
"@atlaskit/prosemirror-collab": "^1.1.0",
|
|
34
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
34
|
+
"@atlaskit/tmp-editor-statsig": "^258.0.0",
|
|
35
35
|
"@atlaskit/tokens": "^20.9.0",
|
|
36
36
|
"@babel/runtime": "^7.0.0",
|
|
37
37
|
"memoize-one": "^6.0.0"
|
|
@@ -47,10 +47,6 @@
|
|
|
47
47
|
"react-dom": "^19.2.0"
|
|
48
48
|
},
|
|
49
49
|
"platform-feature-flags": {
|
|
50
|
-
"confluence_ncs_step_diffing_version_history": {
|
|
51
|
-
"type": "boolean",
|
|
52
|
-
"referenceOnly": true
|
|
53
|
-
},
|
|
54
50
|
"platform_editor_collab_organic_change_reporting": {
|
|
55
51
|
"type": "boolean"
|
|
56
52
|
}
|