@atlaskit/editor-plugin-collab-edit 1.22.6 → 1.23.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 1.23.0
+
+### Minor Changes
+
+- [#162298](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/162298)
+  [`f5893b7270927`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f5893b7270927) -
+  ED-25498 Integrate transformNestedTablesIncomingDocument with Editor and Renderer to transform
+  nested table extensions
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.22.7
+
+### Patch Changes
+
+- [#159766](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159766)
+  [`5140d0f3b3895`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5140d0f3b3895) -
+  ED-25400 Use consistent node parsing logic for preload of editor-plugin-collab-edit
+
 ## 1.22.6
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -20,14 +20,14 @@ var registerAllCustomSteps = exports.registerAllCustomSteps = function registerA
   Object.entries(allAtlaskitCustomSteps).forEach(function () {});
   Object.entries(allAdfSchemaSteps).forEach(function () {});
 };
-var handleInit = exports.handleInit = function handleInit(initData, view, options) {
+var handleInit = exports.handleInit = function handleInit(initData, view, options, editorAnalyticsApi) {
   var doc = initData.doc,
     json = initData.json,
     version = initData.version,
     reserveCursor = initData.reserveCursor;
   if (doc) {
     var state = view.state;
-    var tr = (0, _utils.replaceDocument)(doc, state, version, options, reserveCursor);
+    var tr = (0, _utils.replaceDocument)(doc, state, version, options, reserveCursor, editorAnalyticsApi);
     tr.setMeta('isRemote', true);
     view.dispatch(tr);
   } else if (json) {

package/dist/cjs/events/handlers.js

@@ -40,7 +40,7 @@ var subscribe = exports.subscribe = effect(function (view, provider, options, fe
   var handlers = {
     initHandler: function initHandler(data) {
       view.dispatch(view.state.tr.setMeta('collabInitialised', true));
-      (0, _actions.handleInit)(data, view, options);
+      (0, _actions.handleInit)(data, view, options, editorAnalyticsApi);
     },
     connectedHandler: function connectedHandler(data) {
       return (0, _actions.handleConnection)(data, view);

package/dist/cjs/utils.js

@@ -10,11 +10,13 @@ exports.scrollToCollabCursor = exports.replaceDocument = exports.originalTransac
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _consts = require("@atlaskit/editor-shared-styles/consts");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var findPointers = exports.findPointers = function findPointers(id, decorations) {
   return decorations.find().reduce(function (arr, deco) {
     return deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr;
@@ -81,13 +83,21 @@ var createTelepointers = exports.createTelepointers = function createTelepointer
     key: "telepointer-".concat(sessionId, "-zero")
   }));
 };
-var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {
+var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
   var schema = state.schema,
     tr = state.tr;
-  var content = (doc.content || []).map(function (child) {
-    return schema.nodeFromJSON(child);
-  });
-  var hasContent = !!content.length;
+  var hasContent;
+  var content;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
+    var parsedDoc = (0, _processRawValue.processRawValueWithoutValidation)(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
+    hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
+    content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
+  } else {
+    content = (doc.content || []).map(function (child) {
+      return schema.nodeFromJSON(child);
+    });
+    hasContent = Array.isArray(content) && !!content.length;
+  }
   if (hasContent) {
     tr.setMeta('addToHistory', false);
     tr.replaceWith(0, state.doc.nodeSize - 2, content);

package/dist/es2019/actions.js

@@ -12,7 +12,7 @@ export const registerAllCustomSteps = () => {
   Object.entries(allAtlaskitCustomSteps).forEach(() => {});
   Object.entries(allAdfSchemaSteps).forEach(() => {});
 };
-export const handleInit = (initData, view, options) => {
+export const handleInit = (initData, view, options, editorAnalyticsApi) => {
   const {
     doc,
     json,
@@ -23,7 +23,7 @@ export const handleInit = (initData, view, options) => {
     const {
       state
     } = view;
-    const tr = replaceDocument(doc, state, version, options, reserveCursor);
+    const tr = replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsApi);
     tr.setMeta('isRemote', true);
     view.dispatch(tr);
   } else if (json) {

package/dist/es2019/events/handlers.js

@@ -31,7 +31,7 @@ export const subscribe = effect((view, provider, options, featureFlags, _provide
   const handlers = {
     initHandler: data => {
       view.dispatch(view.state.tr.setMeta('collabInitialised', true));
-      handleInit(data, view, options);
+      handleInit(data, view, options, editorAnalyticsApi);
     },
     connectedHandler: data => handleConnection(data, view),
     dataHandler: data => applyRemoteData(data, view, options),

package/dist/es2019/utils.js

@@ -1,11 +1,13 @@
 import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { avatarColors } from '@atlaskit/editor-shared-styles/consts';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const findPointers = (id, decorations) => decorations.find().reduce((arr, deco) => deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr, []);
 function style(options) {
   const color = options && options.color || 'black';
@@ -68,13 +70,21 @@ export const createTelepointers = (from, to, sessionId, isSelection, initial) =>
     key: `telepointer-${sessionId}-zero`
   }));
 };
-export const replaceDocument = (doc, state, version, options, reserveCursor) => {
+export const replaceDocument = (doc, state, version, options, reserveCursor, editorAnalyticsAPI) => {
   const {
     schema,
     tr
   } = state;
-  let content = (doc.content || []).map(child => schema.nodeFromJSON(child));
-  let hasContent = !!content.length;
+  let hasContent;
+  let content;
+  if (fg('platform_editor_use_nested_table_pm_nodes')) {
+    const parsedDoc = processRawValueWithoutValidation(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
+    hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
+    content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
+  } else {
+    content = (doc.content || []).map(child => schema.nodeFromJSON(child));
+    hasContent = Array.isArray(content) && !!content.length;
+  }
   if (hasContent) {
     tr.setMeta('addToHistory', false);
     tr.replaceWith(0, state.doc.nodeSize - 2, content);

package/dist/esm/actions.js

@@ -12,14 +12,14 @@ export var registerAllCustomSteps = function registerAllCustomSteps() {
   Object.entries(allAtlaskitCustomSteps).forEach(function () {});
   Object.entries(allAdfSchemaSteps).forEach(function () {});
 };
-export var handleInit = function handleInit(initData, view, options) {
+export var handleInit = function handleInit(initData, view, options, editorAnalyticsApi) {
   var doc = initData.doc,
     json = initData.json,
     version = initData.version,
     reserveCursor = initData.reserveCursor;
   if (doc) {
     var state = view.state;
-    var tr = replaceDocument(doc, state, version, options, reserveCursor);
+    var tr = replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsApi);
     tr.setMeta('isRemote', true);
     view.dispatch(tr);
   } else if (json) {

package/dist/esm/events/handlers.js

@@ -34,7 +34,7 @@ export var subscribe = effect(function (view, provider, options, featureFlags, _
   var handlers = {
     initHandler: function initHandler(data) {
       view.dispatch(view.state.tr.setMeta('collabInitialised', true));
-      handleInit(data, view, options);
+      handleInit(data, view, options, editorAnalyticsApi);
     },
     connectedHandler: function connectedHandler(data) {
       return handleConnection(data, view);

package/dist/esm/utils.js

@@ -1,12 +1,14 @@
 import _typeof from "@babel/runtime/helpers/typeof";
 import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { avatarColors } from '@atlaskit/editor-shared-styles/consts';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var findPointers = function findPointers(id, decorations) {
   return decorations.find().reduce(function (arr, deco) {
     return deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr;
@@ -73,13 +75,21 @@ export var createTelepointers = function createTelepointers(from, to, sessionId,
     key: "telepointer-".concat(sessionId, "-zero")
   }));
 };
-export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {
+export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
   var schema = state.schema,
     tr = state.tr;
-  var content = (doc.content || []).map(function (child) {
-    return schema.nodeFromJSON(child);
-  });
-  var hasContent = !!content.length;
+  var hasContent;
+  var content;
+  if (fg('platform_editor_use_nested_table_pm_nodes')) {
+    var parsedDoc = processRawValueWithoutValidation(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
+    hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
+    content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
+  } else {
+    content = (doc.content || []).map(function (child) {
+      return schema.nodeFromJSON(child);
+    });
+    hasContent = Array.isArray(content) && !!content.length;
+  }
   if (hasContent) {
     tr.setMeta('addToHistory', false);
     tr.replaceWith(0, state.doc.nodeSize - 2, content);

package/dist/types/actions.d.ts

@@ -1,9 +1,10 @@
 import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
+import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/src/analytics';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PrivateCollabEditOptions } from './types';
 export declare const registerAllCustomSteps: () => void;
-export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions) => void;
+export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions, editorAnalyticsApi?: EditorAnalyticsAPI) => void;
 export declare const handleConnection: (connectionData: CollabEventConnectionData, view: EditorView) => void;
 export declare const handlePresence: (presenceData: CollabEventPresenceData, view: EditorView) => void;
 /**

package/dist/types/utils.d.ts

@@ -10,7 +10,7 @@ export declare function getAvatarColor(str: string): {
     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)";
 };
 export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string) => Decoration[];
-export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => Transaction;
+export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean, editorAnalyticsAPI?: EditorAnalyticsAPI) => Transaction;
 export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
 export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;
 export declare const isReplaceStep: (step: Step) => boolean;

package/dist/types-ts4.5/actions.d.ts

@@ -1,9 +1,10 @@
 import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
+import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/src/analytics';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PrivateCollabEditOptions } from './types';
 export declare const registerAllCustomSteps: () => void;
-export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions) => void;
+export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions, editorAnalyticsApi?: EditorAnalyticsAPI) => void;
 export declare const handleConnection: (connectionData: CollabEventConnectionData, view: EditorView) => void;
 export declare const handlePresence: (presenceData: CollabEventPresenceData, view: EditorView) => void;
 /**

package/dist/types-ts4.5/utils.d.ts

@@ -10,7 +10,7 @@ export declare function getAvatarColor(str: string): {
     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)";
 };
 export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string) => Decoration[];
-export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => Transaction;
+export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean, editorAnalyticsAPI?: EditorAnalyticsAPI) => Transaction;
 export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
 export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;
 export declare const isReplaceStep: (step: Step) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "1.22.6",
+	"version": "1.23.0",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,13 +33,13 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^44.2.0",
 		"@atlaskit/custom-steps": "^0.8.0",
-		"@atlaskit/editor-common": "^94.9.0",
-		"@atlaskit/editor-json-transformer": "^8.18.2",
+		"@atlaskit/editor-common": "^94.17.0",
+		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-plugin-analytics": "1.10.3",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
-		"@atlaskit/editor-shared-styles": "^3.1.0",
+		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-collab": "^0.10.0",
 		"@babel/runtime": "^7.0.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/editor-test-helpers": "^20.0.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/synchrony-test-helpers": "^2.5.0",
-		"@atlaskit/util-data-test": "^17.11.0",
+		"@atlaskit/util-data-test": "^17.12.0",
 		"@atlaskit/visual-regression": "*",
 		"@testing-library/react": "^12.1.5",
 		"typescript": "~5.4.2",
@@ -107,6 +107,9 @@
 		},
 		"platform_editor_filter_spamming_transactions": {
 			"type": "boolean"
+		},
+		"platform_editor_use_nested_table_pm_nodes": {
+			"type": "boolean"
 		}
 	}
 }