@atlaskit/editor-common 122.8.0 → 122.8.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-common
 
+## 122.8.2
+
+### Patch Changes
+
+- [`2bbc1c84de468`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2bbc1c84de468) -
+  Migrate Volt consumer imports to existing definitions and align affected test mocks without
+  changing runtime behavior.
+- Updated dependencies
+
+## 122.8.1
+
+### Patch Changes
+
+- [`442abbe2a88e0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/442abbe2a88e0) -
+  Normalize documents before relaxed show-diff comparisons when Confluence version-history diffing
+  is enabled.
+
 ## 122.8.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -27,7 +27,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "122.7.0";
+var packageVersion = "122.8.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "122.7.0";
+var packageVersion = "122.8.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/utils/areDocsEqualByBlockStructureAndText.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.areDocsEqualByBlockStructureAndText = areDocsEqualByBlockStructureAndText;
+var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+/**
+ * Returns true when documents have the same text and block structure, while ignoring marks and
+ * attributes. This is useful when comparing documents produced by different serialization paths.
+ */
+function areDocsEqualByBlockStructureAndText(node1, node2) {
+  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+    node1 = normalizeDocument(node1);
+    node2 = normalizeDocument(node2);
+  }
+  if (node1.textContent !== node2.textContent) {
+    return false;
+  }
+  var stripped1 = stripMarks(node1);
+  var stripped2 = stripMarks(node2);
+  return stripped1.nodeSize === stripped2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
+}
+var transformers = new WeakMap();
+function normalizeDocument(node) {
+  var schema = node.type.schema;
+  var transformer = transformers.get(schema);
+  if (!transformer) {
+    transformer = new _editorJsonTransformer.JSONTransformer(schema);
+    transformers.set(schema, transformer);
+  }
+  return transformer.parse(transformer.encode(node));
+}
+function stripMarks(doc) {
+  var tr = new _transform.Transform(doc);
+  tr.removeMark(0, doc.content.size);
+  return tr.doc;
+}
+function isBlockStructureEqual(node1, node2) {
+  if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
+    return false;
+  }
+  for (var index = 0; index < node1.childCount; index++) {
+    if (!isBlockStructureEqual(node1.child(index), node2.child(index))) {
+      return false;
+    }
+  }
+  return true;
+}

package/dist/cjs/utils/document.js

@@ -219,6 +219,7 @@ function areFragmentsEqual(frag1, frag2, attributesToIgnore, opts) {
   });
   return childrenEqual;
 }
+
 // eslint-disable-next-line @atlaskit/editor/no-re-export
 
 // eslint-disable-next-line @atlaskit/editor/no-re-export

package/dist/cjs/utils/filter/privacy-filter.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.sanitizeNodeForPrivacy = sanitizeNodeForPrivacy;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _traverse = require("@atlaskit/adf-utils/traverse");
-var _resource = require("@atlaskit/mention/resource");
+var _isResolvingMentionProvider = require("@atlaskit/mention/is-resolving-mention-provider");
 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; }
 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; }
 /**
@@ -41,7 +41,7 @@ function sanitizeNodeForPrivacy(json, providerFactory) {
     var _handler = function handler(_name, providerPromise) {
       if (providerPromise) {
         providerPromise.then(function (provider) {
-          if ((0, _resource.isResolvingMentionProvider)(provider)) {
+          if ((0, _isResolvingMentionProvider.isResolvingMentionProvider)(provider)) {
             mentionNames.forEach(function (name, id) {
               provider.cacheMentionName(id, name);
             });

package/dist/es2019/monitoring/error.js

@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "122.7.0";
+const packageVersion = "122.8.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "122.7.0";
+const packageVersion = "122.8.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/utils/areDocsEqualByBlockStructureAndText.js

@@ -0,0 +1,46 @@
+import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { Transform } from '@atlaskit/editor-prosemirror/transform';
+
+/**
+ * Returns true when documents have the same text and block structure, while ignoring marks and
+ * attributes. This is useful when comparing documents produced by different serialization paths.
+ */
+export function areDocsEqualByBlockStructureAndText(node1, node2) {
+  if (fg('confluence_ncs_step_diffing_version_history')) {
+    node1 = normalizeDocument(node1);
+    node2 = normalizeDocument(node2);
+  }
+  if (node1.textContent !== node2.textContent) {
+    return false;
+  }
+  const stripped1 = stripMarks(node1);
+  const stripped2 = stripMarks(node2);
+  return stripped1.nodeSize === stripped2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
+}
+const transformers = new WeakMap();
+function normalizeDocument(node) {
+  const schema = node.type.schema;
+  let transformer = transformers.get(schema);
+  if (!transformer) {
+    transformer = new JSONTransformer(schema);
+    transformers.set(schema, transformer);
+  }
+  return transformer.parse(transformer.encode(node));
+}
+function stripMarks(doc) {
+  const tr = new Transform(doc);
+  tr.removeMark(0, doc.content.size);
+  return tr.doc;
+}
+function isBlockStructureEqual(node1, node2) {
+  if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
+    return false;
+  }
+  for (let index = 0; index < node1.childCount; index++) {
+    if (!isBlockStructureEqual(node1.child(index), node2.child(index))) {
+      return false;
+    }
+  }
+  return true;
+}

package/dist/es2019/utils/document.js

@@ -155,6 +155,7 @@ function areFragmentsEqual(frag1, frag2, attributesToIgnore, opts) {
   });
   return childrenEqual;
 }
+
 // eslint-disable-next-line @atlaskit/editor/no-re-export
 export { getStepRange } from './getStepRange';
 // eslint-disable-next-line @atlaskit/editor/no-re-export

package/dist/es2019/utils/filter/privacy-filter.js

@@ -1,5 +1,5 @@
 import { traverse } from '@atlaskit/adf-utils/traverse';
-import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { isResolvingMentionProvider } from '@atlaskit/mention/is-resolving-mention-provider';
 /**
  * Sanitises a document where some content should not be in the document (e.g. mention names).
  *

package/dist/esm/monitoring/error.js

@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "122.7.0";
+var packageVersion = "122.8.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "122.7.0";
+var packageVersion = "122.8.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/utils/areDocsEqualByBlockStructureAndText.js

@@ -0,0 +1,46 @@
+import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { Transform } from '@atlaskit/editor-prosemirror/transform';
+
+/**
+ * Returns true when documents have the same text and block structure, while ignoring marks and
+ * attributes. This is useful when comparing documents produced by different serialization paths.
+ */
+export function areDocsEqualByBlockStructureAndText(node1, node2) {
+  if (fg('confluence_ncs_step_diffing_version_history')) {
+    node1 = normalizeDocument(node1);
+    node2 = normalizeDocument(node2);
+  }
+  if (node1.textContent !== node2.textContent) {
+    return false;
+  }
+  var stripped1 = stripMarks(node1);
+  var stripped2 = stripMarks(node2);
+  return stripped1.nodeSize === stripped2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
+}
+var transformers = new WeakMap();
+function normalizeDocument(node) {
+  var schema = node.type.schema;
+  var transformer = transformers.get(schema);
+  if (!transformer) {
+    transformer = new JSONTransformer(schema);
+    transformers.set(schema, transformer);
+  }
+  return transformer.parse(transformer.encode(node));
+}
+function stripMarks(doc) {
+  var tr = new Transform(doc);
+  tr.removeMark(0, doc.content.size);
+  return tr.doc;
+}
+function isBlockStructureEqual(node1, node2) {
+  if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
+    return false;
+  }
+  for (var index = 0; index < node1.childCount; index++) {
+    if (!isBlockStructureEqual(node1.child(index), node2.child(index))) {
+      return false;
+    }
+  }
+  return true;
+}

package/dist/esm/utils/document.js

@@ -175,6 +175,7 @@ function areFragmentsEqual(frag1, frag2, attributesToIgnore, opts) {
   });
   return childrenEqual;
 }
+
 // eslint-disable-next-line @atlaskit/editor/no-re-export
 export { getStepRange } from './getStepRange';
 // eslint-disable-next-line @atlaskit/editor/no-re-export

package/dist/esm/utils/filter/privacy-filter.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 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; }
 import { traverse } from '@atlaskit/adf-utils/traverse';
-import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { isResolvingMentionProvider } from '@atlaskit/mention/is-resolving-mention-provider';
 /**
  * Sanitises a document where some content should not be in the document (e.g. mention names).
  *

package/dist/types/utils/areDocsEqualByBlockStructureAndText.d.ts

@@ -0,0 +1,6 @@
+import type { Node } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Returns true when documents have the same text and block structure, while ignoring marks and
+ * attributes. This is useful when comparing documents produced by different serialization paths.
+ */
+export declare function areDocsEqualByBlockStructureAndText(node1: Node, node2: Node): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "122.8.0",
+	"version": "122.8.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -64,7 +64,7 @@
 		"@atlaskit/media-picker": "^72.4.0",
 		"@atlaskit/media-ui": "^30.16.0",
 		"@atlaskit/media-viewer": "^54.8.0",
-		"@atlaskit/mention": "^29.1.0",
+		"@atlaskit/mention": "^29.2.0",
 		"@atlaskit/menu": "^10.2.0",
 		"@atlaskit/object": "^2.3.0",
 		"@atlaskit/onboarding": "^15.4.0",
@@ -84,7 +84,7 @@
 		"@atlaskit/task-decision": "^21.10.0",
 		"@atlaskit/teams-app-config": "^3.1.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^196.0.0",
+		"@atlaskit/tmp-editor-statsig": "^197.0.0",
 		"@atlaskit/tokens": "^17.0.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/width-detector": "^7.2.0",
@@ -145,6 +145,10 @@
 		"sinon": "^2.2.0"
 	},
 	"platform-feature-flags": {
+		"confluence_ncs_step_diffing_version_history": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_add_text_color_tracking": {
 			"type": "boolean"
 		},

package/utils/areDocsEqualByBlockStructureAndText/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText",
+  "main": "../../dist/cjs/utils/areDocsEqualByBlockStructureAndText.js",
+  "module": "../../dist/esm/utils/areDocsEqualByBlockStructureAndText.js",
+  "module:es2019": "../../dist/es2019/utils/areDocsEqualByBlockStructureAndText.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../../dist/types/utils/areDocsEqualByBlockStructureAndText.d.ts"
+}