@atlaskit/editor-plugin-synced-block 3.7.1 → 3.8.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 3.8.0
+
+### Minor Changes
+
+- [`7ef8ad00e2b1f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7ef8ad00e2b1f) -
+  EDITOR-2430 Update the sync-blocker-tracker to work properly for bodied-sync-block
+
+### Patch Changes
+
+- [`23b21c4b4ffe5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/23b21c4b4ffe5) -
+  [ux] EDITOR-2505 Fix deletion of source sync block from floating toolbar
+- [`c28cd65d12c24`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c28cd65d12c24) -
+  EDITOR-2447 Bump adf-schema to 51.3.1
+- Updated dependencies
+
+## 3.7.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.7.1
 
 ### Patch Changes

package/afm-products/tsconfig.json

@@ -0,0 +1,68 @@
+{
+	"extends": "../../../../tsconfig.entry-points.products.json",
+	"compilerOptions": {
+		"target": "es5",
+		"outDir": "../../../../../tsDist/@atlaskit__editor-plugin-synced-block/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*",
+		"../src/**/examples.*",
+		"../src/**/examples/*",
+		"../src/**/examples/**/*",
+		"../src/**/*.stories.*",
+		"../src/**/stories/*",
+		"../src/**/stories/**/*"
+	],
+	"references": [
+		{
+			"path": "../../../design-system/button/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-json-transformer/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-analytics/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-decorations/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-floating-toolbar/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-plugin-selection/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-shared-styles/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-synced-block-provider/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-tables/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-toolbar/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/icon/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/modal-dialog/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-common/afm-products/tsconfig.json"
+		}
+	]
+}

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

