@atlaskit/editor-plugin-synced-block 3.1.1 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 3.2.0
+
+### Minor Changes
+
+- [`acb8231bc9e0c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/acb8231bc9e0c) -
+  EDITOR-1779 - "rebase" the transaction to reflect the latest document state
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.1.1
 
 ### Patch Changes

package/afm-dev-agents/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../design-system/button/afm-dev-agents/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-dev-agents/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-dev-agents/tsconfig.json"
 		},
@@ -40,6 +43,9 @@
 		{
 			"path": "../../editor-synced-block-provider/afm-dev-agents/tsconfig.json"
 		},
+		{
+			"path": "../../editor-toolbar/afm-dev-agents/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/icon/afm-dev-agents/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../design-system/button/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-jira/tsconfig.json"
 		},
@@ -40,6 +43,9 @@
 		{
 			"path": "../../editor-synced-block-provider/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-toolbar/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/icon/afm-jira/tsconfig.json"
 		},

package/afm-passionfruit/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../design-system/button/afm-passionfruit/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-passionfruit/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-passionfruit/tsconfig.json"
 		},
@@ -40,6 +43,9 @@
 		{
 			"path": "../../editor-synced-block-provider/afm-passionfruit/tsconfig.json"
 		},
+		{
+			"path": "../../editor-toolbar/afm-passionfruit/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/icon/afm-passionfruit/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../design-system/button/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-post-office/tsconfig.json"
 		},
@@ -40,6 +43,9 @@
 		{
 			"path": "../../editor-synced-block-provider/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../editor-toolbar/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/icon/afm-post-office/tsconfig.json"
 		},

package/afm-rovo-extension/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../design-system/button/afm-rovo-extension/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-rovo-extension/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-rovo-extension/tsconfig.json"
 		},
@@ -40,6 +43,9 @@
 		{
 			"path": "../../editor-synced-block-provider/afm-rovo-extension/tsconfig.json"
 		},
+		{
+			"path": "../../editor-toolbar/afm-rovo-extension/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/icon/afm-rovo-extension/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -25,6 +25,9 @@
 		{
 			"path": "../../../design-system/button/afm-townsquare/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-block-menu/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-decorations/afm-townsquare/tsconfig.json"
 		},
@@ -40,6 +43,9 @@
 		{
 			"path": "../../editor-synced-block-provider/afm-townsquare/tsconfig.json"
 		},
+		{
+			"path": "../../editor-toolbar/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/icon/afm-townsquare/tsconfig.json"
 		},

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

@@ -64,6 +64,14 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         return false;
       }
       return true;
+    },
+    appendTransaction: function appendTransaction(trs, oldState, newState) {
+      trs.filter(function (tr) {
+        return tr.docChanged;
+      }).forEach(function (tr) {
+        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.rebaseTransaction(tr, newState);
+      });
+      return null;
     }
   });
 };

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

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.rebaseTransaction = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var rebaseTransaction = exports.rebaseTransaction = function rebaseTransaction(currentTr, incomingTr, state) {
+  if (!incomingTr.docChanged) {
+    return currentTr;
+  }
+  var currentMapping = new _transform.Mapping((0, _toConsumableArray2.default)(currentTr.mapping.maps).reverse().map(function (map) {
+    return map.invert();
+  }));
+  var rebasedTransaction = state.tr;
+  currentTr.steps.forEach(function (step) {
+    var mappedStep = step.map(currentMapping);
+    if (mappedStep) {
+      rebasedTransaction.step(mappedStep);
+      currentMapping.appendMap(mappedStep.getMap());
+    }
+  });
+  return rebasedTransaction;
+};

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

@@ -8,43 +8,48 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(storeManager, tr, state) {
   var sourceSyncBlockRemoved = {};
   var sourceSyncBlockAdded = {};
-  tr.steps.map(function (step) {
-    if (step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep) {
-      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;
-            }
+
+  // and cast to specific step types
+  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;
           }
-          // 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 (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]) {
-              // If a source block is removed and added back in the same transaction,
-              // we treat it as no-op.
-              delete sourceSyncBlockRemoved[node.attrs.localId];
-            } else {
-              sourceSyncBlockAdded[node.attrs.localId] = node.attrs;
-            }
+    // 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) {
+      step.slice.content.nodesBetween(0, step.slice.content.size, function (node) {
+        if (storeManager.isSourceBlock(node)) {
+          if (sourceSyncBlockRemoved[node.attrs.localId]) {
+            // If a source block is removed and added back in the same transaction,
+            // we treat it as no-op.
+            delete sourceSyncBlockRemoved[node.attrs.localId];
+          } else {
+            sourceSyncBlockAdded[node.attrs.localId] = node.attrs;
           }
-          // we don't need to go deeper
-          return false;
-        });
-      }
+        }
+        // we don't need to go deeper
+        return false;
+      });
     }
   });
   return {

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

@@ -59,6 +59,12 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         return false;
       }
       return true;
+    },
+    appendTransaction: (trs, oldState, newState) => {
+      trs.filter(tr => tr.docChanged).forEach(tr => {
+        syncBlockStore === null || syncBlockStore === void 0 ? void 0 : syncBlockStore.rebaseTransaction(tr, newState);
+      });
+      return null;
     }
   });
 };

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

@@ -0,0 +1,16 @@
+import { Mapping } from '@atlaskit/editor-prosemirror/transform';
+export const rebaseTransaction = (currentTr, incomingTr, state) => {
+  if (!incomingTr.docChanged) {
+    return currentTr;
+  }
+  const currentMapping = new Mapping([...currentTr.mapping.maps].reverse().map(map => map.invert()));
+  const rebasedTransaction = state.tr;
+  currentTr.steps.forEach(step => {
+    const mappedStep = step.map(currentMapping);
+    if (mappedStep) {
+      rebasedTransaction.step(mappedStep);
+      currentMapping.appendMap(mappedStep.getMap());
+    }
+  });
+  return rebasedTransaction;
+};

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

@@ -2,45 +2,48 @@ import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/tra
 export const trackSyncBlocks = (storeManager, tr, state) => {
   const sourceSyncBlockRemoved = {};
   const sourceSyncBlockAdded = {};
-  tr.steps.map(step => {
-    if (step instanceof ReplaceStep || step instanceof ReplaceAroundStep) {
-      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;
-            }
+
+  // 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;
           }
-          // 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 (step.slice.content.size > 0) {
-        step.slice.content.nodesBetween(0, step.slice.content.size, node => {
-          if (storeManager.isSourceBlock(node)) {
-            if (sourceSyncBlockRemoved[node.attrs.localId]) {
-              // If a source block is removed and added back in the same transaction,
-              // we treat it as no-op.
-              delete sourceSyncBlockRemoved[node.attrs.localId];
-            } else {
-              sourceSyncBlockAdded[node.attrs.localId] = node.attrs;
-            }
+    // 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) {
+      step.slice.content.nodesBetween(0, step.slice.content.size, node => {
+        if (storeManager.isSourceBlock(node)) {
+          if (sourceSyncBlockRemoved[node.attrs.localId]) {
+            // If a source block is removed and added back in the same transaction,
+            // we treat it as no-op.
+            delete sourceSyncBlockRemoved[node.attrs.localId];
+          } else {
+            sourceSyncBlockAdded[node.attrs.localId] = node.attrs;
           }
-          // we don't need to go deeper
-          return false;
-        });
-      }
+        }
+        // we don't need to go deeper
+        return false;
+      });
     }
   });
   return {

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

@@ -58,6 +58,14 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         return false;
       }
       return true;
+    },
+    appendTransaction: function appendTransaction(trs, oldState, newState) {
+      trs.filter(function (tr) {
+        return tr.docChanged;
+      }).forEach(function (tr) {
+        syncBlockStore === null || syncBlockStore === void 0 || syncBlockStore.rebaseTransaction(tr, newState);
+      });
+      return null;
     }
   });
 };

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

@@ -0,0 +1,19 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { Mapping } from '@atlaskit/editor-prosemirror/transform';
+export var rebaseTransaction = function rebaseTransaction(currentTr, incomingTr, state) {
+  if (!incomingTr.docChanged) {
+    return currentTr;
+  }
+  var currentMapping = new Mapping(_toConsumableArray(currentTr.mapping.maps).reverse().map(function (map) {
+    return map.invert();
+  }));
+  var rebasedTransaction = state.tr;
+  currentTr.steps.forEach(function (step) {
+    var mappedStep = step.map(currentMapping);
+    if (mappedStep) {
+      rebasedTransaction.step(mappedStep);
+      currentMapping.appendMap(mappedStep.getMap());
+    }
+  });
+  return rebasedTransaction;
+};

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

@@ -2,43 +2,48 @@ import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/tra
 export var trackSyncBlocks = function trackSyncBlocks(storeManager, tr, state) {
   var sourceSyncBlockRemoved = {};
   var sourceSyncBlockAdded = {};
-  tr.steps.map(function (step) {
-    if (step instanceof ReplaceStep || step instanceof ReplaceAroundStep) {
-      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;
-            }
+
+  // and cast to specific step types
+  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;
           }
-          // 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 (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]) {
-              // If a source block is removed and added back in the same transaction,
-              // we treat it as no-op.
-              delete sourceSyncBlockRemoved[node.attrs.localId];
-            } else {
-              sourceSyncBlockAdded[node.attrs.localId] = node.attrs;
-            }
+    // 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) {
+      step.slice.content.nodesBetween(0, step.slice.content.size, function (node) {
+        if (storeManager.isSourceBlock(node)) {
+          if (sourceSyncBlockRemoved[node.attrs.localId]) {
+            // If a source block is removed and added back in the same transaction,
+            // we treat it as no-op.
+            delete sourceSyncBlockRemoved[node.attrs.localId];
+          } else {
+            sourceSyncBlockAdded[node.attrs.localId] = node.attrs;
           }
-          // we don't need to go deeper
-          return false;
-        });
-      }
+        }
+        // we don't need to go deeper
+        return false;
+      });
     }
   });
   return {

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

@@ -0,0 +1,2 @@
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const rebaseTransaction: (currentTr: Transaction, incomingTr: Transaction, state: EditorState) => Transaction;

package/dist/types/ui/CreateSyncedBlockDropdownItem.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { SyncedBlockPlugin } from '../syncedBlockPluginType';
-export declare const CreateSyncedBlockDropdownItem: ({ api }: {
+export declare const CreateSyncedBlockDropdownItem: ({ api, }: {
     api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined;
 }) => React.JSX.Element | null;

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

@@ -0,0 +1,2 @@
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const rebaseTransaction: (currentTr: Transaction, incomingTr: Transaction, state: EditorState) => Transaction;

package/dist/types-ts4.5/ui/CreateSyncedBlockDropdownItem.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { SyncedBlockPlugin } from '../syncedBlockPluginType';
-export declare const CreateSyncedBlockDropdownItem: ({ api }: {
+export declare const CreateSyncedBlockDropdownItem: ({ api, }: {
     api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined;
 }) => React.JSX.Element | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "3.1.1",
+	"version": "3.2.0",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,18 +33,18 @@
 		"@atlaskit/editor-plugin-block-menu": "^4.0.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^8.2.0",
-		"@atlaskit/editor-plugin-selection": "^6.0.0",
+		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
-		"@atlaskit/editor-synced-block-provider": "^0.3.0",
-		"@atlaskit/editor-toolbar": "^0.13.0",
+		"@atlaskit/editor-synced-block-provider": "^0.4.0",
+		"@atlaskit/editor-toolbar": "^0.14.0",
 		"@atlaskit/icon": "28.4.0",
 		"@atlaskit/modal-dialog": "^14.4.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.4.0",
+		"@atlaskit/editor-common": "^110.7.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {