@atlaskit/editor-plugin-collab-edit 3.9.4 → 3.9.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 3.9.5
+
+### Patch Changes
+
+- [#171054](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/171054)
+  [`46a532280fd7c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/46a532280fd7c) -
+  Filter out AnalyticsSteps from metric
+- [#169039](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/169039)
+  [`d2488752fcad8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d2488752fcad8) -
+  EDITOR-508 Part 1 of cleaning up `platform_editor_use_nested_table_pm_nodes`
+- Updated dependencies
+
 ## 3.9.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/track-steps.js

@@ -10,6 +10,7 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _trackStepMetrics = require("./track-step-metrics");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -179,7 +180,9 @@ var track = exports.track = function track(_ref3) {
   if ((0, _platformFeatureFlags.fg)('platform_enable_ncs_step_metrics')) {
     (0, _trackStepMetrics.updateNcsSessionStepMetrics)({
       api: api,
-      steps: newSteps
+      steps: (0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(function (step) {
+        return !(step instanceof _steps.AnalyticsStep);
+      }) : newSteps
     });
   }
   scheduler.postTask(function () {

package/dist/cjs/pm-plugins/utils.js

@@ -121,20 +121,9 @@ var createTelepointers = exports.createTelepointers = function createTelepointer
 var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
   var schema = state.schema,
     tr = state.tr;
-  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 {
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    content = (doc.content || []).map(function (child) {
-      return schema.nodeFromJSON(child);
-    });
-    hasContent = Array.isArray(content) && !!content.length;
-  }
+  var parsedDoc = (0, _processRawValue.processRawValueWithoutValidation)(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
+  var hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
+  var content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
   if (hasContent) {
     tr.setMeta('addToHistory', false);
     // Ignored via go/ees005

package/dist/es2019/pm-plugins/track-steps.js

@@ -1,7 +1,8 @@
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateNcsSessionStepMetrics } from './track-step-metrics';
 function groupBy(array, keyGetter) {
   // Check group by exists, and that it's a function. If so, use the native browser code
@@ -157,7 +158,7 @@ export const track = ({
   if (fg('platform_enable_ncs_step_metrics')) {
     updateNcsSessionStepMetrics({
       api,
-      steps: newSteps
+      steps: editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(step => !(step instanceof AnalyticsStep)) : newSteps
     });
   }
   scheduler.postTask(() => {

package/dist/es2019/pm-plugins/utils.js

@@ -105,18 +105,9 @@ export const replaceDocument = (doc, state, version, options, reserveCursor, edi
     schema,
     tr
   } = state;
-  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 {
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    content = (doc.content || []).map(child => schema.nodeFromJSON(child));
-    hasContent = Array.isArray(content) && !!content.length;
-  }
+  const parsedDoc = processRawValueWithoutValidation(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
+  const hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
+  const content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
   if (hasContent) {
     tr.setMeta('addToHistory', false);
     // Ignored via go/ees005

package/dist/esm/pm-plugins/track-steps.js

@@ -2,10 +2,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateNcsSessionStepMetrics } from './track-step-metrics';
 function groupBy(array, keyGetter) {
   // Check group by exists, and that it's a function. If so, use the native browser code
@@ -172,7 +173,9 @@ export var track = function track(_ref3) {
   if (fg('platform_enable_ncs_step_metrics')) {
     updateNcsSessionStepMetrics({
       api: api,
-      steps: newSteps
+      steps: editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(function (step) {
+        return !(step instanceof AnalyticsStep);
+      }) : newSteps
     });
   }
   scheduler.postTask(function () {

package/dist/esm/pm-plugins/utils.js

@@ -112,20 +112,9 @@ export var createTelepointers = function createTelepointers(from, to, sessionId,
 export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
   var schema = state.schema,
     tr = state.tr;
-  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 {
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    content = (doc.content || []).map(function (child) {
-      return schema.nodeFromJSON(child);
-    });
-    hasContent = Array.isArray(content) && !!content.length;
-  }
+  var parsedDoc = processRawValueWithoutValidation(schema, doc, editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent);
+  var hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
+  var content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
   if (hasContent) {
     tr.setMeta('addToHistory', false);
     // Ignored via go/ees005

package/dist/types/pm-plugins/track-step-metrics.d.ts

@@ -1,6 +1,6 @@
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
-import { CollabEditPlugin } from '../collabEditPluginType';
+import type { CollabEditPlugin } from '../collabEditPluginType';
 type StepSessionMetrics = {
     totalStepSize: number;
     numberOfSteps: number;

package/dist/types/pm-plugins/track-steps.d.ts

@@ -1,7 +1,7 @@
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
-import { CollabEditPlugin } from '../collabEditPluginType';
+import type { CollabEditPlugin } from '../collabEditPluginType';
 export type SanitizedStep = {
     stepType: string;
     attr?: string;

package/dist/types-ts4.5/pm-plugins/track-step-metrics.d.ts

@@ -1,6 +1,6 @@
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
-import { CollabEditPlugin } from '../collabEditPluginType';
+import type { CollabEditPlugin } from '../collabEditPluginType';
 type StepSessionMetrics = {
     totalStepSize: number;
     numberOfSteps: number;

package/dist/types-ts4.5/pm-plugins/track-steps.d.ts

@@ -1,7 +1,7 @@
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
-import { CollabEditPlugin } from '../collabEditPluginType';
+import type { CollabEditPlugin } from '../collabEditPluginType';
 export type SanitizedStep = {
     stepType: string;
     attr?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "3.9.4",
+	"version": "3.9.5",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^106.6.0",
+		"@atlaskit/editor-common": "^106.7.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -56,7 +56,7 @@
 		"@af/integration-testing": "workspace:^",
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/editor-plugin-mentions": "^4.7.0",
-		"@atlaskit/editor-plugin-text-formatting": "^2.2.0",
+		"@atlaskit/editor-plugin-text-formatting": "^2.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^2.7.0",
 		"@atlaskit/editor-plugin-unsupported-content": "^2.1.0",
 		"@atlaskit/editor-test-helpers": "workspace:^",
@@ -105,9 +105,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_use_nested_table_pm_nodes": {
-			"type": "boolean"
-		},
 		"platform_editor_selection_without_left_shift": {
 			"type": "boolean"
 		},