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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 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/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;
@@ -84,10 +86,18 @@ var createTelepointers = exports.createTelepointers = function createTelepointer
 var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {
   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.processRawValueWithoutTransformation)(schema, doc);
+    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/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 { processRawValueWithoutTransformation } 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';
@@ -73,8 +75,16 @@ export const replaceDocument = (doc, state, version, options, reserveCursor) =>
     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 = processRawValueWithoutTransformation(schema, doc);
+    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/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 { processRawValueWithoutTransformation } 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;
@@ -76,10 +78,18 @@ export var createTelepointers = function createTelepointers(from, to, sessionId,
 export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {
   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 = processRawValueWithoutTransformation(schema, doc);
+    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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "1.22.6",
+	"version": "1.22.7",
 	"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-common": "^94.11.0",
 		"@atlaskit/editor-json-transformer": "^8.18.2",
 		"@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",
@@ -107,6 +107,9 @@
 		},
 		"platform_editor_filter_spamming_transactions": {
 			"type": "boolean"
+		},
+		"platform_editor_use_nested_table_pm_nodes": {
+			"type": "boolean"
 		}
 	}
 }