@atlaskit/editor-plugin-collab-edit 1.22.7 → 1.23.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 +13 -0
- package/dist/cjs/actions.js +2 -2
- package/dist/cjs/events/handlers.js +1 -1
- package/dist/cjs/utils.js +2 -2
- package/dist/es2019/actions.js +2 -2
- package/dist/es2019/events/handlers.js +1 -1
- package/dist/es2019/utils.js +3 -3
- package/dist/esm/actions.js +2 -2
- package/dist/esm/events/handlers.js +1 -1
- package/dist/esm/utils.js +3 -3
- package/dist/types/actions.d.ts +2 -1
- package/dist/types/utils.d.ts +1 -1
- package/dist/types-ts4.5/actions.d.ts +2 -1
- package/dist/types-ts4.5/utils.d.ts +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-collab-edit
|
|
2
2
|
|
|
3
|
+
## 1.23.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#162298](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/162298)
|
|
8
|
+
[`f5893b7270927`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f5893b7270927) -
|
|
9
|
+
ED-25498 Integrate transformNestedTablesIncomingDocument with Editor and Renderer to transform
|
|
10
|
+
nested table extensions
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
3
16
|
## 1.22.7
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
package/dist/cjs/actions.js
CHANGED
|
@@ -20,14 +20,14 @@ var registerAllCustomSteps = exports.registerAllCustomSteps = function registerA
|
|
|
20
20
|
Object.entries(allAtlaskitCustomSteps).forEach(function () {});
|
|
21
21
|
Object.entries(allAdfSchemaSteps).forEach(function () {});
|
|
22
22
|
};
|
|
23
|
-
var handleInit = exports.handleInit = function handleInit(initData, view, options) {
|
|
23
|
+
var handleInit = exports.handleInit = function handleInit(initData, view, options, editorAnalyticsApi) {
|
|
24
24
|
var doc = initData.doc,
|
|
25
25
|
json = initData.json,
|
|
26
26
|
version = initData.version,
|
|
27
27
|
reserveCursor = initData.reserveCursor;
|
|
28
28
|
if (doc) {
|
|
29
29
|
var state = view.state;
|
|
30
|
-
var tr = (0, _utils.replaceDocument)(doc, state, version, options, reserveCursor);
|
|
30
|
+
var tr = (0, _utils.replaceDocument)(doc, state, version, options, reserveCursor, editorAnalyticsApi);
|
|
31
31
|
tr.setMeta('isRemote', true);
|
|
32
32
|
view.dispatch(tr);
|
|
33
33
|
} else if (json) {
|
|
@@ -40,7 +40,7 @@ var subscribe = exports.subscribe = effect(function (view, provider, options, fe
|
|
|
40
40
|
var handlers = {
|
|
41
41
|
initHandler: function initHandler(data) {
|
|
42
42
|
view.dispatch(view.state.tr.setMeta('collabInitialised', true));
|
|
43
|
-
(0, _actions.handleInit)(data, view, options);
|
|
43
|
+
(0, _actions.handleInit)(data, view, options, editorAnalyticsApi);
|
|
44
44
|
},
|
|
45
45
|
connectedHandler: function connectedHandler(data) {
|
|
46
46
|
return (0, _actions.handleConnection)(data, view);
|
package/dist/cjs/utils.js
CHANGED
|
@@ -83,13 +83,13 @@ var createTelepointers = exports.createTelepointers = function createTelepointer
|
|
|
83
83
|
key: "telepointer-".concat(sessionId, "-zero")
|
|
84
84
|
}));
|
|
85
85
|
};
|
|
86
|
-
var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {
|
|
86
|
+
var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
|
|
87
87
|
var schema = state.schema,
|
|
88
88
|
tr = state.tr;
|
|
89
89
|
var hasContent;
|
|
90
90
|
var content;
|
|
91
91
|
if ((0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
|
|
92
|
-
var parsedDoc = (0, _processRawValue.
|
|
92
|
+
var parsedDoc = (0, _processRawValue.processRawValueWithoutValidation)(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
|
|
93
93
|
hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
|
|
94
94
|
content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
|
|
95
95
|
} else {
|
package/dist/es2019/actions.js
CHANGED
|
@@ -12,7 +12,7 @@ export const registerAllCustomSteps = () => {
|
|
|
12
12
|
Object.entries(allAtlaskitCustomSteps).forEach(() => {});
|
|
13
13
|
Object.entries(allAdfSchemaSteps).forEach(() => {});
|
|
14
14
|
};
|
|
15
|
-
export const handleInit = (initData, view, options) => {
|
|
15
|
+
export const handleInit = (initData, view, options, editorAnalyticsApi) => {
|
|
16
16
|
const {
|
|
17
17
|
doc,
|
|
18
18
|
json,
|
|
@@ -23,7 +23,7 @@ export const handleInit = (initData, view, options) => {
|
|
|
23
23
|
const {
|
|
24
24
|
state
|
|
25
25
|
} = view;
|
|
26
|
-
const tr = replaceDocument(doc, state, version, options, reserveCursor);
|
|
26
|
+
const tr = replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsApi);
|
|
27
27
|
tr.setMeta('isRemote', true);
|
|
28
28
|
view.dispatch(tr);
|
|
29
29
|
} else if (json) {
|
|
@@ -31,7 +31,7 @@ export const subscribe = effect((view, provider, options, featureFlags, _provide
|
|
|
31
31
|
const handlers = {
|
|
32
32
|
initHandler: data => {
|
|
33
33
|
view.dispatch(view.state.tr.setMeta('collabInitialised', true));
|
|
34
|
-
handleInit(data, view, options);
|
|
34
|
+
handleInit(data, view, options, editorAnalyticsApi);
|
|
35
35
|
},
|
|
36
36
|
connectedHandler: data => handleConnection(data, view),
|
|
37
37
|
dataHandler: data => applyRemoteData(data, view, options),
|
package/dist/es2019/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
|
|
2
2
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
|
|
3
|
-
import {
|
|
3
|
+
import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
|
|
4
4
|
import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
|
|
5
5
|
import { Transaction } from '@atlaskit/editor-prosemirror/state';
|
|
6
6
|
import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
|
|
@@ -70,7 +70,7 @@ export const createTelepointers = (from, to, sessionId, isSelection, initial) =>
|
|
|
70
70
|
key: `telepointer-${sessionId}-zero`
|
|
71
71
|
}));
|
|
72
72
|
};
|
|
73
|
-
export const replaceDocument = (doc, state, version, options, reserveCursor) => {
|
|
73
|
+
export const replaceDocument = (doc, state, version, options, reserveCursor, editorAnalyticsAPI) => {
|
|
74
74
|
const {
|
|
75
75
|
schema,
|
|
76
76
|
tr
|
|
@@ -78,7 +78,7 @@ export const replaceDocument = (doc, state, version, options, reserveCursor) =>
|
|
|
78
78
|
let hasContent;
|
|
79
79
|
let content;
|
|
80
80
|
if (fg('platform_editor_use_nested_table_pm_nodes')) {
|
|
81
|
-
const parsedDoc =
|
|
81
|
+
const parsedDoc = processRawValueWithoutValidation(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
|
|
82
82
|
hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
|
|
83
83
|
content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
|
|
84
84
|
} else {
|
package/dist/esm/actions.js
CHANGED
|
@@ -12,14 +12,14 @@ export var registerAllCustomSteps = function registerAllCustomSteps() {
|
|
|
12
12
|
Object.entries(allAtlaskitCustomSteps).forEach(function () {});
|
|
13
13
|
Object.entries(allAdfSchemaSteps).forEach(function () {});
|
|
14
14
|
};
|
|
15
|
-
export var handleInit = function handleInit(initData, view, options) {
|
|
15
|
+
export var handleInit = function handleInit(initData, view, options, editorAnalyticsApi) {
|
|
16
16
|
var doc = initData.doc,
|
|
17
17
|
json = initData.json,
|
|
18
18
|
version = initData.version,
|
|
19
19
|
reserveCursor = initData.reserveCursor;
|
|
20
20
|
if (doc) {
|
|
21
21
|
var state = view.state;
|
|
22
|
-
var tr = replaceDocument(doc, state, version, options, reserveCursor);
|
|
22
|
+
var tr = replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsApi);
|
|
23
23
|
tr.setMeta('isRemote', true);
|
|
24
24
|
view.dispatch(tr);
|
|
25
25
|
} else if (json) {
|
|
@@ -34,7 +34,7 @@ export var subscribe = effect(function (view, provider, options, featureFlags, _
|
|
|
34
34
|
var handlers = {
|
|
35
35
|
initHandler: function initHandler(data) {
|
|
36
36
|
view.dispatch(view.state.tr.setMeta('collabInitialised', true));
|
|
37
|
-
handleInit(data, view, options);
|
|
37
|
+
handleInit(data, view, options, editorAnalyticsApi);
|
|
38
38
|
},
|
|
39
39
|
connectedHandler: function connectedHandler(data) {
|
|
40
40
|
return handleConnection(data, view);
|
package/dist/esm/utils.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _typeof from "@babel/runtime/helpers/typeof";
|
|
2
2
|
import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
|
|
3
3
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
|
|
4
|
-
import {
|
|
4
|
+
import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
|
|
5
5
|
import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
|
|
6
6
|
import { Transaction } from '@atlaskit/editor-prosemirror/state';
|
|
7
7
|
import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
|
|
@@ -75,13 +75,13 @@ export var createTelepointers = function createTelepointers(from, to, sessionId,
|
|
|
75
75
|
key: "telepointer-".concat(sessionId, "-zero")
|
|
76
76
|
}));
|
|
77
77
|
};
|
|
78
|
-
export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {
|
|
78
|
+
export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
|
|
79
79
|
var schema = state.schema,
|
|
80
80
|
tr = state.tr;
|
|
81
81
|
var hasContent;
|
|
82
82
|
var content;
|
|
83
83
|
if (fg('platform_editor_use_nested_table_pm_nodes')) {
|
|
84
|
-
var parsedDoc =
|
|
84
|
+
var parsedDoc = processRawValueWithoutValidation(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
|
|
85
85
|
hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
|
|
86
86
|
content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
|
|
87
87
|
} else {
|
package/dist/types/actions.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
|
|
2
|
+
import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/src/analytics';
|
|
2
3
|
import type { Selection } from '@atlaskit/editor-prosemirror/state';
|
|
3
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { PrivateCollabEditOptions } from './types';
|
|
5
6
|
export declare const registerAllCustomSteps: () => void;
|
|
6
|
-
export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions) => void;
|
|
7
|
+
export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions, editorAnalyticsApi?: EditorAnalyticsAPI) => void;
|
|
7
8
|
export declare const handleConnection: (connectionData: CollabEventConnectionData, view: EditorView) => void;
|
|
8
9
|
export declare const handlePresence: (presenceData: CollabEventPresenceData, view: EditorView) => void;
|
|
9
10
|
/**
|
package/dist/types/utils.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare function getAvatarColor(str: string): {
|
|
|
10
10
|
color: "var(--ds-icon-accent-lime)" | "var(--ds-icon-accent-red)" | "var(--ds-icon-accent-orange)" | "var(--ds-icon-accent-yellow)" | "var(--ds-icon-accent-green)" | "var(--ds-icon-accent-teal)" | "var(--ds-icon-accent-blue)" | "var(--ds-icon-accent-purple)" | "var(--ds-icon-accent-magenta)" | "var(--ds-icon-accent-gray)" | "var(--ds-background-accent-lime-bolder-hovered)" | "var(--ds-background-accent-red-bolder-hovered)" | "var(--ds-background-accent-orange-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-pressed)" | "var(--ds-background-accent-green-bolder-hovered)" | "var(--ds-background-accent-teal-bolder-hovered)" | "var(--ds-background-accent-blue-bolder-hovered)" | "var(--ds-background-accent-purple-bolder-hovered)" | "var(--ds-background-accent-magenta-bolder-hovered)" | "var(--ds-background-accent-gray-bolder-hovered)";
|
|
11
11
|
};
|
|
12
12
|
export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string) => Decoration[];
|
|
13
|
-
export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => Transaction;
|
|
13
|
+
export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean, editorAnalyticsAPI?: EditorAnalyticsAPI) => Transaction;
|
|
14
14
|
export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
|
|
15
15
|
export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;
|
|
16
16
|
export declare const isReplaceStep: (step: Step) => boolean;
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
|
|
2
|
+
import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/src/analytics';
|
|
2
3
|
import type { Selection } from '@atlaskit/editor-prosemirror/state';
|
|
3
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { PrivateCollabEditOptions } from './types';
|
|
5
6
|
export declare const registerAllCustomSteps: () => void;
|
|
6
|
-
export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions) => void;
|
|
7
|
+
export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions, editorAnalyticsApi?: EditorAnalyticsAPI) => void;
|
|
7
8
|
export declare const handleConnection: (connectionData: CollabEventConnectionData, view: EditorView) => void;
|
|
8
9
|
export declare const handlePresence: (presenceData: CollabEventPresenceData, view: EditorView) => void;
|
|
9
10
|
/**
|
|
@@ -10,7 +10,7 @@ export declare function getAvatarColor(str: string): {
|
|
|
10
10
|
color: "var(--ds-icon-accent-lime)" | "var(--ds-icon-accent-red)" | "var(--ds-icon-accent-orange)" | "var(--ds-icon-accent-yellow)" | "var(--ds-icon-accent-green)" | "var(--ds-icon-accent-teal)" | "var(--ds-icon-accent-blue)" | "var(--ds-icon-accent-purple)" | "var(--ds-icon-accent-magenta)" | "var(--ds-icon-accent-gray)" | "var(--ds-background-accent-lime-bolder-hovered)" | "var(--ds-background-accent-red-bolder-hovered)" | "var(--ds-background-accent-orange-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-pressed)" | "var(--ds-background-accent-green-bolder-hovered)" | "var(--ds-background-accent-teal-bolder-hovered)" | "var(--ds-background-accent-blue-bolder-hovered)" | "var(--ds-background-accent-purple-bolder-hovered)" | "var(--ds-background-accent-magenta-bolder-hovered)" | "var(--ds-background-accent-gray-bolder-hovered)";
|
|
11
11
|
};
|
|
12
12
|
export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string) => Decoration[];
|
|
13
|
-
export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => Transaction;
|
|
13
|
+
export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean, editorAnalyticsAPI?: EditorAnalyticsAPI) => Transaction;
|
|
14
14
|
export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
|
|
15
15
|
export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;
|
|
16
16
|
export declare const isReplaceStep: (step: Step) => boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-collab-edit",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.23.0",
|
|
4
4
|
"description": "Collab Edit plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@atlaskit/adf-schema": "^44.2.0",
|
|
35
35
|
"@atlaskit/custom-steps": "^0.8.0",
|
|
36
|
-
"@atlaskit/editor-common": "^94.
|
|
37
|
-
"@atlaskit/editor-json-transformer": "^8.
|
|
36
|
+
"@atlaskit/editor-common": "^94.17.0",
|
|
37
|
+
"@atlaskit/editor-json-transformer": "^8.21.0",
|
|
38
38
|
"@atlaskit/editor-plugin-analytics": "1.10.3",
|
|
39
39
|
"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
|
|
40
40
|
"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@atlaskit/editor-test-helpers": "^20.0.0",
|
|
60
60
|
"@atlaskit/ssr": "*",
|
|
61
61
|
"@atlaskit/synchrony-test-helpers": "^2.5.0",
|
|
62
|
-
"@atlaskit/util-data-test": "^17.
|
|
62
|
+
"@atlaskit/util-data-test": "^17.12.0",
|
|
63
63
|
"@atlaskit/visual-regression": "*",
|
|
64
64
|
"@testing-library/react": "^12.1.5",
|
|
65
65
|
"typescript": "~5.4.2",
|