@atlaskit/editor-common 110.31.0 → 110.31.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 110.31.1
+
+### Patch Changes
+
+- [`b14a5fc14cf22`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b14a5fc14cf22) -
+  [ux] EDITOR-2606 copy sync block from renderer should flatten out content instead of creating new
+  reference
+
 ## 110.31.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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 = "110.30.2";
+var packageVersion = "0.0.0-development";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/transforms/index.js

@@ -153,16 +153,16 @@ Object.defineProperty(exports, "transformSliceToRemoveOpenNestedExpand", {
     return _expand.transformSliceToRemoveOpenNestedExpand;
   }
 });
-Object.defineProperty(exports, "transformTaskListToBlockNodes", {
+Object.defineProperty(exports, "transformSyncBlock", {
   enumerable: true,
   get: function get() {
-    return _listTransforms.transformTaskListToBlockNodes;
+    return _syncBlock.transformSyncBlock;
   }
 });
-Object.defineProperty(exports, "transformToNewReferenceSyncBlock", {
+Object.defineProperty(exports, "transformTaskListToBlockNodes", {
   enumerable: true,
   get: function get() {
-    return _syncBlock.transformToNewReferenceSyncBlock;
+    return _listTransforms.transformTaskListToBlockNodes;
   }
 });
 Object.defineProperty(exports, "transformToTaskList", {

package/dist/cjs/transforms/sync-block.js

@@ -4,34 +4,56 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformToNewReferenceSyncBlock = void 0;
+exports.transformSyncBlock = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _slice = require("../utils/slice");
 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; }
-var transformToNewReferenceSyncBlock = exports.transformToNewReferenceSyncBlock = function transformToNewReferenceSyncBlock(slice, schema) {
+var transformSyncBlockNode = function transformSyncBlockNode(node, schema, isFromEditor) {
+  // if copying from renderer, flatten out the content and remove the sync block
+  if (!isFromEditor) {
+    return node.content;
+  }
+
+  // sync blocks need a unique localId to function correctly
+  var newAttrs = _objectSpread(_objectSpread({}, node.attrs), {}, {
+    localId: _adfSchema.uuid.generate()
+  });
+  return schema.nodes.syncBlock.create(newAttrs, null, (0, _toConsumableArray2.default)(node.marks));
+};
+var transformBodiedSyncBlockNode = function transformBodiedSyncBlockNode(node, schema, isFromEditor) {
+  // if copying from renderer, flatten out the content and remove the bodied sync block
+  if (!isFromEditor) {
+    return node.content;
+  }
+
+  // bodied sync blocks need a unique localId and convert to a reference sync block
+  // when converting we want to be specific about attributes and marks we carry over
+  var newAttrs = {
+    resourceId: node.attrs.resourceId,
+    localId: _adfSchema.uuid.generate()
+  };
+  var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
+    var _schema$nodes$syncBlo;
+    return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
+  }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
+
+  return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+};
+
+/**
+ * If we are copying from editor, transform the copied source or reference sync block to a new reference sync block
+ * Otherwise, (e.g. if copying from renderer), flatten out the content and remove the sync block
+ */
+var transformSyncBlock = exports.transformSyncBlock = function transformSyncBlock(slice, schema, pasteSource) {
+  var isFromEditor = pasteSource === 'fabric-editor';
   slice = (0, _slice.mapSlice)(slice, function (node) {
-    // sync blocks need a unique localId to function correctly
     if (node.type === schema.nodes.syncBlock) {
-      var newAttrs = _objectSpread(_objectSpread({}, node.attrs), {}, {
-        localId: _adfSchema.uuid.generate()
-      });
-      return schema.nodes.syncBlock.create(newAttrs, null, (0, _toConsumableArray2.default)(node.marks));
+      return transformSyncBlockNode(node, schema, isFromEditor);
     } else if (node.type === schema.nodes.bodiedSyncBlock) {
-      // bodied sync blocks need a unique localId and convert to a reference sync block
-      // when converting we want to be specific about attributes and marks we carry over
-      var _newAttrs = {
-        resourceId: node.attrs.resourceId,
-        localId: _adfSchema.uuid.generate()
-      };
-      var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
-        var _schema$nodes$syncBlo;
-        return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
-      }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
-
-      return schema.nodes.syncBlock.create(_newAttrs, null, newMarks);
+      return transformBodiedSyncBlockNode(node, schema, isFromEditor);
     }
     return node;
   });

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 = "110.30.2";
+var packageVersion = "0.0.0-development";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

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 = "110.30.2";
+const packageVersion = "0.0.0-development";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/transforms/index.js

@@ -8,4 +8,4 @@ export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToC
 export { transformSliceToDecisionList } from './decision-list';
 export { transformListStructure, transformBetweenListTypes, transformListRecursively, transformToTaskList, transformTaskListToBlockNodes, getFormattedNode } from './list-transforms';
 export { isBulletOrOrderedList, isTaskList, getSupportedListTypesSet, convertBlockToInlineContent } from './list-utils';
-export { transformToNewReferenceSyncBlock } from './sync-block';
+export { transformSyncBlock } from './sync-block';

package/dist/es2019/transforms/sync-block.js

@@ -1,27 +1,49 @@
 import { uuid } from '@atlaskit/adf-schema';
 import { mapSlice } from '../utils/slice';
-export const transformToNewReferenceSyncBlock = (slice, schema) => {
+const transformSyncBlockNode = (node, schema, isFromEditor) => {
+  // if copying from renderer, flatten out the content and remove the sync block
+  if (!isFromEditor) {
+    return node.content;
+  }
+
+  // sync blocks need a unique localId to function correctly
+  const newAttrs = {
+    ...node.attrs,
+    localId: uuid.generate()
+  };
+  return schema.nodes.syncBlock.create(newAttrs, null, [...node.marks]);
+};
+const transformBodiedSyncBlockNode = (node, schema, isFromEditor) => {
+  // if copying from renderer, flatten out the content and remove the bodied sync block
+  if (!isFromEditor) {
+    return node.content;
+  }
+
+  // bodied sync blocks need a unique localId and convert to a reference sync block
+  // when converting we want to be specific about attributes and marks we carry over
+  const newAttrs = {
+    resourceId: node.attrs.resourceId,
+    localId: uuid.generate()
+  };
+  const newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(mark => {
+    var _schema$nodes$syncBlo;
+    return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
+  }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
+
+  return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+};
+
+/**
+ * If we are copying from editor, transform the copied source or reference sync block to a new reference sync block
+ * Otherwise, (e.g. if copying from renderer), flatten out the content and remove the sync block
+ */
+export const transformSyncBlock = (slice, schema, pasteSource) => {
+  const isFromEditor = pasteSource === 'fabric-editor';
   slice = mapSlice(slice, node => {
-    // sync blocks need a unique localId to function correctly
     if (node.type === schema.nodes.syncBlock) {
-      const newAttrs = {
-        ...node.attrs,
-        localId: uuid.generate()
-      };
-      return schema.nodes.syncBlock.create(newAttrs, null, [...node.marks]);
+      return transformSyncBlockNode(node, schema, isFromEditor);
     } else if (node.type === schema.nodes.bodiedSyncBlock) {
-      // bodied sync blocks need a unique localId and convert to a reference sync block
-      // when converting we want to be specific about attributes and marks we carry over
-      const newAttrs = {
-        resourceId: node.attrs.resourceId,
-        localId: uuid.generate()
-      };
-      const newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(mark => {
-        var _schema$nodes$syncBlo;
-        return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
-      }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
-
-      return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+      return transformBodiedSyncBlockNode(node, schema, isFromEditor);
     }
     return node;
   });

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';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "110.30.2";
+const packageVersion = "0.0.0-development";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

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 = "110.30.2";
+var packageVersion = "0.0.0-development";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/transforms/index.js

@@ -8,4 +8,4 @@ export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToC
 export { transformSliceToDecisionList } from './decision-list';
 export { transformListStructure, transformBetweenListTypes, transformListRecursively, transformToTaskList, transformTaskListToBlockNodes, getFormattedNode } from './list-transforms';
 export { isBulletOrOrderedList, isTaskList, getSupportedListTypesSet, convertBlockToInlineContent } from './list-utils';
-export { transformToNewReferenceSyncBlock } from './sync-block';
+export { transformSyncBlock } from './sync-block';

package/dist/esm/transforms/sync-block.js

@@ -4,27 +4,49 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { uuid } from '@atlaskit/adf-schema';
 import { mapSlice } from '../utils/slice';
-export var transformToNewReferenceSyncBlock = function transformToNewReferenceSyncBlock(slice, schema) {
+var transformSyncBlockNode = function transformSyncBlockNode(node, schema, isFromEditor) {
+  // if copying from renderer, flatten out the content and remove the sync block
+  if (!isFromEditor) {
+    return node.content;
+  }
+
+  // sync blocks need a unique localId to function correctly
+  var newAttrs = _objectSpread(_objectSpread({}, node.attrs), {}, {
+    localId: uuid.generate()
+  });
+  return schema.nodes.syncBlock.create(newAttrs, null, _toConsumableArray(node.marks));
+};
+var transformBodiedSyncBlockNode = function transformBodiedSyncBlockNode(node, schema, isFromEditor) {
+  // if copying from renderer, flatten out the content and remove the bodied sync block
+  if (!isFromEditor) {
+    return node.content;
+  }
+
+  // bodied sync blocks need a unique localId and convert to a reference sync block
+  // when converting we want to be specific about attributes and marks we carry over
+  var newAttrs = {
+    resourceId: node.attrs.resourceId,
+    localId: uuid.generate()
+  };
+  var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
+    var _schema$nodes$syncBlo;
+    return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
+  }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
+
+  return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+};
+
+/**
+ * If we are copying from editor, transform the copied source or reference sync block to a new reference sync block
+ * Otherwise, (e.g. if copying from renderer), flatten out the content and remove the sync block
+ */
+export var transformSyncBlock = function transformSyncBlock(slice, schema, pasteSource) {
+  var isFromEditor = pasteSource === 'fabric-editor';
   slice = mapSlice(slice, function (node) {
-    // sync blocks need a unique localId to function correctly
     if (node.type === schema.nodes.syncBlock) {
-      var newAttrs = _objectSpread(_objectSpread({}, node.attrs), {}, {
-        localId: uuid.generate()
-      });
-      return schema.nodes.syncBlock.create(newAttrs, null, _toConsumableArray(node.marks));
+      return transformSyncBlockNode(node, schema, isFromEditor);
     } else if (node.type === schema.nodes.bodiedSyncBlock) {
-      // bodied sync blocks need a unique localId and convert to a reference sync block
-      // when converting we want to be specific about attributes and marks we carry over
-      var _newAttrs = {
-        resourceId: node.attrs.resourceId,
-        localId: uuid.generate()
-      };
-      var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
-        var _schema$nodes$syncBlo;
-        return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
-      }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
-
-      return schema.nodes.syncBlock.create(_newAttrs, null, newMarks);
+      return transformBodiedSyncBlockNode(node, schema, isFromEditor);
     }
     return node;
   });

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';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.30.2";
+var packageVersion = "0.0.0-development";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

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

@@ -5,5 +5,5 @@ export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToC
 export { transformSliceToDecisionList } from './decision-list';
 export { transformListStructure, transformBetweenListTypes, transformListRecursively, transformToTaskList, transformTaskListToBlockNodes, getFormattedNode, } from './list-transforms';
 export { isBulletOrOrderedList, isTaskList, getSupportedListTypesSet, convertBlockToInlineContent, } from './list-utils';
-export { transformToNewReferenceSyncBlock } from './sync-block';
+export { transformSyncBlock } from './sync-block';
 export type { TransformContext, TransformFunction } from './list-types';

package/dist/types/transforms/sync-block.d.ts

@@ -1,2 +1,7 @@
 import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
-export declare const transformToNewReferenceSyncBlock: (slice: Slice, schema: Schema) => Slice;
+import type { PasteSource } from '../analytics';
+/**
+ * If we are copying from editor, transform the copied source or reference sync block to a new reference sync block
+ * Otherwise, (e.g. if copying from renderer), flatten out the content and remove the sync block
+ */
+export declare const transformSyncBlock: (slice: Slice, schema: Schema, pasteSource: PasteSource) => Slice;

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

@@ -5,5 +5,5 @@ export { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToC
 export { transformSliceToDecisionList } from './decision-list';
 export { transformListStructure, transformBetweenListTypes, transformListRecursively, transformToTaskList, transformTaskListToBlockNodes, getFormattedNode, } from './list-transforms';
 export { isBulletOrOrderedList, isTaskList, getSupportedListTypesSet, convertBlockToInlineContent, } from './list-utils';
-export { transformToNewReferenceSyncBlock } from './sync-block';
+export { transformSyncBlock } from './sync-block';
 export type { TransformContext, TransformFunction } from './list-types';

package/dist/types-ts4.5/transforms/sync-block.d.ts

@@ -1,2 +1,7 @@
 import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
-export declare const transformToNewReferenceSyncBlock: (slice: Slice, schema: Schema) => Slice;
+import type { PasteSource } from '../analytics';
+/**
+ * If we are copying from editor, transform the copied source or reference sync block to a new reference sync block
+ * Otherwise, (e.g. if copying from renderer), flatten out the content and remove the sync block
+ */
+export declare const transformSyncBlock: (slice: Slice, schema: Schema, pasteSource: PasteSource) => Slice;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "110.31.0",
+	"version": "110.31.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -84,7 +84,7 @@
 		"@atlaskit/theme": "^21.0.0",
 		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@atlaskit/tokens": "^8.0.0",
-		"@atlaskit/tooltip": "^20.8.0",
+		"@atlaskit/tooltip": "^20.9.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/width-detector": "^5.0.0",
 		"@babel/runtime": "^7.0.0",