@@ -110,22 +110,16 @@ var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedB
 };
 var removeSyncedBlock = exports.removeSyncedBlock = function removeSyncedBlock(api) {
   return function (state, dispatch, _view) {
-    var _state$selection = state.selection,
-      from = _state$selection.$from.pos,
-      to = _state$selection.$to.pos,
-      tr = state.tr;
-    var syncBlock = (0, _utils.findSyncBlockOrBodiedSyncBlock)(state);
-    if (!syncBlock) {
-      return false;
-    }
-    if (!dispatch) {
+    var tr = state.tr;
+    var syncBlockFindResult = (0, _utils.findSyncBlockOrBodiedSyncBlock)(state);
+    if (!syncBlockFindResult) {
       return false;
     }
-    var newTr = tr.deleteRange(from, to);
+    var newTr = tr.deleteRange(syncBlockFindResult.pos, syncBlockFindResult.pos + syncBlockFindResult.node.nodeSize);
     if (!newTr) {
       return false;
     }
-    dispatch(newTr);
+    dispatch === null || dispatch === void 0 || dispatch(newTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;
   };

package/dist/cjs/pm-plugins/utils/track-sync-blocks.js

@@ -6,14 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.trackSyncBlocks = void 0;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(storeManager, tr, state) {
-  // TODO: EDITOR-2430 - Disable tracking for now, it will be updated to handle the new bodied sync block
-  var dontTrack = true;
-  if (dontTrack) {
-    return {
-      removed: [],
-      added: []
-    };
-  }
   var sourceSyncBlockRemoved = {};
   var sourceSyncBlockAdded = {};
 
@@ -21,30 +13,35 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(storeMa
   var replaceSteps = tr.steps.filter(function (step) {
     return step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep;
   });
-  var hasMultipleReplaceSteps = replaceSteps.length > 1;
   replaceSteps.forEach(function (step) {
     var from = step.from,
       to = step.to;
     // replaced a range, check for deleted syncBlock
+
     if (from !== to) {
-      state.doc.nodesBetween(step.from, step.to, function (node) {
-        if (storeManager.isSourceBlock(node)) {
-          if (sourceSyncBlockAdded[node.attrs.localId]) {
-            // If a source block added and then removed in the same transaction,
-            // we treat it as no-op.
-            delete sourceSyncBlockAdded[node.attrs.localId];
-          } else {
-            sourceSyncBlockRemoved[node.attrs.localId] = node.attrs;
-          }
+      step.getMap().forEach(function (oldStart, oldEnd) {
+        if (oldStart !== oldEnd) {
+          var deletedSlice = state.doc.slice(oldStart, oldEnd);
+          deletedSlice.content.nodesBetween(0, deletedSlice.content.size, function (node) {
+            if (storeManager.isSourceBlock(node)) {
+              if (sourceSyncBlockAdded[node.attrs.localId]) {
+                // If a source block added and then removed in the same transaction,
+                // we treat it as no-op.
+                delete sourceSyncBlockAdded[node.attrs.localId];
+              } else {
+                sourceSyncBlockRemoved[node.attrs.localId] = node.attrs;
+              }
+            }
+            // we don't need to go deeper
+            return false;
+          });
         }
-        // we don't need to go deeper
-        return false;
       });
     }
 
     // replaced content, check for inserted syncBlock
     // if only one replace step, we have already checked the entire replaced range above
-    if (step.slice.content.size > 0 && hasMultipleReplaceSteps) {
+    if (step.slice.content.size > 0) {
       step.slice.content.nodesBetween(0, step.slice.content.size, function (node) {
         if (storeManager.isSourceBlock(node)) {
           if (sourceSyncBlockRemoved[node.attrs.localId]) {

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

@@ -111,29 +111,16 @@ export const editSyncedBlockSource = (syncBlockStore, api) => (state, dispatch,
   return true;
 };
 export const removeSyncedBlock = api => (state, dispatch, _view) => {
-  const {
-    selection: {
-      $from: {
-        pos: from
-      },
-      $to: {
-        pos: to
-      }
-    },
-    tr
-  } = state;
-  const syncBlock = findSyncBlockOrBodiedSyncBlock(state);
-  if (!syncBlock) {
-    return false;
-  }
-  if (!dispatch) {
+  const tr = state.tr;
+  const syncBlockFindResult = findSyncBlockOrBodiedSyncBlock(state);
+  if (!syncBlockFindResult) {
     return false;
   }
-  const newTr = tr.deleteRange(from, to);
+  const newTr = tr.deleteRange(syncBlockFindResult.pos, syncBlockFindResult.pos + syncBlockFindResult.node.nodeSize);
   if (!newTr) {
     return false;
   }
-  dispatch(newTr);
+  dispatch === null || dispatch === void 0 ? void 0 : dispatch(newTr);
   api === null || api === void 0 ? void 0 : api.core.actions.focus();
   return true;
 };

package/dist/es2019/pm-plugins/utils/track-sync-blocks.js

@@ -1,44 +1,41 @@
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 export const trackSyncBlocks = (storeManager, tr, state) => {
-  // TODO: EDITOR-2430 - Disable tracking for now, it will be updated to handle the new bodied sync block
-  const dontTrack = true;
-  if (dontTrack) {
-    return {
-      removed: [],
-      added: []
-    };
-  }
   const sourceSyncBlockRemoved = {};
   const sourceSyncBlockAdded = {};
 
   // and cast to specific step types
   const replaceSteps = tr.steps.filter(step => step instanceof ReplaceStep || step instanceof ReplaceAroundStep);
-  const hasMultipleReplaceSteps = replaceSteps.length > 1;
   replaceSteps.forEach(step => {
     const {
       from,
       to
     } = step;
     // replaced a range, check for deleted syncBlock
+
     if (from !== to) {
-      state.doc.nodesBetween(step.from, step.to, node => {
-        if (storeManager.isSourceBlock(node)) {
-          if (sourceSyncBlockAdded[node.attrs.localId]) {
-            // If a source block added and then removed in the same transaction,
-            // we treat it as no-op.
-            delete sourceSyncBlockAdded[node.attrs.localId];
-          } else {
-            sourceSyncBlockRemoved[node.attrs.localId] = node.attrs;
-          }
+      step.getMap().forEach((oldStart, oldEnd) => {
+        if (oldStart !== oldEnd) {
+          const deletedSlice = state.doc.slice(oldStart, oldEnd);
+          deletedSlice.content.nodesBetween(0, deletedSlice.content.size, node => {
+            if (storeManager.isSourceBlock(node)) {
+              if (sourceSyncBlockAdded[node.attrs.localId]) {
+                // If a source block added and then removed in the same transaction,
+                // we treat it as no-op.
+                delete sourceSyncBlockAdded[node.attrs.localId];
+              } else {
+                sourceSyncBlockRemoved[node.attrs.localId] = node.attrs;
+              }
+            }
+            // we don't need to go deeper
+            return false;
+          });
         }
-        // we don't need to go deeper
-        return false;
       });
     }
 
     // replaced content, check for inserted syncBlock
     // if only one replace step, we have already checked the entire replaced range above
-    if (step.slice.content.size > 0 && hasMultipleReplaceSteps) {
+    if (step.slice.content.size > 0) {
       step.slice.content.nodesBetween(0, step.slice.content.size, node => {
         if (storeManager.isSourceBlock(node)) {
           if (sourceSyncBlockRemoved[node.attrs.localId]) {

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

@@ -103,22 +103,16 @@ export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore
 };
 export var removeSyncedBlock = function removeSyncedBlock(api) {
   return function (state, dispatch, _view) {
-    var _state$selection = state.selection,
-      from = _state$selection.$from.pos,
-      to = _state$selection.$to.pos,
-      tr = state.tr;
-    var syncBlock = findSyncBlockOrBodiedSyncBlock(state);
-    if (!syncBlock) {
-      return false;
-    }
-    if (!dispatch) {
+    var tr = state.tr;
+    var syncBlockFindResult = findSyncBlockOrBodiedSyncBlock(state);
+    if (!syncBlockFindResult) {
       return false;
     }
-    var newTr = tr.deleteRange(from, to);
+    var newTr = tr.deleteRange(syncBlockFindResult.pos, syncBlockFindResult.pos + syncBlockFindResult.node.nodeSize);
     if (!newTr) {
       return false;
     }
-    dispatch(newTr);
+    dispatch === null || dispatch === void 0 || dispatch(newTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;
   };

package/dist/esm/pm-plugins/utils/track-sync-blocks.js

@@ -1,13 +1,5 @@
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 export var trackSyncBlocks = function trackSyncBlocks(storeManager, tr, state) {
-  // TODO: EDITOR-2430 - Disable tracking for now, it will be updated to handle the new bodied sync block
-  var dontTrack = true;
-  if (dontTrack) {
-    return {
-      removed: [],
-      added: []
-    };
-  }
   var sourceSyncBlockRemoved = {};
   var sourceSyncBlockAdded = {};
 
@@ -15,30 +7,35 @@ export var trackSyncBlocks = function trackSyncBlocks(storeManager, tr, state) {
   var replaceSteps = tr.steps.filter(function (step) {
     return step instanceof ReplaceStep || step instanceof ReplaceAroundStep;
   });
-  var hasMultipleReplaceSteps = replaceSteps.length > 1;
   replaceSteps.forEach(function (step) {
     var from = step.from,
       to = step.to;
     // replaced a range, check for deleted syncBlock
+
     if (from !== to) {
-      state.doc.nodesBetween(step.from, step.to, function (node) {
-        if (storeManager.isSourceBlock(node)) {
-          if (sourceSyncBlockAdded[node.attrs.localId]) {
-            // If a source block added and then removed in the same transaction,
-            // we treat it as no-op.
-            delete sourceSyncBlockAdded[node.attrs.localId];
-          } else {
-            sourceSyncBlockRemoved[node.attrs.localId] = node.attrs;
-          }
+      step.getMap().forEach(function (oldStart, oldEnd) {
+        if (oldStart !== oldEnd) {
+          var deletedSlice = state.doc.slice(oldStart, oldEnd);
+          deletedSlice.content.nodesBetween(0, deletedSlice.content.size, function (node) {
+            if (storeManager.isSourceBlock(node)) {
+              if (sourceSyncBlockAdded[node.attrs.localId]) {
+                // If a source block added and then removed in the same transaction,
+                // we treat it as no-op.
+                delete sourceSyncBlockAdded[node.attrs.localId];
+              } else {
+                sourceSyncBlockRemoved[node.attrs.localId] = node.attrs;
+              }
+            }
+            // we don't need to go deeper
+            return false;
+          });
         }
-        // we don't need to go deeper
-        return false;
       });
     }
 
     // replaced content, check for inserted syncBlock
     // if only one replace step, we have already checked the entire replaced range above
-    if (step.slice.content.size > 0 && hasMultipleReplaceSteps) {
+    if (step.slice.content.size > 0) {
       step.slice.content.nodesBetween(0, step.slice.content.size, function (node) {
         if (storeManager.isSourceBlock(node)) {
           if (sourceSyncBlockRemoved[node.attrs.localId]) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "3.7.1",
+	"version": "3.8.0",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.3.0",
+		"@atlaskit/adf-schema": "^51.3.1",
 		"@atlaskit/button": "23.5.3",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
@@ -38,16 +38,16 @@
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.8.0",
-		"@atlaskit/editor-synced-block-provider": "^2.0.0",
+		"@atlaskit/editor-synced-block-provider": "^2.1.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/editor-toolbar": "^0.15.0",
+		"@atlaskit/editor-toolbar": "^0.16.0",
 		"@atlaskit/icon": "28.5.3",
 		"@atlaskit/modal-dialog": "^14.5.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.16.0",
+		"@atlaskit/editor-common": "^110.18.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {