@atlaskit/editor-plugin-collab-edit 2.3.0 → 2.4.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 2.4.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.4.0
+
+### Minor Changes
+
+- [#106350](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/106350)
+  [`ab9819f908779`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ab9819f908779) -
+  Migrated onEditorViewStateUpdatedCallbacks calls to createEditorStateNotificationPlugin
+
 ## 2.3.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/events/send-transaction.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sendTransaction = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../actions");
 var _pluginKey = require("../main/plugin-key");
 var sendTransaction = exports.sendTransaction = function sendTransaction(_ref) {
@@ -14,7 +15,7 @@ var sendTransaction = exports.sendTransaction = function sendTransaction(_ref) {
     useNativePlugin = _ref.useNativePlugin,
     viewMode = _ref.viewMode;
   return function (provider) {
-    var docChangedTransaction = transactions.find(function (tr) {
+    var docChangedTransaction = (0, _platformFeatureFlags.fg)('platform_editor_migrate_state_updates') ? originalTransaction.docChanged : transactions.find(function (tr) {
       return tr.docChanged;
     });
     var currentPluginState = _pluginKey.pluginKey.getState(newEditorState);
@@ -27,7 +28,11 @@ var sendTransaction = exports.sendTransaction = function sendTransaction(_ref) {
     // This metadata is coming from the scaleTable command in table-resizing plugin
     !originalTransaction.getMeta('scaleTable') && docChangedTransaction;
     if (useNativePlugin || shouldSendStepForSynchronyCollabProvider) {
-      provider.send(docChangedTransaction, oldEditorState, newEditorState);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_migrate_state_updates')) {
+        provider.send(originalTransaction, oldEditorState, newEditorState);
+      } else {
+        provider.send(docChangedTransaction, oldEditorState, newEditorState);
+      }
     }
     var prevPluginState = _pluginKey.pluginKey.getState(oldEditorState);
     var _ref2 = prevPluginState || {},

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

@@ -175,14 +175,14 @@ var getPositionOfTelepointer = exports.getPositionOfTelepointer = function getPo
 var isReplaceStep = exports.isReplaceStep = function isReplaceStep(step) {
   return step instanceof _transform.ReplaceStep;
 };
-var originalTransactionHasMeta = exports.originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
+var _originalTransactionHasMeta = exports.originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
   var hasMetaTag = Boolean(transaction.getMeta(metaTag));
   if (hasMetaTag) {
     return true;
   }
   var appendedTransaction = transaction.getMeta('appendedTransaction');
   if (appendedTransaction instanceof _state.Transaction) {
-    return originalTransactionHasMeta(appendedTransaction, metaTag);
+    return _originalTransactionHasMeta(appendedTransaction, metaTag);
   }
   return false;
 };

package/dist/es2019/pm-plugins/events/send-transaction.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getSendableSelection } from '../actions';
 import { pluginKey } from '../main/plugin-key';
 export const sendTransaction = ({
@@ -8,7 +9,7 @@ export const sendTransaction = ({
   useNativePlugin,
   viewMode
 }) => provider => {
-  const docChangedTransaction = transactions.find(tr => tr.docChanged);
+  const docChangedTransaction = fg('platform_editor_migrate_state_updates') ? originalTransaction.docChanged : transactions.find(tr => tr.docChanged);
   const currentPluginState = pluginKey.getState(newEditorState);
   if (!(currentPluginState !== null && currentPluginState !== void 0 && currentPluginState.isReady)) {
     return;
@@ -19,7 +20,11 @@ export const sendTransaction = ({
   // This metadata is coming from the scaleTable command in table-resizing plugin
   !originalTransaction.getMeta('scaleTable') && docChangedTransaction;
   if (useNativePlugin || shouldSendStepForSynchronyCollabProvider) {
-    provider.send(docChangedTransaction, oldEditorState, newEditorState);
+    if (fg('platform_editor_migrate_state_updates')) {
+      provider.send(originalTransaction, oldEditorState, newEditorState);
+    } else {
+      provider.send(docChangedTransaction, oldEditorState, newEditorState);
+    }
   }
   const prevPluginState = pluginKey.getState(oldEditorState);
   const {

package/dist/esm/pm-plugins/events/send-transaction.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getSendableSelection } from '../actions';
 import { pluginKey } from '../main/plugin-key';
 export var sendTransaction = function sendTransaction(_ref) {
@@ -8,7 +9,7 @@ export var sendTransaction = function sendTransaction(_ref) {
     useNativePlugin = _ref.useNativePlugin,
     viewMode = _ref.viewMode;
   return function (provider) {
-    var docChangedTransaction = transactions.find(function (tr) {
+    var docChangedTransaction = fg('platform_editor_migrate_state_updates') ? originalTransaction.docChanged : transactions.find(function (tr) {
       return tr.docChanged;
     });
     var currentPluginState = pluginKey.getState(newEditorState);
@@ -21,7 +22,11 @@ export var sendTransaction = function sendTransaction(_ref) {
     // This metadata is coming from the scaleTable command in table-resizing plugin
     !originalTransaction.getMeta('scaleTable') && docChangedTransaction;
     if (useNativePlugin || shouldSendStepForSynchronyCollabProvider) {
-      provider.send(docChangedTransaction, oldEditorState, newEditorState);
+      if (fg('platform_editor_migrate_state_updates')) {
+        provider.send(originalTransaction, oldEditorState, newEditorState);
+      } else {
+        provider.send(docChangedTransaction, oldEditorState, newEditorState);
+      }
     }
     var prevPluginState = pluginKey.getState(oldEditorState);
     var _ref2 = prevPluginState || {},

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

@@ -166,14 +166,14 @@ export var getPositionOfTelepointer = function getPositionOfTelepointer(sessionI
 export var isReplaceStep = function isReplaceStep(step) {
   return step instanceof ReplaceStep;
 };
-export var originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
+var _originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
   var hasMetaTag = Boolean(transaction.getMeta(metaTag));
   if (hasMetaTag) {
     return true;
   }
   var appendedTransaction = transaction.getMeta('appendedTransaction');
   if (appendedTransaction instanceof Transaction) {
-    return originalTransactionHasMeta(appendedTransaction, metaTag);
+    return _originalTransactionHasMeta(appendedTransaction, metaTag);
   }
   return false;
 };
@@ -188,6 +188,7 @@ export var originalTransactionHasMeta = function originalTransactionHasMeta(tran
  *
  * Steps analycs dashboard: https://atlassian-discover.cloud.databricks.com/dashboardsv3/01ef4d3c8aa916c8b0cb5332a9f37caf/published?o=4482001201517624
  */
+export { _originalTransactionHasMeta as originalTransactionHasMeta };
 var blockedAttrsList = ['__contextId', 'localId', '__autoSize', 'attr_colwidth', 'originalHeight', 'originalWidth'];
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "2.3.0",
+	"version": "2.4.1",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^99.6.0",
+		"@atlaskit/editor-common": "^99.7.0",
 		"@atlaskit/editor-json-transformer": "^8.22.0",
 		"@atlaskit/editor-plugin-analytics": "1.11.0",
 		"@atlaskit/editor-plugin-connectivity": "^1.1.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/platform-feature-flags": "^1.0.0",
 		"@atlaskit/prosemirror-collab": "^0.11.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
@@ -111,6 +111,9 @@
 		},
 		"platform_editor_selection_without_left_shift": {
 			"type": "boolean"
+		},
+		"platform_editor_migrate_state_updates": {
+			"type": "boolean"
 		}
 	}
 }