@atlaskit/editor-plugin-synced-block 8.4.3 → 8.4.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 8.4.4
+
+### Patch Changes
+
+- [`0805dc02ccee3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0805dc02ccee3) -
+  Fix partial cut handling for source synced blocks behind platform_synced_block_patch_13.
+- Updated dependencies
+
 ## 8.4.3
 
 ### Patch Changes

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

@@ -290,6 +290,7 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
       current: undefined
     });
     (0, _defineProperty2.default)(this, "_isCopyEvent", false);
+    (0, _defineProperty2.default)(this, "_isCutEvent", false);
     (0, _defineProperty2.default)(this, "unpublishedFlagShown", new Set());
     (0, _defineProperty2.default)(this, "extensionFlagShown", new Set());
   }
@@ -303,6 +304,11 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
     value: function markCopyEvent() {
       this._isCopyEvent = true;
     }
+  }, {
+    key: "markCutEvent",
+    value: function markCutEvent() {
+      this._isCutEvent = true;
+    }
   }, {
     key: "consumeCopyEvent",
     value: function consumeCopyEvent() {
@@ -310,6 +316,13 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
       this._isCopyEvent = false;
       return was;
     }
+  }, {
+    key: "consumeCutEvent",
+    value: function consumeCutEvent() {
+      var was = this._isCutEvent;
+      this._isCutEvent = false;
+      return was;
+    }
   }]);
 }();
 var createPlugin = exports.createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
@@ -672,6 +685,13 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         copy: function copy() {
           ctx.markCopyEvent();
           return false;
+        },
+        cut: function cut() {
+          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_13')) {
+            ctx.consumeCutEvent();
+            ctx.markCutEvent();
+          }
+          return false;
         }
       },
       transformPasted: function transformPasted(slice, _view) {
@@ -704,11 +724,16 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
         var schema = state.schema;
         var isCopy = ctx.consumeCopyEvent();
-        if (!syncBlockStore || !isCopy) {
+        var isSyncedBlockPatch13Enabled = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_13');
+        var isCut = isSyncedBlockPatch13Enabled && ctx.consumeCutEvent();
+        if (!syncBlockStore || !isCopy && !isCut) {
           return slice;
         }
         return (0, _utils.mapSlice)(slice, function (node) {
           if (syncBlockStore.referenceManager.isReferenceBlock(node)) {
+            if (isCut) {
+              return node;
+            }
             showCopiedFlag(api);
             return node;
           }
@@ -718,6 +743,9 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             if (!(0, _utils3.sliceFullyContainsNode)(slice, node)) {
               return node.content;
             }
+            if (isSyncedBlockPatch13Enabled && isCut) {
+              return node;
+            }
             showCopiedFlag(api);
             var newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
             // Convert bodiedSyncBlock to syncBlock

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

@@ -266,6 +266,7 @@ class SyncedBlockPluginContext {
       current: undefined
     });
     _defineProperty(this, "_isCopyEvent", false);
+    _defineProperty(this, "_isCutEvent", false);
     _defineProperty(this, "unpublishedFlagShown", new Set());
     _defineProperty(this, "extensionFlagShown", new Set());
   }
@@ -275,11 +276,19 @@ class SyncedBlockPluginContext {
   markCopyEvent() {
     this._isCopyEvent = true;
   }
+  markCutEvent() {
+    this._isCutEvent = true;
+  }
   consumeCopyEvent() {
     const was = this._isCopyEvent;
     this._isCopyEvent = false;
     return was;
   }
+  consumeCutEvent() {
+    const was = this._isCutEvent;
+    this._isCutEvent = false;
+    return was;
+  }
 }
 export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api) => {
   const {
@@ -640,6 +649,13 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         copy: () => {
           ctx.markCopyEvent();
           return false;
+        },
+        cut: () => {
+          if (fg('platform_synced_block_patch_13')) {
+            ctx.consumeCutEvent();
+            ctx.markCutEvent();
+          }
+          return false;
         }
       },
       transformPasted: (slice, _view) => {
@@ -675,11 +691,16 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           schema
         } = state;
         const isCopy = ctx.consumeCopyEvent();
-        if (!syncBlockStore || !isCopy) {
+        const isSyncedBlockPatch13Enabled = fg('platform_synced_block_patch_13');
+        const isCut = isSyncedBlockPatch13Enabled && ctx.consumeCutEvent();
+        if (!syncBlockStore || !isCopy && !isCut) {
           return slice;
         }
         return mapSlice(slice, node => {
           if (syncBlockStore.referenceManager.isReferenceBlock(node)) {
+            if (isCut) {
+              return node;
+            }
             showCopiedFlag(api);
             return node;
           }
@@ -689,6 +710,9 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             if (!sliceFullyContainsNode(slice, node)) {
               return node.content;
             }
+            if (isSyncedBlockPatch13Enabled && isCut) {
+              return node;
+            }
             showCopiedFlag(api);
             const newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
             // Convert bodiedSyncBlock to syncBlock

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

@@ -283,6 +283,7 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
       current: undefined
     });
     _defineProperty(this, "_isCopyEvent", false);
+    _defineProperty(this, "_isCutEvent", false);
     _defineProperty(this, "unpublishedFlagShown", new Set());
     _defineProperty(this, "extensionFlagShown", new Set());
   }
@@ -296,6 +297,11 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
     value: function markCopyEvent() {
       this._isCopyEvent = true;
     }
+  }, {
+    key: "markCutEvent",
+    value: function markCutEvent() {
+      this._isCutEvent = true;
+    }
   }, {
     key: "consumeCopyEvent",
     value: function consumeCopyEvent() {
@@ -303,6 +309,13 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
       this._isCopyEvent = false;
       return was;
     }
+  }, {
+    key: "consumeCutEvent",
+    value: function consumeCutEvent() {
+      var was = this._isCutEvent;
+      this._isCutEvent = false;
+      return was;
+    }
   }]);
 }();
 export var createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
@@ -665,6 +678,13 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         copy: function copy() {
           ctx.markCopyEvent();
           return false;
+        },
+        cut: function cut() {
+          if (fg('platform_synced_block_patch_13')) {
+            ctx.consumeCutEvent();
+            ctx.markCutEvent();
+          }
+          return false;
         }
       },
       transformPasted: function transformPasted(slice, _view) {
@@ -697,11 +717,16 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
         var schema = state.schema;
         var isCopy = ctx.consumeCopyEvent();
-        if (!syncBlockStore || !isCopy) {
+        var isSyncedBlockPatch13Enabled = fg('platform_synced_block_patch_13');
+        var isCut = isSyncedBlockPatch13Enabled && ctx.consumeCutEvent();
+        if (!syncBlockStore || !isCopy && !isCut) {
           return slice;
         }
         return mapSlice(slice, function (node) {
           if (syncBlockStore.referenceManager.isReferenceBlock(node)) {
+            if (isCut) {
+              return node;
+            }
             showCopiedFlag(api);
             return node;
           }
@@ -711,6 +736,9 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
             if (!sliceFullyContainsNode(slice, node)) {
               return node.content;
             }
+            if (isSyncedBlockPatch13Enabled && isCut) {
+              return node;
+            }
             showCopiedFlag(api);
             var newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
             // Convert bodiedSyncBlock to syncBlock

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "8.4.3",
+	"version": "8.4.4",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -64,7 +64,7 @@
 		"date-fns": "^2.17.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.46.0",
+		"@atlaskit/editor-common": "^114.47.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},