@atlaskit/editor-common 99.15.0 → 99.16.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 99.16.0
+
+### Minor Changes
+
+- [#114421](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114421)
+  [`1b137b82b89d3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1b137b82b89d3) -
+  [ECOHELP-54944] Strip macro IDs on paste for extensions and inline extensions
+
 ## 99.15.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 = "99.15.0";
+var packageVersion = "99.16.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/transforms/extension.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformSliceToRemoveOpenMultiBodiedExtension = exports.transformSliceToRemoveOpenBodiedExtension = exports.transformSliceToRemoveLegacyContentMacro = void 0;
+exports.transformSliceToRemoveOpenMultiBodiedExtension = exports.transformSliceToRemoveOpenBodiedExtension = exports.transformSliceToRemoveMacroId = exports.transformSliceToRemoveLegacyContentMacro = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _slice = require("../utils/slice");
@@ -93,4 +93,19 @@ var transformSliceToRemoveLegacyContentMacro = exports.transformSliceToRemoveLeg
     }
     return node;
   });
+};
+var transformSliceToRemoveMacroId = exports.transformSliceToRemoveMacroId = function transformSliceToRemoveMacroId(slice, schema) {
+  var _schema$nodes2 = schema.nodes,
+    extension = _schema$nodes2.extension,
+    inlineExtension = _schema$nodes2.inlineExtension;
+  return (0, _slice.mapSlice)(slice, function (node) {
+    var _node$attrs$parameter2;
+    if ([extension, inlineExtension].includes(node.type) && typeof ((_node$attrs$parameter2 = node.attrs.parameters) === null || _node$attrs$parameter2 === void 0 || (_node$attrs$parameter2 = _node$attrs$parameter2.macroMetadata) === null || _node$attrs$parameter2 === void 0 || (_node$attrs$parameter2 = _node$attrs$parameter2.macroId) === null || _node$attrs$parameter2 === void 0 ? void 0 : _node$attrs$parameter2.value) !== 'undefined') {
+      // Strip the macroId. While pasting on the same page, macroId does not change until the page
+      // is published and causes collision with the existing macroId where switching tabs of one
+      // node changes the tabs for the other node
+      delete node.attrs.parameters.macroMetadata.macroId;
+    }
+    return node;
+  });
 };

package/dist/cjs/transforms/index.js

@@ -69,6 +69,12 @@ Object.defineProperty(exports, "transformSliceToRemoveLegacyContentMacro", {
     return _extension.transformSliceToRemoveLegacyContentMacro;
   }
 });
+Object.defineProperty(exports, "transformSliceToRemoveMacroId", {
+  enumerable: true,
+  get: function get() {
+    return _extension.transformSliceToRemoveMacroId;
+  }
+});
 Object.defineProperty(exports, "transformSliceToRemoveOpenBodiedExtension", {
   enumerable: true,
   get: function get() {

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

@@ -23,7 +23,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 = "99.15.0";
+var packageVersion = "99.16.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "99.15.0";
+const packageVersion = "99.16.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/transforms/extension.js

@@ -93,4 +93,20 @@ export const transformSliceToRemoveLegacyContentMacro = (slice, schema) => {
     }
     return node;
   });
+};
+export const transformSliceToRemoveMacroId = (slice, schema) => {
+  const {
+    extension,
+    inlineExtension
+  } = schema.nodes;
+  return mapSlice(slice, node => {
+    var _node$attrs$parameter4, _node$attrs$parameter5, _node$attrs$parameter6;
+    if ([extension, inlineExtension].includes(node.type) && typeof ((_node$attrs$parameter4 = node.attrs.parameters) === null || _node$attrs$parameter4 === void 0 ? void 0 : (_node$attrs$parameter5 = _node$attrs$parameter4.macroMetadata) === null || _node$attrs$parameter5 === void 0 ? void 0 : (_node$attrs$parameter6 = _node$attrs$parameter5.macroId) === null || _node$attrs$parameter6 === void 0 ? void 0 : _node$attrs$parameter6.value) !== 'undefined') {
+      // Strip the macroId. While pasting on the same page, macroId does not change until the page
+      // is published and causes collision with the existing macroId where switching tabs of one
+      // node changes the tabs for the other node
+      delete node.attrs.parameters.macroMetadata.macroId;
+    }
+    return node;
+  });
 };

package/dist/es2019/transforms/index.js

@@ -3,6 +3,6 @@
 
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, transformSingleColumnLayout } from './layout';
 export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand } from './expand';
-export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro } from './extension';
+export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "99.15.0";
+const packageVersion = "99.16.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "99.15.0";
+var packageVersion = "99.16.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/transforms/extension.js

@@ -88,4 +88,19 @@ export var transformSliceToRemoveLegacyContentMacro = function transformSliceToR
     }
     return node;
   });
+};
+export var transformSliceToRemoveMacroId = function transformSliceToRemoveMacroId(slice, schema) {
+  var _schema$nodes2 = schema.nodes,
+    extension = _schema$nodes2.extension,
+    inlineExtension = _schema$nodes2.inlineExtension;
+  return mapSlice(slice, function (node) {
+    var _node$attrs$parameter2;
+    if ([extension, inlineExtension].includes(node.type) && typeof ((_node$attrs$parameter2 = node.attrs.parameters) === null || _node$attrs$parameter2 === void 0 || (_node$attrs$parameter2 = _node$attrs$parameter2.macroMetadata) === null || _node$attrs$parameter2 === void 0 || (_node$attrs$parameter2 = _node$attrs$parameter2.macroId) === null || _node$attrs$parameter2 === void 0 ? void 0 : _node$attrs$parameter2.value) !== 'undefined') {
+      // Strip the macroId. While pasting on the same page, macroId does not change until the page
+      // is published and causes collision with the existing macroId where switching tabs of one
+      // node changes the tabs for the other node
+      delete node.attrs.parameters.macroMetadata.macroId;
+    }
+    return node;
+  });
 };

package/dist/esm/transforms/index.js

@@ -3,6 +3,6 @@
 
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, transformSingleColumnLayout } from './layout';
 export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand } from './expand';
-export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro } from './extension';
+export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

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

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "99.15.0";
+var packageVersion = "99.16.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/types/transforms/extension.d.ts

@@ -11,3 +11,4 @@ export declare const transformSliceToRemoveOpenBodiedExtension: (slice: Slice, s
  */
 export declare const transformSliceToRemoveOpenMultiBodiedExtension: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceToRemoveLegacyContentMacro: (slice: Slice, schema: Schema) => Slice;
+export declare const transformSliceToRemoveMacroId: (slice: Slice, schema: Schema) => Slice;

package/dist/types/transforms/index.d.ts

@@ -1,5 +1,5 @@
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, transformSingleColumnLayout, } from './layout';
 export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand, } from './expand';
-export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro, } from './extension';
+export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock, } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

package/dist/types-ts4.5/transforms/extension.d.ts

@@ -11,3 +11,4 @@ export declare const transformSliceToRemoveOpenBodiedExtension: (slice: Slice, s
  */
 export declare const transformSliceToRemoveOpenMultiBodiedExtension: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceToRemoveLegacyContentMacro: (slice: Slice, schema: Schema) => Slice;
+export declare const transformSliceToRemoveMacroId: (slice: Slice, schema: Schema) => Slice;

package/dist/types-ts4.5/transforms/index.d.ts

@@ -1,5 +1,5 @@
 export { unwrapContentFromLayout, removeLayoutFromFirstChild, removeLayoutFromLastChild, transformSliceToRemoveOpenLayoutNodes, transformSingleColumnLayout, } from './layout';
 export { findExpand, transformSliceToRemoveOpenExpand, transformSliceToRemoveOpenNestedExpand, transformSliceNestedExpandToExpand, transformSliceExpandToNestedExpand, } from './expand';
-export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro, } from './extension';
+export { transformSliceToRemoveOpenBodiedExtension, transformSliceToRemoveOpenMultiBodiedExtension, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, } from './extension';
 export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, findCodeBlock, } from './code-block';
 export { transformSliceToDecisionList } from './decision-list';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "99.15.0",
+	"version": "99.16.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -132,7 +132,7 @@
 		"@atlaskit/emoji": "^67.14.0",
 		"@atlaskit/icon": "^23.9.0",
 		"@atlaskit/icon-object": "^6.11.0",
-		"@atlaskit/link-datasource": "^3.19.0",
+		"@atlaskit/link-datasource": "^3.20.0",
 		"@atlaskit/link-picker": "^1.49.0",
 		"@atlaskit/media-card": "^78.19.0",
 		"@atlaskit/media-client": "^31.1.0",