@atlaskit/editor-plugin-synced-block 13.0.15 → 13.0.17

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 13.0.17
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.0.16
+
+### Patch Changes
+
+- [`ec69e45a298f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ec69e45a298f2) -
+  [ux] Preserve synced block breakout width behind `platform_editor_blocks_patch_8`.
+- Updated dependencies
+
 ## 13.0.15
 
 ### Patch Changes

package/dist/cjs/editor-commands/index.js

@@ -13,6 +13,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-synced-block-provider/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _main = require("../pm-plugins/main");
 var _utils3 = require("../pm-plugins/utils/utils");
@@ -131,7 +132,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
       return false;
     }
     var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
-    var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude);
+    var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude, (0, _fg.fg)('platform_editor_blocks_patch_8') && conversionInfo.breakoutMark ? [conversionInfo.breakoutMark] : undefined);
     if (!_newBodiedSyncBlockNode) {
       fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
         action: _analytics.ACTION.ERROR,

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

@@ -45,6 +45,7 @@ var getUnsupportedNodeTypes = exports.getUnsupportedNodeTypes = (0, _memoizeOne.
  * or false if conversion is not possible
  */
 var canBeConvertedToSyncBlock = exports.canBeConvertedToSyncBlock = function canBeConvertedToSyncBlock(selection) {
+  var _selectedContent$firs;
   var _expandSelectionToBlo = (0, _selection.expandSelectionToBlockRange)(selection),
     $from = _expandSelectionToBlo.$from,
     range = _expandSelectionToBlo.range;
@@ -64,8 +65,14 @@ var canBeConvertedToSyncBlock = exports.canBeConvertedToSyncBlock = function can
   if (!canBeConverted) {
     return false;
   }
-  var contentToInclude = removeBreakoutMarks($from.doc.slice(from, to).content);
+  var selectedContent = $from.doc.slice(from, to).content;
+  // A single wrapper cannot preserve independent breakout widths for a multi-node selection.
+  var breakoutMark = selectedContent.childCount === 1 ? (_selectedContent$firs = selectedContent.firstChild) === null || _selectedContent$firs === void 0 ? void 0 : _selectedContent$firs.marks.find(function (mark) {
+    return mark.type.name === 'breakout';
+  }) : undefined;
+  var contentToInclude = removeBreakoutMarks(selectedContent);
   return {
+    breakoutMark: breakoutMark,
     contentToInclude: contentToInclude,
     from: from,
     to: to

package/dist/es2019/editor-commands/index.js

@@ -5,6 +5,7 @@ import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { creationMetaKey, deleteMechanismMetaKey, syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, deferDispatch, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
@@ -127,7 +128,7 @@ export const createSyncedBlock = ({
       return false;
     }
     const attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
-    const newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, conversionInfo.contentToInclude);
+    const newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, conversionInfo.contentToInclude, fg('platform_editor_blocks_patch_8') && conversionInfo.breakoutMark ? [conversionInfo.breakoutMark] : undefined);
     if (!newBodiedSyncBlockNode) {
       fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent({
         action: ACTION.ERROR,

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

@@ -36,6 +36,7 @@ export const getUnsupportedNodeTypes = memoizeOne(() => new Set(['inlineExtensio
  * or false if conversion is not possible
  */
 export const canBeConvertedToSyncBlock = selection => {
+  var _selectedContent$firs;
   const {
     $from,
     range
@@ -56,8 +57,12 @@ export const canBeConvertedToSyncBlock = selection => {
   if (!canBeConverted) {
     return false;
   }
-  const contentToInclude = removeBreakoutMarks($from.doc.slice(from, to).content);
+  const selectedContent = $from.doc.slice(from, to).content;
+  // A single wrapper cannot preserve independent breakout widths for a multi-node selection.
+  const breakoutMark = selectedContent.childCount === 1 ? (_selectedContent$firs = selectedContent.firstChild) === null || _selectedContent$firs === void 0 ? void 0 : _selectedContent$firs.marks.find(mark => mark.type.name === 'breakout') : undefined;
+  const contentToInclude = removeBreakoutMarks(selectedContent);
   return {
+    breakoutMark,
     contentToInclude,
     from,
     to

package/dist/esm/editor-commands/index.js

@@ -8,6 +8,7 @@ import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { creationMetaKey, deleteMechanismMetaKey, syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, deferDispatch, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
@@ -124,7 +125,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
       return false;
     }
     var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
-    var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude);
+    var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude, fg('platform_editor_blocks_patch_8') && conversionInfo.breakoutMark ? [conversionInfo.breakoutMark] : undefined);
     if (!_newBodiedSyncBlockNode) {
       fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
         action: ACTION.ERROR,

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

@@ -39,6 +39,7 @@ export var getUnsupportedNodeTypes = memoizeOne(function () {
  * or false if conversion is not possible
  */
 export var canBeConvertedToSyncBlock = function canBeConvertedToSyncBlock(selection) {
+  var _selectedContent$firs;
   var _expandSelectionToBlo = expandSelectionToBlockRange(selection),
     $from = _expandSelectionToBlo.$from,
     range = _expandSelectionToBlo.range;
@@ -58,8 +59,14 @@ export var canBeConvertedToSyncBlock = function canBeConvertedToSyncBlock(select
   if (!canBeConverted) {
     return false;
   }
-  var contentToInclude = removeBreakoutMarks($from.doc.slice(from, to).content);
+  var selectedContent = $from.doc.slice(from, to).content;
+  // A single wrapper cannot preserve independent breakout widths for a multi-node selection.
+  var breakoutMark = selectedContent.childCount === 1 ? (_selectedContent$firs = selectedContent.firstChild) === null || _selectedContent$firs === void 0 ? void 0 : _selectedContent$firs.marks.find(function (mark) {
+    return mark.type.name === 'breakout';
+  }) : undefined;
+  var contentToInclude = removeBreakoutMarks(selectedContent);
   return {
+    breakoutMark: breakoutMark,
     contentToInclude: contentToInclude,
     from: from,
     to: to

package/dist/types/pm-plugins/utils/utils.d.ts

@@ -1,6 +1,6 @@
 import type { MemoizedFn } from 'memoize-one';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import type { NodeType, Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Mark, NodeType, Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 /**
@@ -13,6 +13,7 @@ export declare const findBodiedSyncBlock: (schema: Schema, selection: Selection)
 export declare const findSyncBlockOrBodiedSyncBlock: (schema: Schema, selection: Selection) => ContentNodeWithPos | undefined;
 export declare const isBodiedSyncBlockNode: (node: PMNode, bodiedSyncBlock: NodeType) => boolean;
 export interface SyncBlockConversionInfo {
+    breakoutMark?: Mark;
     contentToInclude: Fragment;
     from: number;
     to: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "13.0.15",
+	"version": "13.0.17",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/primitives": "^22.4.0",
 		"@atlaskit/spinner": "20.3.0",
-		"@atlaskit/tmp-editor-statsig": "^157.0.0",
+		"@atlaskit/tmp-editor-statsig": "^158.0.0",
 		"@atlaskit/tokens": "16.8.0",
 		"@atlaskit/tooltip": "^24.2.0",
 		"@atlaskit/visually-hidden": "^4.3.0",
@@ -60,7 +60,7 @@
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.13.0",
+		"@atlaskit/editor-common": "^119.16.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -112,6 +112,9 @@
 		"platform_editor_blocks_patch_7": {
 			"type": "boolean"
 		},
+		"platform_editor_blocks_patch_8": {
+			"type": "boolean"
+		},
 		"platform_editor_blocks_patch_9": {
 			"type": "boolean"
 		}