@atlaskit/editor-plugin-synced-block 4.6.2 → 4.6.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 4.6.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.6.3
+
+### Patch Changes
+
+- [`8289826cdcae0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8289826cdcae0) -
+  [ux] EDITOR-3998 fix sync block copy when copying content inside the bodied sync block
+- Updated dependencies
+
 ## 4.6.2
 
 ### Patch Changes

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

@@ -20,6 +20,7 @@ var _handleBodiedSyncBlockRemoval = require("./utils/handle-bodied-sync-block-re
 var _ignoreDomEvent = require("./utils/ignore-dom-event");
 var _selectionDecorations = require("./utils/selection-decorations");
 var _trackSyncBlocks4 = require("./utils/track-sync-blocks");
+var _utils2 = require("./utils/utils");
 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; }
@@ -140,6 +141,11 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             return node;
           }
           if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            // if we only selected part of the bodied sync block content,
+            // remove the sync block node and only keep the content
+            if (!(0, _utils2.sliceFullyContainsNode)(slice, node)) {
+              return node.content;
+            }
             showCopiedFlag(api);
             var newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
             // Convert bodiedSyncBlock to syncBlock

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isBodiedSyncBlockNode = exports.findSyncBlockOrBodiedSyncBlock = exports.findSyncBlock = exports.findBodiedSyncBlock = exports.canBeConvertedToSyncBlock = void 0;
+exports.sliceFullyContainsNode = exports.isBodiedSyncBlockNode = exports.findSyncBlockOrBodiedSyncBlock = exports.findSyncBlock = exports.findBodiedSyncBlock = exports.canBeConvertedToSyncBlock = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
@@ -86,4 +86,15 @@ var removeBreakoutMarks = function removeBreakoutMarks(content) {
     }
   });
   return _model.Fragment.from(nodes);
+};
+var sliceFullyContainsNode = exports.sliceFullyContainsNode = function sliceFullyContainsNode(slice, node) {
+  var _slice$content$firstC, _slice$content$firstC2, _slice$content$lastCh, _slice$content$lastCh2;
+  var isFirstChild = ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === node.type && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.attrs.resourceId) === node.attrs.resourceId;
+  var isLastChild = ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === node.type && ((_slice$content$lastCh2 = slice.content.lastChild) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.attrs.resourceId) === node.attrs.resourceId;
+  var isOpenAtStart = isFirstChild && slice.openStart > 0;
+  var isOpenAtEnd = isLastChild && slice.openEnd > 0;
+  if (isOpenAtStart || isOpenAtEnd) {
+    return false;
+  }
+  return true;
 };

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

@@ -12,6 +12,7 @@ import { handleBodiedSyncBlockRemoval } from './utils/handle-bodied-sync-block-r
 import { shouldIgnoreDomEvent } from './utils/ignore-dom-event';
 import { calculateDecorations } from './utils/selection-decorations';
 import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
+import { sliceFullyContainsNode } from './utils/utils';
 export const syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
 const showCopiedFlag = api => {
   // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
@@ -131,6 +132,11 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             return node;
           }
           if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            // if we only selected part of the bodied sync block content,
+            // remove the sync block node and only keep the content
+            if (!sliceFullyContainsNode(slice, node)) {
+              return node.content;
+            }
             showCopiedFlag(api);
             const newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
             // Convert bodiedSyncBlock to syncBlock

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

@@ -80,4 +80,15 @@ const removeBreakoutMarks = content => {
     }
   });
   return Fragment.from(nodes);
+};
+export const sliceFullyContainsNode = (slice, node) => {
+  var _slice$content$firstC, _slice$content$firstC2, _slice$content$lastCh, _slice$content$lastCh2;
+  const isFirstChild = ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === node.type && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.attrs.resourceId) === node.attrs.resourceId;
+  const isLastChild = ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === node.type && ((_slice$content$lastCh2 = slice.content.lastChild) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.attrs.resourceId) === node.attrs.resourceId;
+  const isOpenAtStart = isFirstChild && slice.openStart > 0;
+  const isOpenAtEnd = isLastChild && slice.openEnd > 0;
+  if (isOpenAtStart || isOpenAtEnd) {
+    return false;
+  }
+  return true;
 };

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

@@ -18,6 +18,7 @@ import { handleBodiedSyncBlockRemoval } from './utils/handle-bodied-sync-block-r
 import { shouldIgnoreDomEvent } from './utils/ignore-dom-event';
 import { calculateDecorations } from './utils/selection-decorations';
 import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
+import { sliceFullyContainsNode } from './utils/utils';
 export var syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
 var showCopiedFlag = function showCopiedFlag(api) {
   // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
@@ -133,6 +134,11 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
             return node;
           }
           if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            // if we only selected part of the bodied sync block content,
+            // remove the sync block node and only keep the content
+            if (!sliceFullyContainsNode(slice, node)) {
+              return node.content;
+            }
             showCopiedFlag(api);
             var newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
             // Convert bodiedSyncBlock to syncBlock

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

@@ -80,4 +80,15 @@ var removeBreakoutMarks = function removeBreakoutMarks(content) {
     }
   });
   return Fragment.from(nodes);
+};
+export var sliceFullyContainsNode = function sliceFullyContainsNode(slice, node) {
+  var _slice$content$firstC, _slice$content$firstC2, _slice$content$lastCh, _slice$content$lastCh2;
+  var isFirstChild = ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === node.type && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.attrs.resourceId) === node.attrs.resourceId;
+  var isLastChild = ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === node.type && ((_slice$content$lastCh2 = slice.content.lastChild) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.attrs.resourceId) === node.attrs.resourceId;
+  var isOpenAtStart = isFirstChild && slice.openStart > 0;
+  var isOpenAtEnd = isLastChild && slice.openEnd > 0;
+  if (isOpenAtStart || isOpenAtEnd) {
+    return false;
+  }
+  return true;
 };

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

@@ -1,5 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { NodeType, Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import { type Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export declare const findSyncBlock: (schema: Schema, selection: Selection) => ContentNodeWithPos | undefined;
@@ -20,3 +20,4 @@ export interface SyncBlockConversionInfo {
  * or false if conversion is not possible
  */
 export declare const canBeConvertedToSyncBlock: (selection: Selection) => SyncBlockConversionInfo | false;
+export declare const sliceFullyContainsNode: (slice: Slice, node: PMNode) => boolean;

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

@@ -1,5 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import type { NodeType, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { NodeType, Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import { type Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export declare const findSyncBlock: (schema: Schema, selection: Selection) => ContentNodeWithPos | undefined;
@@ -20,3 +20,4 @@ export interface SyncBlockConversionInfo {
  * or false if conversion is not possible
  */
 export declare const canBeConvertedToSyncBlock: (selection: Selection) => SyncBlockConversionInfo | false;
+export declare const sliceFullyContainsNode: (slice: Slice, node: PMNode) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "4.6.2",
+	"version": "4.6.4",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,7 +29,7 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^51.5.0",
-		"@atlaskit/button": "23.8.1",
+		"@atlaskit/button": "23.9.1",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
 		"@atlaskit/editor-plugin-block-menu": "^5.2.0",
@@ -43,13 +43,13 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/flag": "^17.7.0",
-		"@atlaskit/icon": "29.3.0",
+		"@atlaskit/icon": "29.3.1",
 		"@atlaskit/icon-lab": "^5.13.0",
 		"@atlaskit/lozenge": "^13.2.0",
 		"@atlaskit/modal-dialog": "^14.9.0",
-		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^15.15.0",
-		"@atlaskit/tokens": "8.6.1",
+		"@atlaskit/primitives": "^17.0.0",
+		"@atlaskit/tmp-editor-statsig": "^16.0.0",
+		"@atlaskit/tokens": "9.0.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",